diff --git a/.github/actions/constellation_iam_create/action.yml b/.github/actions/constellation_iam_create/action.yml index aca32378ed..6f3ad02a70 100644 --- a/.github/actions/constellation_iam_create/action.yml +++ b/.github/actions/constellation_iam_create/action.yml @@ -14,6 +14,10 @@ inputs: namePrefix: description: "Name prefix to use for resources." required: true + additionalTags: + description: "Additional resource tags that will be written into the constellation configuration." + default: "" + required: false # # AWS specific inputs # @@ -49,7 +53,7 @@ runs: fi echo "flag=--update-config" | tee -a "$GITHUB_OUTPUT" - constellation config generate ${{ inputs.cloudProvider }} ${kubernetesFlag} --attestation ${{ inputs.attestationVariant }} + 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 bf76f9c8a2..441e853c8d 100644 --- a/.github/actions/e2e_test/action.yml +++ b/.github/actions/e2e_test/action.yml @@ -258,6 +258,7 @@ runs: gcpProjectID: ${{ inputs.gcpProject }} gcpZone: ${{ inputs.regionZone || 'europe-west3-b' }} kubernetesVersion: ${{ inputs.kubernetesVersion }} + additionalTags: "workflow=${{ github.workflow }}" - 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 bbccd079e8..78ee6b62fc 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 + .\constellation.exe config generate azure -t "workflow=${{ github.workflow }}" .\constellation.exe iam create azure --region=westus --resourceGroup=$rgName-rg --servicePrincipal=$rgName-sp --update-config --debug -y - name: Login to Azure (Cluster service principal)