DEVPROD-3580 Extracted and re-used common logic.

Author: amierzwicki

CONTRIBUTING.md

@@ -25,6 +25,22 @@ For any pull requests, code owners should review the changes thoroughly and make
 
 For external contributions, any Github action workflow related changes are not acceptable.
 
+## Windows Users
+
+This repository uses **symlinks** to share common Helm templates across product charts
+(see `src/main/charts/common_templates/`). Git on Windows doesn't enable symlinks by default — without them,
+Helm template rendering will fail.
+
+To enable symlinks on Windows:
+
+1. Enable **Developer Mode** in Windows Settings (Settings → Update & Security → For Developers), or run Git as Administrator
+2. Configure Git to create real symlinks:
+   ```
+   git config --global core.symlinks true
+   ```
+3. Re-clone the repository after changing this setting (existing clones won't retroactively fix symlinks)
+
+
 ### How to run E2E tests
 
 The Data Center Helm Charts uses the latest release of [Deployment Automation for Atlassian DC on K8s](https://github.com/atlassian-labs/data-center-terraform#deployment-automation-for-atlassian-dc-on-k8s) for end-to-end testing. Internal reviewers can run the tests by adding `e2e` label on a pull request (for external contributions, be mindful of the changes as it will run on internal cloud environment).

src/main/charts/bamboo-agent/.helmignore

@@ -21,3 +21,5 @@
 .idea/
 *.tmproj
 .vscode/
+# Ignore non-template files from symlinked common_templates
+templates/common_templates/*.md

src/main/charts/bamboo/.helmignore

@@ -21,3 +21,5 @@
 .idea/
 *.tmproj
 .vscode/
+# Ignore non-template files from symlinked common_templates
+templates/common_templates/*.md

src/main/charts/bamboo/templates/NOTES.txt

@@ -13,8 +13,8 @@ To see the custom values you used for this release:
 
   $ helm get values {{ .Release.Name }} -n {{ .Release.Namespace }}
 
-{{ if or .Values.ingress.create .Values.gateway.create -}}
-{{ title .Chart.Name }} service URL: {{ if .Values.gateway.create }}{{ ternary "https" "http" .Values.gateway.https }}{{ else }}{{ ternary "https" "http" .Values.ingress.https }}{{ end -}}://{{ include "bamboo.hostname" . }}{{ include "bamboo.ingressPath" . }}
+{{ if eq (include "common.gateway.isConfigured" .) "true" -}}
+{{ title .Chart.Name }} service URL: {{ include "bamboo.baseUrl" . }}
 {{- else }}
 Get the {{ title .Chart.Name }} URL by running these commands in the same shell:
 {{- if contains "NodePort" .Values.bamboo.service.type }}

src/main/charts/bamboo/templates/_helpers.tpl

@@ -62,45 +62,31 @@
 Deduce the base URL for bamboo.
 */}}
 {{- define "bamboo.baseUrl" -}}
-    {{- if or .Values.ingress.host .Values.gateway.create -}}
-        {{ ternary "https" "http" (include "bamboo.https" . | trim | eq "true") -}}
-        ://
-        {{- include "bamboo.hostname" . -}}
-        {{- if .Values.gateway.create -}}
-            {{- if .Values.gateway.path -}}
-                {{- .Values.gateway.path -}}
-            {{- end -}}
-        {{- else if .Values.ingress.path -}}
-            {{- .Values.ingress.path -}}
-        {{- end }}
-    {{- else -}}
-        {{- print  "http://localhost:8085/" }}
-    {{- end }}
+{{- if eq (include "common.gateway.isConfigured" .) "true" -}}
+{{- include "common.gateway.origin" . -}}{{ include "bamboo.path" . -}}
+{{- else -}}
+{{- print "http://localhost:8085/" -}}
+{{- end -}}
 {{- end }}
 
 {{/*
-Create default value for ingress port
+Create default value for the service path.
+Works with both Ingress and Gateway API.
 */}}
-{{- define "bamboo.ingressPort" -}}
-{{ default (ternary "443" "80" .Values.ingress.https) .Values.ingress.port -}}
+{{- define "bamboo.path" -}}
+{{- include "common.gateway.path" (dict
+  "useGatewayMode" (include "common.gateway.useGatewayMode" .)
+  "gatewayPath"   .Values.gateway.path
+  "ingressPath"   .Values.ingress.path
+  "contextPath"   .Values.bamboo.service.contextPath
+) -}}
 {{- end }}
 
 {{/*
-Create default value for ingress path.
-
-When using Gateway API, prefer gateway.path to keep URL/path
-behavior consistent with ingress.path.
+Alias for backward compatibility with ingress templates.
 */}}
 {{- define "bamboo.ingressPath" -}}
-{{- if .Values.gateway.create -}}
-{{- if .Values.gateway.path -}}
-{{- .Values.gateway.path -}}
-{{- end -}}
-{{- else if .Values.ingress.path -}}
-{{- .Values.ingress.path -}}
-{{- else -}}
-{{ default ( "/" ) .Values.bamboo.service.contextPath -}}
-{{- end }}
+{{- include "bamboo.path" . -}}
 {{- end }}
 
 {{/*
@@ -458,51 +444,4 @@ set -e; cp $JAVA_HOME/lib/security/cacerts /var/ssl/cacerts; chmod 664 /var/ssl/
 {{- end }}
 {{- end }}
 
-{{/*
-Validate Gateway API configuration
-*/}}
-{{- define "bamboo.validateGatewayConfig" -}}
-    {{- if and .Values.gateway.create .Values.ingress.create -}}
-        {{- fail "ERROR: Cannot enable both gateway.create and ingress.create" -}}
-    {{- end -}}
-    {{- if and .Values.gateway.create (not .Values.gateway.gatewayName) -}}
-        {{- fail "ERROR: gateway.gatewayName is required when gateway.create is true" -}}
-    {{- end -}}
-    {{- if and .Values.gateway.create (not .Values.gateway.hostnames) -}}
-        {{- fail "ERROR: gateway.hostnames must contain at least one hostname when gateway.create is true" -}}
-    {{- end -}}
-{{- end -}}
 
-{{/*
-Get the hostname for the service - works with both Ingress and Gateway API
-Returns the first hostname from gateway.hostnames if gateway is enabled, otherwise ingress.host
-*/}}
-{{- define "bamboo.hostname" -}}
-    {{- if .Values.gateway.create -}}
-        {{- index .Values.gateway.hostnames 0 -}}
-    {{- else -}}
-        {{- .Values.ingress.host -}}
-    {{- end -}}
-{{- end -}}
-
-{{/*
-Returns true if HTTPS is enabled (gateway.https if gateway is enabled, otherwise ingress.https)
-*/}}
-{{- define "bamboo.https" -}}
-    {{- if .Values.gateway.create -}}
-        {{- .Values.gateway.https -}}
-    {{- else -}}
-        {{- .Values.ingress.https -}}
-    {{- end -}}
-{{- end -}}
-
-{{/*
-Returns the proxy port (gateway or ingress-based)
-*/}}
-{{- define "bamboo.proxyPort" -}}
-    {{- if .Values.gateway.create -}}
-        {{- ternary "443" "80" .Values.gateway.https -}}
-    {{- else -}}
-        {{- default (ternary "443" "80" .Values.ingress.https) .Values.ingress.port -}}
-    {{- end -}}
-{{- end -}}

src/main/charts/bamboo/templates/common_templates

@@ -0,0 +1 @@
+../../common_templates

src/main/charts/bamboo/templates/configmap-server-config.yaml

@@ -32,10 +32,10 @@ data:
                    protocol="{{ .Values.bamboo.tomcatConfig.protocol | default "HTTP/1.1" }}"
                    redirectPort="{{ .Values.bamboo.tomcatConfig.redirectPort | default "8443" }}"
                    acceptCount="{{ .Values.bamboo.tomcatConfig.acceptCount | default "100" }}"
-                   secure="{{ default (ternary "true" "false" (eq (include "bamboo.https" . | trim) "true")) .Values.bamboo.tomcatConfig.secure }}"
-                   scheme="{{ default (ternary "https" "http" (eq (include "bamboo.https" . | trim) "true")) .Values.bamboo.tomcatConfig.scheme }}"
-                   proxyName="{{ .Values.bamboo.tomcatConfig.proxyName | default (include "bamboo.hostname" .)  }}"
-                   proxyPort="{{ .Values.bamboo.tomcatConfig.proxyPort | default (include "bamboo.proxyPort" .)  }}"
+                   secure="{{ default (include "common.gateway.https" .) .Values.bamboo.tomcatConfig.secure }}"
+                   scheme="{{ default (include "common.gateway.scheme" .) .Values.bamboo.tomcatConfig.scheme }}"
+                   proxyName="{{ .Values.bamboo.tomcatConfig.proxyName | default (include "common.gateway.hostname" .)  }}"
+                   proxyPort="{{ .Values.bamboo.tomcatConfig.proxyPort | default (include "common.gateway.externalPort" .)  }}"
 
                    {{- if .Values.bamboo.tomcatConfig.address }}
                    address="{{ .Values.bamboo.tomcatConfig.address }}"

src/main/charts/bamboo/templates/httproute.yaml

@@ -1,13 +1,5 @@
 {{- if .Values.gateway.create }}
-{{- if .Values.ingress.create }}
-{{- fail "Cannot enable both gateway.create and ingress.create. Please set one to false." }}
-{{- end }}
-{{- if not .Values.gateway.gatewayName }}
-{{- fail "gateway.gatewayName is required when gateway.create is true" }}
-{{- end }}
-{{- if not .Values.gateway.hostnames }}
-{{- fail "gateway.hostnames is required when gateway.create is true. Provide at least one hostname." }}
-{{- end }}
+{{- include "common.gateway.validateConfig" . -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:

src/main/charts/bamboo/templates/statefulset.yaml

@@ -1,4 +1,4 @@
-{{- include "bamboo.validateGatewayConfig" . -}}
+{{- include "common.gateway.validateConfig" . -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -118,7 +118,7 @@ spec:
           image: {{ include "bamboo.image" . | quote }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            {{ if eq (include "bamboo.https" . | trim) "true" }}
+            {{ if eq (include "common.gateway.https" .) "true" }}
             - name: ATL_TOMCAT_SCHEME
               value: "https"
             - name: ATL_TOMCAT_SECURE
@@ -132,11 +132,11 @@ spec:
             {{ end }}
             - name: ATL_TOMCAT_PORT
               value: {{ .Values.bamboo.ports.http | quote }}
-            {{ if or .Values.ingress.host .Values.gateway.create }}
+            {{ if eq (include "common.gateway.isConfigured" .) "true" }}
             - name: ATL_PROXY_NAME
-              value: {{ include "bamboo.hostname" . | quote }}
+              value: {{ include "common.gateway.hostname" . | quote }}
             - name: ATL_PROXY_PORT
-              value: {{ include "bamboo.proxyPort" . | quote }}
+              value: {{ include "common.gateway.externalPort" . | quote }}
             {{ end }}
             {{- include "bamboo.databaseEnvVars" . | nindent 12 }}
             - name: SET_PERMISSIONS

src/main/charts/bamboo/values.yaml

@@ -484,11 +484,18 @@ gateway:
   # - bamboo.example.com
   # - ci.example.com
 
-  # -- Set to 'true' if browser communication with the application should be TLS
-  # (HTTPS) enforced. This affects the service URL and proxy port configuration.
+  # -- Whether users access the application over HTTPS. This does NOT configure TLS
+  # on the Gateway itself — it tells the application to generate https:// URLs and
+  # set Tomcat's secure flag. Set this to match your actual Gateway/load balancer TLS config.
   #
   https: true
 
+  # -- The external port the application is accessed on. Defaults to 443 (https) or 80 (http).
+  # This does NOT configure the Gateway itself — it tells the application which port users connect on,
+  # so it generates correct URLs. Set this to match your actual Gateway/load balancer port.
+  #
+  # externalPort:
+
   # -- The base path for routing. Defaults to "/" to route all paths.
   #
   path: "/"