From f0ac0a62c2d23d5b740797db185bdbc3107bb3ae Mon Sep 17 00:00:00 2001
From: "Kumar, Nishant (nk613n)" <nishant.e.kumar@att.com>
Date: Mon, 7 Oct 2019 10:06:56 -0400
Subject: [PATCH] [Ingress] Change apiVersion for Ingress and Deployment
 Resource

'apps/v1beta1' apiVersion for Deployment has been deprecated.
'extensions/v1beta1' apiVersion for Ingress resource has been deprecated.

This PS aligns towards the effort in moving to k8s 1.16.

Reference: https://v1-14.docs.kubernetes.io/docs/setup/release/notes/#deprecations

Change-Id: Ied31e4e136fb9bf0343d609cf75bd1b7028d6f66
---
 charts/maas/templates/deployment-ingress-errors.yaml | 8 ++++++--
 charts/maas/templates/deployment-maas-ingress.yaml   | 8 ++++++--
 charts/maas/templates/ingress-region.yaml            | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/charts/maas/templates/deployment-ingress-errors.yaml b/charts/maas/templates/deployment-ingress-errors.yaml
index 8553efc..b0f15c3 100644
--- a/charts/maas/templates/deployment-ingress-errors.yaml
+++ b/charts/maas/templates/deployment-ingress-errors.yaml
@@ -17,23 +17,27 @@ limitations under the License.
 
 {{- if .Values.manifests.rack_statefulset }}
 {{- $envAll := . }}
+{{- $labels := tuple $envAll "maas" "ingress-errors" | include "helm-toolkit.snippets.kubernetes_metadata_labels" -}}
 {{- $serviceAccountName := "maas-ingress-errors" }}
 {{- $mounts_maas_rack := .Values.pod.mounts.maas_rack }}
 {{- $mounts_maas_rack_init := .Values.pod.mounts.maas_rack.init_container }}
 
 {{ tuple $envAll "rack_controller" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maas-ingress-errors
 spec:
   serviceName: maas-rack
   replicas: {{ .Values.pod.replicas.ingress_errors }}
+  selector:
+    matchLabels:
+{{ $labels | indent 6 }}
   template:
     metadata:
       labels:
-{{ tuple $envAll "maas" "ingress-errors" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ $labels | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "ingress_errors" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/maas/templates/deployment-maas-ingress.yaml b/charts/maas/templates/deployment-maas-ingress.yaml
index 8ba9dcf..22eba1e 100644
--- a/charts/maas/templates/deployment-maas-ingress.yaml
+++ b/charts/maas/templates/deployment-maas-ingress.yaml
@@ -17,6 +17,7 @@ limitations under the License.
 
 {{- if .Values.manifests.maas_ingress }}
 {{- $envAll := . }}
+{{- $labels := tuple $envAll "maas" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" -}}
 {{- $serviceAccountName := "maas-ingress" }}
 {{- $mounts_maas_ingress := .Values.pod.mounts.maas_ingress }}
 {{- $mounts_maas_ingress_init := .Values.pod.mounts.maas_ingress.init_container }}
@@ -142,7 +143,7 @@ subjects:
     namespace: {{ $envAll.Release.Namespace }}
 ---
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maas-ingress
@@ -150,10 +151,13 @@ metadata:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
   replicas: {{ .Values.pod.replicas.ingress }}
+  selector:
+    matchLabels:
+{{ $labels | indent 6 }}
   template:
     metadata:
       labels:
-{{ tuple $envAll "maas" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ $labels | indent 8 }}
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
diff --git a/charts/maas/templates/ingress-region.yaml b/charts/maas/templates/ingress-region.yaml
index 7a2f0e3..2926c97 100644
--- a/charts/maas/templates/ingress-region.yaml
+++ b/charts/maas/templates/ingress-region.yaml
@@ -16,7 +16,7 @@
 
 {{- if and .Values.manifests.ingress_region .Values.network.region_api.ingress.public }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: maas-region-api