test that the operator api never adopts copied CSVs

Signed-off-by: Evan Cordell <[email protected]>

Author: ecordell

pkg/controller/operators/operatorcondition_controller_test.go

@@ -250,7 +250,7 @@ var _ = Describe("OperatorCondition", func() {
 					}
 					Expect(k8sClient.Create(ctx, operatorCondition)).To(Succeed())
 				})
-				It("does not injected the OperatorCondition name into the deployment's Environment Variables", func() {
+				It("does not inject the OperatorCondition name into the deployment's Environment Variables", func() {
 					deployment := &appsv1.Deployment{}
 					Consistently(func() error {
 						err := k8sClient.Get(ctx, types.NamespacedName{Name: operatorCondition.Spec.Deployments[0], Namespace: namespace.GetName()}, deployment)

test/e2e/operator_test.go

@@ -28,7 +28,7 @@ import (
 )
 
 // Describes test specs for the Operator resource.
-var _ = Describe("Operator", func() {
+var _ = Describe("Operator API", func() {
 	var (
 		clientCtx       context.Context
 		scheme          *runtime.Scheme
@@ -74,6 +74,8 @@ var _ = Describe("Operator", func() {
 		o := &operatorsv1.Operator{}
 		o.SetName(genName("o-"))
 
+		Consistently(o).ShouldNot(ContainCopiedCSVReferences())
+
 		Eventually(func() error {
 			return client.Create(clientCtx, o)
 		}).Should(Succeed())
@@ -327,6 +329,12 @@ var _ = Describe("Operator", func() {
 		})
 
 		It("should automatically adopt components", func() {
+			Consistently(func() (*operatorsv1.Operator, error) {
+				o := &operatorsv1.Operator{}
+				err := client.Get(clientCtx, operatorName, o)
+				return o, err
+			}).ShouldNot(ContainCopiedCSVReferences())
+
 			Eventually(func() (*operatorsv1.Operator, error) {
 				o := &operatorsv1.Operator{}
 				err := client.Get(clientCtx, operatorName, o)
@@ -346,8 +354,36 @@ var _ = Describe("Operator", func() {
 				getReference(scheme, testobj.WithName("monitoringdashboards.monitoring.kiali.io", &apiextensionsv1.CustomResourceDefinition{})),
 			}))
 		})
-	})
 
+		Context("when a namespace is added", func() {
+			var newNs  *corev1.Namespace
+
+			BeforeEach(func() {
+				// Subscribe to a package and await a successful install
+				newNs = &corev1.Namespace{}
+				newNs.SetName(genName("ns-"))
+				Eventually(func() error {
+					return client.Create(clientCtx, newNs)
+				}).Should(Succeed())
+			})
+			AfterEach(func() {
+				Eventually(func() error {
+					err := client.Delete(clientCtx, newNs)
+					if apierrors.IsNotFound(err) {
+						return nil
+					}
+					return err
+				}).Should(Succeed())
+			})
+			It("should not adopt copied csvs", func() {
+				Consistently(func() (*operatorsv1.Operator, error) {
+					o := &operatorsv1.Operator{}
+					err := client.Get(clientCtx, operatorName, o)
+					return o, err
+				}).ShouldNot(ContainCopiedCSVReferences())
+			})
+		})
+	})
 })
 
 func getReference(scheme *runtime.Scheme, obj runtime.Object) *corev1.ObjectReference {
@@ -380,6 +416,53 @@ func componentRefEventuallyExists(w watch.Interface, exists bool, ref *corev1.Ob
 	}))
 }
 
+func ContainCopiedCSVReferences() gomegatypes.GomegaMatcher {
+	return &copiedCSVRefMatcher{}
+}
+
+type copiedCSVRefMatcher struct {
+}
+
+func (matcher *copiedCSVRefMatcher) Match(actual interface{}) (success bool, err error) {
+	if actual == nil {
+		return false, nil
+	}
+	operator, ok := actual.(*operatorsv1.Operator)
+	if !ok {
+		return false, fmt.Errorf("copiedCSVRefMatcher matcher expects an *Operator")
+	}
+	if operator.Status.Components == nil {
+		return false, nil
+	}
+	for _, ref := range operator.Status.Components.Refs {
+		if ref.Kind != operatorsv1alpha1.ClusterServiceVersionKind {
+			continue
+		}
+		for _, c := range ref.Conditions {
+			if c.Reason == string(operatorsv1alpha1.CSVReasonCopied) {
+				return true, nil
+			}
+		}
+	}
+	return false, nil
+}
+
+func (matcher *copiedCSVRefMatcher) FailureMessage(actual interface{}) (message string) {
+	operator, ok := actual.(*operatorsv1.Operator)
+	if !ok {
+		return fmt.Sprintf("copiedCSVRefMatcher matcher expects an *Operator")
+	}
+	return fmt.Sprintf("Expected\n\t%#v\nto contain copied CSVs in components\n\t%#v\n", operator, operator.Status.Components)
+}
+
+func (matcher *copiedCSVRefMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+	operator, ok := actual.(*operatorsv1.Operator)
+	if !ok {
+		return fmt.Sprintf("copiedCSVRefMatcher matcher expects an *Operator")
+	}
+	return fmt.Sprintf("Expected\n\t%#v\nto not contain copied CSVs in components\n\t%#v\n", operator, operator.Status.Components)
+}
+
 func operatorPredicate(fn func(*operatorsv1.Operator) bool) predicateFunc {
 	return func(event watch.Event) bool {
 		o, ok := event.Object.(*operatorsv1.Operator)