refactor(charts): Move wait-postgresql to Helm chart helper templates (…

…#753) * refactor(charts): Move wait-postgresql to Helm chart helper templates Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com> * chore(charts): Chart version bumped to 22.8.3 Changelog updated Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com> * fix(changelog): typoe fixed in title Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com> * chore(helm): change wait-postgresql image with postgresql image Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com> --------- Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com>
Substra · Oct 10, 2023 · 24c3703 · 24c3703
1 parent 85d797d
commit 24c3703
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [22.8.5] - 2023-10-09
+
+### Changed
+
+- initContainer `wait-postgresql` refactored to Helm Helper templates
+
 ## [22.8.4] - 2023-10-06
 
 ## Changed

diff --git a/charts/substra-backend/Chart.yaml b/charts/substra-backend/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: substra-backend
 home: https://github.com/Substra
-version: 22.8.4
+version: 22.8.5
 appVersion: 0.42.1
 kubeVersion: ">= 1.19.0-0"
 description: Main package for Substra

diff --git a/charts/substra-backend/templates/_helpers.tpl b/charts/substra-backend/templates/_helpers.tpl
@@ -204,4 +204,14 @@ The hostname we should connect to (external is defined, otherwise integrated)
 - name: wait-minio
   image: jwilder/dockerize:0.6.1
   command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
+{{- end -}}
+
+
+{{/*
+`wait-postgresql` container initialisation used inside of `initContainers`
+*/}}
+{{- define "common.waitPostgresqlInitContainer" -}}
+- name: wait-postgresql
+  image: postgres
+  command: ['sh', '-c', 'until pg_isready --host={{ template "substra-backend.database.host" . }} --port={{ .Values.database.port }}; do echo "Waiting for postgresql service"; sleep 2; done;']
 {{- end -}}
diff --git a/charts/substra-backend/templates/deployment-api-events.yaml b/charts/substra-backend/templates/deployment-api-events.yaml
@@ -109,9 +109,7 @@ spec:
             - mountPath: /tmp/certs/
               name: ssl-certs
         {{- end }}
-        - name: wait-postgresql
-          image: jwilder/dockerize:0.6.1
-          command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+        {{- include "common.waitPostgresqlInitContainer" . | nindent 8 }}
         - name: wait-init-migrations
           image: {{ include "substra-backend.images.name" (dict "img" .Values.api.events.image "defaultTag" $.Chart.AppVersion) }}
           command: ['bash', '/usr/src/app/wait-init-migration.sh']

diff --git a/charts/substra-backend/templates/deployment-server.yaml b/charts/substra-backend/templates/deployment-server.yaml
@@ -188,9 +188,7 @@ spec:
           - mountPath: /tmp/certs/
             name: ssl-certs
       {{- end }}
-      - name: wait-postgresql
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+      {{- include "common.waitPostgresqlInitContainer" . | nindent 6 }}
       {{- include "common.waitMinIOContainer" . | nindent 6 }}
       - name: init-migrate
         image: {{ include "substra-backend.images.name" (dict "img" .Values.server.image "defaultTag" $.Chart.AppVersion) }}

diff --git a/charts/substra-backend/templates/deployment-worker-events.yaml b/charts/substra-backend/templates/deployment-worker-events.yaml
@@ -109,9 +109,7 @@ spec:
             - mountPath: /tmp/certs/
               name: ssl-certs
         {{- end }}
-        - name: wait-postgresql
-          image: jwilder/dockerize:0.6.1
-          command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+        {{- include "common.waitPostgresqlInitContainer" . | nindent 8 }}
         - name: wait-init-migrations
           image: {{ include "substra-backend.images.name" (dict "img" .Values.worker.events.image "defaultTag" $.Chart.AppVersion) }}
           command: ['bash', '/usr/src/app/wait-init-migration.sh']

diff --git a/charts/substra-backend/templates/runtime-class.yaml b/charts/substra-backend/templates/runtime-class.yaml
diff --git a/charts/substra-backend/templates/statefulset-worker.yaml b/charts/substra-backend/templates/statefulset-worker.yaml
@@ -97,9 +97,7 @@ spec:
             mountPath: /kaniko/.docker
           {{- end }}
       {{- end}}
-      - name: wait-postgresql
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+      {{- include "common.waitPostgresqlInitContainer" . | nindent 6 }}
       {{- include "common.waitMinIOContainer" . | nindent 6}}
       containers:
         - name: worker