From 686594e179a9e16511c539b12bc667851b1774bb Mon Sep 17 00:00:00 2001 From: dzsak Date: Mon, 12 Feb 2024 10:13:55 +0100 Subject: [PATCH 1/3] Ability to provide the TLS secret name --- charts/onechart/templates/ingress.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml index 862abb14..6529ea7e 100644 --- a/charts/onechart/templates/ingress.yaml +++ b/charts/onechart/templates/ingress.yaml @@ -38,7 +38,11 @@ spec: tls: - hosts: - {{ .ingress.host | quote }} + {{- if .ingress.secretName }} + secretName: {{ .ingress.secretName }} + {{ else }} secretName: {{ printf "tls-%s" $resourceName }} + {{- end }} {{- end }} rules: - host: {{ .ingress.host | quote }} From 1e4fe5f0838e52d8f14d1effaed9352f7b3d82f3 Mon Sep 17 00:00:00 2001 From: dzsak Date: Mon, 12 Feb 2024 10:26:58 +0100 Subject: [PATCH 2/3] Test --- charts/onechart/tests/ingress_domain_test.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/charts/onechart/tests/ingress_domain_test.yaml b/charts/onechart/tests/ingress_domain_test.yaml index 278712b0..0b04ce9f 100644 --- a/charts/onechart/tests/ingress_domain_test.yaml +++ b/charts/onechart/tests/ingress_domain_test.yaml @@ -119,3 +119,16 @@ tests: - hosts: - chart-example.local secretName: tls-release-name-chart-example-local + - it: Should set Ingress secret name if provided + set: + ingress: + host: chart-example.local + tlsEnabled: true + secretName: tls-internal + asserts: + - equal: + path: spec.tls + value: + - hosts: + - chart-example.local + secretName: tls-internal From 1497dadeb03ebfa6c21ef9e1d958104f21a4f4a5 Mon Sep 17 00:00:00 2001 From: dzsak Date: Mon, 12 Feb 2024 11:36:54 +0100 Subject: [PATCH 3/3] Refactor --- charts/onechart/templates/ingress.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml index 6529ea7e..61214143 100644 --- a/charts/onechart/templates/ingress.yaml +++ b/charts/onechart/templates/ingress.yaml @@ -38,11 +38,7 @@ spec: tls: - hosts: - {{ .ingress.host | quote }} - {{- if .ingress.secretName }} - secretName: {{ .ingress.secretName }} - {{ else }} - secretName: {{ printf "tls-%s" $resourceName }} - {{- end }} + secretName: {{ .ingress.secretName | default (printf "tls-%s" $resourceName) }} {{- end }} rules: - host: {{ .ingress.host | quote }}