Merge pull request #308 from andyzhangx/tolerations

feat: support customization tolerations in chart

Author: andyzhangx

charts/README.md

@@ -96,7 +96,6 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `node.resources.smb.requests.memory`                 | smb-csi-driver memory requests limits                | 20Mi                                                           |
 | `node.affinity`                                       | node pod affinity                                     | {}                                                             |
 | `node.nodeSelector`                                   | node pod node selector                                | {}                                                             |
-| `node.tolerations`                                    | node pod tolerations                                  | []                                                             |
 | `podAnnotations`                                      | collection of annotations to add to all the pods      | {}                                                             |
 | `podLabels`                                           | collection of labels to add to all the pods           | {}                                                             |
 | `priorityClassName`                                   | priority class name to be added to pods               | system-cluster-critical                                        |

charts/latest/csi-driver-smb-v1.1.0.tgz

@@ -37,16 +37,8 @@ spec:
         kubernetes.io/role: master
         {{- end}}
       priorityClassName: system-cluster-critical
-      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 }}
       {{- include "smb.pullSecrets" . | indent 6 }}

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

@@ -14,10 +14,10 @@ spec:
 {{ include "smb.labels" . | indent 6 }}
         app: csi-smb-node-win
     spec:
+{{- with .Values.windows.tolerations }}
       tolerations:
-        - key: "node.kubernetes.io/os"
-          operator: "Exists"
-          effect: "NoSchedule"
+{{ toYaml . | indent 8 }}
+{{- end }}
       nodeSelector:
         kubernetes.io/os: windows
       priorityClassName: system-node-critical

charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml

@@ -32,12 +32,11 @@ spec:
 {{- toYaml .Values.node.affinity | nindent 8 }}
         {{- end }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
+{{- with .Values.linux.tolerations }}
       tolerations:
-        - operator: "Exists"
+{{ toYaml . | indent 8 }}
+{{- end }}
       {{- include "smb.pullSecrets" . | indent 6 }}
-        {{- if .Values.node.tolerations }}
-{{- toYaml .Values.node.tolerations | nindent 8 }}
-        {{- end }}
       containers:
         - name: liveness-probe
           volumeMounts:

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

@@ -54,7 +54,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: 29645
@@ -85,11 +93,12 @@ node:
         memory: 20Mi
   affinity: {}
   nodeSelector: {}
-  tolerations: []
 
 linux:
   enabled: true
   kubelet: /var/lib/kubelet
+  tolerations:
+    - operator: "Exists"
 
 windows:
   enabled: false
@@ -103,7 +112,10 @@ windows:
       repository: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar
       tag: v2.2.0
       pullPolicy: IfNotPresent
-
+  tolerations:
+    - key: "node.kubernetes.io/os"
+      operator: "Exists"
+      effect: "NoSchedule"
 
 ## Collection of annotations to add to all the pods
 podAnnotations: {}

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

@@ -107,6 +107,8 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 			return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())
 		}
 		parameters[sourceField] = parameters[sourceField] + "/" + smbVol.subDir
+	} else {
+		klog.Infof("CreateVolume(%s) does not provide secrets", name)
 	}
 	return &csi.CreateVolumeResponse{Volume: d.smbVolToCSI(smbVol, parameters)}, nil
 }
@@ -142,6 +144,8 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		if err = os.RemoveAll(internalVolumePath); err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to delete subdirectory: %v", err.Error())
 		}
+	} else {
+		klog.Infof("DeleteVolume(%s) does not provide secrets", volumeID)
 	}
 
 	return &csi.DeleteVolumeResponse{}, nil