From b7f095b6b84750d0b5f64c085fc83a6df589bfed Mon Sep 17 00:00:00 2001
From: Joel Tianqi Zhu <66701969+tianzhu007@users.noreply.github.com>
Date: Fri, 9 Oct 2020 13:20:56 -0700
Subject: [PATCH] Edit Deployment Files by Kubernetes v1.16.13 and Fluidcr
 Registry (#3848)

* Edit the yaml for the k8s deployment

* Edit the deployment file for historian

* update the secrets' name

* Update cobalt-deployment.yaml

* Change to lower case
---
 server/charts/historian/templates/cobalt-deployment.yaml    | 2 +-
 server/charts/historian/values.yaml                         | 6 +++---
 server/charts/kafka/templates/kafka-stateful-set.yaml       | 5 ++++-
 server/charts/kafka/templates/zookeeper-stateful-set.yaml   | 5 ++++-
 .../kubernetes/nginx/nginx-ingress-controller-eastus.yml    | 5 ++++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/server/charts/historian/templates/cobalt-deployment.yaml b/server/charts/historian/templates/cobalt-deployment.yaml
index 07b05eca3a7d..88b807939376 100644
--- a/server/charts/historian/templates/cobalt-deployment.yaml
+++ b/server/charts/historian/templates/cobalt-deployment.yaml
@@ -35,7 +35,7 @@ spec:
         - name: data
           mountPath: /var/lib/cobalt/
       imagePullSecrets:
-      - name: regsecret
+      - name: legacyregsecret
       volumes:
         - name: data
           persistentVolumeClaim:
diff --git a/server/charts/historian/values.yaml b/server/charts/historian/values.yaml
index cb71c72eb70f..e06419f363cf 100644
--- a/server/charts/historian/values.yaml
+++ b/server/charts/historian/values.yaml
@@ -4,7 +4,7 @@ imagePullPolicy: IfNotPresent
 
 historian:
   name: historian
-  image: prague.azurecr.io/historian:4049
+  image: fluidcr.azurecr.io/build/fluidframework/routerlicious/historian:latest
   redis:
     url: redis_url
     port: 6379
@@ -16,7 +16,7 @@ historian:
 
 gitrest:
   name: gitrest
-  image: prague.azurecr.io/gitrest:4048
+  image: fluidcr.azurecr.io/build/fluidframework/routerlicious/gitrest:latest
   mode: latest
   persistence:
     storageClass: managed-premium
@@ -25,7 +25,7 @@ gitrest:
 
 gitssh:
   name: gitssh
-  image: prague.azurecr.io/gitssh:654
+  image: fluidcr.azurecr.io/build/fluidframework/routerlicious/gitssh:latest
 
 cobalt:
   name: cobalt
diff --git a/server/charts/kafka/templates/kafka-stateful-set.yaml b/server/charts/kafka/templates/kafka-stateful-set.yaml
index eb6bc220c7e8..4a2a78e0f015 100644
--- a/server/charts/kafka/templates/kafka-stateful-set.yaml
+++ b/server/charts/kafka/templates/kafka-stateful-set.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "kafka.fullname" . }}
@@ -11,6 +11,9 @@ metadata:
 spec:
   serviceName: kafka
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ template "kafka.fullname" . }}
   template:
     metadata:
       labels:
diff --git a/server/charts/kafka/templates/zookeeper-stateful-set.yaml b/server/charts/kafka/templates/zookeeper-stateful-set.yaml
index bc50394b4d37..d37cbc1ad57f 100644
--- a/server/charts/kafka/templates/zookeeper-stateful-set.yaml
+++ b/server/charts/kafka/templates/zookeeper-stateful-set.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "zookeeper.fullname" . }}
@@ -11,6 +11,9 @@ metadata:
 spec:
   serviceName: zookeeper
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ template "kafka.fullname" . }}
   template:
     metadata:
       labels:
diff --git a/server/routerlicious/kubernetes/nginx/nginx-ingress-controller-eastus.yml b/server/routerlicious/kubernetes/nginx/nginx-ingress-controller-eastus.yml
index f30eed607385..e403f13a7d71 100644
--- a/server/routerlicious/kubernetes/nginx/nginx-ingress-controller-eastus.yml
+++ b/server/routerlicious/kubernetes/nginx/nginx-ingress-controller-eastus.yml
@@ -12,13 +12,16 @@ spec:
   selector:
     k8s-app: nginx-ingress-prod-lb
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-ingress-prod-controller
 spec:
   replicas: 2
   revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      k8s-app: nginx-ingress-prod-lb
   template:
     metadata:
       labels: