Merge pull request #84036 from Huang-Wei/tbe-int-test-issue

Ensure TaintBasedEviction int test not rely on TaintNodeByConditions
kubernetes · Oct 17, 2019 · 534051a · 534051a
2 parents 4887b0c + fbcc3c1
commit 534051a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/integration/scheduler/taint_test.go b/test/integration/scheduler/taint_test.go
@@ -689,7 +689,7 @@ func TestTaintBasedEvictions(t *testing.T) {
 				0.55,             // Unhealthy zone threshold
 				true,             // Run taint manager
 				true,             // Use taint based evictions
-				false,            // Enabled TaintNodeByCondition feature
+				true,             // Enabled TaintNodeByCondition feature
 			)
 			if err != nil {
 				t.Errorf("Failed to create node controller: %v", err)

diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go
@@ -385,7 +385,8 @@ func nodeTainted(cs clientset.Interface, nodeName string, taints []v1.Taint) wai
 			return false, err
 		}
 
-		if len(taints) != len(node.Spec.Taints) {
+		// node.Spec.Taints may have more taints
+		if len(taints) > len(node.Spec.Taints) {
 			return false, nil
 		}