From e9245b0903551059a032179c05f059986de2aa1c Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 27 Jul 2017 15:19:57 -0400 Subject: [PATCH] Do not error out on pods in kube-system Scheduling tests are too aggressive about the health of kube-system. --- test/e2e/scheduling/predicates.go | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index f4c49fe9d30..761460f9f27 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -60,12 +60,10 @@ type pausePodConfig struct { var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { var cs clientset.Interface var nodeList *v1.NodeList - var systemPodsNo int var totalPodCapacity int64 var RCName string var ns string f := framework.NewDefaultFramework("sched-pred") - ignoreLabels := framework.ImagePullerLabels AfterEach(func() { rc, err := cs.CoreV1().ReplicationControllers(ns).Get(RCName, metav1.GetOptions{}) @@ -87,24 +85,6 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { err := framework.CheckTestingNSDeletedExcept(cs, ns) framework.ExpectNoError(err) - // Every test case in this suite assumes that cluster add-on pods stay stable and - // cannot be run in parallel with any other test that touches Nodes or Pods. - // It is so because we need to have precise control on what's running in the cluster. - systemPods, err := framework.GetPodsInNamespace(cs, ns, ignoreLabels) - Expect(err).NotTo(HaveOccurred()) - systemPodsNo = 0 - for _, pod := range systemPods { - if !masterNodes.Has(pod.Spec.NodeName) && pod.DeletionTimestamp == nil { - systemPodsNo++ - } - } - - err = framework.WaitForPodsRunningReady(cs, metav1.NamespaceSystem, int32(systemPodsNo), 0, framework.PodReadyBeforeTimeout, ignoreLabels) - Expect(err).NotTo(HaveOccurred()) - - err = framework.WaitForPodsSuccess(cs, metav1.NamespaceSystem, framework.ImagePullerLabels, framework.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)