Merge pull request #457 from andyzhangx/customerize-tolerations

feat: add customize tolerations support in chart

Author: andyzhangx

charts/latest/blob-csi-driver-v1.3.0.tgz

@@ -40,16 +40,8 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
-      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"
 {{- with .Values.controller.tolerations }}
+      tolerations:
 {{ toYaml . | indent 8 }}
 {{- end }}
       containers:

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

@@ -45,11 +45,10 @@ spec:
 {{- toYaml .Values.node.affinity | nindent 8 }}
         {{- end }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
+{{- with .Values.node.tolerations }}
       tolerations:
-        - operator: "Exists"
-        {{- if .Values.node.tolerations }}
-{{- toYaml .Values.node.tolerations | nindent 8 }}
-        {{- end }}
+{{ toYaml . | indent 8 }}
+{{- end }}
       containers:
         - name: liveness-probe
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}

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

@@ -67,7 +67,15 @@ controller:
         memory: 20Mi
   affinity: {}
   nodeSelector: {}
-  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"
 
 node:
   metricsPort: 29635
@@ -98,7 +106,8 @@ node:
         memory: 20Mi
   affinity: {}
   nodeSelector: {}
-  tolerations: []
+  tolerations:
+    - operator: "Exists"
   livenessProbe:
     healthPort: 29633