[metricbeat] add extra init containers

elastic · Feb 6, 2020 · 3d482df · 3d482df
1 parent 219eea6
commit 3d482df
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/metricbeat/README.md b/metricbeat/README.md
@@ -69,6 +69,7 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.5.2
 | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------- |
 | `metricbeatConfig`       | Allows you to add any config files in `/usr/share/metricbeat` such as `metricbeat.yml`. See [values.yaml](https://github.com/elastic/helm-charts/tree/master/metricbeat/values.yaml) for an example of the formatting with the default configuration.                                                                    | see [values.yaml](https://github.com/elastic/helm-charts/tree/master/metricbeat/values.yaml)                              |
 | `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                                                                                                                                                                                                                                           | `""`                                                                                                                      |
 | `extraEnvs`              | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container                                                                       | `[]`                                                                                                                      |
 | `extraVolumeMounts`      | Templatable string of additional volumeMounts to be passed to the `tpl` function                                                                                                                                                                                                                                         | `""`                                                                                                                      |
 | `extraVolumes`           | Templatable string of additional volumes to be passed to the `tpl` function                                                                                                                                                                                                                                              | `""`                                                                                                                      |

diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
@@ -86,6 +86,10 @@ spec:
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
+      {{- end }}
+      {{- if .Values.extraInitContainers }}
+      initContainers:
+{{ tpl .Values.extraInitContainers . | indent 6 }}
       {{- end }}
       containers:
       - name: "metricbeat"

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

diff --git a/metricbeat/tests/metricbeat_test.py b/metricbeat/tests/metricbeat_test.py
@@ -58,6 +58,21 @@ def test_adding_a_extra_container():
     assert {'name': 'do-something', 'image': 'busybox', 'command': ['do', 'something'], } in extraContainerDeployment
 
 
+def test_adding_a_extra_init_container():
+    config = '''
+extraInitContainers: |
+  - name: do-something
+    image: busybox
+    command: ['do', 'something']
+'''
+    r = helm_template(config)
+    extraInitContainerDaemonset = r['daemonset'][name]['spec']['template']['spec']['initContainers']
+    assert {'name': 'do-something', 'image': 'busybox', 'command': ['do', 'something'], } in extraInitContainerDaemonset
+    deployment_name = name + '-metrics'
+    extraInitContainerDeployment = r['deployment'][deployment_name]['spec']['template']['spec']['initContainers']
+    assert {'name': 'do-something', 'image': 'busybox', 'command': ['do', 'something'], } in extraInitContainerDeployment
+
+
 def test_adding_envs():
     config = '''
 extraEnvs:

diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
@@ -69,6 +69,11 @@ extraContainers: ""
 #   image: busybox
 #   command: ['echo', 'hey']
 
+extraInitContainers: ""
+# - name: dummy-init
+#   image: busybox
+#   command: ['echo', 'hey']
+
 # Extra environment variables to append to the DaemonSet pod spec.
 # This will be appended to the current 'env:' key. You can use any of the kubernetes env
 # syntax here