Merge pull request #87 from bcho/feat/leader-election

Enable leader election in csi components

Author: k8s-ci-robot

.gitignore

@@ -69,3 +69,6 @@ cscope.*
 /bazel-*
 *.pyc
 profile.cov
+
+# helm packaged chart
+/charts/*/*.tgz

charts/README.md

@@ -13,7 +13,7 @@ Quick start instructions for the setup and configuration of blobfuse CSI driver
 ```console
 $ cd $GOPATH/src/sigs.k8s.io/blobfuse-csi-driver/charts/latest
 $ helm package blobfuse-csi-driver
-$ helm install blobfuse-csi-driver-latest.tgz --name blobfuse-csi-driver --namespace kube-system
+$ helm install blobfuse-csi-driver blobfuse-csi-driver-latest.tgz --namespace kube-system
 ```
 
 ## Uninstall

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{ include "blobfuse.labels" . | indent 2 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.controller.replicas }}
   selector:
     matchLabels:
       app: csi-blobfuse-controller
@@ -20,28 +20,32 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.0.1
+          image: {{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}
           args:
             - "--provisioner=blobfuse.csi.azure.com"
             - "--csi-address=$(ADDRESS)"
             - "--connection-timeout=15s"
+            - "--enable-leader-election"
+            - "--leader-election-type=leases"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.image.csiProvisioner.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
         - name: csi-attacher
           image: "{{ .Values.image.csiAttacher.repository }}:{{ .Values.image.csiAttacher.tag }}"
           args:
-            - --v=5
-            - --csi-address=$(ADDRESS)
-            - --timeout=120s
+            - "-v=5"
+            - "-csi-address=$(ADDRESS)"
+            - "-timeout=120s"
+            - "-leader-election"
+            - "-leader-election-type=leases"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.image.csiAttacher.pullPolicy }}
           volumeMounts:
           - mountPath: /csi
             name: socket-dir
@@ -54,6 +58,7 @@ spec:
           env:
             - name: ADDRESS
               value: /csi/csi.sock
+          imagePullPolicy: {{ .Values.image.clusterDriverRegistrar.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -63,6 +68,7 @@ spec:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s
             - --health-port=9802
+          imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -89,7 +95,7 @@ spec:
               value: "/etc/kubernetes/azure.json"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.blobfuse.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-node.yaml

@@ -19,7 +19,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
         - name: liveness-probe
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir

charts/latest/blobfuse-csi-driver/templates/rbac-csi-blobfuse-controller.yaml

@@ -146,6 +146,9 @@ rules:
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
     verbs: ["create", "list", "watch", "delete"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["get", "list", "watch", "create", "update", "patch"]
 
 ---
 

charts/latest/blobfuse-csi-driver/values.yaml

@@ -5,11 +5,11 @@ image:
     pullPolicy: Always
   csiProvisioner:
     repository: quay.io/k8scsi/csi-provisioner
-    tag: v1.0.1
+    tag: v1.4.0
     pullPolicy: Always
   csiAttacher:
     repository: quay.io/k8scsi/csi-attacher
-    tag: v1.0.1
+    tag: v1.2.0
     pullPolicy: Always
   clusterDriverRegistrar:
     repository: quay.io/k8scsi/csi-cluster-driver-registrar
@@ -29,3 +29,6 @@ serviceAccount:
 
 rbac:
   create: true
+
+controller:
+  replicas: 3

deploy/csi-blobfuse-controller.yaml

@@ -5,7 +5,7 @@ metadata:
   name: csi-blobfuse-controller
   namespace: kube-system
 spec:
-  replicas: 1
+  replicas: 3
   selector:
     matchLabels:
       app: csi-blobfuse-controller
@@ -20,11 +20,13 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.0.1
+          image: quay.io/k8scsi/csi-provisioner:v1.4.0
           args:
             - "--provisioner=blobfuse.csi.azure.com"
             - "--csi-address=$(ADDRESS)"
             - "--connection-timeout=15s"
+            - "--enable-leader-election"
+            - "--leader-election-type=leases"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -33,11 +35,13 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.0.1
+          image: quay.io/k8scsi/csi-attacher:v1.2.0
           args:
-            - --v=5
-            - --csi-address=$(ADDRESS)
-            - --timeout=120s
+            - "-v=5"
+            - "-csi-address=$(ADDRESS)"
+            - "-timeout=120s"
+            - "-leader-election"
+            - "-leader-election-type=leases"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

deploy/rbac-csi-blobfuse-controller.yaml

@@ -142,6 +142,9 @@ rules:
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
     verbs: ["create", "list", "watch", "delete"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["get", "list", "watch", "create", "update", "patch"]
 
 ---