Merge pull request #2077 from atlassian/release/8.10.4

bgospodarek · web-flow · commit 22ae127c4f18 · 2026-06-17T13:02:19.000+02:00
Release/8.10.4
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,8 @@ ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_c
 ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 
 RUN apt-get -y update \
-  && $APT_INSTALL vim git openssh-server wget \
+  && apt-get -y upgrade \
+  && $APT_INSTALL git openssh-server wget \
   && python -m pip install --upgrade pip \
   && apt-get clean
 
diff --git a/app/bamboo.yml b/app/bamboo.yml
@@ -126,7 +126,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "148.0.7778.178" # Supports Chrome version 148. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "149.0.7827.155" # Supports Chrome version 149. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/bitbucket.yml b/app/bitbucket.yml
@@ -92,7 +92,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "148.0.7778.178" # Supports Chrome version 148. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "149.0.7827.155" # Supports Chrome version 149. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/confluence.yml b/app/confluence.yml
@@ -119,7 +119,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "148.0.7778.178" # Supports Chrome version 148. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "149.0.7827.155" # Supports Chrome version 149. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/jira.yml b/app/jira.yml
@@ -120,7 +120,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "148.0.7778.178" # Supports Chrome version 148. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "149.0.7827.155" # Supports Chrome version 149. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/jsm.yml b/app/jsm.yml
@@ -171,7 +171,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "148.0.7778.178" # Supports Chrome version 148. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "149.0.7827.155" # Supports Chrome version 149. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
   - data-source: sample-labels
     module: junit-xml
diff --git a/app/util/conf.py b/app/util/conf.py
@@ -2,7 +2,7 @@
 
 from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
 
-TOOLKIT_VERSION = '8.10.3'
+TOOLKIT_VERSION = '8.10.4'
 UNSUPPORTED_VERSION = '8.7.0'
 
 
diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD
@@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \
 -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
 -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
 -v "/$PWD/logs:/data-center-terraform/logs" \
--it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
 ```
 ### Terminate development environment
 Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag.
@@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \
 -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
 -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
 -v "/$PWD/logs:/data-center-terraform/logs" \
--it atlassianlabs/terraform:2.9.21 ./uninstall.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.23 ./uninstall.sh -c conf.tfvars
 ```
 
 # Enterprise-scale environment
@@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \
 -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
 -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
 -v "/$PWD/logs:/data-center-terraform/logs" \
--it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
 ```
 ### Terminate enterprise-scale environment
 Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag.
@@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \
 -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
 -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
 -v "/$PWD/logs:/data-center-terraform/logs" \
--it atlassianlabs/terraform:2.9.21 ./uninstall.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.23 ./uninstall.sh -c conf.tfvars
 ```
 
 # Collect detailed k8s logs
@@ -93,7 +93,7 @@ export REGION=us-east-2
 docker run --pull=always --env-file aws_envs \
 -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \
 -v "/$PWD/logs:/data-center-terraform/logs" \
--it atlassianlabs/terraform:2.9.21 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs
+-it atlassianlabs/terraform:2.9.23 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs
 ```
 
 # Force terminate cluster
@@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus
     docker run --pull=always --env-file aws_envs \
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -e REGION=$REGION \
-    -it atlassianlabs/terraform:2.9.21 bash 
+    -it atlassianlabs/terraform:2.9.23 bash 
     ```
 
 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly.
@@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -e REGION=$REGION \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
-    -it atlassianlabs/terraform:2.9.21 bash 
+    -it atlassianlabs/terraform:2.9.23 bash 
     ```
 5. Copy code base and connect to the execution environment pod:
     ``` bash
@@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus
     -e REGION=$REGION \
     -e PRODUCT=$PRODUCT \
     -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \
-    -it atlassianlabs/terraform:2.9.21 bash 
+    -it atlassianlabs/terraform:2.9.23 bash 
     ```
 5. Run following commands one by one inside docker container:
     ``` bash
@@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio
     docker run --pull=always --env-file aws_envs \
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -e REGION=$REGION \
-    -it atlassianlabs/terraform:2.9.21 bash 
+    -it atlassianlabs/terraform:2.9.23 bash 
     ```
     ``` bash
     aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION
@@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh jira.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh jira.yml
     ```
 
 # Retry to copy run results from the execution environment pod to local
@@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash copy_run_results.sh
+    -it atlassianlabs/terraform:2.9.23 bash copy_run_results.sh
     ```
 
 # Debug AWS required policies
@@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n
 3. Start and ssh to `atlassianlabs/terraform` docker container:
     ``` bash
     docker run --pull=always --env-file aws_envs \
-    -it atlassianlabs/terraform:2.9.21 bash 
+    -it atlassianlabs/terraform:2.9.23 bash 
     ```
 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json).
 5. Run following commands one by one inside docker container to get effective policies permissions:
diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars
@@ -72,6 +72,12 @@ max_cluster_capacity = 2
 # This can be used in case you hit the limit which can happen if 30+ whitelist_cidrs are provided.
 #enable_https_ingress = false
 
+# Use Gateway API (Envoy Gateway) instead of NGINX Ingress controller.
+# When set to true, Envoy Gateway is deployed as a drop-in replacement for NGINX. Only one can be active per deployment.
+# If `domain` is set, HTTPS is used with TLS termination via ACM cert; otherwise the raw NLB hostname is used over HTTP.
+# For Bitbucket, SSH on port 7999 is handled natively via TCPRoute (no manual ELB listener modification needed).
+# use_gateway_api = "true"
+
 ################################################################################
 # Jira/JSM Settings
 ################################################################################
diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars
@@ -81,6 +81,12 @@ max_cluster_capacity = 6
 # This can be used in case you hit the limit which can happen if 30+ whitelist_cidrs are provided.
 #enable_https_ingress = false
 
+# Use Gateway API (Envoy Gateway) instead of NGINX Ingress controller.
+# When set to true, Envoy Gateway is deployed as a drop-in replacement for NGINX. Only one can be active per deployment.
+# If `domain` is set, HTTPS is used with TLS termination via ACM cert; otherwise the raw NLB hostname is used over HTTP.
+# For Bitbucket, SSH on port 7999 is handled natively via TCPRoute (no manual ELB listener modification needed).
+# use_gateway_api = "true"
+
 ################################################################################
 # Execution Environment Settings
 ################################################################################
diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md
@@ -4,7 +4,7 @@ platform: platform
 product: marketplace
 category: devguide
 subcategory: build
-date: "2026-05-19"
+date: "2026-06-17"
 ---
 # Data Center App Performance Toolkit User Guide For Bamboo
 
@@ -101,7 +101,7 @@ specifically for performance testing during the DC app review process.
    -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
    -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
    -v "/$PWD/logs:/data-center-terraform/logs" \
-   -it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
    ```
 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`.
 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`.
@@ -302,7 +302,7 @@ To receive performance baseline results **without** an app installed and **witho
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bamboo.yml
     ```
 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder:
     - `results_summary.log`: detailed run summary
@@ -333,7 +333,7 @@ To receive performance results with an app installed (still use master branch):
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bamboo.yml
     ```
 
 {{% note %}}
@@ -367,7 +367,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**:
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bamboo.yml
     ```
 
 {{% note %}}
diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md
@@ -4,7 +4,7 @@ platform: platform
 product: marketplace
 category: devguide
 subcategory: build
-date: "2026-05-19"
+date: "2026-06-17"
 ---
 # Data Center App Performance Toolkit User Guide For Bitbucket
 
@@ -114,7 +114,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase
    -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
    -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
    -v "/$PWD/logs:/data-center-terraform/logs" \
-   -it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
    ```
 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`.
 
@@ -317,7 +317,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large
    -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
    -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
    -v "/$PWD/logs:/data-center-terraform/logs" \
-   -it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
    ```
 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`.
 
@@ -392,7 +392,7 @@ To receive performance baseline results **without** an app installed:
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder:
@@ -423,7 +423,7 @@ To receive performance results with an app installed (still use master branch):
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 {{% note %}}
@@ -473,7 +473,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app-
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bitbucket.yml
     ```
    
 {{% note %}}
@@ -498,7 +498,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app-
    -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
    -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
    -v "/$PWD/logs:/data-center-terraform/logs" \
-   -it atlassianlabs/terraform:2.9.21 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.23 ./install.sh -c conf.tfvars
    ```
 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution:
     ``` bash
@@ -511,7 +511,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app-
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 {{% note %}}
@@ -540,7 +540,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe
     -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
     -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
     -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
-    -it atlassianlabs/terraform:2.9.21 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.23 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 {{% note %}}
diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md
diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md
diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md
diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md
diff --git a/requirements.txt b/requirements.txt
