Merge pull request #1622 from atlassian/bump-tf-version-294

Bump TF version 2.9.4
atlassian · Nov 22, 2024 · 5ec9ce1 · 5ec9ce1
2 parents 42c9569 + 734c524
commit 5ec9ce1
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 61 deletions.
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.3 ./install.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.4 ./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.3 ./uninstall.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.4 ./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.3 ./install.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.4 ./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.3 ./uninstall.sh -c conf.tfvars
+-it atlassianlabs/terraform:2.9.4 ./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.3 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs
+-it atlassianlabs/terraform:2.9.4 ./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.3 bash 
+    -it atlassianlabs/terraform:2.9.4 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.3 bash 
+    -it atlassianlabs/terraform:2.9.4 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.3 bash 
+    -it atlassianlabs/terraform:2.9.4 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.3 bash 
+    -it atlassianlabs/terraform:2.9.4 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.3 bash bzt_on_pod.sh jira.yml
+    -it atlassianlabs/terraform:2.9.4 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.3 bash copy_run_results.sh
+    -it atlassianlabs/terraform:2.9.4 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.3 bash 
+    -it atlassianlabs/terraform:2.9.4 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/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: "2024-10-22"
+date: "2024-11-22"
 ---
 # Data Center App Performance Toolkit User Guide For Bamboo
 
@@ -102,7 +102,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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./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`.
@@ -303,7 +303,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.3 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.4 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
@@ -334,7 +334,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.3 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml
     ```
 
 {{% note %}}
@@ -368,7 +368,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.3 bash bzt_on_pod.sh bamboo.yml
+    -it atlassianlabs/terraform:2.9.4 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: "2024-10-22"
+date: "2024-11-22"
 ---
 # Data Center App Performance Toolkit User Guide For Bitbucket
 
@@ -115,7 +115,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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./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`.
 
@@ -319,7 +319,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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./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`.
 
@@ -394,7 +394,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.3 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.4 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:
@@ -425,7 +425,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.3 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 {{% note %}}
@@ -475,7 +475,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.3 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml
     ```
    
 {{% note %}}
@@ -500,7 +500,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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars
    ```
 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution:
     ``` bash
@@ -513,7 +513,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.3 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml
     ```
 
 {{% note %}}
@@ -542,7 +542,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.3 bash bzt_on_pod.sh bitbucket.yml
+    -it atlassianlabs/terraform:2.9.4 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
@@ -4,7 +4,7 @@ platform: platform
 product: marketplace
 category: devguide
 subcategory: build
-date: "2024-10-22"
+date: "2024-11-22"
 ---
 # Data Center App Performance Toolkit User Guide For Confluence
 
@@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas
    -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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./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/confluence`.
 
@@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg
    -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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./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/confluence`.
 
@@ -474,7 +474,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.3 bash bzt_on_pod.sh confluence.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml
     ```
 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder:
     - `results_summary.log`: detailed run summary
@@ -504,7 +504,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.3 bash bzt_on_pod.sh confluence.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml
     ```
 
 {{% note %}}
@@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence 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.3 bash bzt_on_pod.sh confluence.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml
     ```
 
 {{% note %}}
@@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence 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.3 ./install.sh -c conf.tfvars
+   -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars
    ```
 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution:
     ``` bash
@@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence 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.3 bash bzt_on_pod.sh confluence.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml
     ```
 
 {{% note %}}
@@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp
     -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.3 bash bzt_on_pod.sh confluence.yml
+    -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml
     ```
 
 {{% note %}}