From d97d461046a0f96e32630c118fba5245b862a677 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:06:04 +0000 Subject: [PATCH 1/7] fix(deps): update patch-grouped | datasource | package | from | to | | --------------- | ---------------------------------------- | ------- | ------- | | github-releases | rhysd/actionlint | 1.7.6 | 1.7.7 | | helm | camunda-platform | 11.1.0 | 11.1.1 | | helm | camunda-platform | 10.4.6 | 10.4.7 | | helm | camunda-platform | 9.4.5 | 9.4.6 | | github-tags | camunda/infraex-common-config | 1.2.11 | 1.2.12 | | go | github.com/aws/aws-sdk-go | v1.55.5 | v1.55.6 | | go | github.com/aws/aws-sdk-go-v2/service/eks | v1.56.2 | v1.56.5 | | github-tags | golang/go | 1.23.4 | 1.23.5 | | github-tags | kubernetes/kubernetes | 1.32.0 | 1.32.1 | | github-tags | rhysd/actionlint | 1.7.6 | 1.7.7 | | github-tags | rhysd/actionlint | v1.7.6 | v1.7.7 | | github-releases | aquasecurity/trivy | 0.58.1 | 0.58.2 | --- .github/workflows/lint.yml | 2 +- .../nightly_aws_operational_procedure_snapshot.yml | 2 +- .../nightly_aws_operational_procedure_stable.yml | 10 +++++----- .github/workflows/renovate-automerge.yml | 2 +- .pre-commit-config.yaml | 4 ++-- .tool-versions | 8 ++++---- .../scripts/export_environment_prerequisites.sh | 2 +- test/go.mod | 4 ++-- test/go.sum | 4 ++++ test/multi_region_aws_camunda_test.go | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4cf71ebd..a7b0d074 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,5 +9,5 @@ on: jobs: lint: - uses: camunda/infraex-common-config/.github/workflows/lint-global.yml@08c796604f9b08614df763b333833dd1bdc037c0 # 1.2.11 + uses: camunda/infraex-common-config/.github/workflows/lint-global.yml@41bed71d5715d2e2e83a83997a44be59fcddf615 # 1.2.12 secrets: inherit diff --git a/.github/workflows/nightly_aws_operational_procedure_snapshot.yml b/.github/workflows/nightly_aws_operational_procedure_snapshot.yml index b3030737..eb6d4ece 100644 --- a/.github/workflows/nightly_aws_operational_procedure_snapshot.yml +++ b/.github/workflows/nightly_aws_operational_procedure_snapshot.yml @@ -255,7 +255,7 @@ jobs: steps: - name: Notify in Slack in case of failure id: slack-notification - uses: camunda/infraex-common-config/.github/actions/report-failure-on-slack@08c796604f9b08614df763b333833dd1bdc037c0 # 1.2.11 + uses: camunda/infraex-common-config/.github/actions/report-failure-on-slack@41bed71d5715d2e2e83a83997a44be59fcddf615 # 1.2.12 with: vault_addr: ${{ secrets.VAULT_ADDR }} vault_role_id: ${{ secrets.VAULT_ROLE_ID }} diff --git a/.github/workflows/nightly_aws_operational_procedure_stable.yml b/.github/workflows/nightly_aws_operational_procedure_stable.yml index 356c31dc..65bff599 100644 --- a/.github/workflows/nightly_aws_operational_procedure_stable.yml +++ b/.github/workflows/nightly_aws_operational_procedure_stable.yml @@ -143,13 +143,13 @@ jobs: id: generate-matrix run: | # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^9(\.(?\d+))?(\.(?\d+))?$ - c84=9.4.5 + c84=9.4.6 # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^10(\.(?\d+))?(\.(?\d+))?$ - c85=10.4.6 + c85=10.4.7 # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^11(\.(?\d+))?(\.(?\d+))?$ - c86=11.1.0 + c86=11.1.1 # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:11(\.(?\d+))?(\.(?\d+))?$ - c86_old=OLD.11.1.0 + 11.1.1 # Snapshot is used for namespace setup to do the DNS chaining tests with a static namespace. It's not used for the matrix. # shellcheck disable=SC2034 c87=SNAPSHOT @@ -255,7 +255,7 @@ jobs: steps: - name: Notify in Slack in case of failure id: slack-notification - uses: camunda/infraex-common-config/.github/actions/report-failure-on-slack@08c796604f9b08614df763b333833dd1bdc037c0 # 1.2.11 + uses: camunda/infraex-common-config/.github/actions/report-failure-on-slack@41bed71d5715d2e2e83a83997a44be59fcddf615 # 1.2.12 with: vault_addr: ${{ secrets.VAULT_ADDR }} vault_role_id: ${{ secrets.VAULT_ROLE_ID }} diff --git a/.github/workflows/renovate-automerge.yml b/.github/workflows/renovate-automerge.yml index 64ed3324..14a255a9 100644 --- a/.github/workflows/renovate-automerge.yml +++ b/.github/workflows/renovate-automerge.yml @@ -11,5 +11,5 @@ concurrency: jobs: renovate-automerge: - uses: camunda/infraex-common-config/.github/workflows/automerge-global.yml@08c796604f9b08614df763b333833dd1bdc037c0 # 1.2.11 + uses: camunda/infraex-common-config/.github/workflows/automerge-global.yml@41bed71d5715d2e2e83a83997a44be59fcddf615 # 1.2.12 secrets: inherit diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 800ee5eb..5436636b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: terraform_fmt - id: terraform_tflint - repo: https://github.com/rhysd/actionlint - rev: v1.7.6 + rev: v1.7.7 hooks: - id: actionlint - repo: https://github.com/shellcheck-py/shellcheck-py @@ -42,7 +42,7 @@ repos: - id: yamlfmt - repo: https://github.com/camunda/infraex-common-config - rev: 1.2.11 # use tags until renovate supports sha: https://github.com/renovatebot/renovate/issues/22567 + rev: 1.2.12 # use tags until renovate supports sha: https://github.com/renovatebot/renovate/issues/22567 hooks: - id: update-action-readmes-docker diff --git a/.tool-versions b/.tool-versions index dbc4d08b..b92e4fc2 100644 --- a/.tool-versions +++ b/.tool-versions @@ -12,13 +12,13 @@ awscli 2.23.2 # renovate: datasource=github-tags depName=rhysd/actionlint -actionlint 1.7.6 +actionlint 1.7.7 -golang 1.23.4 +golang 1.23.5 helm 3.17.0 -kubectl 1.32.0 +kubectl 1.32.1 pre-commit 4.0.1 @@ -28,4 +28,4 @@ terraform 1.10.4 tflint 0.55.0 -trivy 0.58.1 +trivy 0.58.2 diff --git a/aws/dual-region/scripts/export_environment_prerequisites.sh b/aws/dual-region/scripts/export_environment_prerequisites.sh index c48dc4c8..cbaa0871 100755 --- a/aws/dual-region/scripts/export_environment_prerequisites.sh +++ b/aws/dual-region/scripts/export_environment_prerequisites.sh @@ -25,4 +25,4 @@ export CAMUNDA_NAMESPACE_1=camunda-paris # The Helm release name used for installing Camunda 8 in both Kubernetes clusters export HELM_RELEASE_NAME=camunda # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io -export HELM_CHART_VERSION=11.1.0 +export HELM_CHART_VERSION=11.1.1 diff --git a/test/go.mod b/test/go.mod index c3b5e8e0..56685ee3 100644 --- a/test/go.mod +++ b/test/go.mod @@ -3,10 +3,10 @@ module multiregiontests go 1.22.0 require ( - github.com/aws/aws-sdk-go v1.55.5 + github.com/aws/aws-sdk-go v1.55.6 github.com/aws/aws-sdk-go-v2/config v1.29.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.200.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.56.2 + github.com/aws/aws-sdk-go-v2/service/eks v1.56.5 github.com/camunda/camunda/clients/go/v8 v8.6.0-alpha5-rc2 github.com/gruntwork-io/terratest v0.48.1 github.com/stretchr/testify v1.10.0 diff --git a/test/go.sum b/test/go.sum index 88cb9208..5250b8d0 100644 --- a/test/go.sum +++ b/test/go.sum @@ -225,6 +225,8 @@ github.com/aws/aws-sdk-go v1.54.20 h1:FZ2UcXya7bUkvkpf7TaPmiL7EubK0go1nlXGLRwEso github.com/aws/aws-sdk-go v1.54.20/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= +github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.27.2 h1:pLsTXqX93rimAOZG2FIYraDQstZaaGVVN4tNw65v0h8= github.com/aws/aws-sdk-go-v2 v1.27.2/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= @@ -551,6 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.56.0 h1:x31cGGE/t/QkrHVh5m2uWvYwDiaD github.com/aws/aws-sdk-go-v2/service/eks v1.56.0/go.mod h1:kNUWaiotRWCnfQlprrxSMg8ALqbZyA9xLCwKXuLumSk= github.com/aws/aws-sdk-go-v2/service/eks v1.56.2 h1:NXxglcZhHubtK2SgqavDGkbArM4NYI7QvLr+FpOL3Oo= github.com/aws/aws-sdk-go-v2/service/eks v1.56.2/go.mod h1:KkH+D6VJmtIVGD9KTxB9yZu4hQP7s9kxWn8lLb7tmVg= +github.com/aws/aws-sdk-go-v2/service/eks v1.56.5 h1:AoVtICtIPSSgRJzNhT5A6IAP9kNbah2jJu1MAnBkHtM= +github.com/aws/aws-sdk-go-v2/service/eks v1.56.5/go.mod h1:6gWwo7rT4qfYVHwJnj0nUM4DP+XuURcTO+89H8dCvrM= github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 h1:hfkzDZHBp9jAT4zcd5mtqckpU4E3Ax0LQaEWWk1VgN8= github.com/aws/aws-sdk-go-v2/service/iam v1.38.1/go.mod h1:u36ahDtZcQHGmVm/r+0L1sfKX4fzLEMdCqiKRKkUMVM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= diff --git a/test/multi_region_aws_camunda_test.go b/test/multi_region_aws_camunda_test.go index a07b1af1..6fafb647 100644 --- a/test/multi_region_aws_camunda_test.go +++ b/test/multi_region_aws_camunda_test.go @@ -26,7 +26,7 @@ const ( var ( // renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io - remoteChartVersion = helpers.GetEnv("HELM_CHART_VERSION", "11.1.0") + remoteChartVersion = helpers.GetEnv("HELM_CHART_VERSION", "11.1.1") remoteChartName = helpers.GetEnv("HELM_CHART_NAME", "camunda/camunda-platform") // allows using OCI registries globalImageTag = helpers.GetEnv("GLOBAL_IMAGE_TAG", "") // allows overwriting the image tag via GHA of every Camunda image clusterName = helpers.GetEnv("CLUSTER_NAME", "nightly") // allows supplying random cluster name via GHA From b1bbb30ff6fd99505d7fdbe1f8d4b53b098f61c0 Mon Sep 17 00:00:00 2001 From: Leo J <153937047+leiicamundi@users.noreply.github.com> Date: Mon, 20 Jan 2025 12:13:23 +0100 Subject: [PATCH 2/7] fix lint --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a7b0d074..c45619b7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,5 +9,5 @@ on: jobs: lint: - uses: camunda/infraex-common-config/.github/workflows/lint-global.yml@41bed71d5715d2e2e83a83997a44be59fcddf615 # 1.2.12 + uses: camunda/infraex-common-config/.github/workflows/lint-global.yml@506a1e6eedf7d806d42bf5fdad8b0bd110841406 # 1.2.13 secrets: inherit From e1c756d19bee076223e7e4f25befbb15f8240a53 Mon Sep 17 00:00:00 2001 From: Leo J <153937047+leiicamundi@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:41:06 +0100 Subject: [PATCH 3/7] trigger ci From 86d98623af3d71764e4d068af115e3cdd9633a47 Mon Sep 17 00:00:00 2001 From: Leo J <153937047+leiicamundi@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:55:30 +0100 Subject: [PATCH 4/7] add justfile and fix renovate issue --- ...ghtly_aws_operational_procedure_stable.yml | 9 ++++++--- .tool-versions | 10 ++++++++-- justfile | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 justfile diff --git a/.github/workflows/nightly_aws_operational_procedure_stable.yml b/.github/workflows/nightly_aws_operational_procedure_stable.yml index 65bff599..fa7aedaf 100644 --- a/.github/workflows/nightly_aws_operational_procedure_stable.yml +++ b/.github/workflows/nightly_aws_operational_procedure_stable.yml @@ -148,14 +148,17 @@ jobs: c85=10.4.7 # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^11(\.(?\d+))?(\.(?\d+))?$ c86=11.1.1 - # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:11(\.(?\d+))?(\.(?\d+))?$ - 11.1.1 + + # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^11(\.(?\d+))?(\.(?\d+))?$ + c86_old=11.1.1 + # for not messing up with renovate, we add the prefix "OLD" in the next step + # Snapshot is used for namespace setup to do the DNS chaining tests with a static namespace. It's not used for the matrix. # shellcheck disable=SC2034 c87=SNAPSHOT if [ "${{ inputs.helm-versions }}" == "" ]; then - versions='{"helm-version":["'${c84}'","'${c85}'","'${c86}'","'${c86_old}'"]}' + versions='{"helm-version":["'${c84}'","'${c85}'","'${c86}'","'OLD.${c86_old}'"]}' else output=$(echo "${{ inputs.helm-versions }}" | awk -F, '{ for(i=1;i<=NF;i++) { diff --git a/.tool-versions b/.tool-versions index b92e4fc2..4913b161 100644 --- a/.tool-versions +++ b/.tool-versions @@ -8,16 +8,22 @@ # as the version but the Docker tag/Github tag is actually v1.2.3 # # # ################################################################################ - -awscli 2.23.2 +# +# /!\ Please maintain this file sorted alphabetically. +# 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" # renovate: datasource=github-tags depName=rhysd/actionlint actionlint 1.7.7 +awscli 2.23.2 + golang 1.23.5 helm 3.17.0 +just 1.38.0 + kubectl 1.32.1 pre-commit 4.0.1 diff --git a/justfile b/justfile new file mode 100644 index 00000000..7f7ff3e5 --- /dev/null +++ b/justfile @@ -0,0 +1,20 @@ +# this file is a recipe file for the project + +# Install all the tooling +install-tooling: asdf-install + +# Install asdf plugins +asdf-plugins: + #!/bin/sh + echo "Installing asdf plugins" + for plugin in $(awk '{print $1}' .tool-versions); do \ + asdf plugin add ${plugin} 2>&1 | (grep "already added" && exit 0); \ + done + + echo "Update all asdf plugins" + asdf plugin update --all + +# Install tools using asdf +asdf-install: asdf-plugins + asdf install + From c95ca6d00ff889e7652fd15c94959b5ef6a79eab Mon Sep 17 00:00:00 2001 From: Leo J <153937047+leiicamundi@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:56:44 +0100 Subject: [PATCH 5/7] fix end of file --- .github/workflows/nightly_aws_operational_procedure_stable.yml | 2 +- justfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly_aws_operational_procedure_stable.yml b/.github/workflows/nightly_aws_operational_procedure_stable.yml index fa7aedaf..1b3d53f1 100644 --- a/.github/workflows/nightly_aws_operational_procedure_stable.yml +++ b/.github/workflows/nightly_aws_operational_procedure_stable.yml @@ -148,7 +148,7 @@ jobs: c85=10.4.7 # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^11(\.(?\d+))?(\.(?\d+))?$ c86=11.1.1 - + # renovate: datasource=helm depName=camunda-platform registryUrl=https://helm.camunda.io versioning=regex:^11(\.(?\d+))?(\.(?\d+))?$ c86_old=11.1.1 # for not messing up with renovate, we add the prefix "OLD" in the next step diff --git a/justfile b/justfile index 7f7ff3e5..08f6a374 100644 --- a/justfile +++ b/justfile @@ -17,4 +17,3 @@ asdf-plugins: # Install tools using asdf asdf-install: asdf-plugins asdf install - From 9a43fcdef8aaa8986e9d2d049b697bfe2090da2e Mon Sep 17 00:00:00 2001 From: Langleu Date: Fri, 24 Jan 2025 14:24:01 +0100 Subject: [PATCH 6/7] fix: add old prefix in parser script --- .github/workflows/scripts/c8_namespace_parser.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scripts/c8_namespace_parser.sh b/.github/workflows/scripts/c8_namespace_parser.sh index 3c19c7f6..d941259c 100755 --- a/.github/workflows/scripts/c8_namespace_parser.sh +++ b/.github/workflows/scripts/c8_namespace_parser.sh @@ -16,6 +16,9 @@ fi # It greps the c8-version and the next x lines versions=$(grep 'id: generate-matrix' -A 12 "$1" | awk '/generate-matrix/ {flag=1; next} flag {print $1}') +# add OLD. prefix to the old version to allow new and old procedure texting for the same version +versions="${versions//_old=/_old=OLD.}" + variables=("CLUSTER_0_NAMESPACE" "CLUSTER_1_NAMESPACE" "CLUSTER_0_NAMESPACE_FAILOVER" "CLUSTER_1_NAMESPACE_FAILOVER") # Loop through each variable and print its name and all values found From bd9fe98d7aa73335ee3d2b94e47a102db31cf53c Mon Sep 17 00:00:00 2001 From: Langleu Date: Fri, 24 Jan 2025 16:10:51 +0100 Subject: [PATCH 7/7] fix: considered lines for namespaces parser --- .github/workflows/scripts/c8_namespace_parser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/c8_namespace_parser.sh b/.github/workflows/scripts/c8_namespace_parser.sh index d941259c..7e56ebc7 100755 --- a/.github/workflows/scripts/c8_namespace_parser.sh +++ b/.github/workflows/scripts/c8_namespace_parser.sh @@ -14,7 +14,7 @@ fi # For new versions bump -A argument by 1 # It greps the c8-version and the next x lines -versions=$(grep 'id: generate-matrix' -A 12 "$1" | awk '/generate-matrix/ {flag=1; next} flag {print $1}') +versions=$(grep 'id: generate-matrix' -A 16 "$1" | awk '/generate-matrix/ {flag=1; next} flag {print $1}') # add OLD. prefix to the old version to allow new and old procedure texting for the same version versions="${versions//_old=/_old=OLD.}"