diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index 7651fbc3f18..291bc25d92a 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -221,31 +221,9 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { // make the nodes have balanced cpu,mem usage ratio err := createBalancedPodForNodes(f, cs, ns, nodeList.Items, podRequestedResource, 0.5) framework.ExpectNoError(err) - //we need apply more taints on a node, because one match toleration only count 1 - ginkgo.By("Trying to apply 10 taint on the nodes except first one.") + // Apply 10 taints to first node nodeName := nodeList.Items[0].Name - for index, node := range nodeList.Items { - if index == 0 { - continue - } - for i := 0; i < 10; i++ { - testTaint := addRandomTaitToNode(cs, node.Name) - defer framework.RemoveTaintOffNode(cs, node.Name, *testTaint) - } - } - ginkgo.By("Create a pod without any tolerations") - tolerationPodName := "without-tolerations" - pod := createPausePod(f, pausePodConfig{ - Name: tolerationPodName, - }) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) - - ginkgo.By("Pod should prefer scheduled to the node don't have the taint.") - tolePod, err := cs.CoreV1().Pods(ns).Get(tolerationPodName, metav1.GetOptions{}) - framework.ExpectNoError(err) - framework.ExpectEqual(tolePod.Spec.NodeName, nodeName) - ginkgo.By("Trying to apply 10 taint on the first node.") var tolerations []v1.Toleration for i := 0; i < 10; i++ { @@ -253,16 +231,16 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { tolerations = append(tolerations, v1.Toleration{Key: testTaint.Key, Value: testTaint.Value, Effect: testTaint.Effect}) defer framework.RemoveTaintOffNode(cs, nodeName, *testTaint) } - tolerationPodName = "with-tolerations" + tolerationPodName := "with-tolerations" ginkgo.By("Create a pod that tolerates all the taints of the first node.") - pod = createPausePod(f, pausePodConfig{ + pod := createPausePod(f, pausePodConfig{ Name: tolerationPodName, Tolerations: tolerations, }) framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) ginkgo.By("Pod should prefer scheduled to the node that pod can tolerate.") - tolePod, err = cs.CoreV1().Pods(ns).Get(tolerationPodName, metav1.GetOptions{}) + tolePod, err := cs.CoreV1().Pods(ns).Get(tolerationPodName, metav1.GetOptions{}) framework.ExpectNoError(err) framework.ExpectEqual(tolePod.Spec.NodeName, nodeName) })