fix: increase timeout wait min io container (#850)

* chore: increase timeout for minio wait Signed-off-by: Guilhem Barthés <[email protected]> * chore: change order of `initContainer` Signed-off-by: Guilhem Barthés <[email protected]> * chore: bump chart version Signed-off-by: Guilhem Barthés <[email protected]> * docs(chart): changelog Signed-off-by: Guilhem Barthés <[email protected]> --------- Signed-off-by: Guilhem Barthés <[email protected]>
Substra · Mar 6, 2024 · b650487 · b650487
1 parent a6e558d
commit b650487
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+
+## [24.3.1] - 2024-03-06
+
+### Fixed
+
+- increased timout in `wait-minio` & changed initContainers order
+
 ## [24.3.0] - 2024-03-05
 
 ### Removed

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: 24.3.0
+version: 24.3.1
 appVersion: 0.43.0
 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,7 +204,7 @@ The hostname we should connect to (external is defined, otherwise integrated)
 {{- if or .Values.minio.enabled .Values.localstack.enabled }}
 - name: wait-minio
   image: jwilder/dockerize:0.6.1
-  command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.objectStore.url" .}}']
+  command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.objectStore.url" .}}', '-timeout', '15s']
 {{- end }}
 {{- end -}}
 

diff --git a/charts/substra-backend/templates/deployment-server.yaml b/charts/substra-backend/templates/deployment-server.yaml
@@ -168,8 +168,21 @@ spec:
       {{- end }}
       initContainers:
       {{- include "common.addCertInitContainer" . | nindent 6 }}
+      - name: init-collectstatic
+        image: {{ include "substra-backend.images.name" (dict "img" .Values.server.image "defaultTag" $.Chart.AppVersion) }}
+        command: ['python', 'manage.py', 'collectstatic', '--noinput']
+        envFrom:
+          - configMapRef:
+              name: {{ include "substra.fullname" . }}-orchestrator
+          - configMapRef:
+              name: {{ include "substra.fullname" . }}-settings
+        env:
+          - name: DJANGO_SETTINGS_MODULE
+            value: backend.settings.{{ .Values.settings }}
+        volumeMounts:
+          - name: statics
+            mountPath: /usr/src/app/backend/statics
       {{- 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) }}
         command: ['python', 'manage.py', 'migrate']
@@ -187,20 +200,7 @@ spec:
         env:
         - name: DJANGO_SETTINGS_MODULE
           value: backend.settings.{{ .Values.settings }}
-      - name: init-collectstatic
-        image: {{ include "substra-backend.images.name" (dict "img" .Values.server.image "defaultTag" $.Chart.AppVersion) }}
-        command: ['python', 'manage.py', 'collectstatic', '--noinput']
-        envFrom:
-          - configMapRef:
-              name: {{ include "substra.fullname" . }}-orchestrator
-          - configMapRef:
-              name: {{ include "substra.fullname" . }}-settings
-        env:
-          - name: DJANGO_SETTINGS_MODULE
-            value: backend.settings.{{ .Values.settings }}
-        volumeMounts:
-          - name: statics
-            mountPath: /usr/src/app/backend/statics
+      {{- include "common.waitMinIOContainer" . | nindent 6 }}
       volumes:
       - name: data-servermedias
         persistentVolumeClaim: