add tolerations to pump/drainer

charts/tidb-cluster/templates/drainer-statefulset.yaml

@@ -33,6 +33,10 @@ spec:
     {{- if .Values.binlog.drainer.affinity }}
       affinity:
 {{ toYaml .Values.binlog.drainer.affinity | indent 8 }}
+    {{- end }}
+    {{- if .Values.binlog.drainer.tolerations }}
+      tolerations:
+{{ toYaml .Values.binlog.drainer.tolerations | indent 8 }}
     {{- end }}
       containers:
       - name: drainer

charts/tidb-cluster/templates/pump-statefulset.yaml

@@ -33,6 +33,10 @@ spec:
     {{- if .Values.binlog.pump.affinity }}
       affinity:
 {{ toYaml .Values.binlog.pump.affinity | indent 8 }}
+    {{- end }}
+    {{- if .Values.binlog.pump.tolerations }}
+      tolerations:
+    {{ toYaml .Values.binlog.pump.tolerations | indent 8 }}
     {{- end }}
       containers:
       - name: pump

charts/tidb-cluster/values.yaml

@@ -413,6 +413,9 @@ binlog:
     # affinity for pump pod assignment, default: empty
     # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
     affinity: {}
+    # tolerations are applied to pods, and allow pods to schedule onto nodes with matching taints.
+    # refer to https://kubernetes.io/docs/concepts/configuration/taint-and-toleration
+    tolerations: []
     syncLog: true
     # a integer value to control expiry date of the binlog data, indicates for how long (in days) the binlog data would be stored.
     # must bigger than 0
@@ -434,6 +437,9 @@ binlog:
     # affinity for drainer pod assignment, default: empty
     # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
     affinity: {}
+    # tolerations are applied to pods, and allow pods to schedule onto nodes with matching taints.
+    # refer to https://kubernetes.io/docs/concepts/configuration/taint-and-toleration
+    tolerations: []
     # the number of the concurrency of the downstream for synchronization. The bigger the value,
     # the better throughput performance of the concurrency (16 by default)
     workerCount: 16

tests/actions.go

@@ -2356,6 +2356,9 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 			if len(pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution) != 1 {
 				return true, fmt.Errorf("pump pod %s/%s should have affinity set", pod.Namespace, pod.Name)
 			}
+			if len(pod.Spec.Tolerations) != 1 {
+				return true, fmt.Errorf("pump pod %s/%s should have tolerations set", pod.Namespace, pod.Name)
+			}
 		}
 
 		if !withDrainer {
@@ -2396,6 +2399,9 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 			if len(pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution) != 1 {
 				return true, fmt.Errorf("drainer pod %s/%s should have spec.affinity set", pod.Namespace, pod.Name)
 			}
+			if len(pod.Spec.Tolerations) != 1 {
+				return true, fmt.Errorf("drainer pod %s/%s should have tolerations set", pod.Namespace, pod.Name)
+			}
 		}
 
 		return true, nil

tests/util.go

@@ -106,6 +106,11 @@ var affinityTemp string = `{{.Kind}}:
           - {{.Namespace}}
 binlog:
   pump:
+    tolerations:
+    - key: node-role
+      operator: Equal
+      value: tidb
+      effect: "NoSchedule"
     affinity:
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
@@ -115,6 +120,11 @@ binlog:
             namespaces:
             - {{.Namespace}}
   drainer:
+    tolerations:
+    - key: node-role
+      operator: Equal
+      value: tidb
+      effect: "NoSchedule"
     affinity:
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution: