Skip to content

K
k3s
Commit 86e9b4bc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30223 from…

Merge pull request #30223 from intelsdi-x/use_GetMasterAndWorkerNodesOrDie_in_scheduler_predicates_tests Automatic merge from submit-queue Use GetMasterAndWorkerNodesOrDie in scheduler predicates tests fixes #28857 follow up to https://github.com/kubernetes/kubernetes/pull/28970 Makes sure that unschedulable node won't be count as worker node. Its using [GetMasterAndWorkerNodesOrDie](https://github.com/kubernetes/kubernetes/blob/master/test/e2e/framework/util.go#L4743) method which is used also in [density tests](https://github.com/kubernetes/kubernetes/blob/master/test/e2e/density.go#L389). @gmarek PTAL
parents c4f48509 0c3fb42e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 11 deletions
test/e2e/scheduler_predicates.go
View file @ 86e9b4bc
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/system"
"k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
...@@ -198,17 +197,10 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -198,17 +197,10 @@ 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{})
masterNodes = sets.NewString()
for _, node := range nodes.Items {
if system.IsMasterNode(&node) {
masterNodes.Insert(node.Name)
} else {
nodeList.Items = append(nodeList.Items, node)
}
}
err = framework.CheckTestingNSDeletedExcept(c, ns) masterNodes, nodeList = framework.GetMasterAndWorkerNodesOrDie(c)
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