Merge pull request #414 from Madhu-1/fix_335

Use Deployment with leader election instead of StatefulSet
This commit is contained in:
Humble Devassy Chirammal 2019-06-10 13:14:20 +05:30 committed by GitHub
commit 47d4e44af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 38 additions and 90 deletions

View File

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

View File

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

View File

@ -1,18 +0,0 @@
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

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,18 +0,0 @@
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

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

View File

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

View File

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

View File

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

View File

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