revert WaitForPodsEvicted

Signed-off-by: Omer Aplatony <[email protected]>

Author: omerap12

vertical-pod-autoscaler/e2e/v1/actuation.go

@@ -203,7 +203,7 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() {
 		utils.InstallVPA(f, vpaCRD)
 
 		ginkgo.By("Waiting for pods to be evicted")
-		err = WaitForPodsEvicted(f, podList, utils.PollTimeout)
+		err = WaitForPodsEvicted(f, podList)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 
@@ -276,7 +276,7 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() {
 		}, restriction.DeferredResizeUpdateTimeout, 10*time.Second).Should(gomega.Succeed())
 
 		ginkgo.By("Waiting for pods to be evicted")
-		err = WaitForPodsEvicted(f, podList, utils.PollTimeout)
+		err = WaitForPodsEvicted(f, podList)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 
@@ -838,7 +838,7 @@ func testEvictsReplicatedPods(f *framework.Framework, controller *autoscaling.Cr
 	utils.InstallVPA(f, vpaCRD)
 
 	ginkgo.By("Waiting for pods to be evicted")
-	err = WaitForPodsEvicted(f, podList, utils.PollTimeout)
+	err = WaitForPodsEvicted(f, podList)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 }
 
@@ -898,7 +898,7 @@ func testEvictsSingletonPodWhenConfigured(f *framework.Framework, controller *au
 	utils.InstallVPA(f, vpaCRD)
 
 	ginkgo.By("Waiting for pods to be evicted")
-	err = WaitForPodsEvicted(f, podList, utils.PollTimeout)
+	err = WaitForPodsEvicted(f, podList)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 }
 

vertical-pod-autoscaler/e2e/v1/common.go

@@ -301,10 +301,10 @@ func WaitForPodsRestarted(f *framework.Framework, podList *apiv1.PodList) error
 }
 
 // WaitForPodsEvicted waits until some pods from the list are evicted.
-func WaitForPodsEvicted(f *framework.Framework, podList *apiv1.PodList, timeout time.Duration) error {
+func WaitForPodsEvicted(f *framework.Framework, podList *apiv1.PodList) error {
 	initialPodSet := MakePodSet(podList)
 
-	return wait.PollUntilContextTimeout(context.Background(), utils.PollInterval, timeout, true, func(ctx context.Context) (done bool, err error) {
+	return wait.PollUntilContextTimeout(context.Background(), utils.PollInterval, utils.PollTimeout, true, func(ctx context.Context) (done bool, err error) {
 		currentPodList, err := GetHamsterPods(f)
 		if err != nil {
 			return false, err

vertical-pod-autoscaler/e2e/v1/updater.go

@@ -65,7 +65,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		podList := setupPodsForUpscalingEviction(f)
 
 		ginkgo.By("Waiting for pods to be evicted")
-		err := WaitForPodsEvicted(f, podList, utils.PollTimeout)
+		err := WaitForPodsEvicted(f, podList)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 
@@ -95,7 +95,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		podList := setupPodsForDownscalingEviction(f, nil)
 
 		ginkgo.By("Waiting for pods to be evicted")
-		err := WaitForPodsEvicted(f, podList, utils.PollTimeout)
+		err := WaitForPodsEvicted(f, podList)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})