refactor(charts): wait-postgresql initContainer moved to the Helm hel…

…per templates Signed-off-by: Kaan Yagci <[email protected]>
Substra · Oct 5, 2023 · e4a8800 · e4a8800
1 parent 3e14d9b
commit e4a8800
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/charts/substra-backend/templates/_helpers.tpl b/charts/substra-backend/templates/_helpers.tpl
@@ -194,4 +194,11 @@ The hostname we should connect to (external is defined, otherwise integrated)
     {{- else }}
         {{- template "postgresql.primary.fullname" .Subcharts.postgresql }}.{{ .Release.Namespace }}
     {{- end }}
-{{- end -}}
+{{- end -}}
+
+# charts/<your_chart>/templates/_helpers.tpl
+{{- define "common.waitPostgresqlInitContainer" -}}
+- name: wait-postgresql
+  image: jwilder/dockerize:0.6.1
+  command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+{{- 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 }}
       - name: wait-minio
         image: jwilder/dockerize:0.6.1
         command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']

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/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 }}
       - name: wait-minio
         image: jwilder/dockerize:0.6.1
         command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']