From bd21e9fbd5b2178e726f8d5a4b34855934edccb0 Mon Sep 17 00:00:00 2001
From: sjahl <636687+sjahl@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:23:53 -0500
Subject: [PATCH] Fixes from being able to actually test this workflow

---
 .cloudbuild/bluegreen-update.sh        |  4 ++--
 .cloudbuild/rev-browser-bluegreen.yaml | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.cloudbuild/bluegreen-update.sh b/.cloudbuild/bluegreen-update.sh
index c4908f275..8489b6e8b 100644
--- a/.cloudbuild/bluegreen-update.sh
+++ b/.cloudbuild/bluegreen-update.sh
@@ -14,7 +14,7 @@ done
 # Retrieve current active blue/green and verify that it matches what's currently defined in git
 ####
 
-gcloud container clusters get-credentials --zone $CLOUDSDK_COMPUTE_ZONE $CLOUDSDK_CONTAINER_CLUSTER
+gcloud container clusters get-credentials --dns-endpoint --zone $CLOUDSDK_COMPUTE_ZONE $CLOUDSDK_CONTAINER_CLUSTER
 
 CURRENT_DEPLOYMENT=$(kubectl get service gnomad-browser-bluegreen -o jsonpath='{.spec.selector.deployment}')
 
@@ -57,7 +57,7 @@ echo "target/inactive deployment is $TARGET_DEPLOYMENT"
 ####
 pushd $TARGET_DEPLOYMENT
 kustomize --stack-trace edit set image "gnomad-api=us-docker.pkg.dev/${REPO_PROJECT}/gnomad/gnomad-api:${DOCKER_TAG}"
-kustomize --stack-trace edit set image "gnomad-browser-us-docker.pkg.dev/${REPO_PROJECT}/gnomad/gnomad-browser:${DOCKER_TAG}"
+kustomize --stack-trace edit set image "gnomad-browser=us-docker.pkg.dev/${REPO_PROJECT}/gnomad/gnomad-browser:${DOCKER_TAG}"
 popd
 
 git add $TARGET_DEPLOYMENT
diff --git a/.cloudbuild/rev-browser-bluegreen.yaml b/.cloudbuild/rev-browser-bluegreen.yaml
index 1bc487b43..2b118fca5 100644
--- a/.cloudbuild/rev-browser-bluegreen.yaml
+++ b/.cloudbuild/rev-browser-bluegreen.yaml
@@ -1,4 +1,12 @@
 steps:
+  - name: 'ubuntu'
+    entrypoint: 'bash'
+    args:
+      - -c
+      - |
+        echo $$GNOMAD_BUILD_ENV > browser/build.env
+    secretEnv:
+      - 'GNOMAD_BUILD_ENV'
   - name: 'gcr.io/cloud-builders/docker'
     args:
       [
@@ -33,7 +41,7 @@ steps:
   - name: 'gcr.io/cloud-builders/docker'
     args: ['push', 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-browser:${_BUILD_TAG}']
 
-  - name: 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/tgg-deploykit:1.0.0'
+  - name: 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/tgg-deploykit:testing-4'
     entrypoint: 'bash'
     args: ['./bluegreen-update.sh']
     dir: '.cloudbuild'
@@ -48,6 +56,8 @@ availableSecrets:
   secretManager:
     - versionName: projects/$PROJECT_ID/secrets/GITHUB_DEPLOY_KEY/versions/latest
       env: 'DEPLOY_KEY'
+    - versionName: projects/$PROJECT_ID/secrets/GNOMAD_BUILD_ENV/versions/1
+      env: 'GNOMAD_BUILD_ENV'
 options:
   dynamicSubstitutions: true
 substitutions: