Fixed initContainer bug

nano-byte · Feb 2, 2024 · 57b45a6 · 57b45a6
1 parent 47c51de
commit 57b45a6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/charts/generic-service/ci/initContainer-values.yaml b/charts/generic-service/ci/initContainer-values.yaml
@@ -12,10 +12,3 @@ initContainers:
     image: docker/whalesay
     command: ["cowsay"]
     args: ["hi"]
-
-initContainerTemplates:
-  - |
-      name: init2
-      image: docker/whalesay:{{ .Values.image.tag }}
-      command: ["cowsay"]
-      args: ["hi"]
diff --git a/charts/generic-service/ci/initContainerTemplates-values.yaml b/charts/generic-service/ci/initContainerTemplates-values.yaml
@@ -0,0 +1,15 @@
+# InitContainer test
+
+name: test
+fullname: my-test
+
+image:
+  repository: jwilder/whoami
+  tag: latest
+
+initContainerTemplates:
+  - |
+      name: init2
+      image: docker/whalesay:{{ .Values.image.tag }}
+      command: ["cowsay"]
+      args: ["hi"]
diff --git a/charts/generic-service/templates/controller.yaml b/charts/generic-service/templates/controller.yaml
@@ -442,7 +442,7 @@ spec:
       {{- end }}
       {{- end }}
 
-      {{ if .Values.initContainers }}
+      {{ if or .Values.initContainers .Values.initContainerTemplates }}
       initContainers:
       {{- range .Values.initContainers }}
         - securityContext: {{- $.Values.securityContext.container | toYaml | nindent 12 }}