mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #84036 from Huang-Wei/tbe-int-test-issue
Ensure TaintBasedEviction int test not rely on TaintNodeByConditions
This commit is contained in:
commit
534051acec
@ -689,7 +689,7 @@ func TestTaintBasedEvictions(t *testing.T) {
|
|||||||
0.55, // Unhealthy zone threshold
|
0.55, // Unhealthy zone threshold
|
||||||
true, // Run taint manager
|
true, // Run taint manager
|
||||||
true, // Use taint based evictions
|
true, // Use taint based evictions
|
||||||
false, // Enabled TaintNodeByCondition feature
|
true, // Enabled TaintNodeByCondition feature
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Failed to create node controller: %v", err)
|
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
|
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
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user