tests in progress - failing unhappy path

refactor

refactored

refactoring

refactoring - for review

refactoring - switched namespace

Author: nsapse

test/e2e/installplan_e2e_test.go

@@ -45,6 +45,7 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
+	// "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/catalogsource"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/apis/rbac"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
@@ -4031,37 +4032,23 @@ var _ = Describe("Install Plan", func() {
 
 
 FDescribe("When an operator is attempted to be installed from a catalog", func ()  {
+	
+	var (
+		csv         operatorsv1alpha1.ClusterServiceVersion
+		scheme      *runtime.Scheme
+		csvManifest bytes.Buffer
+		og			*operatorsv1.OperatorGroup
+		plan		*operatorsv1alpha1.InstallPlan
+		)
+	
+	// BeforeEach
+	BeforeEach(func ()  {
 
-	// AfterEach - Stolen from the top
-	// AfterEach(func() {
-	// 	TearDown(testNamespace)
-	// })
-
-	// Create  valid CSVs
-
-	// Happy Path
-	When("The catalog is properly formed", func ()  { 
-
-		// BeforeEach
-		// BeforeEach(func ()  {
-		// 	// csv := newCSV("test", "default", "", semver.MustParse("0.1.0"), nil, nil, nil)
-		// 	// Expect(ctx.Ctx().Client().Create(context.TODO(), &csv)).To(Succeed())
-		// })
-
-		It("installs the operator as expected", func ()  {
-		// Wait for the inspected install plan to be created
-
-		// generate client
-		c := newKubeClient()
-		// crc := newCRClient()
-
-
-		// create a csv
-		csv := newCSV("stable", "default", "", semver.MustParse("0.1.0"), nil, nil, nil)
-		Expect(ctx.Ctx().Client().Create(context.TODO(), &csv)).To(Succeed())
+		// Make CSV
+		csv = newCSV("test", testNamespace, "", semver.MustParse("0.1.0"), nil, nil, nil)
 
 		// create a scheme
-		scheme := runtime.NewScheme()
+		scheme = runtime.NewScheme()
 		Expect(apiextensionsv1.AddToScheme(scheme)).To(Succeed())
 		Expect(operatorsv1alpha1.AddToScheme(scheme)).To(Succeed())
 
@@ -4071,37 +4058,43 @@ FDescribe("When an operator is attempted to be installed from a catalog", func (
 			return k8sjson.NewSerializer(k8sjson.DefaultMetaFactory, scheme, scheme, false).Encode(&csv, &csvManifest)
 		}).Should(Succeed())
 
-		// fmt.Printf("CSV: %v\n", csv)
-		// create a namespace for the installPlan
-		ns, err := c.KubernetesInterface().CoreV1().Namespaces().Create(context.TODO(), &corev1.Namespace{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: genName("ns-"),
-			},
-		}, metav1.CreateOptions{})
-		Expect(err).ToNot(HaveOccurred())
-		// defer c.KubernetesInterface().CoreV1().Namespaces().Delete(context.TODO(), ns.GetName(), metav1.DeleteOptions{})
-
 		// Create an operatorgroup for the same namespace
-		og := &operatorsv1.OperatorGroup {
+		og = &operatorsv1.OperatorGroup {
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "og",
-				Namespace: ns.GetName(),
+				Namespace: testNamespace,
 			},
 			Spec: operatorsv1.OperatorGroupSpec{
-				TargetNamespaces: []string{ns.GetName()},
+				TargetNamespaces: []string{testNamespace},
 			},
 		}
-
 	    // wait for the OG to be applied
 		Eventually(func() error {
 			return ctx.Ctx().Client().Create(context.Background(), og)
 		}).Should(Succeed())
+	})
 
+	// AfterEach 
+	AfterEach(func() {
+		// delete the operator group
+		Eventually(func() error {
+			return ctx.Ctx().Client().Delete(context.Background(), og)
+		}, timeout, interval).Should(Succeed())
+
+		// remaining teardown should be free from TearDown(testNamespace)
+	})
+
+	// Create  valid CSVs
+
+	// Happy Path
+	When("The catalog is properly formed", func ()  { 
+
+		It("installs the operator as expected", func ()  {
 
 		// put the installplan in motion
-		plan := &operatorsv1alpha1.InstallPlan{
+		plan = &operatorsv1alpha1.InstallPlan{
 			ObjectMeta: metav1.ObjectMeta{
-				Namespace: ns.GetName(),
+				Namespace: testNamespace,
 				Name:      genName("ip-"),
 			},
 			Spec: operatorsv1alpha1.InstallPlanSpec{
@@ -4136,31 +4129,66 @@ FDescribe("When an operator is attempted to be installed from a catalog", func (
 			return	ctx.Ctx().Client().Status().Update(context.Background(), plan)
 		}).Should(Succeed())
 
-		//
-		 key := client.ObjectKeyFromObject(plan)
-		 fmt.Printf("Key: %v\n", key)
-		 Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
-					return plan, ctx.Ctx().Client().Get(context.Background(), key, plan)
-				}).Should(Succeed())
-			})	
+		key := client.ObjectKeyFromObject(plan)
+		Eventually(func() (*operatorsv1alpha1.InstallPlan, error){
+				return plan, ctx.Ctx().Client().Get(context.Background(), key, plan)
+		}).Should(HavePhase(operatorsv1alpha1.InstallPlanPhaseComplete))
 		})	
+	})	
 
 	// Unhappy Path
 	When("The CSV doesn't contain APIVersion", func ()  { 
-
-		// BeforeEach
-		BeforeEach(func ()  {
-		})
 		It("fails to install with an error stating CSV missing APIVersion", func ()  {
-			// TODO Get IPStatus to verify install Is in failed state with expected message
+
+			// modify the CSV to not incude the APIVersion
+			csv.APIVersion = ""
+
+			// put the installplan in motion
+			plan = &operatorsv1alpha1.InstallPlan{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace:  testNamespace,
+					Name:       genName("ip-"),
+				},
+				Spec: operatorsv1alpha1.InstallPlanSpec{
+					Approval:                   operatorsv1alpha1.ApprovalAutomatic,
+					Approved:                   true,
+					ClusterServiceVersionNames: []string{csv.GetName()},
+				},
+			}
+
+
+			// wait for the IP to be applied
+			Eventually(func() error {
+				return ctx.Ctx().Client().Create(context.Background(), plan)
+			}).Should(Succeed())
+					
+			plan.Status = operatorsv1alpha1.InstallPlanStatus{
+				Phase:          operatorsv1alpha1.InstallPlanPhaseInstalling,
+				CatalogSources: []string{},
+				Plan: []*operatorsv1alpha1.Step{
+					{
+						Status: operatorsv1alpha1.StepStatusUnknown,
+						Resource: operatorsv1alpha1.StepResource{
+							Name:     csv.GetName(),
+							Manifest: csvManifest.String(),
+						},
+					},
+				},
+			}
+
+			Eventually(func() error {
+				return	ctx.Ctx().Client().Status().Update(context.Background(), plan)
+			}).Should(Succeed())
+
+			key := client.ObjectKeyFromObject(plan)
+			Eventually(func() (*operatorsv1alpha1.InstallPlan, error){
+					return plan, ctx.Ctx().Client().Get(context.Background(), key, plan)
+				}).Should(HavePhase(operatorsv1alpha1.InstallPlanPhaseFailed))
 			})
 		})	
 
 
 	When("The CSV doesn't contain Kind", func ()  { 
-		// BeforeEach
-		BeforeEach(func ()  {
-		})
 		It("fails to install with an error stating CSV missing Kind", func ()  {
 			// TODO Get IPStatus to verify install Is in failed state with expected message
 			})