refactor(helm): refactor wait-minio (#755)

`wait-minio` inside of `initContainer` moved to the helm helper templates Signed-off-by: Kaan Yagci <kaan.yagci-ext@owkin.com>
Substra · Oct 9, 2023 · 85d797d · 85d797d
1 parent edfb991
commit 85d797d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [22.8.4] - 2023-10-06
+
+## Changed
+
+- `wait-minio` container definition moved to the Helm helper templates
+
 ## [22.8.3] - 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.3
+version: 22.8.4
 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
@@ -194,4 +194,14 @@ The hostname we should connect to (external is defined, otherwise integrated)
     {{- else }}
         {{- template "postgresql.primary.fullname" .Subcharts.postgresql }}.{{ .Release.Namespace }}
     {{- end }}
+{{- end -}}
+
+
+{{/*
+`wait-minio` container initialisation used inside of `initContainers`
+*/}}
+{{- define "common.waitMinIOContainer" -}}
+- name: wait-minio
+  image: jwilder/dockerize:0.6.1
+  command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
 {{- end -}}
diff --git a/charts/substra-backend/templates/deployment-server.yaml b/charts/substra-backend/templates/deployment-server.yaml
@@ -191,9 +191,7 @@ spec:
       - name: wait-postgresql
         image: jwilder/dockerize:0.6.1
         command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
-      - name: wait-minio
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
+      {{- include "common.waitMinIOContainer" . | nindent 6 }}
       - name: init-migrate
         image: {{ include "substra-backend.images.name" (dict "img" .Values.server.image "defaultTag" $.Chart.AppVersion) }}
         command: ['python', 'manage.py', 'migrate']

diff --git a/charts/substra-backend/templates/statefulset-worker.yaml b/charts/substra-backend/templates/statefulset-worker.yaml
@@ -100,9 +100,7 @@ spec:
       - name: wait-postgresql
         image: jwilder/dockerize:0.6.1
         command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
-      - name: wait-minio
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
+      {{- include "common.waitMinIOContainer" . | nindent 6}}
       containers:
         - name: worker
           image: {{ include "substra-backend.images.name" (dict "img" .Values.worker.image "defaultTag" $.Chart.AppVersion) }}