Merge pull request #8775 from adrianmoisey/test-polling

Refactor e2e test to poll, rather than wait

Author: k8s-ci-robot

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

@@ -36,6 +36,7 @@ import (
 	"k8s.io/autoscaler/vertical-pod-autoscaler/e2e/utils"
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	restriction "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/updater/restriction"
+
 	updaterutils "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/updater/utils"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/annotations"
 	clientset "k8s.io/client-go/kubernetes"
@@ -208,6 +209,7 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() {
 	})
 
 	// Consumes the entire node's CPU, causing other pods to be pending - requires WithSerial()
+	// issue.k8s.io/135107 could change the need for WithSerial()
 	framework.It("falls back to evicting pods when resize is Deferred and more than 5 minute has elapsed since last in-place update when update mode is InPlaceOrRecreate", framework.WithSerial(), framework.WithSlow(), func() {
 		ginkgo.By("Setting up a hamster deployment")
 		replicas := int32(2)
@@ -500,12 +502,23 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		ginkgo.By(fmt.Sprintf("Waiting for pods to be evicted, sleep for %s", VpaEvictionTimeout.String()))
-		time.Sleep(VpaEvictionTimeout)
+		err = wait.PollUntilContextTimeout(context.TODO(), 10*time.Second, VpaEvictionTimeout, false, func(ctx context.Context) (done bool, err error) {
+			currentPodList, err := GetHamsterPods(f)
+			if err != nil {
+				framework.Logf("Error listing hamster pods: %v", err)
+				return false, err
+			}
+
+			evictedCount := GetEvictedPodsCount(MakePodSet(currentPodList), podSet)
+
+			return evictedCount >= permissiveMaxUnavailable, nil
+		})
+
+		framework.ExpectNoError(err)
 		ginkgo.By("Checking enough pods were evicted.")
 		currentPodList, err := GetHamsterPods(f)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		framework.ExpectNoError(err)
 		evictedCount := GetEvictedPodsCount(MakePodSet(currentPodList), podSet)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		gomega.Expect(evictedCount >= permissiveMaxUnavailable).To(gomega.BeTrue())
 	})