[metricbeat] apply labels to all pods

elastic · Dec 18, 2019 · 5429030 · 5429030
1 parent 68e43ef
commit 5429030
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
@@ -34,6 +34,9 @@ spec:
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     spec:
       {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 6 }}

diff --git a/metricbeat/tests/metricbeat_test.py b/metricbeat/tests/metricbeat_test.py
@@ -238,6 +238,7 @@ def test_adding_pod_labels():
 '''
     r = helm_template(config)
     assert r['daemonset'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'metricbeat'
+    assert r['daemonset'][name]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'metricbeat'
 
 def test_setting_fullnameOverride():
     config = '''