diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2024-04-11 13:53:39 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2024-04-11 18:41:30 +0200 |
| commit | ee119102020f1dc6044f686c748a37ff0e7487de (patch) | |
| tree | efa4eaf61a118e50697a17ac7853ca62433332d1 /kubernetes/sdnc/templates | |
| parent | 16d200e4f99dbad508156d936b9481bed051055b (diff) | |
[COMMON] Update all ReadinessChecks
Use the new "service" feature of the readiness image to
resolve startup dependencies.
Issue-ID: OOM-3280
Change-Id: Ia331d51528676744e5e0479d1fd0ca02830c3499
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/sdnc/templates')
| -rwxr-xr-x | kubernetes/sdnc/templates/job.yaml | 16 | ||||
| -rwxr-xr-x | kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 4 |
3 files changed, 5 insertions, 19 deletions
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml index 5aaae2a2a3..3dcfdeacfd 100755 --- a/kubernetes/sdnc/templates/job.yaml +++ b/kubernetes/sdnc/templates/job.yaml @@ -34,7 +34,7 @@ spec: release: {{ include "common.release" . }} name: {{ include "common.name" . }} spec: - initContainers: + initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }} - command: - sh args: @@ -75,20 +75,6 @@ spec: image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config - - {{- if .Values.global.mariadbGalera.localCluster }} - {{- if .Values.global.mariadbGalera.useOperator }} - {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }} - {{ else }} - {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }} - {{- end }} - {{ else }} - {{- if .Values.global.mariadbGalera.useOperator }} - {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }} - {{ else }} - {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }} - {{- end }} - {{- end }} containers: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 2c31411f87..419a9c4109 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -28,8 +28,8 @@ spec: - /app/ready.py args: {{- if .Values.config.sdnr.mariadb.enabled }} - - --app-name - - {{ include "common.mariadbAppName" . }} + - --service-name + - {{ include "common.mariadbService" . }} {{- else }} - --container-name - {{.Values.elasticsearch.nameOverride}}-elasticsearch diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 86a011b59f..4b782308d6 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -138,8 +138,8 @@ spec: - /app/ready.py args: {{ if .Values.dgbuilder.enabled -}} - - --app-name - - {{ include "common.mariadbAppName" . }} + - --service-name + - {{ include "common.mariadbService" . }} - --job-name - {{ include "common.fullname" . }}-dbinit-job {{ end -}} |