Skip to content

Commit dead8da

Browse files
authored
[Library chart] Allow custom tls secret name for all ingress (#237)
1 parent aa8b59a commit dead8da

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

charts/library-chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: v2
22
name: library-chart
3-
version: 1.7.4
3+
version: 1.7.5
44
type: library

charts/library-chart/templates/_ingress.tpl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ spec:
5858
tls:
5959
- hosts:
6060
- {{ .Values.ingress.hostname | quote }}
61-
{{- if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret}}
61+
{{ if and .Values.ingress.useTlsSecret (ne .Values.ingress.tlsSecretName "") }}
62+
secretName: {{ .Values.ingress.tlsSecretName }}
63+
{{ else if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }}
6264
secretName: tls-cert-{{ include "library-chart.fullname" . }}
6365
{{- end }}
6466
{{- end }}
@@ -110,7 +112,9 @@ spec:
110112
- {{ regexReplaceAll "([^\\.]+)\\.(.*)" $.Values.ingress.userHostname (printf "${1}-%d.${2}" (int $userPort)) | quote }}
111113
{{- end }}
112114
{{- end }}
113-
{{- if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }}
115+
{{ if and .Values.ingress.useTlsSecret (ne .Values.ingress.tlsSecretName "") }}
116+
secretName: {{ .Values.ingress.tlsSecretName }}
117+
{{ else if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }}
114118
secretName: tls-cert-{{ include "library-chart.fullname" . }}
115119
{{- end }}
116120
{{- end }}

0 commit comments

Comments
 (0)