Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

change secretName field #182

Merged
merged 7 commits into from
Jul 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elasticsearch/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
{{- range .Values.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .name }}
secretName: {{ .secretName }}
{{- end }}
{{- if .Values.esConfig }}
- name: esconfig
Expand Down
6 changes: 3 additions & 3 deletions elasticsearch/tests/elasticsearch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,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)
Expand All @@ -362,7 +362,7 @@ def test_adding_a_secret_mount():
assert s['volumes'] == [{
'name': 'elastic-certificates',
'secret': {
'secretName': 'elastic-certificates'
'secretName': 'elastic-certs'
}
}]

Expand All @@ -371,7 +371,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
'''
Expand Down
2 changes: 1 addition & 1 deletion filebeat/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
{{- range .Values.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .name }}
secretName: {{ .secretName }}
{{- end }}
{{- if .Values.filebeatConfig }}
- name: filebeat-config
Expand Down
4 changes: 2 additions & 2 deletions filebeat/tests/filebeat_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -160,7 +160,7 @@ def test_adding_a_secret_mount():
assert s['volumes'][0] == {
'name': 'elastic-certificates',
'secret': {
'secretName': 'elastic-certificates'
'secretName': 'elastic-certs'
}
}

Expand Down
2 changes: 1 addition & 1 deletion kibana/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
{{- range .Values.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .name }}
secretName: {{ .secretName }}
{{- end }}
{{- if .Values.kibanaConfig }}
- name: kibanaconfig
Expand Down