Update Single/OwnNamespace support e2e

Signed-off-by: Per G. da Silva <[email protected]>

Author: Per G. da Silva

test/experimental-e2e/single_namespace_support_test.go

@@ -55,14 +55,14 @@ func TestNoop(t *testing.T) {
 	defer utils.CollectTestArtifacts(t, artifactName, c, cfg)
 }
 
-func TestClusterExtensionConfigSupport(t *testing.T) {
+func TestClusterExtensionSingleNamespaceSupport(t *testing.T) {
 	t.Log("Test support for cluster extension config")
 	defer utils.CollectTestArtifacts(t, artifactName, c, cfg)
 
 	t.Log("By creating install namespace, watch namespace and necessary rbac resources")
 	namespace := corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-operator",
+			Name: "single-namespace-operator",
 		},
 	}
 	require.NoError(t, c.Create(t.Context(), &namespace))
@@ -72,7 +72,7 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 
 	watchNamespace := corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-operator-watch",
+			Name: "single-namespace-operator-target",
 		},
 	}
 	require.NoError(t, c.Create(t.Context(), &watchNamespace))
@@ -82,7 +82,7 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 
 	serviceAccount := corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-operator-installer",
+			Name:      "single-namespace-operator-installer",
 			Namespace: namespace.GetName(),
 		},
 	}
@@ -93,7 +93,7 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 
 	clusterRoleBinding := &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-operator-installer",
+			Name: "single-namespace-operator-installer",
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -114,10 +114,10 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 		require.NoError(t, c.Delete(context.Background(), clusterRoleBinding))
 	})
 
-	t.Log("By creating the test-operator ClusterCatalog")
+	t.Log("By creating the test-catalog ClusterCatalog")
 	extensionCatalog := &ocv1.ClusterCatalog{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-operator-catalog",
+			Name: "test-catalog",
 		},
 		Spec: ocv1.ClusterCatalogSpec{
 			Source: ocv1.CatalogSource{
@@ -143,16 +143,16 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 		require.Equal(ct, ocv1.ReasonAvailable, cond.Reason)
 	}, pollDuration, pollInterval)
 
-	t.Log("By installing the test-operator ClusterExtension configured in SingleNamespace mode")
+	t.Log("By attempting to install the single-namespace-operator ClusterExtension without any configuration")
 	clusterExtension := &ocv1.ClusterExtension{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-operator-extension",
+			Name: "single-namespace-operator-extension",
 		},
 		Spec: ocv1.ClusterExtensionSpec{
 			Source: ocv1.SourceConfig{
 				SourceType: "Catalog",
 				Catalog: &ocv1.CatalogFilter{
-					PackageName: "test",
+					PackageName: "single-namespace-operator",
 					Selector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{"olm.operatorframework.io/metadata.name": extensionCatalog.Name},
 					},
@@ -162,20 +162,205 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 			ServiceAccount: ocv1.ServiceAccountReference{
 				Name: serviceAccount.GetName(),
 			},
-			Config: &ocv1.ClusterExtensionConfig{
-				ConfigType: ocv1.ClusterExtensionConfigTypeInline,
-				Inline: &apiextensionsv1.JSON{
-					Raw: []byte(fmt.Sprintf(`{"watchNamespace": "%s"}`, watchNamespace.GetName())),
+		},
+	}
+	require.NoError(t, c.Create(t.Context(), clusterExtension))
+	t.Cleanup(func() {
+		require.NoError(t, c.Delete(context.Background(), clusterExtension))
+	})
+
+	t.Log("By waiting for single-namespace-operator extension installation to fail")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
+		cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeProgressing)
+		require.NotNil(ct, cond)
+		require.Equal(ct, metav1.ConditionTrue, cond.Status)
+		require.Equal(ct, ocv1.ReasonRetrying, cond.Reason)
+		require.Contains(ct, cond.Message, "required field \"watchNamespace\" is missing")
+	}, pollDuration, pollInterval)
+
+	t.Log("By updating the ClusterExtension configuration with a watchNamespace")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(t, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.GetName()}, clusterExtension))
+		clusterExtension.Spec.Config = &ocv1.ClusterExtensionConfig{
+			ConfigType: ocv1.ClusterExtensionConfigTypeInline,
+			Inline: &apiextensionsv1.JSON{
+				Raw: []byte(fmt.Sprintf(`{"watchNamespace": "%s"}`, watchNamespace.GetName())),
+			},
+		}
+		require.NoError(t, c.Update(t.Context(), clusterExtension))
+	}, pollDuration, pollInterval)
+
+	t.Log("By waiting for single-namespace-operator extension to be installed successfully")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
+		cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeInstalled)
+		require.NotNil(ct, cond)
+		require.Equal(ct, metav1.ConditionTrue, cond.Status)
+		require.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
+		require.Contains(ct, cond.Message, "Installed bundle")
+		require.NotNil(ct, clusterExtension.Status.Install)
+		require.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
+	}, pollDuration, pollInterval)
+
+	t.Log("By ensuring the single-namespace-operator deployment is correctly configured to watch the watch namespace")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		deployment := &appsv1.Deployment{}
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Namespace: namespace.GetName(), Name: "single-namespace-operator"}, deployment))
+		require.NotNil(ct, deployment.Spec.Template.GetAnnotations())
+		require.Equal(ct, watchNamespace.GetName(), deployment.Spec.Template.GetAnnotations()["olm.targetNamespaces"])
+	}, pollDuration, pollInterval)
+}
+
+func TestClusterExtensionOwnNamespaceSupport(t *testing.T) {
+	t.Log("Test support for cluster extension with OwnNamespace install mode support")
+	defer utils.CollectTestArtifacts(t, artifactName, c, cfg)
+
+	t.Log("By creating install namespace, watch namespace and necessary rbac resources")
+	namespace := corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "own-namespace-operator",
+		},
+	}
+	require.NoError(t, c.Create(t.Context(), &namespace))
+	t.Cleanup(func() {
+		require.NoError(t, c.Delete(context.Background(), &namespace))
+	})
+
+	serviceAccount := corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "own-namespace-operator-installer",
+			Namespace: namespace.GetName(),
+		},
+	}
+	require.NoError(t, c.Create(t.Context(), &serviceAccount))
+	t.Cleanup(func() {
+		require.NoError(t, c.Delete(context.Background(), &serviceAccount))
+	})
+
+	clusterRoleBinding := &rbacv1.ClusterRoleBinding{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "own-namespace-operator-installer",
+		},
+		Subjects: []rbacv1.Subject{
+			{
+				Kind:      "ServiceAccount",
+				APIGroup:  corev1.GroupName,
+				Name:      serviceAccount.GetName(),
+				Namespace: serviceAccount.GetNamespace(),
+			},
+		},
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: rbacv1.GroupName,
+			Kind:     "ClusterRole",
+			Name:     "cluster-admin",
+		},
+	}
+	require.NoError(t, c.Create(t.Context(), clusterRoleBinding))
+	t.Cleanup(func() {
+		require.NoError(t, c.Delete(context.Background(), clusterRoleBinding))
+	})
+
+	t.Log("By creating the test-catalog ClusterCatalog")
+	extensionCatalog := &ocv1.ClusterCatalog{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-catalog",
+		},
+		Spec: ocv1.ClusterCatalogSpec{
+			Source: ocv1.CatalogSource{
+				Type: ocv1.SourceTypeImage,
+				Image: &ocv1.ImageSource{
+					Ref:                 fmt.Sprintf("%s/e2e/test-catalog:v1", os.Getenv("CLUSTER_REGISTRY_HOST")),
+					PollIntervalMinutes: ptr.To(1),
+				},
+			},
+		},
+	}
+	require.NoError(t, c.Create(t.Context(), extensionCatalog))
+	t.Cleanup(func() {
+		require.NoError(t, c.Delete(context.Background(), extensionCatalog))
+	})
+
+	t.Log("By waiting for the catalog to serve its metadata")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.GetName()}, extensionCatalog))
+		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, ocv1.TypeServing)
+		require.NotNil(ct, cond)
+		require.Equal(ct, metav1.ConditionTrue, cond.Status)
+		require.Equal(ct, ocv1.ReasonAvailable, cond.Reason)
+	}, pollDuration, pollInterval)
+
+	t.Log("By attempting to install the own-namespace-operator ClusterExtension without any configuration")
+	clusterExtension := &ocv1.ClusterExtension{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "own-namespace-operator-extension",
+		},
+		Spec: ocv1.ClusterExtensionSpec{
+			Source: ocv1.SourceConfig{
+				SourceType: "Catalog",
+				Catalog: &ocv1.CatalogFilter{
+					PackageName: "own-namespace-operator",
+					Selector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{"olm.operatorframework.io/metadata.name": extensionCatalog.Name},
+					},
 				},
 			},
+			Namespace: namespace.GetName(),
+			ServiceAccount: ocv1.ServiceAccountReference{
+				Name: serviceAccount.GetName(),
+			},
 		},
 	}
 	require.NoError(t, c.Create(t.Context(), clusterExtension))
 	t.Cleanup(func() {
 		require.NoError(t, c.Delete(context.Background(), clusterExtension))
 	})
 
-	t.Log("By waiting for test-operator extension to be installed successfully")
+	t.Log("By waiting for own-namespace-operator extension installation to fail")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
+		cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeProgressing)
+		require.NotNil(ct, cond)
+		require.Equal(ct, metav1.ConditionTrue, cond.Status)
+		require.Equal(ct, ocv1.ReasonRetrying, cond.Reason)
+		require.Contains(ct, cond.Message, "required field \"watchNamespace\" is missing")
+	}, pollDuration, pollInterval)
+
+	t.Log("By updating the ClusterExtension configuration with a watchNamespace other than the install namespace")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(t, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.GetName()}, clusterExtension))
+		clusterExtension.Spec.Config = &ocv1.ClusterExtensionConfig{
+			ConfigType: ocv1.ClusterExtensionConfigTypeInline,
+			Inline: &apiextensionsv1.JSON{
+				Raw: []byte(`{"watchNamespace": "some-namespace"}`),
+			},
+		}
+		require.NoError(t, c.Update(t.Context(), clusterExtension))
+	}, pollDuration, pollInterval)
+
+	t.Log("By waiting for own-namespace-operator extension installation to fail")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
+		cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeProgressing)
+		require.NotNil(ct, cond)
+		require.Equal(ct, metav1.ConditionTrue, cond.Status)
+		require.Equal(ct, ocv1.ReasonRetrying, cond.Reason)
+		require.Contains(ct, cond.Message, fmt.Sprintf("invalid 'watchNamespace' \"some-namespace\": must be install namespace (%s)", clusterExtension.Spec.Namespace))
+	}, pollDuration, pollInterval)
+
+	t.Log("By updating the ClusterExtension configuration with a watchNamespace = install namespace")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		require.NoError(t, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.GetName()}, clusterExtension))
+		clusterExtension.Spec.Config = &ocv1.ClusterExtensionConfig{
+			ConfigType: ocv1.ClusterExtensionConfigTypeInline,
+			Inline: &apiextensionsv1.JSON{
+				Raw: []byte(fmt.Sprintf(`{"watchNamespace": "%s"}`, clusterExtension.Spec.Namespace)),
+			},
+		}
+		require.NoError(t, c.Update(t.Context(), clusterExtension))
+	}, pollDuration, pollInterval)
+
+	t.Log("By waiting for own-namespace-operator extension to be installed successfully")
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
 		cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeInstalled)
@@ -187,12 +372,12 @@ func TestClusterExtensionConfigSupport(t *testing.T) {
 		require.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
 	}, pollDuration, pollInterval)
 
-	t.Log("By ensuring the test-operator deployment is correctly configured to watch the watch namespace")
+	t.Log("By ensuring the own-namespace-operator deployment is correctly configured to watch the watch namespace")
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		deployment := &appsv1.Deployment{}
-		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Namespace: namespace.GetName(), Name: "test-operator"}, deployment))
+		require.NoError(ct, c.Get(t.Context(), types.NamespacedName{Namespace: namespace.GetName(), Name: "own-namespace-operator"}, deployment))
 		require.NotNil(ct, deployment.Spec.Template.GetAnnotations())
-		require.Equal(ct, watchNamespace.GetName(), deployment.Spec.Template.GetAnnotations()["olm.targetNamespaces"])
+		require.Equal(ct, clusterExtension.Spec.Namespace, deployment.Spec.Template.GetAnnotations()["olm.targetNamespaces"])
 	}, pollDuration, pollInterval)
 }
 

testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/olm.operatorframework.com_ownnamespaces.yaml

@@ -0,0 +1,28 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.1
+  name: ownnamespaces.olm.operatorframework.io
+spec:
+  group: olm.operatorframework.io
+  names:
+    kind: OwnNamespace
+    listKind: OwnNamespaceList
+    plural: ownnamespaces
+    singular: ownnamespace
+  scope: Cluster
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                testField:
+                  type: string