github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81108 from oomichi/issue/81103

Browse Source 
Make nodeList schedulable
This commit is contained in:
Kubernetes Prow Robot 2019-08-29 02:55:57 -07:00 committed by GitHub
commit acf5411774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,17 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
var err error var err error
framework.AllNodesReady(cs, time.Minute) 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 { if err != nil {
e2elog.Logf("Unexpected error occurred: %v", err) 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() // TODO: write a wrapper for ExpectNoErrorWithOffset()
framework.ExpectNoErrorWithOffset(0, err) framework.ExpectNoErrorWithOffset(0, err)