From a7bd7cfd09c1aa4cd5b339cc1e48a46a6980ec6d Mon Sep 17 00:00:00 2001 From: inesh Date: Fri, 13 Jun 2025 16:09:29 +0000 Subject: [PATCH] [Library chart] Allow custom tls secret name for all ingress --- charts/library-chart/Chart.yaml | 2 +- charts/library-chart/templates/_ingress.tpl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/library-chart/Chart.yaml b/charts/library-chart/Chart.yaml index a28ff2091..9a00ab001 100644 --- a/charts/library-chart/Chart.yaml +++ b/charts/library-chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: library-chart -version: 1.7.4 +version: 1.7.5 type: library diff --git a/charts/library-chart/templates/_ingress.tpl b/charts/library-chart/templates/_ingress.tpl index 3217a8b22..288834d78 100644 --- a/charts/library-chart/templates/_ingress.tpl +++ b/charts/library-chart/templates/_ingress.tpl @@ -58,7 +58,9 @@ spec: tls: - hosts: - {{ .Values.ingress.hostname | quote }} - {{- if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret}} + {{ if and .Values.ingress.useTlsSecret (ne .Values.ingress.tlsSecretName "") }} + secretName: {{ .Values.ingress.tlsSecretName }} + {{ else if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }} secretName: tls-cert-{{ include "library-chart.fullname" . }} {{- end }} {{- end }} @@ -110,7 +112,9 @@ spec: - {{ regexReplaceAll "([^\\.]+)\\.(.*)" $.Values.ingress.userHostname (printf "${1}-%d.${2}" (int $userPort)) | quote }} {{- end }} {{- end }} - {{- if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }} + {{ if and .Values.ingress.useTlsSecret (ne .Values.ingress.tlsSecretName "") }} + secretName: {{ .Values.ingress.tlsSecretName }} + {{ else if or .Values.ingress.useCertManager .Values.ingress.useTlsSecret }} secretName: tls-cert-{{ include "library-chart.fullname" . }} {{- end }} {{- end }}