Skip to content

K
k3s
Commit f6f2b215 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents b0399114 99142b89
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
test/e2e/scheduling/predicates.go
View file @ f6f2b215
...@@ -39,6 +39,7 @@ import ( ...@@ -39,6 +39,7 @@ import (
const maxNumberOfPods int64 = 10 const maxNumberOfPods int64 = 10
const minPodCPURequest int64 = 500 const minPodCPURequest int64 = 500
const imagePrePullingTimeout = 5 * time.Minute
// variable set in BeforeEach, never modified afterwards // variable set in BeforeEach, never modified afterwards
var masterNodes sets.String var masterNodes sets.String
...@@ -97,6 +98,9 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -97,6 +98,9 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
err = framework.WaitForPodsRunningReady(cs, metav1.NamespaceSystem, int32(systemPodsNo), 0, framework.PodReadyBeforeTimeout, ignoreLabels) err = framework.WaitForPodsRunningReady(cs, metav1.NamespaceSystem, int32(systemPodsNo), 0, framework.PodReadyBeforeTimeout, ignoreLabels)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
err = framework.WaitForPodsSuccess(cs, metav1.NamespaceSystem, framework.ImagePullerLabels, imagePrePullingTimeout)
Expect(err).NotTo(HaveOccurred())
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name) framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
framework.PrintAllKubeletPods(cs, node.Name) framework.PrintAllKubeletPods(cs, node.Name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment