UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and not waiting for k8s cleanups

- Keeps the singleNamespace and ownNamespace checks in one It, but gives each scenario its own bundle/catalog build, package, and CRD suffix so they never clash—even when cleanup lingers.
- Deletes ClusterExtensions/CRDs on a best-effort basis during deferred cleanup: we log what we tried, but we no longer fail the test if Kubernetes needs extra time.

Author: camilamacedo86

openshift/tests-extension/test/olmv1-singleownnamespace.go

@@ -278,9 +278,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMOwnSingleNamespace] OLMv1 ope
 	var (
 		k8sClient        client.Client
 		activeNamespaces map[string]struct{}
-		catalogName      string
-		packageName      string
-		crdSuffix        string
+		singleownImage   string
 	)
 
 	BeforeEach(func(ctx SpecContext) {
@@ -292,29 +290,8 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMOwnSingleNamespace] OLMv1 ope
 		helpers.RequireImageRegistry(ctx)
 		k8sClient = env.Get().K8sClient
 		activeNamespaces = map[string]struct{}{}
-
-		// Generate unique CRD suffix for parallel execution
-		crdSuffix = rand.String(4)
-
-		// Build in-cluster bundle and catalog
-		singleownImage := image.LocationFor("quay.io/olmtest/webhook-operator:v0.0.5")
-		packageName = fmt.Sprintf("singleown-operator-both-%s", crdSuffix)
-		By(fmt.Sprintf("using singleown operator image: %s, CRD suffix: %s, package: %s", singleownImage, crdSuffix, packageName))
-
-		replacements := map[string]string{
-			"{{ TEST-BUNDLE }}":     "",
-			"{{ NAMESPACE }}":       "",
-			"{{ TEST-CONTROLLER }}": singleownImage,
-			"{{ CRD-SUFFIX }}":      crdSuffix,
-			"{{ PACKAGE-NAME }}":    packageName,
-		}
-
-		var nsName, opName string
-		_, nsName, catalogName, opName = helpers.NewCatalogAndClusterBundles(ctx, replacements,
-			singleownindex.AssetNames, singleownindex.Asset,
-			singleownbundle.AssetNames, singleownbundle.Asset,
-		)
-		By(fmt.Sprintf("singleown bundle %q and catalog %q built successfully in namespace %q", opName, catalogName, nsName))
+		singleownImage = image.LocationFor("quay.io/olmtest/webhook-operator:v0.0.5")
+		By(fmt.Sprintf("using singleown operator image: %s", singleownImage))
 	})
 
 	AfterEach(func(ctx SpecContext) {
@@ -360,6 +337,28 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMOwnSingleNamespace] OLMv1 ope
 					activeNamespaces[watchNamespace] = struct{}{}
 				}
 
+				// Build the in-cluster bundle and catalog with unique names for each scenario.
+				// This avoids conflicts between tests, since we don’t wait for a full cleanup
+				// before starting the next one. Sometimes, deleting resources and namespaces
+				// can take longer than expected.
+				crdSuffix := rand.String(4)
+				packageName := fmt.Sprintf("singleown-operator-both-%s", crdSuffix)
+				By(fmt.Sprintf("building singleown operator assets for %s scenario: image=%s, CRD suffix=%s, package=%s", sc.label, singleownImage, crdSuffix, packageName))
+
+				replacements := map[string]string{
+					"{{ TEST-BUNDLE }}":     "",
+					"{{ NAMESPACE }}":       "",
+					"{{ TEST-CONTROLLER }}": singleownImage,
+					"{{ CRD-SUFFIX }}":      crdSuffix, // Unique CRD suffix per scenario
+					"{{ PACKAGE-NAME }}":    packageName,
+				}
+
+				_, nsName, catalogName, opName := helpers.NewCatalogAndClusterBundles(ctx, replacements,
+					singleownindex.AssetNames, singleownindex.Asset,
+					singleownbundle.AssetNames, singleownbundle.Asset,
+				)
+				By(fmt.Sprintf("singleown bundle %q and catalog %q built successfully in namespace %q for %s scenario", opName, catalogName, nsName, sc.label))
+
 				By(fmt.Sprintf("ensuring no ClusterExtension for %s before %s scenario", packageName, sc.label))
 				crdName := fmt.Sprintf("webhooktests-%s.webhook.operators.coreos.io", crdSuffix)
 				helpers.EnsureCleanupClusterExtension(context.Background(), packageName, crdName)
@@ -433,6 +432,13 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMOwnSingleNamespace] OLMv1 ope
 				DeferCleanup(func() {
 					By(fmt.Sprintf("cleanup: deleting ClusterExtension %s", ce.Name))
 					_ = k8sClient.Delete(context.Background(), ce, client.PropagationPolicy(metav1.DeletePropagationForeground))
+					if crdName != "" {
+						crd := &apiextensionsv1.CustomResourceDefinition{}
+						if err := k8sClient.Get(context.Background(), client.ObjectKey{Name: crdName}, crd); err == nil {
+							By(fmt.Sprintf("cleanup: deleting CRD %s", crdName))
+							_ = k8sClient.Delete(context.Background(), crd)
+						}
+					}
 				})
 
 				By(fmt.Sprintf("waiting for the ClusterExtension %s to be installed for %s scenario", ceName, sc.label))
@@ -459,19 +465,6 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMOwnSingleNamespace] OLMv1 ope
 					}
 					g.Expect(found).To(BeTrue(), "failed to find deployment with olm.targetNamespaces annotation")
 				}).WithTimeout(5 * time.Minute).WithPolling(3 * time.Second).Should(Succeed())
-
-				By(fmt.Sprintf("cleaning up resources created for %s scenario to allow next scenario", sc.label))
-				deletePolicy := metav1.DeletePropagationForeground
-				Expect(k8sClient.Delete(ctx, ce, client.PropagationPolicy(deletePolicy))).To(Succeed(), "failed to delete ClusterExtension %q", ceName)
-				helpers.EnsureCleanupClusterExtension(context.Background(), packageName, crdName)
-
-				Expect(k8sClient.Delete(ctx, crb, client.PropagationPolicy(deletePolicy))).To(Succeed(), "failed to delete ClusterRoleBinding %q", crbName)
-				Expect(k8sClient.Delete(ctx, sa, client.PropagationPolicy(deletePolicy))).To(Succeed(), "failed to delete ServiceAccount %q", saName)
-
-				if watchNSObj != nil {
-					Expect(k8sClient.Delete(ctx, watchNSObj, client.PropagationPolicy(deletePolicy))).To(Succeed(), "failed to delete watch namespace %q", watchNamespace)
-				}
-				Expect(k8sClient.Delete(ctx, installNS, client.PropagationPolicy(deletePolicy))).To(Succeed(), "failed to delete install namespace %q", installNamespace)
 			}
 		})
 })