fix(e2e): make problematic test specs eventual

Author: njhale

test/e2e/catalog_e2e_test.go

@@ -13,10 +13,12 @@ import (
 
 	"github.com/blang/semver"
 	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -595,8 +597,13 @@ var _ = Describe("Catalog", func() {
 		require.NoError(GinkgoT(), err)
 
 		// Delete the registry pod
-		err = c.KubernetesInterface().CoreV1().Pods(testNamespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-		require.NoError(GinkgoT(), err)
+		Eventually(func() error {
+			err := c.KubernetesInterface().CoreV1().Pods(testNamespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
+			if apierrors.IsNotFound(err) {
+				err = nil
+			}
+			return err
+		}).Should(Succeed())
 
 		// Wait for a new registry pod to be created
 		notUID := func(pods *corev1.PodList) bool {

test/e2e/metrics_e2e_test.go

@@ -252,11 +252,14 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
 func getPodWithLabel(client operatorclient.ClientInterface, label string) *corev1.Pod {
 	listOptions := metav1.ListOptions{LabelSelector: label}
 	var podList *corev1.PodList
-	EventuallyWithOffset(1, func() (err error) {
+	EventuallyWithOffset(1, func() (numPods int, err error) {
 		podList, err = client.KubernetesInterface().CoreV1().Pods(operatorNamespace).List(context.TODO(), listOptions)
+		if podList != nil {
+			numPods = len(podList.Items)
+		}
+
 		return
-	}).Should(Succeed(), "Failed to list OLM pods")
-	Expect(len(podList.Items)).To(Equal(1))
+	}).Should(Equal(1), "number of pods never scaled to one")
 
 	return &podList.Items[0]
 }

test/e2e/util_test.go

@@ -784,24 +784,25 @@ const (
 func toggleCVO() {
 	c := ctx.Ctx().KubeClient().KubernetesInterface().AppsV1().Deployments(cvoNamespace)
 	clientCtx := context.Background()
-	scale, err := c.GetScale(clientCtx, cvoDeploymentName, metav1.GetOptions{})
-	if err != nil {
-		if apierrors.IsNotFound(err) {
-			// CVO is not enabled
-			return
-		}
 
-		Expect(err).ToNot(HaveOccurred())
-	}
+	Eventually(func() error {
+		scale, err := c.GetScale(clientCtx, cvoDeploymentName, metav1.GetOptions{})
+		if err != nil {
+			if apierrors.IsNotFound(err) {
+				// CVO is not enabled
+				return nil
+			}
 
-	if scale.Spec.Replicas > 0 {
-		scale.Spec.Replicas = 0
-	} else {
-		scale.Spec.Replicas = 1
-	}
+			return err
+		}
 
-	Eventually(func() error {
-		_, err := c.UpdateScale(clientCtx, cvoDeploymentName, scale, metav1.UpdateOptions{})
+		if scale.Spec.Replicas > 0 {
+			scale.Spec.Replicas = 0
+		} else {
+			scale.Spec.Replicas = 1
+		}
+
+		_, err = c.UpdateScale(clientCtx, cvoDeploymentName, scale, metav1.UpdateOptions{})
 		return err
 	}).Should(Succeed())
 }

test/e2e/webhook_e2e_test.go

@@ -16,6 +16,7 @@ import (
 
 	v1 "github.com/operator-framework/api/pkg/operators/v1"
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
+	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
@@ -414,11 +415,13 @@ var _ = Describe("CSVs with a Webhook", func() {
 			Expect(ok).Should(BeTrue())
 
 			// Induce a cert rotation
-			now := metav1.Now()
-			fetchedCSV.Status.CertsLastUpdated = &now
-			fetchedCSV.Status.CertsRotateAt = &now
-			fetchedCSV, err = crc.OperatorsV1alpha1().ClusterServiceVersions(namespace.Name).UpdateStatus(context.TODO(), fetchedCSV, metav1.UpdateOptions{})
-			Expect(err).Should(BeNil())
+			Eventually(Apply(fetchedCSV, func(csv *operatorsv1alpha1.ClusterServiceVersion) error {
+				now := metav1.Now()
+				csv.Status.CertsLastUpdated = &now
+				csv.Status.CertsRotateAt = &now
+				return nil
+			})).Should(Succeed())
+
 			_, err = fetchCSV(crc, csv.Name, namespace.Name, func(csv *v1alpha1.ClusterServiceVersion) bool {
 				// Should create deployment
 				dep, err = c.GetDeployment(namespace.Name, csv.Spec.WebhookDefinitions[0].DeploymentName)