ci: fix service accounts introduced by merge (#2652)

* Fix service accounts introduced my merge * Remove GCP_E2E_PROJECT placeholders --------- Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Nov 28, 2023 · 43f47cc · 43f47cc
1 parent 45f6eec
commit 43f47cc
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/e2e-test-daily.yml b/.github/workflows/e2e-test-daily.yml
@@ -74,7 +74,7 @@ jobs:
           isDebugImage: ${{ matrix.refStream == 'ref/main/stream/debug/?' }}
           cliVersion: ${{ matrix.refStream == 'ref/release/stream/stable/?' && needs.find-latest-image.outputs.image-release-stable || '' }}
           refStream: ${{ matrix.refStream }}
-          gcpProject: constellation-e2e # ${{ secrets.GCP_E2E_PROJECT }}
+          gcpProject: constellation-e2e
           gcpClusterCreateServiceAccount: "[email protected]"
           gcpIAMCreateServiceAccount: "[email protected]"
           kubernetesVersion: ${{ matrix.kubernetesVersion }}
@@ -100,7 +100,7 @@ jobs:
           selfManagedInfra: "false"
           cloudProvider: ${{ matrix.provider }}
           azureClusterDeleteCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
-          gcpClusterDeleteServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
+          gcpClusterDeleteServiceAccount: "infrastructure-e2e@constellation-e2e.iam.gserviceaccount.com"
 
       - name: Always delete IAM configuration
         if: always()

diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml
@@ -226,7 +226,7 @@ jobs:
           awsOpenSearchDomain: ${{ secrets.AWS_OPENSEARCH_DOMAIN }}
           awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }}
           awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }}
-          gcpProject: constellation-e2e # ${{ secrets.GCP_E2E_PROJECT }}
+          gcpProject: constellation-e2e
           gcpClusterCreateServiceAccount: "[email protected]"
           gcpIAMCreateServiceAccount: "[email protected]"
           test: ${{ matrix.test }}
@@ -249,7 +249,7 @@ jobs:
           selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }}
           cloudProvider: ${{ matrix.provider }}
           azureClusterDeleteCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
-          gcpClusterDeleteServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
+          gcpClusterDeleteServiceAccount: "infrastructure-e2e@constellation-e2e.iam.gserviceaccount.com"
 
       - name: Always delete IAM configuration
         if: always()

diff --git a/.github/workflows/e2e-test-tf-module.yml b/.github/workflows/e2e-test-tf-module.yml
@@ -159,7 +159,6 @@ jobs:
         run: |
           cat > terraform.tfvars <<EOF
           name = "${{ steps.create-prefix.outputs.prefix }}"
-          # project = "${{ secrets.GCP_E2E_PROJECT }}"
           project = "constellation-e2e"
           service_account_id = "${{ steps.create-prefix.outputs.prefix }}-sa"
           image = "${{ steps.find-latest-image.outputs.image }}"

diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
@@ -243,7 +243,7 @@ jobs:
           awsOpenSearchDomain: ${{ secrets.AWS_OPENSEARCH_DOMAIN }}
           awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }}
           awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }}
-          gcpProject: constellation-e2e # ${{ secrets.GCP_E2E_PROJECT }}
+          gcpProject: constellation-e2e
           gcpClusterCreateServiceAccount: "[email protected]"
           gcpIAMCreateServiceAccount: "[email protected]"
           test: ${{ matrix.test }}
@@ -268,7 +268,7 @@ jobs:
           selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }}
           cloudProvider: ${{ matrix.provider }}
           azureClusterDeleteCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
-          gcpClusterDeleteServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
+          gcpClusterDeleteServiceAccount: "infrastructure-e2e@constellation-e2e.iam.gserviceaccount.com"
 
       - name: Always delete IAM configuration
         if: always()

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -215,7 +215,7 @@ jobs:
           cloudProvider: ${{ inputs.cloudProvider }}
           machineType: ${{ inputs.machineType }}
           regionZone: ${{ inputs.regionZone }}
-          gcpProject: constellation-e2e # ${{ secrets.GCP_E2E_PROJECT }}
+          gcpProject: constellation-e2e
           gcpClusterCreateServiceAccount: "[email protected]"
           gcpIAMCreateServiceAccount: "[email protected]"
           test: ${{ inputs.test }}
@@ -247,7 +247,7 @@ jobs:
           selfManagedInfra: ${{ inputs.selfManagedInfra }}
           cloudProvider: ${{ inputs.cloudProvider }}
           azureClusterDeleteCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
-          gcpClusterDeleteServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
+          gcpClusterDeleteServiceAccount: "infrastructure-e2e@constellation-e2e.iam.gserviceaccount.com"
 
       - name: Always delete IAM configuration
         if: always()

diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
@@ -170,7 +170,7 @@ jobs:
           isDebugImage: "false"
           cliVersion: ${{ inputs.fromVersion }}
           regionZone: ${{ inputs.regionZone }}
-          gcpProject: constellation-e2e # ${{ secrets.GCP_E2E_PROJECT }}
+          gcpProject: constellation-e2e
           gcpClusterCreateServiceAccount: "[email protected]"
           gcpIAMCreateServiceAccount: "[email protected]"
           test: "upgrade"
@@ -291,7 +291,7 @@ jobs:
           selfManagedInfra: "false"
           cloudProvider: ${{ inputs.cloudProvider }}
           azureClusterDeleteCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
-          gcpClusterDeleteServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
+          gcpClusterDeleteServiceAccount: "infrastructure-e2e@constellation-e2e.iam.gserviceaccount.com"
 
       - name: Always delete IAM configuration
         if: always()