Skip to content
Permalink
Browse files

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

Ensure TaintBasedEviction int test not rely on TaintNodeByConditions
  • Loading branch information
k8s-ci-robot committed Oct 17, 2019
2 parents 4887b0c + fbcc3c1 commit 534051acec00ab0dcaea502cc3bf410ba32c7b27
Showing with 3 additions and 2 deletions.
  1. +1 −1 test/integration/scheduler/taint_test.go
  2. +2 −1 test/integration/scheduler/util.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)
@@ -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
}

0 comments on commit 534051a

Please sign in to comment.
You can’t perform that action at this time.