Merge pull request #1366 from andyzhangx/runOnControlPlane

feat: add controller.runOnControlPlane in chart config
kubernetes-sigs · Jun 6, 2022 · 5d8fd14 · 5d8fd14
2 parents 5b924d4 + 8744293
commit 5d8fd14
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -32,8 +32,7 @@
 - [add the Chart repository](#add-the-helm-chart-repository)
 
 ### Tips
-
-- make controller only run on master node: `--set controller.runOnMaster=true`
+ - schedule controller running on control plane node: `--set controller.runOnControlPlane=true`
 - set replica of controller as `1`: `--set controller.replicas=1`
 - specify different cloud config secret for the driver:
   - `--set controller.cloudConfigSecretName`
@@ -158,7 +157,8 @@ The following table lists the configurable parameters of the latest Azure Disk C
 | `controller.replicas`                             | the replicas of csi-azuredisk-controller                   | `2`                                                            |
 | `controller.metricsPort`                          | metrics port of csi-azuredisk-controller                   | `29604`                                                        |
 | `controller.livenessProbe.healthPort`             | health check port for liveness probe                       | `29602` |
-| `controller.runOnMaster`                          | run csi-azuredisk-controller on master node                | `false`                                                        |
+| `controller.runOnMaster`                          | run csi-azuredisk-controller on master node(deprecated on k8s 1.25+)                | `false`                                                        |
+| `controller.runOnControlPlane`                    | run controller on control plane node                                                          |`false`                                                           |
 | `controller.vmssCacheTTLInSeconds`                | vmss cache TTL in seconds (600 by default)                                |`-1` (use default value)                                                          |
 | `controller.vmType`                | type of agent node. available values: `vmss`, `standard`                     |`` (use default value in cloud config)                                                          |
 | `controller.logLevel`                             | controller driver log level                                |`5`                                                           |

diff --git a/charts/latest/azuredisk-csi-driver-v1.19.0.tgz b/charts/latest/azuredisk-csi-driver-v1.19.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -28,6 +28,9 @@ spec:
         {{- if .Values.controller.runOnMaster}}
         node-role.kubernetes.io/master: ""
         {{- end}}
+        {{- if .Values.controller.runOnControlPlane}}
+        node-role.kubernetes.io/control-plane: ""
+        {{- end}}
       priorityClassName: system-cluster-critical
 {{- with .Values.controller.tolerations }}
       tolerations:

diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -45,6 +45,7 @@ controller:
   livenessProbe:
     healthPort: 29602
   runOnMaster: false
+  runOnControlPlane: false
   disableAvailabilitySetNodes: false
   vmType: ""
   provisionerWorkerThreads: 40

diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh
@@ -34,7 +34,7 @@ setup_e2e_binaries() {
     tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
 
     # test on alternative driver name
-    export EXTRA_HELM_OPTIONS="--set controller.disableAvailabilitySetNodes=true --set controller.replicas=1 --set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set linux.dsName=csi-$DRIVER-node --set windows.dsName=csi-$DRIVER-node-win --set controller.vmssCacheTTLInSeconds=60  --set controller.runOnMaster=true"
+    export EXTRA_HELM_OPTIONS="--set controller.disableAvailabilitySetNodes=true --set controller.replicas=1 --set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set linux.dsName=csi-$DRIVER-node --set windows.dsName=csi-$DRIVER-node-win --set controller.vmssCacheTTLInSeconds=60"
     # install the azuredisk-csi-driver driver
     make e2e-bootstrap
     sed -i "s/csi-azuredisk-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-azuredisk-controller-svc.yaml