From cbc2212a1571f3f6c5674e20c4f51ffbea09afe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Fri, 26 Apr 2024 08:25:55 +0200 Subject: [PATCH] Use github.run_id to correctly tag resources with the run id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .github/actions/constellation_iam_create/action.yml | 2 +- .github/actions/e2e_test/action.yml | 2 +- .github/workflows/e2e-windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/constellation_iam_create/action.yml b/.github/actions/constellation_iam_create/action.yml index 6f3ad02a7..f5dcadaf7 100644 --- a/.github/actions/constellation_iam_create/action.yml +++ b/.github/actions/constellation_iam_create/action.yml @@ -53,7 +53,7 @@ runs: fi echo "flag=--update-config" | tee -a "$GITHUB_OUTPUT" - constellation config generate ${{ inputs.cloudProvider }} ${kubernetesFlag} --attestation ${{ inputs.attestationVariant }} --tags ${{ inputs.additionalTags }} + constellation config generate ${{ inputs.cloudProvider }} ${kubernetesFlag} --attestation ${{ inputs.attestationVariant }} --tags "${{ inputs.additionalTags }}" - name: Constellation iam create aws shell: bash diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml index 441e853c8..3750783a8 100644 --- a/.github/actions/e2e_test/action.yml +++ b/.github/actions/e2e_test/action.yml @@ -258,7 +258,7 @@ runs: gcpProjectID: ${{ inputs.gcpProject }} gcpZone: ${{ inputs.regionZone || 'europe-west3-b' }} kubernetesVersion: ${{ inputs.kubernetesVersion }} - additionalTags: "workflow=${{ github.workflow }}" + additionalTags: "workflow=${{ github.run_id }}" - name: Login to GCP (Cluster service account) if: inputs.cloudProvider == 'gcp' diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml index 78ee6b62f..96906afae 100644 --- a/.github/workflows/e2e-windows.yml +++ b/.github/workflows/e2e-windows.yml @@ -84,7 +84,7 @@ jobs: run: | $uid = Get-Random -Minimum 1000 -Maximum 9999 $rgName = "e2e-win-${{ github.run_id }}-${{ github.run_attempt }}-$uid" - .\constellation.exe config generate azure -t "workflow=${{ github.workflow }}" + .\constellation.exe config generate azure -t "workflow=${{ github.run_id }}" .\constellation.exe iam create azure --region=westus --resourceGroup=$rgName-rg --servicePrincipal=$rgName-sp --update-config --debug -y - name: Login to Azure (Cluster service principal)