From 59d3365d3b13f37a9b914d59d931c71269a21eec Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Wed, 19 Jun 2019 14:35:44 +0530
Subject: [PATCH] update statefulset and daemonset api-version

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml     | 2 +-
 deploy/cephfs/helm/templates/provisioner-statefulset.yaml  | 2 +-
 deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 5 ++++-
 deploy/cephfs/kubernetes/csi-cephfsplugin.yaml             | 2 +-
 deploy/rbd/helm/templates/nodeplugin-daemonset.yaml        | 2 +-
 deploy/rbd/helm/templates/provisioner-statefulset.yaml     | 2 +-
 deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml       | 5 ++++-
 deploy/rbd/kubernetes/csi-rbdplugin.yaml                   | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
index ed49a44b4..31d27337e 100644
--- a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
+++ b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
@@ -1,5 +1,5 @@
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }}
   labels:
diff --git a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
index cc073df49..51e56a722 100644
--- a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
+++ b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
@@ -1,5 +1,5 @@
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}
   labels:
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
index d4732358f..3648aa2f5 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
@@ -14,10 +14,13 @@ spec:
 
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-cephfsplugin-provisioner
 spec:
+  selector:
+    matchLabels:
+      app: csi-cephfsplugin-provisioner
   serviceName: "csi-cephfsplugin-provisioner"
   replicas: 1
   template:
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
index 1788052e1..237a9d413 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -1,6 +1,6 @@
 ---
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: csi-cephfsplugin
 spec:
diff --git a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
index a27f1c71b..5c31ee990 100644
--- a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
+++ b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
@@ -1,5 +1,5 @@
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}
   labels:
diff --git a/deploy/rbd/helm/templates/provisioner-statefulset.yaml b/deploy/rbd/helm/templates/provisioner-statefulset.yaml
index 12751b90d..7f80d0a3f 100644
--- a/deploy/rbd/helm/templates/provisioner-statefulset.yaml
+++ b/deploy/rbd/helm/templates/provisioner-statefulset.yaml
@@ -1,5 +1,5 @@
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
   labels:
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
index 782b2a99f..691955a15 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
@@ -14,12 +14,15 @@ spec:
 
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-rbdplugin-provisioner
 spec:
   serviceName: "csi-rbdplugin-provisioner"
   replicas: 1
+  selector:
+    matchLabels:
+      app: csi-rbdplugin-provisioner
   template:
     metadata:
       labels:
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
index 07431e7ad..02b268fb6 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -1,6 +1,6 @@
 ---
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: csi-rbdplugin
 spec: