Merge pull request #950 from kubernetes-sigs/fix-leader-election-name…

…space fix: leader-election namespace issue
kubernetes-sigs · Mar 24, 2022 · c833d7d · c833d7d
2 parents 437eb35 + 877b1c8
commit c833d7d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/charts/latest/azurefile-csi-driver-v1.13.0.tgz b/charts/latest/azurefile-csi-driver-v1.13.0.tgz
diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml
@@ -49,6 +49,7 @@ spec:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
             - "--leader-election"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--timeout=300s"
             - "--extra-create-metadata=true"
           env:
@@ -70,6 +71,7 @@ spec:
             - "-csi-address=$(ADDRESS)"
             - "-timeout=120s"
             - "-leader-election"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -87,6 +89,7 @@ spec:
           args:
             - "-csi-address=$(ADDRESS)"
             - "-leader-election"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
             - "-v=2"
           env:
             - name: ADDRESS
@@ -105,6 +108,7 @@ spec:
             - "-csi-address=$(ADDRESS)"
             - "-v=2"
             - "-leader-election"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
             - '-handle-volume-inuse-error=false'
             - '-timeout=120s'
             - '-feature-gates=RecoverVolumeExpansionFailure=true'

diff --git a/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml b/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml
@@ -45,6 +45,7 @@ spec:
           args:
             - "--v=2"
             - "--leader-election=true"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
           resources: {{- toYaml .Values.snapshot.snapshotController.resources | nindent 12 }}
           imagePullPolicy: {{ .Values.snapshot.image.csiSnapshotController.pullPolicy }}
 {{- end -}}
diff --git a/deploy/csi-azurefile-controller.yaml b/deploy/csi-azurefile-controller.yaml
@@ -33,6 +33,7 @@ spec:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
             - "--leader-election"
+            - "--leader-election-namespace=kube-system"
             - "--timeout=300s"
             - "--extra-create-metadata=true"
           env:
@@ -53,7 +54,8 @@ spec:
             - "-v=2"
             - "-csi-address=$(ADDRESS)"
             - "-timeout=120s"
-            - "-leader-election"
+            - "--leader-election"
+            - "--leader-election-namespace=kube-system"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -71,7 +73,8 @@ spec:
           args:
             - "-v=2"
             - "-csi-address=$(ADDRESS)"
-            - "-leader-election"
+            - "--leader-election"
+            - "--leader-election-namespace=kube-system"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -89,7 +92,8 @@ spec:
           args:
             - "-csi-address=$(ADDRESS)"
             - "-v=2"
-            - "-leader-election"
+            - "--leader-election"
+            - "--leader-election-namespace=kube-system"
             - '-handle-volume-inuse-error=false'
             - '-feature-gates=RecoverVolumeExpansionFailure=true'
             - '-timeout=120s'

diff --git a/deploy/csi-snapshot-controller.yaml b/deploy/csi-snapshot-controller.yaml
@@ -33,6 +33,7 @@ spec:
           args:
             - "--v=2"
             - "--leader-election=true"
+            - "--leader-election-namespace=kube-system"
           resources:
             limits:
               memory: 100Mi

diff --git a/go.mod b/go.mod
@@ -153,6 +153,5 @@ replace (
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.3
 	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.3
 	k8s.io/sample-controller => k8s.io/sample-controller v0.23.3
-	sigs.k8s.io/azurefile-csi-driver => ./
 	sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.1-0.20220318124122-66e1bec130df
 )
diff --git a/hack/verify-all.sh b/hack/verify-all.sh
@@ -25,4 +25,3 @@ ${PKG_ROOT}/hack/verify-yamllint.sh
 ${PKG_ROOT}/hack/verify-boilerplate.sh
 ${PKG_ROOT}/hack/verify-helm-chart-files.sh
 ${PKG_ROOT}/hack/verify-helm-chart.sh
-${PKG_ROOT}/hack/verify-spelling.sh
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1218,5 +1218,4 @@ sigs.k8s.io/yaml
 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.3
 # k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.3
 # k8s.io/sample-controller => k8s.io/sample-controller v0.23.3
-# sigs.k8s.io/azurefile-csi-driver => ./
 # sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.1-0.20220318124122-66e1bec130df