Skip to content

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

Merge pull request #28970 from intelsdi-x/sheduler_tests_should_consider_unschedulable

Automatic merge from submit-queue Scheduler predicates tests should consider unschedulable fixes https://github.com/kubernetes/kubernetes/issues/28857
parents c3e72aef 1d7ee42f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/scheduler_predicates.go
View file @ 8f8e6205
...@@ -172,7 +172,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -172,7 +172,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
c = f.Client c = f.Client
ns = f.Namespace.Name ns = f.Namespace.Name
nodeList = &api.NodeList{} nodeList = &api.NodeList{}
nodes, err := c.Nodes().List(api.ListOptions{}) nodes := framework.GetReadySchedulableNodesOrDie(c)
masterNodes = sets.NewString() masterNodes = sets.NewString()
for _, node := range nodes.Items { for _, node := range nodes.Items {
if system.IsMasterNode(&node) { if system.IsMasterNode(&node) {
...@@ -182,7 +182,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -182,7 +182,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
} }
} }
err = framework.CheckTestingNSDeletedExcept(c, ns) err := framework.CheckTestingNSDeletedExcept(c, ns)
framework.ExpectNoError(err) framework.ExpectNoError(err)
// Every test case in this suite assumes that cluster add-on pods stay stable and // 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