github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45599 from gmarek/scheduler_predicates 

Automatic merge from submit-queue (batch tested with PRs 43067, 45586, 45590, 38636, 45599)

Make SchedulerPredicates test more resiliant to recent Node restarts

cc @kubernetes/sig-scheduling-pr-reviews
pull/6/head
Kubernetes Submit Queue 2017-05-10 19:31:47 -07:00 committed by GitHub
parent b0399114fe 99142b8911
commit f6f2b2156e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import (
const maxNumberOfPods int64 = 10
const minPodCPURequest int64 = 500
const imagePrePullingTimeout = 5 * time.Minute
// variable set in BeforeEach, never modified afterwards
var masterNodes sets.String
@ -97,6 +98,9 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
err = framework.WaitForPodsRunningReady(cs, metav1.NamespaceSystem, int32(systemPodsNo), 0, framework.PodReadyBeforeTimeout, ignoreLabels)
Expect(err).NotTo(HaveOccurred())
err = framework.WaitForPodsSuccess(cs, metav1.NamespaceSystem, framework.ImagePullerLabels, imagePrePullingTimeout)
Expect(err).NotTo(HaveOccurred())
for _, node := range nodeList.Items {
framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
framework.PrintAllKubeletPods(cs, node.Name)