Skip to content

Commit eac9bab

Browse files
committed
feat: support run controller on master node
1 parent 5705655 commit eac9bab

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ e2e-bootstrap: install-helm
6363
# Only build and push the image if it does not exist in the registry
6464
docker pull $(IMAGE_TAG) || make blob-container push
6565
helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
66+
--set controller.runOnMaster=true \
67+
--set controller.replicas=1 \
6668
$(E2E_HELM_OPTIONS)
6769

6870
.PHONY: install-helm

charts/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ The following table lists the configurable parameters of the latest Azure Blob S
6161
| `serviceAccount.create` | whether create service account of csi-blob-controller | true |
6262
| `rbac.create` | whether create rbac of csi-blob-controller | true |
6363
| `controller.replicas` | the replicas of csi-blob-controller | 2 |
64-
| `controller.metricsPort` | metrics port of csi-blob-controller | 29634 |
64+
| `controller.metricsPort` | metrics port of csi-blob-controller | 29634 |
65+
| `controller.runOnMaster` | run controller on master node |
66+
`false` |
6567
| `node.metricsPort` | metrics port of csi-blob-node | 29635 |
6668

6769
## Troubleshooting

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ spec:
1818
serviceAccountName: csi-blob-controller-sa
1919
nodeSelector:
2020
kubernetes.io/os: linux
21+
{{- if .Values.controller.runOnMaster}}
22+
kubernetes.io/role: master
23+
{{- end}}
2124
priorityClassName: system-cluster-critical
2225
tolerations:
2326
- key: "node-role.kubernetes.io/master"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ rbac:
2525
controller:
2626
metricsPort: 29634
2727
replicas: 2
28+
runOnMaster: false
2829

2930
node:
3031
metricsPort: 29635

deploy/csi-blob-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
hostNetwork: true
1818
serviceAccountName: csi-blob-controller-sa
1919
nodeSelector:
20-
kubernetes.io/os: linux
20+
kubernetes.io/os: linux # add "kubernetes.io/role: master" to run controller on master node
2121
priorityClassName: system-cluster-critical
2222
tolerations:
2323
- key: "node-role.kubernetes.io/master"

0 commit comments

Comments
 (0)