Merge pull request #888 from andyzhangx/tolerations2

fix: add snapshot controller tolerations
kubernetes-sigs · Jun 15, 2021 · 72117ce · 72117ce
2 parents 03d1fd3 + f1e0726
commit 72117ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/charts/latest/azuredisk-csi-driver-v1.4.0.tgz b/charts/latest/azuredisk-csi-driver-v1.4.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-snapshot-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-snapshot-controller.yaml
@@ -19,11 +19,10 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
+{{- with .Values.controller.tolerations }}
       tolerations:
-        - key: "node-role.kubernetes.io/master"
-          operator: "Equal"
-          value: "true"
-          effect: "NoSchedule"
+{{ toYaml . | indent 8 }}
+{{- end }}
       {{- include "azuredisk.pullSecrets" . | indent 6 }}
       containers:
         - name: csi-snapshot-controller

diff --git a/deploy/csi-snapshot-controller.yaml b/deploy/csi-snapshot-controller.yaml
@@ -23,6 +23,10 @@ spec:
           operator: "Equal"
           value: "true"
           effect: "NoSchedule"
+        - key: "node-role.kubernetes.io/controlplane"
+          operator: "Equal"
+          value: "true"
+          effect: "NoSchedule"
       containers:
         - name: csi-snapshot-controller
           image: mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v3.0.3