From 576f1b04886c30f3779c856abeded1c171873fc9 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <mail2hemanth.n@gmail.com>
Date: Tue, 1 Oct 2019 03:11:03 +0530
Subject: [PATCH] Use apps/v1 k8s controllers and add labels

Update apiversion for deployment to apps/v1
Add selector match labels to deployment

This patch is similar to https://review.opendev.org/#/c/638276/
These changes are required to install drydock helm chart on k8s 1.16.0

Change-Id: Ie9b7344fc94058a6212d09a9b96fe1b2b9d07b4e
---
 charts/drydock/templates/deployment.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/drydock/templates/deployment.yaml b/charts/drydock/templates/deployment.yaml
index 1b0baeb0..dfd19ad0 100644
--- a/charts/drydock/templates/deployment.yaml
+++ b/charts/drydock/templates/deployment.yaml
@@ -15,10 +15,11 @@
 
 {{- if .Values.manifests.deployment_drydock }}
 {{- $envAll := . -}}
+{{- $labels :=  tuple $envAll "drydock" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" -}}
 {{- $serviceAccountName := "drydock-api" }}
 {{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drydock-api
@@ -26,11 +27,14 @@ metadata:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
   replicas: {{ .Values.replicas.drydock }}
+  selector:
+    matchLabels:
+{{ $labels | indent 6 }}
 {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
   template:
     metadata:
       labels:
-{{ tuple $envAll "drydock" "api" | 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" }}