Merge branch 'main' of https://github.com/camunda/camunda-deployment-…

…references into add-azure-reference
camunda · Mar 6, 2025 · 9e53372 · 9e53372
2 parents 4d3fe3e + 1d4d1d9
commit 9e53372
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 26 deletions.
diff --git a/.github/workflows/aws_ec2_golden.yml b/.github/workflows/aws_ec2_golden.yml
@@ -80,7 +80,7 @@ jobs:
                   # since we always plan against nothing, it includes all planned objects
                   # it does not contain sensetive data
                   jq --sort-keys '.planned_values.root_module' "${TF_PATH}/tfplan.json" > "${TF_PATH}/tfplan_extracted.json"
-            - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+            - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
               with:
                   name: plan-artifact-json
                   path: ${{ env.TF_PATH }}/tfplan_extracted.json
@@ -92,7 +92,7 @@ jobs:
                   exit $?
             - name: Post diff on PR
               if: always() && github.event_name == 'pull_request'
-              uses: int128/diff-action@1eb9a1ecddd46e6fbc409ad8a8d33b70d0ec0e54 # v1
+              uses: int128/diff-action@db6cce01542cb26e181798736eea1e71f5d36706 # v1
               with:
                   base: ${{ env.GOLDEN_PATH }}//tfplan.json
                   head: ${{ env.TF_PATH }}/tfplan_extracted.json

diff --git a/.github/workflows/aws_ec2_tests.yml b/.github/workflows/aws_ec2_tests.yml
@@ -16,7 +16,9 @@ on:
 # limit to a single execution per actor of this workflow
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
+    # in case of renovate we don't cancel the previous run, so it can finish it
+    # otherwise weekly renovate PRs with tf docs updates result in broken clusters
+    cancel-in-progress: ${{ github.actor == 'renovate[bot]' && false || true }}
 
 env:
     AWS_PROFILE: infex
@@ -33,7 +35,7 @@ jobs:
             matrix:
                 camunda:
                     # renovate: datasource=github-releases depName=camunda/camunda versioning=regex:^8\.6?(\.(?<patch>\d+))?$
-                    - 8.6.9
+                    - 8.6.10
                     - 8.7.0-SNAPSHOT
                 architecture:
                     - x86_64
@@ -148,7 +150,7 @@ jobs:
                   sed 's/\n/&#xA;/g' > "./tests-${{ env.CAMUNDA_HYPHENS }}-filtered.xml"
             - name: Upload test reports
               if: always()
-              uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+              uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
               with:
                   name: test-reports-${{ env.CAMUNDA_HYPHENS }}-${{ matrix.architecture }}
                   path: ${{ github.workspace }}/aws/ec2/test/src/tests-${{ env.CAMUNDA_HYPHENS }}-filtered.xml
@@ -171,7 +173,7 @@ jobs:
             SNAPSHOT_ERROR: ${{ steps.determine-if-failed-tests-include-snapshot.outputs.SNAPSHOT_ERROR }}
         steps:
             - name: Download artifacts
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
               with:
                   pattern: test-reports-*
                   path: /tmp/testreports

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
           - id: actionlint-docker
 
     - repo: https://github.com/renovatebot/pre-commit-hooks
-      rev: 39.170.1
+      rev: 39.185.0
       hooks:
           - id: renovate-config-validator
             args: [--strict]
@@ -41,7 +41,7 @@ repos:
             args: [--strict, --force-scope]
 
     - repo: https://github.com/antonbabenko/pre-commit-terraform
-      rev: v1.97.3
+      rev: v1.97.4
       hooks:
           - id: terraform_fmt
           - id: terraform_tflint

diff --git a/.tool-versions b/.tool-versions
@@ -13,12 +13,12 @@
 # check it with
 # diff <(sed '/^#/d; /^$/d' .tool-versions | sort) <(sed '/^#/d; /^$/d' .tool-versions) && echo ".tool-versions is sorted correctly" || echo ".tool-versions is not sorted correctly"
 
-awscli 2.24.5
+awscli 2.24.15
 
 # renovate: datasource=github-tags depName=rhysd/actionlint
 actionlint 1.7.7
 
-awscli 2.24.5
+awscli 2.24.15
 
 delta 0.18.2
 
@@ -38,7 +38,7 @@ python 3.13.2
 
 shellcheck 0.10.0
 
-terraform 1.10.5
+terraform 1.11.0
 
 terraform-docs 0.19.0
 

diff --git a/README.md b/README.md
@@ -0,0 +1,33 @@
+# Camunda Reference Architectures
+
+[![Camunda](https://img.shields.io/badge/Camunda-FC5D0D)](https://www.camunda.com/)
+[![Terraform](https://img.shields.io/badge/Terraform-5835CC)](https://developer.hashicorp.com/terraform/tutorials?product_intent=terraform)
+[![License](https://img.shields.io/github/license/camunda/camunda-deployment-references)](LICENSE)
+
+Welcome to Camunda Reference Architectures! This repository contains a collection of reference architectures for deploying [Camunda 8 self-managed](https://docs.camunda.io/docs/self-managed/about-self-managed/), implemented using Terraform, scripts, and GitHub Actions for testing.
+
+These architectures serve as blueprints for quick learning and rapid deployment.
+
+For more details, refer to the official [Camunda Reference Architecture documentation](https://docs.camunda.io/docs/8.7/self-managed/reference-architecture/).
+
+**⚠️ Warning:** This project is intended for demonstration and learning purposes only. It is not recommended for production use. There are no guarantees or warranties provided, and certain Terraform configuration warnings from Trivy have been deliberately ignored. For more details, see the [.trivyignore](./.trivyignore) file in the repository root.
+
+## Structure
+
+The repository is structured into cloud providers (`aws`, `azure`, `general`) and internal-only reusable modules (`modules`).
+
+## Support
+
+Please note that the modules have been tested with **[Terraform](https://github.com/hashicorp/terraform)** in the version described in the [.tool-versions](./.tool-versions) of this project.
+
+## Support & Feedback
+
+Camunda Reference Architectures is maintained by Camunda Infrastructure Experience Team.
+
+To provide feedback, please use the [issues templates](https://github.com/camunda/camunda-deployment-references/issues) provided.
+
+If you are interested in contributing to Camunda Reference Architectures, see the [Contribution guide](https://github.com/camunda/camunda/blob/main/CONTRIBUTING.md).
+
+## License
+
+Apache-2.0 Licensed. See [LICENSE](https://github.com/camunda/camunda-deployment-references/blob/main/LICENSE).
diff --git a/aws/ec2/scripts/camunda-install.sh b/aws/ec2/scripts/camunda-install.sh
@@ -10,7 +10,7 @@ set -euo pipefail
 # Executed on remote host, defaults should be set here or env vars preconfigured on remote host
 OPENJDK_VERSION=${OPENJDK_VERSION:-"21"}
 # renovate: datasource=github-releases depName=camunda/camunda versioning=regex:^8\.6?(\.(?<patch>\d+))?$
-CAMUNDA_VERSION=${CAMUNDA_VERSION:-"8.6.9"}
+CAMUNDA_VERSION=${CAMUNDA_VERSION:-"8.6.10"}
 # renovate: datasource=github-releases depName=camunda/connectors versioning=regex:^8\.6?(\.(?<patch>\d+))?$
 CAMUNDA_CONNECTORS_VERSION=${CAMUNDA_CONNECTORS_VERSION:-"8.6.8"}
 MNT_DIR=${MNT_DIR:-"/opt/camunda"}

diff --git a/aws/ec2/test/src/go.mod b/aws/ec2/test/src/go.mod
@@ -4,8 +4,8 @@ go 1.23.2
 
 require (
 	github.com/aws/aws-sdk-go v1.55.6
-	github.com/aws/aws-sdk-go-v2/config v1.29.6
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.13
+	github.com/aws/aws-sdk-go-v2/config v1.29.8
+	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.46.0
 	github.com/gruntwork-io/terratest v0.48.2
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
@@ -20,18 +20,18 @@ require (
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.9 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.61 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect