From bb30f3b7c3af046445cc81922afe3738c4e116e9 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Fri, 27 Aug 2021 08:40:35 -0700
Subject: [PATCH] Enable redeploying same image for QA (#1159)

* Fixing the redeploy of the same docker image to QA

* removing a line that snuck in
---
 .github/workflows/qa-deploy.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/qa-deploy.yml b/.github/workflows/qa-deploy.yml
index 819aa11c26a..1ae61b0cce7 100644
--- a/.github/workflows/qa-deploy.yml
+++ b/.github/workflows/qa-deploy.yml
@@ -8,10 +8,10 @@ on:
         required: false
 
 env:
-  QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops"
-  QA_CLUSTER_NAME: "dev-aks"
-  QA_K8S_NAMESPACE: "bw-qa"
-  QA_K8S_APP_NAME: "bw-web"
+  _QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops"
+  _QA_CLUSTER_NAME: "dev-aks"
+  _QA_K8S_NAMESPACE: "bw-qa"
+  _QA_K8S_APP_NAME: "bw-web"
 
 jobs:
   deploy:
@@ -49,7 +49,7 @@ jobs:
           echo "---az install---"
           az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin
           echo "---az get-creds---"
-          az aks get-credentials -n $QA_CLUSTER_NAME -g $QA_CLUSTER_RESOURCE_GROUP
+          az aks get-credentials -n $_QA_CLUSTER_NAME -g $_QA_CLUSTER_RESOURCE_GROUP
 
       - name: Get image tag
         id: image_tag
@@ -66,5 +66,6 @@ jobs:
         env:
           IMAGE_TAG: ${{ steps.image_tag.outputs.value }}
         run: |
-          kubectl set image -n $QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record
-          kubectl rollout status deployment/web -n $QA_K8S_NAMESPACE
+          kubectl set image -n $_QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record
+          kubectl rollout restart -n $QA_K8s_NAMESPACE deployment/web
+          kubectl rollout status deployment/web -n $_QA_K8S_NAMESPACE