fix e2e

Signed-off-by: chiragkyal <ckyal@redhat.com>

Author: chiragkyal

test/e2e/trustmanager_bundle_test.go

@@ -727,23 +727,22 @@ var _ = Describe("Bundle", Ordered, Label("Feature:TrustManager"), func() {
 				WithFilterExpiredCertificates(v1alpha1.FilterExpiredCertificatesPolicyEnabled))
 
 			sourceCMName = "filter-src-cm-" + randomStr(5)
+			filterBundleName = "bundle-filter-expired-" + randomStr(5)
 			combinedPEM := testCertPEM1 + expiredCertPEM
 
 			By("creating source ConfigMap with valid + expired certs in trust namespace")
 			createSourceConfigMap(ctx, trustManagerNamespace, sourceCMName, bundleSourceKey, combinedPEM)
-		})
-		AfterAll(func() { deleteTrustManager(ctx) })
-
-		It("should exclude expired certificates from ConfigMap target when using ConfigMap source", func() {
-			filterBundleName = "bundle-filter-expired-" + randomStr(5)
 
 			bundle := newBundle(filterBundleName).
 				WithConfigMapSource(sourceCMName, bundleSourceKey).
 				WithConfigMapTarget(bundleTargetKey).
 				Build()
 
 			createBundleWithCleanup(ctx, bundle)
+		})
+		AfterAll(func() { deleteTrustManager(ctx) })
 
+		It("should exclude expired certificates from ConfigMap target when using ConfigMap source", func() {
 			By("verifying target contains the valid certificate")
 			err := waitForConfigMapTarget(ctx, bundleClient, filterBundleName, testNS.Name, bundleTargetKey, testCertPEM1, highTimeout)
 			Expect(err).ShouldNot(HaveOccurred())

test/e2e/trustmanager_helpers_test.go

@@ -301,7 +301,13 @@ func deleteBundle(ctx context.Context, name string) {
 }
 
 func createBundleWithCleanup(ctx context.Context, bundle *trustapi.Bundle) {
-	Expect(bundleClient.Create(ctx, bundle)).ShouldNot(HaveOccurred())
+	Eventually(func() error {
+		err := bundleClient.Create(ctx, bundle)
+		if apierrors.IsAlreadyExists(err) {
+			return nil
+		}
+		return err
+	}, lowTimeout, fastPollInterval).Should(Succeed(), "failed to create Bundle %q (webhook may not be ready yet)", bundle.Name)
 	DeferCleanup(func() { deleteBundle(ctx, bundle.Name) })
 }