fix typo

pingcap · Aug 8, 2019 · 8d68744 · 8d68744
1 parent 6e185f5
commit 8d68744
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/charts/tidb-cluster/templates/pump-statefulset.yaml b/charts/tidb-cluster/templates/pump-statefulset.yaml
@@ -36,7 +36,7 @@ spec:
     {{- end }}
     {{- if .Values.binlog.pump.tolerations }}
       tolerations:
-    {{ toYaml .Values.binlog.pump.tolerations | indent 8 }}
+{{ toYaml .Values.binlog.pump.tolerations | indent 8 }}
     {{- end }}
       containers:
       - name: pump

diff --git a/tests/actions.go b/tests/actions.go
@@ -2352,11 +2352,19 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 				glog.Errorf("some pods is not health %s", pumpStatefulSetName)
 				// return false, nil
 			}
-			glog.V(4).Info(pod.Spec.Affinity)
+			glog.Info(pod.Spec.Affinity)
 			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 {
+			glog.Info(pod.Spec.Tolerations)
+			foundKey := false
+			for _, tor := range pod.Spec.Tolerations {
+				if tor.Key == "node-role" {
+					foundKey = true
+					break
+				}
+			}
+			if !foundKey {
 				return true, fmt.Errorf("pump pod %s/%s should have tolerations set", pod.Namespace, pod.Name)
 			}
 		}
@@ -2395,11 +2403,19 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 				glog.Errorf("some pods is not health %s", drainerStatefulSetName)
 				// return false, nil
 			}
-			glog.V(4).Info(pod.Spec.Affinity)
+			glog.Info(pod.Spec.Affinity)
 			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 {
+			glog.Info(pod.Spec.Tolerations)
+			foundKey := false
+			for _, tor := range pod.Spec.Tolerations {
+				if tor.Key == "node-role" {
+					foundKey = true
+					break
+				}
+			}
+			if !foundKey {
 				return true, fmt.Errorf("drainer pod %s/%s should have tolerations set", pod.Namespace, pod.Name)
 			}
 		}