From 7ec00806acfa333ebabbfce6e82428a0d1346a21 Mon Sep 17 00:00:00 2001 From: mox Date: Wed, 23 Aug 2023 20:29:16 +0200 Subject: [PATCH] [charts/crowd] Release 2.3 Avoid env variables conflinct in case of external SSL termination --- charts/crowd/Chart.yaml | 2 +- charts/crowd/templates/configmap.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/crowd/Chart.yaml b/charts/crowd/Chart.yaml index b1498e3..4ee72d1 100644 --- a/charts/crowd/Chart.yaml +++ b/charts/crowd/Chart.yaml @@ -8,7 +8,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.2.0 +version: 2.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/charts/crowd/templates/configmap.yaml b/charts/crowd/templates/configmap.yaml index 8bef11d..b4dce49 100644 --- a/charts/crowd/templates/configmap.yaml +++ b/charts/crowd/templates/configmap.yaml @@ -10,8 +10,16 @@ data: {{- end }} ATL_TOMCAT_PORT: {{ .Values.service.port | quote }} {{- if .Values.ingress.enabled }} + {{- if not .Values.envVars.ATL_PROXY_NAME }} ATL_PROXY_NAME: {{ (index .Values.ingress.hosts 0).host | quote }} + {{- end }} + {{- if not .Values.envVars.ATL_PROXY_PORT }} ATL_PROXY_PORT: {{ if .Values.ingress.tls }}"443"{{ else }}"80"{{ end }} + {{- end }} + {{- if not .Values.envVars.ATL_TOMCAT_SCHEME }} ATL_TOMCAT_SCHEME: {{ if .Values.ingress.tls }}"https"{{ else }}"http"{{ end }} + {{- end }} + {{- if not .Values.envVars.ATL_TOMCAT_SECURE }} ATL_TOMCAT_SECURE: {{ if .Values.ingress.tls }}"true"{{ else }}"false"{{ end }} + {{- end }} {{- end }}