From 068f55754eeee20a284daeb7209d7fc3d3bcddc9 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 17 Sep 2019 13:18:57 -0500
Subject: [PATCH] Upversion kubernetes config files to be 1.16 compatible

Updating DaemonSet from extensions/v1beta1 to app/v1
Updating Deployment from extensions/v1beta1 to app/v1

app/v1 has a requirement for "selector" entries.

Refer to:
https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16

Change-Id: I2c2efceb71309276bf389eb76d228174cdfd926f
Depends-On: https://review.opendev.org/#/c/684351
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 stx-platform-helm/centos/build_srpm.data                     | 2 +-
 .../helm-charts/rbd-provisioner/templates/daemonset.yaml     | 2 +-
 .../helm-charts/rbd-provisioner/templates/deployment.yaml    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/stx-platform-helm/centos/build_srpm.data b/stx-platform-helm/centos/build_srpm.data
index 88352da..ccb02be 100644
--- a/stx-platform-helm/centos/build_srpm.data
+++ b/stx-platform-helm/centos/build_srpm.data
@@ -4,4 +4,4 @@ COPY_LIST_TO_TAR="\
     $STX_BASE/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts \
 "
 
-TIS_PATCH_VER=7
+TIS_PATCH_VER=8
diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/daemonset.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/daemonset.yaml
index 7d6be68..0c04641 100644
--- a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/daemonset.yaml
+++ b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/daemonset.yaml
@@ -7,7 +7,7 @@
 */}}
 
 {{- if eq .Values.global.deployAs "DaemonSet" }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ .Values.global.name }}
diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/deployment.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/deployment.yaml
index 8868a45..072f553 100644
--- a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/deployment.yaml
+++ b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/deployment.yaml
@@ -7,13 +7,16 @@
 */}}
 
 {{- if eq .Values.global.deployAs "Deployment" }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.global.name }}
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.global.replicas }}
+  selector:
+    matchLabels:
+      app:  {{ .Values.global.name }}
   strategy:
     type: Recreate
   template: