Revert "Use Deployment with leader election instead of StatefulSet"

This reverts commit a151bec94b.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2019-06-14 15:12:48 +05:30 committed by mergify[bot]
parent fb0cbef68b
commit 983f28ad2f
14 changed files with 90 additions and 38 deletions

View File

@ -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 -}}

View File

@ -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

View File

@ -1,5 +1,5 @@
kind: Deployment
apiVersion: apps/v1
kind: StatefulSet
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

View File

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

View File

@ -1,13 +1,25 @@
---
kind: Deployment
apiVersion: apps/v1
kind: Service
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
selector:
matchLabels:
app: csi-cephfsplugin-provisioner
serviceName: "csi-cephfsplugin-provisioner"
replicas: 1
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

View File

@ -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

View File

@ -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 -}}

View File

@ -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

View File

@ -1,5 +1,5 @@
kind: Deployment
apiVersion: apps/v1
kind: StatefulSet
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 }}"

View File

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

View File

@ -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

View File

@ -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
selector:
matchLabels:
app: csi-rbdplugin-provisioner
serviceName: "csi-rbdplugin-provisioner"
replicas: 1
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

View File

@ -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")
err := waitForDeploymentComplete(cephfsDeploymentName, namespace, f.ClientSet, deployTimeout)
By("checking provisioner statefulset is running")
timeout := time.Duration(deployTimeout) * time.Minute
err := framework.WaitForStatefulSetReplicasReady(cephfsDeploymentName, namespace, f.ClientSet, 1*time.Second, timeout)
if err != nil {
Fail(err.Error())
}

View File

@ -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")
err := waitForDeploymentComplete(rbdDeploymentName, namespace, f.ClientSet, deployTimeout)
By("checking provisioner statefulset is running")
timeout := time.Duration(deployTimeout) * time.Minute
err := framework.WaitForStatefulSetReplicasReady(rbdDeploymentName, namespace, f.ClientSet, 1*time.Second, timeout)
if err != nil {
Fail(err.Error())
}