diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-12-17 11:10:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-17 11:10:25 +0000 |
| commit | f8b274b47a9413fe13b6d8e7f5c1edbb7c179a56 (patch) | |
| tree | 1d930bfe0fe2cdf15d24253ffdc5e158a30e1915 /kubernetes/common | |
| parent | cb907bf181d8521bd8708525997b78bfac16d2ba (diff) | |
| parent | 79a4467f0a8ea824c63206739eb51cebceaa3e0e (diff) | |
Merge "[COMMON] Add job support for readinessCheck"
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/readinessCheck/templates/_readinessCheck.tpl | 15 |
1 files changed, 14 insertions, 1 deletions
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: |