Merge pull request #186 from elastic/so_persistent

[elasticsearch] Fix pvc annotations with multiple fields
elastic · Jun 26, 2019 · 35e1b9d · 35e1b9d
2 parents 34bf8c9 + 2d309cb
commit 35e1b9d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -23,7 +23,7 @@ spec:
       name: {{ template "uname" . }}
     {{- with .Values.persistence.annotations  }}
       annotations:
-    {{ toYaml . | indent 4 }}
+{{ toYaml . | indent 8 }}
     {{- end }}
     spec:
 {{ toYaml .Values.volumeClaimTemplate | indent 6 }}

diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -343,7 +343,20 @@ def test_adding_storageclass_annotation_to_volumeclaimtemplate():
 '''
     r = helm_template(config)
     annotations = r['statefulset'][uname]['spec']['volumeClaimTemplates'][0]['metadata']['annotations']
-    assert {'volume.beta.kubernetes.io/storage-class': 'id'} == annotations
+    assert annotations['volume.beta.kubernetes.io/storage-class'] == 'id'
+
+def test_adding_multiple_persistence_annotations():
+    config = '''
+    persistence:
+      annotations:
+        hello: world
+        world: hello
+    '''
+    r = helm_template(config)
+    annotations = r['statefulset'][uname]['spec']['volumeClaimTemplates'][0]['metadata']['annotations']
+
+    assert annotations['hello'] == 'world'
+    assert annotations['world'] == 'hello'
 
 
 def test_adding_a_secret_mount():