Remove gcp runner zone from user input

Signed-off-by: Parthvi <parthvi.vala@gmail.com>
rancher · Jan 4, 2024 · 86606e2 · 86606e2
1 parent 5eae2bc
commit 86606e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/aks.yaml b/.github/workflows/aks.yaml
@@ -43,10 +43,7 @@ on:
         description: Runner template to use
         default: hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1
         type: string
-      zone:
-        description: GCP zone to host the runner
-        default: asia-south2-c
-        type: string
+
 jobs:
   aks-e2e:
     uses: ./.github/workflows/main.yaml
@@ -62,4 +59,3 @@ jobs:
       run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
       destroy_runner: ${{ inputs.destroy_runner == true }}
       runner_template: ${{ inputs.runner_template }}
-      zone: ${{inputs.zone}}
diff --git a/.github/workflows/eks.yaml b/.github/workflows/eks.yaml
@@ -43,10 +43,7 @@ on:
         description: Runner template to use
         default: hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1
         type: string
-      zone:
-        description: GCP zone to host the runner
-        default: asia-south2-c
-        type: string
+
 jobs:
   eks-e2e:
     uses: ./.github/workflows/main.yaml
@@ -62,4 +59,3 @@ jobs:
       run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
       destroy_runner: ${{ inputs.destroy_runner == true }}
       runner_template: ${{ inputs.runner_template }}
-      zone: ${{inputs.zone}}
diff --git a/.github/workflows/gke.yaml b/.github/workflows/gke.yaml
@@ -44,10 +44,7 @@ on:
         description: Runner template to use
         default: hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1
         type: string
-      zone:
-        description: GCP zone to host the runner
-        default: asia-south2-c
-        type: string
+
 jobs:
   gke-e2e:
     uses: ./.github/workflows/main.yaml
@@ -63,4 +60,3 @@ jobs:
       run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
       destroy_runner: ${{ inputs.destroy_runner == true }}
       runner_template: ${{ inputs.runner_template }}
-      zone: ${{inputs.zone}}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -39,10 +39,6 @@ on:
         description: Runner template to use
         default: hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1
         type: string
-      zone:
-        description: GCP zone to host the runner
-        default: asia-south2-c
-        type: string
 
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -56,6 +52,7 @@ env:
   GKE_PROJECT_ID: ${{ secrets.GKE_PROJECT_ID }}
   PROVIDER: ${{ inputs.hosted_provider }}
   RANCHER_PASSWORD: rancherpassword
+  GCP_RUNNER_ZONE: asia-south2-c
 
 jobs:
   create-runner:
@@ -83,14 +80,14 @@ jobs:
         uses: google-github-actions/setup-gcloud@v1
       - name: Create runner
         run: |
-          REGION=$(echo ${{ inputs.zone }} | sed 's/-[abcdef]$//')
+          REGION=$(echo ${{ env.GCP_RUNNER_ZONE }} | sed 's/-[abcdef]$//')
           gcloud compute instances create ${{ steps.generator.outputs.runner }} \
-            --zone ${{ inputs.zone }} \
+            --zone ${{ env.GCP_RUNNER_ZONE }} \
             --source-instance-template projects/${{ env.GKE_PROJECT_ID }}/regions/${REGION}/instanceTemplates/${{ inputs.runner_template }}
       - name: Allow traffic
         run: |
           gcloud compute instances add-tags ${{ steps.generator.outputs.runner }} \
-            --tags http-server,https-server --zone ${{ inputs.zone }}
+            --tags http-server,https-server --zone ${{ env.GCP_RUNNER_ZONE }}
       - name: Create GCP secrets
         run: |
           echo -n ${{ secrets.PAT_TOKEN }} \
@@ -215,4 +212,4 @@ jobs:
         run: |
           gcloud --quiet compute instances delete ${{ needs.create-runner.outputs.runner }} \
             --delete-disks all \
-            --zone ${{ inputs.zone }}
+            --zone ${{ env.GCP_RUNNER_ZONE }}