Address review comments

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

Author: chiragkyal

test/e2e/trustmanager_bundle_test.go

@@ -75,12 +75,25 @@ var _ = Describe("Bundle", Ordered, Label("Platform:Generic", "Feature:TrustMana
 	var (
 		testNS                                     *corev1.Namespace
 		testCertPEM1, testCertPEM2, expiredCertPEM string
+
+		originalUnsupportedAddonFeatures string
+		originalOperatorLogLevel         string
 	)
 
 	BeforeAll(func() {
-		By("enabling TrustManager feature gate")
-		err := patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+		By("capturing original UNSUPPORTED_ADDON_FEATURES from subscription before patching")
+		var err error
+		originalUnsupportedAddonFeatures, err = getSubscriptionEnvVar(ctx, loader, "UNSUPPORTED_ADDON_FEATURES")
+		Expect(err).ShouldNot(HaveOccurred())
+
+		By("capturing original OPERATOR_LOG_LEVEL from subscription before patching")
+		originalOperatorLogLevel, err = getSubscriptionEnvVar(ctx, loader, "OPERATOR_LOG_LEVEL")
+		Expect(err).ShouldNot(HaveOccurred())
+
+		By("enabling TrustManager feature gate via subscription")
+		err = patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
 			"UNSUPPORTED_ADDON_FEATURES": "TrustManager=true",
+			"OPERATOR_LOG_LEVEL":         "4",
 		})
 		Expect(err).ShouldNot(HaveOccurred())
 
@@ -109,6 +122,23 @@ var _ = Describe("Bundle", Ordered, Label("Platform:Generic", "Feature:TrustMana
 		testNS = createNamespaceWithCleanup(ctx, "bundle-e2e-", map[string]string{bundleTestNamespaceLabel: "true"})
 	})
 
+	AfterAll(func() {
+		By("restoring UNSUPPORTED_ADDON_FEATURES and OPERATOR_LOG_LEVEL on subscription to pre-suite values")
+		err := patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+			"UNSUPPORTED_ADDON_FEATURES": originalUnsupportedAddonFeatures,
+			"OPERATOR_LOG_LEVEL":         originalOperatorLogLevel,
+		})
+		Expect(err).ShouldNot(HaveOccurred())
+		if originalUnsupportedAddonFeatures == "" {
+			By("waiting for operator deployment to rollout after removing UNSUPPORTED_ADDON_FEATURES")
+			err = waitForDeploymentEnvVarRemovedAndRollout(ctx, operatorNamespace, operatorDeploymentName, "UNSUPPORTED_ADDON_FEATURES", lowTimeout)
+		} else {
+			By("waiting for operator deployment to rollout with restored UNSUPPORTED_ADDON_FEATURES")
+			err = waitForDeploymentEnvVarAndRollout(ctx, operatorNamespace, operatorDeploymentName, "UNSUPPORTED_ADDON_FEATURES", originalUnsupportedAddonFeatures, lowTimeout)
+		}
+		Expect(err).ShouldNot(HaveOccurred())
+	})
+
 	// ===== Group 1: Default TrustManager =====
 	Context("with default TrustManager configuration", Ordered, func() {
 		BeforeAll(func() { createTrustManager(ctx, newTrustManagerCR()) })

test/e2e/trustmanager_helpers_test.go

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