2 files changed, 21 insertions, 32 deletions
diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index e57d4bedaa..18f9bb1ba5 100644
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -1,42 +1,18 @@
-{{- define "ingress.config.host" -}}
-{{-   $dot := default . .dot -}}
-{{-   $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}}
-{{-   $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}}
-{{ printf "%s.%s" $baseaddr $burl }}
-{{- end -}}
-
 {{- define "ingress.config.port" -}}
 {{-   $dot := default . .dot -}}
-{{- if .Values.ingress -}}
-{{- if .Values.global.ingress -}}
-{{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}}
-  - http:
-      paths:
-{{- range .Values.ingress.service }}
-{{ $baseaddr := required "baseaddr" .baseaddr }}
-        - path: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
-          backend:
-            serviceName: {{ .name }}
-            servicePort: {{ .port }}
-{{- end -}}
-{{- else if .Values.ingress.service -}}
+{{-   $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}}
 {{ range .Values.ingress.service }}
-{{ $baseaddr := required "baseaddr" .baseaddr }}
-  - host: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
+{{-   $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }}
+  - host: {{ printf "%s.%s" $baseaddr $burl }}
     http:
       paths:
       - backend:
           serviceName: {{ .name }}
           servicePort: {{ .port }}
-{{- end -}}
-{{- else -}}
-        - path: {{ printf "/%s" .Chart.Name }}
-          backend:
-            serviceName: {{ .Chart.Name }}
-            servicePort: {{ .Values.service.externalPort }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+        {{- if .path }}
+        path: {{ .path }}
+        {{- end }}
+{{- end }}
 {{- end -}}
 
 
diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
index 6a1a1eb82a..aa03938d28 100644
--- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
+++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
@@ -35,6 +35,14 @@
       - aaf-cm
       - aaf-service
 
+  the powerful one allows also to wait for jobs with this:
+  wait_for:
+    name: myname
+    jobs:
+      - '{{ include "common.release" . }}-the-job'
+
+  Be careful, as on the example above, the job name may have a "non fixed" name
+  and thus don't forget to use templates if needed
 
   The function can takes below arguments (inside a dictionary):
      - .dot : environment (.)
@@ -55,16 +63,21 @@
 {{-   $wait_for := default $initRoot.wait_for .wait_for -}}
 {{-   $containers := index (ternary (dict "containers" $wait_for) $wait_for (kindIs "slice" $wait_for)) "containers" -}}
 {{-   $namePart := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "name" -}}
+{{-   $jobs := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "jobs" -}}
 - name: {{ include "common.name" $dot }}{{ ternary "" (printf "-%s" $namePart) (empty $namePart) }}-readiness
   image: "{{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.readinessImage }}"
   imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
   command:
   - /app/ready.py
   args:
-  {{- range $container := $containers }}
+  {{- range $container := default (list) $containers }}
   - --container-name
   - {{ tpl $container $dot }}
   {{- end }}
+  {{- range $job := $jobs }}
+  - --job-name
+  - {{ tpl $job $dot }}
+  {{- end }}
   env:
   - name: NAMESPACE
     valueFrom: