From 7fbbb989ddc2a29901f7368a4e9538fe5d8e58c6 Mon Sep 17 00:00:00 2001
From: Yevhen Ivantsov <yivantsov@atlassian.com>
Date: Thu, 20 Jun 2024 18:47:28 +1000
Subject: [PATCH] Make it possible to override proxy settings

---
 .../charts/bamboo/templates/configmap-server-config.yaml    | 6 +++---
 .../confluence/templates/configmap-server-config.yaml       | 4 ++--
 .../charts/crowd/templates/configmap-server-config.yaml     | 4 ++--
 src/main/charts/jira/templates/configmap-server-config.yaml | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/charts/bamboo/templates/configmap-server-config.yaml b/src/main/charts/bamboo/templates/configmap-server-config.yaml
index d04958d1b..baec8109d 100644
--- a/src/main/charts/bamboo/templates/configmap-server-config.yaml
+++ b/src/main/charts/bamboo/templates/configmap-server-config.yaml
@@ -34,8 +34,8 @@ data:
                    acceptCount="{{ .Values.bamboo.tomcatConfig.acceptCount | default "10" }}"
                    secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.bamboo.tomcatConfig.secure }}"
                    scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.bamboo.tomcatConfig.scheme }}"
-                   proxyName="{{ .Values.ingress.host | default .Values.bamboo.tomcatConfig.proxyName }}"
-                   proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.bamboo.tomcatConfig.proxyPort }}"
+                   proxyName="{{ .Values.bamboo.tomcatConfig.proxyName | default .Values.ingress.host  }}"
+                   proxyPort="{{ .Values.bamboo.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https)  }}"
 
                    {{- if .Values.bamboo.tomcatConfig.address }}
                    address="{{ .Values.bamboo.tomcatConfig.address }}"
@@ -192,7 +192,7 @@ data:
                 <param-name>cookie.encoding</param-name>
                 <param-value>BAM</param-value>
             </init-param>
-            
+
             <init-param>
                 <param-name>autologin.cookie.age</param-name>
                 <param-value>{{ .Values.bamboo.seraphConfig.autoLoginCookieAge | default "1209600" }}</param-value>
diff --git a/src/main/charts/confluence/templates/configmap-server-config.yaml b/src/main/charts/confluence/templates/configmap-server-config.yaml
index 4768dae9f..c91e02426 100644
--- a/src/main/charts/confluence/templates/configmap-server-config.yaml
+++ b/src/main/charts/confluence/templates/configmap-server-config.yaml
@@ -27,8 +27,8 @@ data:
                    URIEncoding="{{ .Values.confluence.tomcatConfig.uriEncoding | default "UTF-8" }}"
                    secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.confluence.tomcatConfig.secure }}"
                    scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.confluence.tomcatConfig.scheme }}"
-                   proxyName="{{ .Values.ingress.host | default .Values.confluence.tomcatConfig.proxyName }}"
-                   proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.confluence.tomcatConfig.proxyPort }}"
+                   proxyName="{{ .Values.confluence.tomcatConfig.proxyName | default .Values.ingress.host  }}"
+                   proxyPort="{{ .Values.confluence.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https)  }}"
                    maxHttpHeaderSize="{{ .Values.confluence.tomcatConfig.maxHttpHeaderSize | default "8192" }}" />
 
         <Engine name="Standalone"
diff --git a/src/main/charts/crowd/templates/configmap-server-config.yaml b/src/main/charts/crowd/templates/configmap-server-config.yaml
index 90b79b3b7..c20e6d59f 100644
--- a/src/main/charts/crowd/templates/configmap-server-config.yaml
+++ b/src/main/charts/crowd/templates/configmap-server-config.yaml
@@ -34,8 +34,8 @@ data:
                    acceptCount="{{ .Values.crowd.tomcatConfig.acceptCount | default "100" }}"
                    secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.crowd.tomcatConfig.secure }}"
                    scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.crowd.tomcatConfig.scheme }}"
-                   proxyName="{{ .Values.ingress.host | default .Values.crowd.tomcatConfig.proxyName }}"
-                   proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.crowd.tomcatConfig.proxyPort }}"
+                   proxyName="{{ .Values.crowd.tomcatConfig.proxyName | default .Values.ingress.host  }}"
+                   proxyPort="{{ .Values.crowd.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https)  }}"
                    maxHttpHeaderSize="{{ .Values.crowd.tomcatConfig.maxHttpHeaderSize | default "8192" }}"
                    useBodyEncodingForURI="true"
                    URIEncoding="UTF-8"
diff --git a/src/main/charts/jira/templates/configmap-server-config.yaml b/src/main/charts/jira/templates/configmap-server-config.yaml
index 0adde83a6..5d4a8b4ba 100644
--- a/src/main/charts/jira/templates/configmap-server-config.yaml
+++ b/src/main/charts/jira/templates/configmap-server-config.yaml
@@ -34,8 +34,8 @@ data:
                    acceptCount="{{ .Values.jira.tomcatConfig.acceptCount | default "10" }}"
                    secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.jira.tomcatConfig.secure }}"
                    scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.jira.tomcatConfig.scheme }}"
-                   proxyName="{{ .Values.ingress.host | default .Values.jira.tomcatConfig.proxyName }}"
-                   proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.jira.tomcatConfig.proxyPort }}"
+                   proxyName="{{ .Values.jira.tomcatConfig.proxyName | default .Values.ingress.host  }}"
+                   proxyPort="{{ .Values.jira.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https)  }}"
 
                    relaxedPathChars="[]|"
                    relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"