From 7f949e1fcc93020b593fbf2e462c19bc3af7d56f Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Wed, 7 Aug 2019 09:50:58 +0000 Subject: [PATCH] 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. --- test/e2e/scheduling/predicates.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index e0202e79c87..ff4aceda384 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -87,10 +87,17 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { var err error framework.AllNodesReady(cs, time.Minute) - masterNodes, nodeList, err = e2enode.GetMasterAndWorkerNodes(cs) + + // NOTE: Here doesn't get nodeList for supporting a master nodes which can host workload pods. + masterNodes, _, err = e2enode.GetMasterAndWorkerNodes(cs) if err != nil { e2elog.Logf("Unexpected error occurred: %v", err) } + nodeList, err = e2enode.GetReadySchedulableNodesOrDie(cs) + if err != nil { + e2elog.Logf("Unexpected error occurred: %v", err) + } + // TODO: write a wrapper for ExpectNoErrorWithOffset() framework.ExpectNoErrorWithOffset(0, err)