Merge pull request #1036 from kubernetes-sigs/runOnControlPlane

feat: add controller.runOnControlPlane in chart config
kubernetes-sigs · Jun 6, 2022 · e26287d · e26287d
2 parents 150f9c6 + 1347e22
commit e26287d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -4,7 +4,7 @@
  - [install Helm](https://helm.sh/docs/intro/quickstart/#install-helm)
 
 ### Tips
- - make controller only run on master node: `--set controller.runOnMaster=true`
+ - make controller only run on control plane node: `--set controller.runOnControlPlane=true`
  - set replica of controller as `1`: `--set controller.replicas=1` (only applied for NFS protocol)
  - specify different cloud config secret for the driver:
    - `--set controller.cloudConfigSecretName`
@@ -87,7 +87,8 @@ The following table lists the configurable parameters of the latest Azure File C
 | `controller.hostNetwork`                          | `hostNetwork` setting on controller driver(could be disabled if controller does not depend on MSI setting)                            | `true`                                                            | `true`, `false`
 | `controller.metricsPort`                          | metrics port of csi-azurefile-controller                   |`29614`                                                        |
 | `controller.livenessProbe.healthPort `            | health check port for liveness probe                   | `29612` |
-| `controller.runOnMaster`                          | run controller on master node                                                          |`false`                                                           |
+| `controller.runOnMaster`                          | run controller on master node(deprecated on k8s 1.25+)                                                          |`false`                                                           |
+| `controller.runOnControlPlane`                    | run controller on control plane node                                                          |`false`                                                           |
 | `controller.attachRequired`                       | enable attach/detach (only valid for vhd disk feature)                                            |`false`                                                           |
 | `controller.logLevel`                             | controller driver log level                                                          |`5`                                                           |
 | `controller.resources.csiProvisioner.limits.memory`   | csi-provisioner memory limits                         | 500Mi                                                          |

diff --git a/charts/latest/azurefile-csi-driver-v1.19.0.tgz b/charts/latest/azurefile-csi-driver-v1.19.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
@@ -25,6 +25,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/azurefile-csi-driver/values.yaml b/charts/latest/azurefile-csi-driver/values.yaml
@@ -55,6 +55,7 @@ controller:
   livenessProbe:
     healthPort: 29612
   runOnMaster: false
+  runOnControlPlane: false
   attachRequired: false
   logLevel: 5
   resources: