fix disable copied csv e2e test failure

Signed-off-by: akihikokuroda <[email protected]>

Author: akihikokuroda

test/e2e/csv_e2e_test.go

@@ -4204,29 +4204,78 @@ var _ = Describe("Disabling copied CSVs", func() {
 			},
 		},
 	}
+	BeforeEach(func() {
+		Eventually(func() error {
 
-	When("an operator is installed in AllNamespace mode", func() {
-		BeforeEach(func() {
-			Eventually(func() error {
-				if err := ctx.Ctx().Client().Create(context.TODO(), ns); err != nil && !k8serrors.IsAlreadyExists(err) {
-					ctx.Ctx().Logf("Unable to create ns: %v", err)
-					return err
-				}
+			ns = &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: genName("csv-toggle-test-"),
+				},
+			}
 
-				if err := ctx.Ctx().Client().Create(context.TODO(), &operatorGroup); err != nil && !k8serrors.IsAlreadyExists(err) {
-					ctx.Ctx().Logf("Unable to create og: %v", err)
-					return err
-				}
+			operatorGroup = operatorsv1.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      genName("csv-toggle-test-"),
+					Namespace: ns.GetName(),
+				},
+			}
 
-				if err := ctx.Ctx().Client().Create(context.TODO(), &csv); err != nil && !k8serrors.IsAlreadyExists(err) {
-					ctx.Ctx().Logf("Unable to create csv: %v", err)
-					return err
-				}
+			csv = operatorsv1alpha1.ClusterServiceVersion{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      genName("csv-toggle-test-"),
+					Namespace: ns.GetName(),
+				},
+				Spec: operatorsv1alpha1.ClusterServiceVersionSpec{
+					InstallStrategy: newNginxInstallStrategy(genName("csv-toggle-test-"), nil, nil),
+					InstallModes: []operatorsv1alpha1.InstallMode{
+						{
+							Type:      operatorsv1alpha1.InstallModeTypeAllNamespaces,
+							Supported: true,
+						},
+					},
+				},
+			}
 
-				return nil
-			}).Should(Succeed())
-		})
+			if err := ctx.Ctx().Client().Create(context.TODO(), ns); err != nil && !k8serrors.IsAlreadyExists(err) {
+				ctx.Ctx().Logf("Unable to create ns: %v", err)
+				return err
+			}
+			if err := ctx.Ctx().Client().Create(context.TODO(), &operatorGroup); err != nil && !k8serrors.IsAlreadyExists(err) {
+				ctx.Ctx().Logf("Unable to create og: %v", err)
+				return err
+			}
 
+			if err := ctx.Ctx().Client().Create(context.TODO(), &csv); err != nil && !k8serrors.IsAlreadyExists(err) {
+				ctx.Ctx().Logf("Unable to create csv: %v", err)
+				return err
+			}
+
+			return nil
+		}).Should(Succeed())
+
+	})
+	AfterEach(func() {
+		Eventually(func() error {
+			err := ctx.Ctx().Client().Delete(context.TODO(), &csv)
+			if err != nil {
+				return err
+			}
+
+			err = ctx.Ctx().Client().Delete(context.TODO(), &operatorGroup)
+			if err != nil {
+				return err
+			}
+
+			err = ctx.Ctx().Client().Delete(context.TODO(), ns)
+			if err != nil {
+				return err
+			}
+
+			return nil
+		}).Should(Succeed())
+	})
+
+	When("an operator is installed in AllNamespace mode", func() {
 		It("should have Copied CSVs in all other namespaces", func() {
 			Eventually(func() error {
 				requirement, err := k8slabels.NewRequirement(operatorsv1alpha1.CopiedLabelKey, selection.Equals, []string{csv.GetNamespace()})