ci: add missing quotation marks for region flag + revert to northeuro…

…pe (#2459) * Add missing quotation marks for region flag * Revert default Azure region to northeurope --------- Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Oct 16, 2023 · afb154c · afb154c
1 parent c52086c
commit afb154c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/.github/actions/constellation_iam_create/action.yml b/.github/actions/constellation_iam_create/action.yml
@@ -39,14 +39,7 @@ runs:
     - name: Generate config
       id: generate-config
       shell: bash
-      # TODO(katexochen): Remove the generate-config flag once v2.10 is released.
       run: |
-        output=$(constellation iam create --help)
-        if [[ $output == *"generate-config"* ]]; then
-          echo "flag=--generate-config" | tee -a "$GITHUB_OUTPUT"
-          exit 0
-        fi
-
         kubernetesFlag=""
         if [[ ! -z "${{ inputs.kubernetesVersion }}" ]]; then
           kubernetesFlag="--kubernetes=${{ inputs.kubernetesVersion }}"
@@ -60,9 +53,9 @@ runs:
       if: inputs.cloudProvider == 'aws'
       run: |
         constellation iam create aws \
-          --zone=${{ inputs.awsZone }} \
-          --prefix=${{ inputs.namePrefix }} \
-          ${{ steps.generate-config.outputs.flag }} \
+          --zone="${{ inputs.awsZone }}" \
+          --prefix="${{ inputs.namePrefix }}" \
+          --update-config \
           --tf-log=DEBUG \
           --yes
 
@@ -71,10 +64,10 @@ runs:
       if: inputs.cloudProvider == 'azure'
       run: |
         constellation iam create azure \
-          --region=${{ inputs.azureRegion }} \
+          --region="${{ inputs.azureRegion }}" \
           --resourceGroup="${{ inputs.namePrefix }}-rg" \
           --servicePrincipal="${{ inputs.namePrefix }}-sp" \
-          ${{ steps.generate-config.outputs.flag }} \
+          --update-config \
           --tf-log=DEBUG \
           --yes
 
@@ -83,9 +76,9 @@ runs:
       if: inputs.cloudProvider == 'gcp'
       run: |
         constellation iam create gcp \
-          --projectID=${{ inputs.gcpProjectID }} \
-          --zone=${{ inputs.gcpZone }} \
+          --projectID="${{ inputs.gcpProjectID }}" \
+          --zone="${{ inputs.gcpZone }}" \
           --serviceAccountID="${{ inputs.namePrefix }}-sa" \
-          ${{ steps.generate-config.outputs.flag }} \
+          --update-config \
           --tf-log=DEBUG \
           --yes
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
@@ -209,7 +209,7 @@ runs:
         cloudProvider: ${{ inputs.cloudProvider }}
         namePrefix: ${{ steps.create-prefix.outputs.prefix }}
         awsZone: ${{ inputs.regionZone || 'us-east-2c' }}
-        azureRegion: ${{ inputs.regionZone || 'westus' }}
+        azureRegion: ${{ inputs.regionZone || 'northeurope' }}
         gcpProjectID: ${{ inputs.gcpProject }}
         gcpZone: ${{ inputs.regionZone || 'europe-west3-b' }}
         kubernetesVersion: ${{ inputs.kubernetesVersion }}