Skip to content

Commit 7f949e1

Browse files
author
Kenichi Omichi
committed
Make nodeList schedulable
The conformance test "validates resource limits of pods that are allowed to run" is failed if master node doesn't have taints. The reason is that nodeList which should consist of schedulable nodes is gotten with GetMasterAndWorkerNodes() and master nodes were excluded from nodeList. This makes nodeList be gotten with GetReadySchedulableNodesOrDie() and nodeList can consist of schedulable nodes.
1 parent a51d574 commit 7f949e1

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

test/e2e/scheduling/predicates.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,17 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
8787
var err error
8888

8989
framework.AllNodesReady(cs, time.Minute)
90-
masterNodes, nodeList, err = e2enode.GetMasterAndWorkerNodes(cs)
90+
91+
// NOTE: Here doesn't get nodeList for supporting a master nodes which can host workload pods.
92+
masterNodes, _, err = e2enode.GetMasterAndWorkerNodes(cs)
9193
if err != nil {
9294
e2elog.Logf("Unexpected error occurred: %v", err)
9395
}
96+
nodeList, err = e2enode.GetReadySchedulableNodesOrDie(cs)
97+
if err != nil {
98+
e2elog.Logf("Unexpected error occurred: %v", err)
99+
}
100+
94101
// TODO: write a wrapper for ExpectNoErrorWithOffset()
95102
framework.ExpectNoErrorWithOffset(0, err)
96103

0 commit comments

Comments
 (0)