From 157d9f75c1f831bf5d3edbe2cd4340638d6cd267 Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Wed, 16 Sep 2020 09:15:35 -0400
Subject: [PATCH] Use the save API version for the HPA controller and the
 deployment (#807)

This supposedly can fix our deployment problem. Tested on alpha.

Also updated the deployment script to replace the service object as
well.
---
 proxy/deploy-proxy-for-env.sh              | 4 +++-
 proxy/kubernetes/proxy-service-canary.yaml | 2 +-
 proxy/kubernetes/proxy-service.yaml        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/proxy/deploy-proxy-for-env.sh b/proxy/deploy-proxy-for-env.sh
index 50a00008c..ada39e065 100755
--- a/proxy/deploy-proxy-for-env.sh
+++ b/proxy/deploy-proxy-for-env.sh
@@ -31,14 +31,16 @@ do
   echo "Updating cluster ${parts[0]} in zone ${parts[1]}..."
   gcloud container clusters get-credentials "${parts[0]}" \
     --project "${project}" --zone "${parts[1]}"
-  # Kills all running pods, new pods created will be pulling the new image.
   sed s/GCP_PROJECT/${project}/g "./kubernetes/proxy-deployment-${environment}.yaml" | \
   kubectl replace -f -
+  kubectl replace -f "./kubernetes/proxy-service.yaml" --force
   # Alpha does not have canary
   if [[ ${environment} != "alpha" ]]; then
     sed s/GCP_PROJECT/${project}/g "./kubernetes/proxy-deployment-${environment}-canary.yaml" | \
     kubectl replace -f -
+    kubectl replace -f "./kubernetes/proxy-service-canary.yaml" --force
   fi
+  # Kills all running pods, new pods created will be pulling the new image.
   kubectl delete pods --all
 done < <(gcloud container clusters list --project ${project} | grep proxy-cluster)
 kubectl config use-context "$current_context"
diff --git a/proxy/kubernetes/proxy-service-canary.yaml b/proxy/kubernetes/proxy-service-canary.yaml
index f76bbe01b..5b3878983 100644
--- a/proxy/kubernetes/proxy-service-canary.yaml
+++ b/proxy/kubernetes/proxy-service-canary.yaml
@@ -43,7 +43,7 @@ metadata:
     app: proxy-canary
 spec:
   scaleTargetRef:
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     name: proxy-deployment-canary
   maxReplicas: 10
diff --git a/proxy/kubernetes/proxy-service.yaml b/proxy/kubernetes/proxy-service.yaml
index 87833ebe9..3f74ff74f 100644
--- a/proxy/kubernetes/proxy-service.yaml
+++ b/proxy/kubernetes/proxy-service.yaml
@@ -43,7 +43,7 @@ metadata:
     app: proxy
 spec:
   scaleTargetRef:
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     name: proxy-deployment
   maxReplicas: 10