Merge pull request #208 from andyzhangx/tolerations

feat: support customization tolerations in chart

charts/README.md

@@ -55,8 +55,10 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `controller.replicas`                             | the replicas of csi-nfs-controller                         | 2                                                                 |
 | `controller.runOnMaster`                          | run controller on master node                              | false                                                             |
 | `controller.logLevel`                             | controller driver log level                                                          |`5`                                                           |
+| `controller.tolerations`                              | controller pod tolerations                            |                                                              |
 | `node.logLevel`                                   | node driver log level                                                          |`5`                                                           |
 | `node.livenessProbe.healthPort `                  | the health check port for liveness probe                    |`29653`                                                           |
+| `node.tolerations`                              | node pod tolerations                            |                                                              |
 
 ## troubleshooting
  - Add `--wait -v=5 --debug` in `helm install` command to get detailed error

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

@@ -28,15 +28,10 @@ spec:
         kubernetes.io/role: master
         {{- end}}
       priorityClassName: system-cluster-critical
+{{- with .Values.controller.tolerations }}
       tolerations:
-        - key: "node-role.kubernetes.io/master"
-          operator: "Equal"
-          value: "true"
-          effect: "NoSchedule"
-        - key: "node-role.kubernetes.io/controlplane"
-          operator: "Equal"
-          value: "true"
-          effect: "NoSchedule"
+{{ toYaml . | indent 8 }}
+{{- end }}
       containers:
         - name: csi-provisioner
           image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"

charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml

@@ -23,6 +23,10 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       nodeSelector:
         kubernetes.io/os: linux
+{{- with .Values.node.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
       containers:
         - name: liveness-probe
           image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"

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

@@ -19,15 +19,27 @@ serviceAccount:
   create: true
 rbac:
   create: true
+
 controller:
   replicas: 2
   runOnMaster: false
   logLevel: 5
+  tolerations:
+    - key: "node-role.kubernetes.io/master"
+      operator: "Equal"
+      value: "true"
+      effect: "NoSchedule"
+    - key: "node-role.kubernetes.io/controlplane"
+      operator: "Equal"
+      value: "true"
+      effect: "NoSchedule"
 
 node:
   logLevel: 5
   livenessProbe:
     healthPort: 29653
+  tolerations:
+    - operator: "Exists"
 
 feature:
   enableFSGroupPolicy: false

deploy/csi-nfs-node.yaml

@@ -19,6 +19,8 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       nodeSelector:
         kubernetes.io/os: linux
+      tolerations:
+        - operator: "Exists"
       containers:
         - name: liveness-probe
           image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0