github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 05:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Make nodeList schedulable

Browse Source 
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.
This commit is contained in:
Kenichi Omichi
2019-08-07 09:50:58 +00:00
parent a51d574596
commit 7f949e1fcc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/scheduling/predicates.go
View File

@@ -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)