From abbbf3d6b2ebef8cce33e1f05ba94b3485962263 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <mail2hemanth.n@gmail.com>
Date: Tue, 1 Oct 2019 03:10:04 +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 deckhand helm chart on k8s 1.16.0

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

diff --git a/charts/deckhand/templates/deployment.yaml b/charts/deckhand/templates/deployment.yaml
index d96f501d..6cab808a 100644
--- a/charts/deckhand/templates/deployment.yaml
+++ b/charts/deckhand/templates/deployment.yaml
@@ -16,12 +16,13 @@
 
 {{- if .Values.manifests.deployment }}
 {{- $envAll := . }}
+{{- $labels :=  tuple $envAll "deckhand" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" -}}
 {{- $mounts_deckhand := .Values.pod.mounts.deckhand.deckhand }}
 {{- $mounts_deckhand_init := .Values.pod.mounts.deckhand.init_container }}
 {{- $serviceAccountName := "deckhand" }}
 {{ tuple $envAll "deckhand" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: deckhand-api
@@ -29,11 +30,14 @@ metadata:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
   replicas: {{ .Values.pod.replicas.deckhand }}
+  selector:
+    matchLabels:
+{{ $labels | indent 6 }}
 {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
   template:
     metadata:
       labels:
-{{ tuple $envAll "deckhand" "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" }}