Skip to content

Commit 1988b25

Browse files
authored
Merge pull request #633 from andyzhangx/fix-leader-election-namespace
fix: leader-election namespace issue
2 parents b87a3ca + 71f724b commit 1988b25

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed
6 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ spec:
5959
- "-v=2"
6060
- "--csi-address=$(ADDRESS)"
6161
- "--leader-election"
62+
- "--leader-election-namespace={{ .Release.Namespace }}"
6263
- "--timeout=120s"
6364
- "--extra-create-metadata=true"
6465
env:
@@ -160,6 +161,7 @@ spec:
160161
- "-csi-address=$(ADDRESS)"
161162
- "-v=2"
162163
- "-leader-election"
164+
- "--leader-election-namespace={{ .Release.Namespace }}"
163165
- '-handle-volume-inuse-error=false'
164166
env:
165167
- name: ADDRESS

deploy/csi-blob-controller.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ spec:
3333
- "-v=2"
3434
- "--csi-address=$(ADDRESS)"
3535
- "--leader-election"
36+
- "--leader-election-namespace=kube-system"
3637
- "--timeout=120s"
3738
- "--extra-create-metadata=true"
3839
env:
@@ -111,6 +112,7 @@ spec:
111112
- "-csi-address=$(ADDRESS)"
112113
- "-v=2"
113114
- "-leader-election"
115+
- "--leader-election-namespace=kube-system"
114116
- '-handle-volume-inuse-error=false'
115117
env:
116118
- name: ADDRESS

hack/verify-all.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ PKG_ROOT=$(git rev-parse --show-toplevel)
2020

2121
${PKG_ROOT}/hack/verify-gofmt.sh
2222
${PKG_ROOT}/hack/verify-govet.sh
23-
${PKG_ROOT}/hack/verify-golint.sh
2423
${PKG_ROOT}/hack/verify-gomod.sh
2524
${PKG_ROOT}/hack/verify-yamllint.sh
2625
${PKG_ROOT}/hack/verify-boilerplate.sh
2726
${PKG_ROOT}/hack/verify-helm-chart-files.sh
2827
${PKG_ROOT}/hack/verify-helm-chart.sh
29-
${PKG_ROOT}/hack/verify-spelling.sh

hack/verify-golint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -euo pipefail
1818

1919
if [[ -z "$(command -v golangci-lint)" ]]; then
2020
echo "Cannot find golangci-lint. Installing golangci-lint..."
21-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
21+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.0
2222
export PATH=$PATH:$(go env GOPATH)/bin
2323
fi
2424

0 commit comments

Comments
 (0)