Merge pull request #182 from hxquangnhat/patch-1

change secretName field
elastic · Jul 1, 2019 · 7c79ace · 7c79ace
2 parents 35e1b9d + 61a2f5e
commit 7c79ace
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -96,7 +96,7 @@ spec:
         {{- range .Values.secretMounts }}
         - name: {{ .name }}
           secret:
-            secretName: {{ .name }}
+            secretName: {{ .secretName }}
         {{- end }}
         {{- if .Values.esConfig }}
         - name: esconfig

diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -363,7 +363,7 @@ def test_adding_a_secret_mount():
     config = '''
 secretMounts:
   - name: elastic-certificates
-    secretName: elastic-certificates
+    secretName: elastic-certs
     path: /usr/share/elasticsearch/config/certs
 '''
     r = helm_template(config)
@@ -375,7 +375,7 @@ def test_adding_a_secret_mount():
     assert s['volumes'] == [{
         'name': 'elastic-certificates',
         'secret': {
-            'secretName': 'elastic-certificates'
+            'secretName': 'elastic-certs'
         }
     }]
 
@@ -384,7 +384,7 @@ def test_adding_a_secret_mount_with_subpath():
     config = '''
 secretMounts:
   - name: elastic-certificates
-    secretName: elastic-certificates
+    secretName: elastic-certs
     path: /usr/share/elasticsearch/config/certs
     subPath: cert.crt
 '''

diff --git a/filebeat/templates/daemonset.yaml b/filebeat/templates/daemonset.yaml
@@ -42,7 +42,7 @@ spec:
       {{- range .Values.secretMounts }}
       - name: {{ .name }}
         secret:
-          secretName: {{ .name }}
+          secretName: {{ .secretName }}
       {{- end }}
       {{- if .Values.filebeatConfig }}
       - name: filebeat-config

diff --git a/filebeat/tests/filebeat_test.py b/filebeat/tests/filebeat_test.py
@@ -148,7 +148,7 @@ def test_adding_a_secret_mount():
     config = '''
 secretMounts:
   - name: elastic-certificates
-    secretName: elastic-certificates
+    secretName: elastic-certs
     path: /usr/share/filebeat/config/certs
 '''
     r = helm_template(config)
@@ -160,7 +160,7 @@ def test_adding_a_secret_mount():
     assert s['volumes'][0] == {
         'name': 'elastic-certificates',
         'secret': {
-            'secretName': 'elastic-certificates'
+            'secretName': 'elastic-certs'
         }
     }
 

diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
         {{- range .Values.secretMounts }}
         - name: {{ .name }}
           secret:
-            secretName: {{ .name }}
+            secretName: {{ .secretName }}
         {{- end }}
         {{- if .Values.kibanaConfig }}
         - name: kibanaconfig