Added support for initContainers

nano-byte · Feb 2, 2024 · 812bf0c · 812bf0c
1 parent 6dfbec2
commit 812bf0c
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
@@ -180,6 +180,8 @@ app:
 | `alerting.custom.*.description`                 | __required if used__        | A longer description of the alert; can include metric labels via templating                              |
 | `sidecars`                                      | `[]`                        | Additional sidecar containers to be added to the `Pod`                                                   |
 | `sidecarTemplates`                              | `[]`                        | Strings to be templated providing additional sidecar containers to be added to the Pod                   |
+| `initContainers`                                | `[]`                        | Additional init containers to be added to the `Pod`                                                   |
+| `initContainerTemplates`                        | `[]`                        | Strings to be templated providing additional init containers to be added to the Pod   
 | `rbac.roles`                                    | `[]`                        | Namespace-specific Kubernetes RBAC Roles to assign to the service (supports templating)                  |
 | `rbac.clusterRoles`                             | `[]`                        | Cluster-wide Kubernetes RBAC Roles to assign to the service (supports templating)                        |
 | `rbac.existingServiceAccount`                   |                             | The name of an existing service account to use (instead of automatically creating one for the service)   |

diff --git a/charts/generic-service/ci/initContainer-values.yaml b/charts/generic-service/ci/initContainer-values.yaml
@@ -0,0 +1,21 @@
+# InitContainer test
+
+name: test
+fullname: my-test
+
+image:
+  repository: jwilder/whoami
+  tag: latest
+
+initContainers:
+  - name: init1
+    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/templates/controller.yaml b/charts/generic-service/templates/controller.yaml
@@ -441,3 +441,19 @@ spec:
           {{- $spec | nindent 10 }}
       {{- end }}
       {{- end }}
+
+      {{ if .Values.initContainers }}
+      initContainers:
+      {{- range .Values.initContainers }}
+        - securityContext: {{- $.Values.securityContext.container | toYaml | nindent 12 }}
+          {{- toYaml . | nindent 10 }}
+      {{- end }}
+      {{- range .Values.initContainerTemplates }}
+      {{- $spec := tpl . $ }}
+      {{- if $spec }}
+        - securityContext: {{- $.Values.securityContext.container | toYaml | nindent 12 }}
+          {{- $spec | nindent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
+
diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
@@ -1042,6 +1042,16 @@
       "items": {"type": "string"},
       "description": "Strings to be templated providing additional sidecar containers to be added to the Pod"
     },
+    "initContainers": {
+      "type": "array",
+      "items": {"type": "object"},
+      "description": "Additional init containers to be added to the Pod"
+    },
+    "initContainerTemplates": {
+      "type": "array",
+      "items": {"type": "string"},
+      "description": "Strings to be templated providing additional init containers to be added to the Pod"
+    },
     "rbac": {
       "type": "object",
       "properties": {

diff --git a/charts/generic-service/values.yaml b/charts/generic-service/values.yaml
@@ -187,6 +187,9 @@ alerting:
       labelValue: ""
   custom: {}
 
+initContainers: []
+initContainerTemplates: []
+
 sidecars: []
 sidecarTemplates: []