Remove NoExecute toleration for attacher, but add CriticalAddons back for provisioner and attacher

deploy/helm/templates/attacher.yaml

@@ -77,8 +77,10 @@ spec:
     spec:
       serviceAccount: csi-attacher-sa
       tolerations:
-      - key: node-role.kubernetes.io/master
+        - key: node-role.kubernetes.io/master
-        operator: "Exists"
+          operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
       containers:
         - name: csi-attacher
           image: {{ .Values.images.attacher }}

deploy/helm/templates/provisioner.yaml

@@ -72,6 +72,8 @@ spec:
       tolerations:
         - key: node-role.kubernetes.io/master
           operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
         {{- with .Values.tolerations.controller }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

deploy/kubernetes/attacher.yaml

@@ -81,9 +81,6 @@ spec:
           operator: Exists
         - key: CriticalAddonsOnly
           operator: Exists
-        - operator: Exists
-          effect: NoExecute
-          tolerationSeconds: 300
       containers:
         - name: csi-attacher
           image: quay.io/k8scsi/csi-attacher:v3.0.1

deploy/kubernetes/provisioner.yaml

@@ -70,8 +70,10 @@ spec:
     spec:
       serviceAccount: csi-provisioner-sa
       tolerations:
-      - key: node-role.kubernetes.io/master
+        - key: node-role.kubernetes.io/master
-        operator: "Exists"
+          operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
       containers:
         - name: csi-provisioner
           image: quay.io/k8scsi/csi-provisioner:v2.1.0