Move deprecated e2e to one namespace per spec (#2707)

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

Author: perdasilva

test/e2e/deprecated_e2e_test.go

@@ -2,89 +2,92 @@ package e2e
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/blang/semver/v4"
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
+	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
 )
 
 var missingAPI = `{"apiVersion":"verticalpodautoscalers.autoscaling.k8s.io/v1","kind":"VerticalPodAutoscaler","metadata":{"name":"my.thing","namespace":"foo"}}`
 
 var _ = Describe("Not found APIs", func() {
+
+	var ns corev1.Namespace
+
 	BeforeEach(func() {
-		csv := newCSV("test-csv", testNamespace, "", semver.Version{}, nil, nil, nil)
+		namespaceName := genName("deprecated-e2e-")
+		og := operatorsv1.OperatorGroup{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      fmt.Sprintf("%s-operatorgroup", namespaceName),
+				Namespace: namespaceName,
+			},
+		}
+		ns = SetupGeneratedTestNamespaceWithOperatorGroup(namespaceName, og)
+
+		csv := newCSV("test-csv", ns.GetName(), "", semver.Version{}, nil, nil, nil)
 		Expect(ctx.Ctx().Client().Create(context.TODO(), &csv)).To(Succeed())
 	})
+
 	AfterEach(func() {
-		TearDown(testNamespace)
+		TeardownNamespace(ns.GetName())
 	})
 
-	When("objects with APIs that are not on-cluster are created in the installplan", func() {
-		// each entry is an installplan with a deprecated resource
-		type payload struct {
-			name       string
-			IP         *operatorsv1alpha1.InstallPlan
-			errMessage string
-		}
-
-		tableEntries := []table.TableEntry{
-			table.Entry("contains an entry with a missing API not found on cluster ", payload{
-				name: "installplan contains a missing API",
-				IP: &operatorsv1alpha1.InstallPlan{
+	Context("objects with APIs that are not on-cluster are created in the installplan", func() {
+		When("installplan contains a missing API", func() {
+			It("the ip enters a failed state with a helpful error message", func() {
+				ip := &operatorsv1alpha1.InstallPlan{
 					ObjectMeta: metav1.ObjectMeta{
-						Namespace: *namespace, // this is necessary due to ginkgo table semantics, see https://github.com/onsi/ginkgo/issues/378
 						Name:      "test-plan-api",
+						Namespace: ns.GetName(),
 					},
 					Spec: operatorsv1alpha1.InstallPlanSpec{
 						Approval:                   operatorsv1alpha1.ApprovalAutomatic,
 						Approved:                   true,
 						ClusterServiceVersionNames: []string{},
 					},
-				},
-				errMessage: "api-server resource not found installing VerticalPodAutoscaler my.thing: GroupVersionKind " +
-					"verticalpodautoscalers.autoscaling.k8s.io/v1, Kind=VerticalPodAutoscaler not found on the cluster",
-			}),
-		}
-
-		table.DescribeTable("the ip enters a failed state with a helpful error message", func(tt payload) {
-			Expect(ctx.Ctx().Client().Create(context.Background(), tt.IP)).To(Succeed())
+				}
+				Expect(ctx.Ctx().Client().Create(context.Background(), ip)).To(Succeed())
 
-			tt.IP.Status = operatorsv1alpha1.InstallPlanStatus{
-				Phase:          operatorsv1alpha1.InstallPlanPhaseInstalling,
-				CatalogSources: []string{},
-				Plan: []*operatorsv1alpha1.Step{
-					{
-						Resolving: "test-csv",
-						Status:    operatorsv1alpha1.StepStatusUnknown,
-						Resource: operatorsv1alpha1.StepResource{
-							Name:     "my.thing",
-							Group:    "verticalpodautoscalers.autoscaling.k8s.io",
-							Version:  "v1",
-							Kind:     "VerticalPodAutoscaler",
-							Manifest: missingAPI,
+				ip.Status = operatorsv1alpha1.InstallPlanStatus{
+					Phase:          operatorsv1alpha1.InstallPlanPhaseInstalling,
+					CatalogSources: []string{},
+					Plan: []*operatorsv1alpha1.Step{
+						{
+							Resolving: "test-csv",
+							Status:    operatorsv1alpha1.StepStatusUnknown,
+							Resource: operatorsv1alpha1.StepResource{
+								Name:     "my.thing",
+								Group:    "verticalpodautoscalers.autoscaling.k8s.io",
+								Version:  "v1",
+								Kind:     "VerticalPodAutoscaler",
+								Manifest: missingAPI,
+							},
 						},
 					},
-				},
-			}
+				}
 
-			Expect(ctx.Ctx().Client().Status().Update(context.Background(), tt.IP)).To(Succeed(), "failed to update the resource")
+				Expect(ctx.Ctx().Client().Status().Update(context.Background(), ip)).To(Succeed(), "failed to update the resource")
 
-			// The IP sits in the Installing phase with the GVK missing error
-			Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
-				return tt.IP, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.IP), tt.IP)
-			}).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseInstalling)), HaveMessage(tt.errMessage))
+				errMessage := "api-server resource not found installing VerticalPodAutoscaler my.thing: GroupVersionKind " +
+					"verticalpodautoscalers.autoscaling.k8s.io/v1, Kind=VerticalPodAutoscaler not found on the cluster"
+				// The IP sits in the Installing phase with the GVK missing error
+				Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
+					return ip, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(ip), ip)
+				}).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseInstalling)), HaveMessage(errMessage))
 
-			// Eventually the IP fails with the GVK missing error, after installplan retries, which is by default 1 minute.
-			Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
-				return tt.IP, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.IP), tt.IP)
-			}, 2*time.Minute).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseFailed)), HaveMessage(tt.errMessage))
-		}, tableEntries...)
+				// Eventually the IP fails with the GVK missing error, after installplan retries, which is by default 1 minute.
+				Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
+					return ip, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(ip), ip)
+				}, 2*time.Minute).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseFailed)), HaveMessage(errMessage))
+			})
+		})
 	})
 })