Merge pull request #383 from tanakapayam/tanakapayam/elasticsearch-po…

…d-labels [elasticsearch] Apply labels to all pods
elastic · Nov 22, 2019 · 2226073 · 2226073
2 parents f2c8815 + b9757da
commit 2226073
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -41,6 +41,9 @@ spec:
         release: {{ .Release.Name | quote }}
         chart: "{{ .Chart.Name }}"
         app: "{{ template "uname" . }}"
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
       annotations:
         {{- range $key, $value := .Values.podAnnotations }}
         {{ $key }}: {{ $value | quote }}

diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -680,7 +680,7 @@ def test_adding_a_label_on_non_headless_service():
     r = helm_template(config)
 
     assert 'label1' not in r['service'][uname]['metadata']['labels']
-    
+
     config = '''
     service:
       labels:
@@ -699,7 +699,7 @@ def test_adding_a_label_on_headless_service():
     r = helm_template(config)
 
     assert 'label1' not in r['service'][uname + '-headless']['metadata']['labels']
-    
+
     config = '''
     service:
       labelsHeadless:
@@ -847,6 +847,7 @@ def test_adding_pod_labels():
 '''
     r = helm_template(config)
     assert r['statefulset'][uname]['metadata']['labels']['app.kubernetes.io/name'] == 'elasticsearch'
+    assert r['statefulset'][uname]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'elasticsearch'
 
 def test_keystore_enable():
     config = ''