From 57b45a6756ed1abecab3c2fb938aea3b281044d8 Mon Sep 17 00:00:00 2001
From: Jannik Hoffjann <mail@jannikhoffjann.de>
Date: Fri, 2 Feb 2024 15:31:33 +0100
Subject: [PATCH] Fixed initContainer bug

---
 .../generic-service/ci/initContainer-values.yaml  |  7 -------
 .../ci/initContainerTemplates-values.yaml         | 15 +++++++++++++++
 charts/generic-service/templates/controller.yaml  |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 charts/generic-service/ci/initContainerTemplates-values.yaml

diff --git a/charts/generic-service/ci/initContainer-values.yaml b/charts/generic-service/ci/initContainer-values.yaml
index c20b29f..4731277 100644
--- 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
new file mode 100644
index 0000000..50f1d85
--- /dev/null
+++ 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
index 657db07..7627aa8 100644
--- 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 }}