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

fix support wildcard tls host on ingress #184

Merged
merged 1 commit into from
Jun 24, 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
8 changes: 1 addition & 7 deletions kibana/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,7 @@ metadata:
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{ toYaml .Values.ingress.tls | indent 4 }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
Expand Down
28 changes: 28 additions & 0 deletions kibana/tests/kibana_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,34 @@ def test_adding_an_ingress_rule():
assert i['rules'][0]['http']['paths'][0]['backend']['serviceName'] == name
assert i['rules'][0]['http']['paths'][0]['backend']['servicePort'] == 5601

def test_adding_an_ingress_rule_wildcard():
config = '''
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
path: /
hosts:
- kibana.elastic.co
tls:
- secretName: elastic-co-wildcard
hosts:
- "*.elastic.co"
'''

r = helm_template(config)
assert name in r['ingress']
i = r['ingress'][name]['spec']
assert i['tls'][0]['hosts'][0] == '*.elastic.co'
assert i['tls'][0]['secretName'] == 'elastic-co-wildcard'

assert i['rules'][0]['host'] == 'kibana.elastic.co'
assert i['rules'][0]['http']['paths'][0]['path'] == '/'
assert i['rules'][0]['http']['paths'][0]['backend']['serviceName'] == name
assert i['rules'][0]['http']['paths'][0]['backend']['servicePort'] == 5601



def test_override_the_default_update_strategy():
config = '''
updateStrategy:
Expand Down