From b3691c514a7a7ef8d13928436029f4b62d70facd Mon Sep 17 00:00:00 2001
From: Gustavo Valverde <gustavo@iterativo.do>
Date: Tue, 9 May 2023 17:13:26 -0400
Subject: [PATCH] fix(deployment): explicitly use a service account and region
 (#6643)

---
 .github/workflows/continous-delivery.yml   | 9 ++++++---
 .github/workflows/zcashd-manual-deploy.yml | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml
index 6d2d4d9dc..2eb13812c 100644
--- a/.github/workflows/continous-delivery.yml
+++ b/.github/workflows/continous-delivery.yml
@@ -159,9 +159,11 @@ jobs:
           --create-disk=name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }},auto-delete=yes,size=300GB,type=pd-ssd \
           --container-mount-disk=mount-path="/zebrad-cache",name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }} \
           --machine-type ${{ vars.GCP_SMALL_MACHINE }} \
+          --service-account ${{ vars.GCP_DEPLOYMENTS_SA }} \
           --scopes cloud-platform \
           --labels=app=zebrad,environment=prod,network=${NETWORK},github_ref=${{ env.GITHUB_REF_SLUG_URL }} \
-          --tags zebrad
+          --tags zebrad \
+          --zone ${{ vars.GCP_ZONE }}
 
       # Check if our destination instance group exists already
       - name: Check if instance group exists
@@ -245,6 +247,7 @@ jobs:
           --create-disk=name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }},auto-delete=yes,size=300GB,type=pd-ssd \
           --container-mount-disk=mount-path='/zebrad-cache',name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }} \
           --machine-type ${{ vars.GCP_SMALL_MACHINE }} \
-          --zone ${{ vars.GCP_ZONE }} \
+          --service-account ${{ vars.GCP_DEPLOYMENTS_SA }} \
           --labels=app=zebrad,environment=qa,network=${NETWORK},github_ref=${{ env.GITHUB_REF_SLUG_URL }} \
-          --tags zebrad
+          --tags zebrad \
+          --zone ${{ vars.GCP_ZONE }}
diff --git a/.github/workflows/zcashd-manual-deploy.yml b/.github/workflows/zcashd-manual-deploy.yml
index d8ef2020d..697225001 100644
--- a/.github/workflows/zcashd-manual-deploy.yml
+++ b/.github/workflows/zcashd-manual-deploy.yml
@@ -67,10 +67,11 @@ jobs:
           --container-image electriccoinco/zcashd \
           --container-env ZCASHD_NETWORK="${{ inputs.network }}" \
           --machine-type ${{ vars.GCP_SMALL_MACHINE }} \
-          --service-account ${{ env.DEPLOY_SA }} \
+          --service-account ${{ vars.GCP_DEPLOYMENTS_SA }} \
           --scopes cloud-platform \
           --labels=app=zcashd,environment=prod,network=${NETWORK},github_ref=${{ env.GITHUB_REF_SLUG_URL }} \
-          --tags zcashd
+          --tags zcashd \
+          --zone ${{ vars.GCP_ZONE }}
 
       # Check if our destination instance group exists already
       - name: Check if instance group exists