From ff2333eebbbb4cd5524221eb4feff640eb073459 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 14 Jun 2021 03:18:51 +0000 Subject: [PATCH] feat: support customization tolerations in chart update deploy/csi-nfs-node.yaml --- charts/README.md | 2 ++ charts/latest/csi-driver-nfs-v3.0.0.tgz | Bin 3210 -> 3248 bytes .../templates/csi-nfs-controller.yaml | 11 +++-------- .../templates/csi-nfs-node.yaml | 4 ++++ charts/latest/csi-driver-nfs/values.yaml | 12 ++++++++++++ deploy/csi-nfs-node.yaml | 2 ++ 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/charts/README.md b/charts/README.md index 1d20854f..c672abd9 100644 --- a/charts/README.md +++ b/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 diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz index 46cc8ca3e1ab6b8c8e10c4ada8819268db6c1353..5604a84906e3813be16e23df4447ffeb318ac496 100644 GIT binary patch delta 3221 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 U?JwW{KL7y#|GxuanE*@x0Bi#+v;Y7A diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index 5041e813..9805d8e6 100755 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/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 }}" diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index a7d50baf..02c18d44 100755 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/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 }}" diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 5cf553fa..f22c9871 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/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 diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 2bc087c8..84819874 100644 --- a/deploy/csi-nfs-node.yaml +++ b/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