Merge pull request #286 from andyzhangx/blob-run-on-master

feat: support run controller on master node

Author: andyzhangx

Makefile

@@ -63,6 +63,8 @@ e2e-bootstrap: install-helm
 	# Only build and push the image if it does not exist in the registry
 	docker pull $(IMAGE_TAG) || make blob-container push
 	helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
+		--set controller.runOnMaster=true \
+		--set controller.replicas=1 \
 		$(E2E_HELM_OPTIONS)
 
 .PHONY: install-helm

charts/README.md

@@ -61,7 +61,9 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `serviceAccount.create`                           | whether create service account of csi-blob-controller  | true                                                              |
 | `rbac.create`                                     | whether create rbac of csi-blob-controller             | true                                                              |
 | `controller.replicas`                             | the replicas of csi-blob-controller                    | 2                                                                 |
-| `controller.metricsPort`                          | metrics port of csi-blob-controller                    | 29634                                                                 |
+| `controller.metricsPort`                          | metrics port of csi-blob-controller                    | 29634                                                             |
+| `controller.runOnMaster`                          | run controller on master node                          |
+`false`                                                           |
 | `node.metricsPort`                                | metrics port of csi-blob-node                          | 29635                                                                |
 
 ## Troubleshooting

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

@@ -18,6 +18,9 @@ spec:
       serviceAccountName: csi-blob-controller-sa
       nodeSelector:
         kubernetes.io/os: linux
+        {{- if .Values.controller.runOnMaster}}
+        kubernetes.io/role: master
+        {{- end}}
       priorityClassName: system-cluster-critical
       tolerations:
         - key: "node-role.kubernetes.io/master"

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

@@ -25,6 +25,7 @@ rbac:
 controller:
   metricsPort: 29634
   replicas: 2
+  runOnMaster: false
 
 node:
   metricsPort: 29635

deploy/csi-blob-controller.yaml

@@ -17,7 +17,7 @@ spec:
       hostNetwork: true
       serviceAccountName: csi-blob-controller-sa
       nodeSelector:
-        kubernetes.io/os: linux
+        kubernetes.io/os: linux  # add "kubernetes.io/role: master" to run controller on master node
       priorityClassName: system-cluster-critical
       tolerations:
         - key: "node-role.kubernetes.io/master"