Skip to content

K
k3s
Commit 0bd6e2d8 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29245 from kubernetes/revert-28970-sheduler_tests_should_consider_unschedulable

Automatic merge from submit-queue Revert "Scheduler predicates tests should consider unschedulable" Reverts kubernetes/kubernetes#28970 See https://github.com/kubernetes/kubernetes/pull/28970#issuecomment-233817280 cc @pskrzyns @rmmh
parents 8c84fae0 ec4b2879
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/scheduler_predicates.go
View file @ 0bd6e2d8
......@@ -172,7 +172,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
c = f.Client
ns = f.Namespace.Name
nodeList = &api.NodeList{}
nodes := framework.GetReadySchedulableNodesOrDie(c)
nodes, err := c.Nodes().List(api.ListOptions{})
masterNodes = sets.NewString()
for _, node := range nodes.Items {
if system.IsMasterNode(&node) {
......@@ -182,7 +182,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
}
}
err := framework.CheckTestingNSDeletedExcept(c, ns)
err = framework.CheckTestingNSDeletedExcept(c, ns)
framework.ExpectNoError(err)
// Every test case in this suite assumes that cluster add-on pods stay stable and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment