Consolidate GitHub Environment variables.

The following variables can be removed: * DUCHY_STORAGE_BUCKET * SIMULATOR_STORAGE_BUCKET * REPORTING_CLUSTER_LOCATION * POSTGRES_REGION
world-federation-of-advertisers · May 15, 2023 · 4eb42f3 · 4eb42f3
1 parent d52ca38
commit 4eb42f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/configure-duchy.yml b/.github/workflows/configure-duchy.yml
@@ -90,7 +90,7 @@ jobs:
         IMAGE_TAG: ${{ inputs.image-tag }}
         SPANNER_INSTANCE: ${{ vars.SPANNER_INSTANCE }}
         KINGDOM_SYSTEM_API_TARGET: ${{ vars.KINGDOM_SYSTEM_API_TARGET }}
-        DUCHY_STORAGE_BUCKET: ${{ vars.DUCHY_STORAGE_BUCKET }}
+        STORAGE_BUCKET: ${{ vars.STORAGE_BUCKET }}
       run: >
         bazelisk build 
         "//src/main/k8s/dev:${DUCHY_NAME}_duchy.tar"
@@ -100,7 +100,7 @@ jobs:
         --define "google_cloud_project=$GCLOUD_PROJECT"
         --define "spanner_instance=$SPANNER_INSTANCE"
         --define "kingdom_system_api_target=$KINGDOM_SYSTEM_API_TARGET"
-        --define "duchy_storage_bucket=$DUCHY_STORAGE_BUCKET"
+        --define "duchy_storage_bucket=$STORAGE_BUCKET"
         --define "duchy_cert_id=$DUCHY_CERT_ID"
 
 

diff --git a/.github/workflows/configure-reporting.yml b/.github/workflows/configure-reporting.yml
@@ -69,7 +69,7 @@ jobs:
       env:
         IMAGE_TAG: ${{ inputs.image-tag }}
         POSTGRES_INSTANCE: ${{ vars.POSTGRES_INSTANCE }}
-        POSTGRES_REGION: ${{ vars.POSTGRES_REGION }}
+        GCLOUD_REGION: ${{ vars.GCLOUD_REGION }}
         KINGDOM_PUBLIC_API_TARGET: ${{ vars.KINGDOM_PUBLIC_API_TARGET }}
       run: >
         bazelisk build 
@@ -79,7 +79,7 @@ jobs:
         --define "image_tag=$IMAGE_TAG"
         --define "google_cloud_project=$GCLOUD_PROJECT"
         --define "postgres_instance=$POSTGRES_INSTANCE"
-        --define "postgres_region=$POSTGRES_REGION"
+        --define "postgres_region=$GCLOUD_REGION"
         --define "kingdom_public_api_target=$KINGDOM_PUBLIC_API_TARGET"
 
 
@@ -133,7 +133,7 @@ jobs:
       uses: google-github-actions/get-gke-credentials@v1
       with:
         cluster_name: reporting
-        location: ${{ vars.REPORTING_CLUSTER_LOCATION }}
+        location: ${{ vars.GCLOUD_ZONE }}
 
     - name: Export KUSTOMIZE_PATH
       run: echo "KUSTOMIZE_PATH=$KUSTOMIZATION_PATH/src/main/k8s/dev/reporting" >> $GITHUB_ENV

diff --git a/.github/workflows/configure-simulators.yml b/.github/workflows/configure-simulators.yml
@@ -68,7 +68,7 @@ jobs:
     - name: Generate archives
       env:
         IMAGE_TAG: ${{ inputs.image-tag }}
-        SIMULATOR_STORAGE_BUCKET: ${{ vars.SIMULATOR_STORAGE_BUCKET }}
+        STORAGE_BUCKET: ${{ vars.STORAGE_BUCKET }}
         KINGDOM_PUBLIC_API_TARGET: ${{ vars.KINGDOM_PUBLIC_API_TARGET }}
         DUCHY_PUBLIC_API_TARGET: ${{ vars.DUCHY_PUBLIC_API_TARGET }}
         MC_NAME: ${{ vars.MC_NAME }}
@@ -85,7 +85,7 @@ jobs:
         --config ghcr
         --define "image_tag=$IMAGE_TAG"
         --define "google_cloud_project=$GCLOUD_PROJECT"
-        --define "simulator_storage_bucket=$SIMULATOR_STORAGE_BUCKET"
+        --define "simulator_storage_bucket=$STORAGE_BUCKET"
         --define "kingdom_public_api_target=$KINGDOM_PUBLIC_API_TARGET"
         --define "duchy_public_api_target=$DUCHY_PUBLIC_API_TARGET"
         --define "mc_name=$MC_NAME"