[charts/crowd] Release 2.3 Avoid env variables conflinct in case of e…

…xternal SSL termination
javimox · Aug 23, 2023 · 53191ec · 53191ec
2 parents 8ecb096 + 7ec0080
commit 53191ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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 }}