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

Commit

Permalink
Merge pull request #230 from elastic/yellow_subpathmarine
Browse files Browse the repository at this point in the history
[kibana] Add subPath support to secretMounts
Crazybus authored Jul 23, 2019
2 parents 899c7d2 + df7118b commit 1be55ba
Showing 3 changed files with 37 additions and 3 deletions.
3 changes: 3 additions & 0 deletions kibana/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -112,6 +112,9 @@ spec:
{{- range .Values.secretMounts }}
- name: {{ .name }}
mountPath: {{ .path }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end }}
{{- end }}
{{- range $path, $config := .Values.kibanaConfig }}
- name: kibanaconfig
30 changes: 30 additions & 0 deletions kibana/tests/kibana_test.py
Original file line number Diff line number Diff line change
@@ -364,3 +364,33 @@ def test_adding_pod_labels():
'''
r = helm_template(config)
assert r['deployment'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'kibana'

def test_adding_a_secret_mount_with_subpath():
config = '''
secretMounts:
- name: elastic-certificates
secretName: elastic-certs
path: /usr/share/elasticsearch/config/certs
subPath: cert.crt
'''
r = helm_template(config)
d = r['deployment'][name]['spec']['template']['spec']
assert d['containers'][0]['volumeMounts'][-1] == {
'mountPath': '/usr/share/elasticsearch/config/certs',
'subPath': 'cert.crt',
'name': 'elastic-certificates'
}

def test_adding_a_secret_mount_without_subpath():
config = '''
secretMounts:
- name: elastic-certificates
secretName: elastic-certs
path: /usr/share/elasticsearch/config/certs
'''
r = helm_template(config)
d = r['deployment'][name]['spec']['template']['spec']
assert d['containers'][0]['volumeMounts'][-1] == {
'mountPath': '/usr/share/elasticsearch/config/certs',
'name': 'elastic-certificates'
}
7 changes: 4 additions & 3 deletions kibana/values.yaml
Original file line number Diff line number Diff line change
@@ -16,9 +16,10 @@ extraEnvs: []
# This is useful for mounting certificates for security and for mounting
# the X-Pack license
secretMounts: []
# - name: elastic-certificates
# secretName: elastic-certificates
# path: /usr/share/elasticsearch/config/certs
# - name: kibana-keystore
# secretName: kibana-keystore
# path: /usr/share/kibana/data/kibana.keystore
# subPath: kibana.keystore # optional

image: "docker.elastic.co/kibana/kibana"
imageTag: "7.2.0"

0 comments on commit 1be55ba

Please sign in to comment.