Revert "Use Deployment with leader election instead of StatefulSet"

This reverts commit a151bec94b.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

deploy/cephfs/helm/templates/provisioner-role.yaml

@@ -16,7 +16,4 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get", "list", "watch", "create", "delete"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "watch", "list", "delete", "update", "create"]
 {{- end -}}

deploy/cephfs/helm/templates/provisioner-service.yaml

@@ -0,0 +1,18 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}
+  labels:
+    app: {{ include "ceph-csi-cephfs.name" . }}
+    chart: {{ include "ceph-csi-cephfs.chart" . }}
+    component: {{ .Values.provisioner.name }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  selector:
+    app: {{ include "ceph-csi-cephfs.name" . }}
+    component: {{ .Values.provisioner.name }}
+    release: {{ .Release.Name }}
+  ports:
+    - name: dummy
+      port: 12345

deploy/cephfs/helm/templates/provisioner-statefulset.yaml

@@ -1,5 +1,5 @@
-kind: Deployment
+kind: StatefulSet
-apiVersion: apps/v1
+apiVersion: apps/v1beta1
 metadata:
   name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}
   labels:
@@ -9,6 +9,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
+  serviceName: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}
   replicas: {{ .Values.provisioner.replicas }}
   selector:
     matchLabels:
@@ -30,7 +31,6 @@ spec:
           image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}"
           args:
             - "--csi-address=$(ADDRESS)"
-            - "--leader-election-type=leases"
             - "--v=5"
           env:
             - name: ADDRESS

deploy/cephfs/helm/values.yaml

@@ -66,7 +66,7 @@ nodeplugin:
 provisioner:
   name: provisioner
 
-  replicaCount: 3
+  replicaCount: 1
 
   image:
     repository: quay.io/k8scsi/csi-provisioner

deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml

@@ -1,13 +1,25 @@
 ---
-kind: Deployment
+kind: Service
-apiVersion: apps/v1
+apiVersion: v1
+metadata:
+  name: csi-cephfsplugin-provisioner
+  labels:
+    app: csi-cephfsplugin-provisioner
+spec:
+  selector:
+    app: csi-cephfsplugin-provisioner
+  ports:
+    - name: dummy
+      port: 12345
+
+---
+kind: StatefulSet
+apiVersion: apps/v1beta1
 metadata:
   name: csi-cephfsplugin-provisioner
 spec:
-  replicas: 3
+  serviceName: "csi-cephfsplugin-provisioner"
-  selector:
+  replicas: 1
-    matchLabels:
-      app: csi-cephfsplugin-provisioner
   template:
     metadata:
       labels:
@@ -20,7 +32,6 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"
-            - "--leader-election-type=leases"
           env:
             - name: ADDRESS
               value: unix:///csi/csi-provisioner.sock

deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml

@@ -75,9 +75,6 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get", "list", "create", "delete"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "watch", "list", "delete", "update", "create"]
 
 ---
 kind: RoleBinding

deploy/rbd/helm/templates/provisioner-role.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create -}}
+{{- if .Values.rbac.create -}} 
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -13,7 +13,4 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get", "list", "watch", "create", "delete"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "watch", "list", "delete", "update", "create"]
 {{- end -}}

deploy/rbd/helm/templates/provisioner-service.yaml

@@ -0,0 +1,18 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
+  labels:
+    app: {{ include "ceph-csi-rbd.name" . }}
+    chart: {{ include "ceph-csi-rbd.chart" . }}
+    component: {{ .Values.provisioner.name }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  selector:
+    app: {{ include "ceph-csi-rbd.name" . }}
+    component: {{ .Values.provisioner.name }}
+    release: {{ .Release.Name }}
+  ports:
+    - name: dummy
+      port: 12345

deploy/rbd/helm/templates/provisioner-statefulset.yaml

@@ -1,5 +1,5 @@
-kind: Deployment
+kind: StatefulSet
-apiVersion: apps/v1
+apiVersion: apps/v1beta1
 metadata:
   name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
   labels:
@@ -9,6 +9,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
+  serviceName: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
   replicas: {{ .Values.provisioner.replicas }}
   selector:
     matchLabels:
@@ -31,7 +32,6 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"
-            - "--leader-election-type=leases"
           env:
             - name: ADDRESS
               value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"

deploy/rbd/helm/values.yaml

@@ -67,7 +67,7 @@ nodeplugin:
 provisioner:
   name: provisioner
 
-  replicaCount: 3
+  replicaCount: 1
 
   image:
     repository: quay.io/k8scsi/csi-provisioner

deploy/rbd/kubernetes/csi-provisioner-rbac.yaml

@@ -87,9 +87,6 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get", "list", "watch", "create", "delete"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "watch", "list", "delete", "update", "create"]
 
 ---
 kind: RoleBinding

deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml

@@ -1,13 +1,25 @@
 ---
-kind: Deployment
+kind: Service
+apiVersion: v1
+metadata:
+  name: csi-rbdplugin-provisioner
+  labels:
+    app: csi-rbdplugin-provisioner
+spec:
+  selector:
+    app: csi-rbdplugin-provisioner
+  ports:
+    - name: dummy
+      port: 12345
+
+---
+kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:
   name: csi-rbdplugin-provisioner
 spec:
-  replicas: 3
+  serviceName: "csi-rbdplugin-provisioner"
-  selector:
+  replicas: 1
-    matchLabels:
-      app: csi-rbdplugin-provisioner
   template:
     metadata:
       labels:
@@ -20,7 +32,6 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"
-            - --leader-election-type=leases"
           env:
             - name: ADDRESS
               value: unix:///csi/csi-provisioner.sock

e2e/cephfs.go

@@ -1,6 +1,8 @@
 package e2e
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo" // nolint
 
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -50,8 +52,9 @@ var _ = Describe("cephfs", func() {
 
 	Context("Test cephfs CSI", func() {
 		It("Test cephfs CSI", func() {
-			By("checking provisioner deployment is completed")
+			By("checking provisioner statefulset is running")
-			err := waitForDeploymentComplete(cephfsDeploymentName, namespace, f.ClientSet, deployTimeout)
+			timeout := time.Duration(deployTimeout) * time.Minute
+			err := framework.WaitForStatefulSetReplicasReady(cephfsDeploymentName, namespace, f.ClientSet, 1*time.Second, timeout)
 			if err != nil {
 				Fail(err.Error())
 			}

e2e/rbd.go

@@ -1,6 +1,8 @@
 package e2e
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo" // nolint
 
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -52,8 +54,9 @@ var _ = Describe("RBD", func() {
 
 	Context("Test RBD CSI", func() {
 		It("Test RBD CSI", func() {
-			By("checking provisioner deployment is completed")
+			By("checking provisioner statefulset is running")
-			err := waitForDeploymentComplete(rbdDeploymentName, namespace, f.ClientSet, deployTimeout)
+			timeout := time.Duration(deployTimeout) * time.Minute
+			err := framework.WaitForStatefulSetReplicasReady(rbdDeploymentName, namespace, f.ClientSet, 1*time.Second, timeout)
 			if err != nil {
 				Fail(err.Error())
 			}