diff --git a/bitnami/dokuwiki/Chart.yaml b/bitnami/dokuwiki/Chart.yaml index 154944bd5..3f737c023 100644 --- a/bitnami/dokuwiki/Chart.yaml +++ b/bitnami/dokuwiki/Chart.yaml @@ -24,4 +24,4 @@ name: dokuwiki sources: - https://github.com/bitnami/bitnami-docker-dokuwiki - http://www.dokuwiki.org/ -version: 10.0.2 +version: 10.0.3 diff --git a/bitnami/dokuwiki/templates/ingress.yaml b/bitnami/dokuwiki/templates/ingress.yaml index b6520bbeb..bea853003 100644 --- a/bitnami/dokuwiki/templates/ingress.yaml +++ b/bitnami/dokuwiki/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -23,6 +22,11 @@ metadata: {{- end }} spec: rules: + {{- $tls := false }} + {{- range .Values.ingress.hosts }} + {{- if .tls }} + {{- $tls = true }} + {{- end }} - host: {{ .name }} http: paths: @@ -30,12 +34,15 @@ spec: backend: serviceName: {{ template "dokuwiki.fullname" $ }} servicePort: 80 -{{- if .tls }} + {{- end }} + {{- if $tls }} tls: + {{- range .Values.ingress.hosts }} + {{- if .tls }} - hosts: - {{ .name }} secretName: {{ .tlsSecret }} -{{- end }} ---- -{{- end }} + {{- end }} + {{- end }} + {{- end }} {{- end }}