github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Ensure TaintBasedEviction int test not rely on TaintNodeByConditions

Browse Source
This commit is contained in:
Wei Huang 2019-10-17 01:25:12 -07:00
parent 6a5f0e6eda
commit fbcc3c183a
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/scheduler/taint_test.go
View File

@ -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)

3
test/integration/scheduler/util.go
View File

@ -381,7 +381,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
} }