[kibana] add extra init containers

elastic · Feb 6, 2020 · decd945 · decd945
1 parent 8ea88ae
commit decd945
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/kibana/README.md b/kibana/README.md
@@ -83,6 +83,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.5.2
 | `lifecycle`               | Allows you to add lifecycle configuration. See [values.yaml](https://github.com/elastic/helm-charts/tree/master/kibana/values.yaml) for an example of the formatting.                                                                                                                                                                                          | `{}`                                                                                                                      |
 | `fullnameOverride`        | Overrides the full name of the resources. If not set the name will default to "`.Release.Name`-`.Values.nameOverride or .Chart.Name`"                                                                                                                                                                                                                          | `""`                                                                                                                      |
 | `extraContainers`         | Templatable string of additional containers to be passed to the `tpl` function                                                                                                                                                                                                                                                                                 | `""`                                                                                                                      |
+| `extraInitContainers`     | Templatable string of additional containers to be passed to the `tpl` function                                                                                                                                                                                                                                                                                 | `""`                                                                                                                      |
 
 ## Examples
 

diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
@@ -68,6 +68,10 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
     {{- end }}
+      {{- if .Values.extraInitContainers }}
+      initContainers:
+{{ tpl .Values.extraInitContainers . | indent 6 }}
+      {{- end }}
       containers:
       - name: kibana
         securityContext:

diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
@@ -148,6 +148,18 @@ def test_adding_a_extra_container():
     assert {'name': 'do-something', 'image': 'busybox', 'command': ['do', 'something'], } in extraContainer
 
 
+def test_adding_a_extra_init_container():
+    config = '''
+extraInitContainers: |
+  - name: do-something
+    image: busybox
+    command: ['do', 'something']
+'''
+    r = helm_template(config)
+    extraInitContainer = r['deployment'][name]['spec']['template']['spec']['initContainers']
+    assert {'name': 'do-something', 'image': 'busybox', 'command': ['do', 'something'], } in extraInitContainer
+
+
 def test_adding_an_ingress_rule():
     config = '''
 ingress:

diff --git a/kibana/values.yaml b/kibana/values.yaml
@@ -78,6 +78,11 @@ extraContainers: ""
 #   image: busybox
 #   command: ['echo', 'hey']
 
+extraInitContainers: ""
+# - name: dummy-init
+#   image: busybox
+#   command: ['echo', 'hey']
+
 updateStrategy:
   type: "Recreate"