Revert "chore: append ownerRef to resources owned by Features (openda…

…tahub-io#1039)" This reverts commit 6583645. opendatahub-io#1039 (comment) Signed-off-by: Yauheni Kaliuta <[email protected]>
red-hat-data-services · Jun 6, 2024 · 952795a · 952795a
1 parent 6583645
commit 952795a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/pkg/cluster/cluster_operations_int_test.go b/pkg/cluster/cluster_operations_int_test.go
@@ -92,13 +92,6 @@ var _ = Describe("Creating cluster resources", func() {
 			Namespace: "default",
 		}
 
-		owner := &v1.Namespace{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "default",
-				UID:  "default",
-			},
-		}
-
 		It("should create configmap with labels and owner reference", func() {
 			// given
 			configMap := &v1.ConfigMap{
@@ -114,7 +107,12 @@ var _ = Describe("Creating cluster resources", func() {
 				envTestClient,
 				configMap,
 				cluster.WithLabels(labels.K8SCommon.PartOf, "opendatahub"),
-				cluster.OwnedBy(owner, envTestClient.Scheme()),
+				cluster.WithOwnerReference(metav1.OwnerReference{
+					APIVersion: "v1",
+					Kind:       "Namespace",
+					Name:       "default",
+					UID:        "default",
+				}),
 			)
 			Expect(err).ToNot(HaveOccurred())
 			defer objectCleaner.DeleteAll(configMap)

diff --git a/pkg/cluster/meta.go b/pkg/cluster/meta.go
@@ -22,6 +22,13 @@ func ApplyMetaOptions(obj metav1.Object, opts ...MetaOptions) error {
 	return nil
 }
 
+func WithOwnerReference(ownerReferences ...metav1.OwnerReference) MetaOptions {
+	return func(obj metav1.Object) error {
+		obj.SetOwnerReferences(ownerReferences)
+		return nil
+	}
+}
+
 func OwnedBy(owner metav1.Object, scheme *runtime.Scheme) MetaOptions {
 	return func(obj metav1.Object) error {
 		return controllerutil.SetOwnerReference(owner, obj, scheme)

diff --git a/pkg/feature/feature.go b/pkg/feature/feature.go
@@ -160,7 +160,7 @@ func (f *Feature) createApplier(m Manifest) applier {
 	}
 
 	return func(objects []*unstructured.Unstructured) error {
-		return applyResources(f.Client, objects, OwnedByFeatureTracker(f))
+		return applyResources(f.Client, objects, OwnedBy(f))
 	}
 }
 
@@ -197,6 +197,6 @@ func (f *Feature) AsOwnerReference() metav1.OwnerReference {
 	return f.Tracker.ToOwnerReference()
 }
 
-func OwnedByFeatureTracker(f *Feature) cluster.MetaOptions {
-	return cluster.OwnedBy(f.Tracker, f.Client.Scheme())
+func OwnedBy(f *Feature) cluster.MetaOptions {
+	return cluster.WithOwnerReference(f.AsOwnerReference())
 }
diff --git a/pkg/feature/servicemesh/conditions.go b/pkg/feature/servicemesh/conditions.go
@@ -28,7 +28,7 @@ func EnsureAuthNamespaceExists(f *feature.Feature) error {
 		return resolveNsErr
 	}
 
-	_, err := cluster.CreateNamespace(context.TODO(), f.Client, f.Spec.Auth.Namespace, feature.OwnedByFeatureTracker(f), cluster.WithLabels(labels.ODH.OwnedNamespace, "true"))
+	_, err := cluster.CreateNamespace(context.TODO(), f.Client, f.Spec.Auth.Namespace, feature.OwnedBy(f), cluster.WithLabels(labels.ODH.OwnedNamespace, "true"))
 	return err
 }
 

diff --git a/pkg/feature/servicemesh/resources.go b/pkg/feature/servicemesh/resources.go
@@ -32,7 +32,7 @@ func MeshRefs(f *feature.Feature) error {
 			},
 			Data: data,
 		},
-		feature.OwnedByFeatureTracker(f),
+		feature.OwnedBy(f),
 	)
 }
 
@@ -66,6 +66,6 @@ func AuthRefs(f *feature.Feature) error {
 			},
 			Data: data,
 		},
-		feature.OwnedByFeatureTracker(f),
+		feature.OwnedBy(f),
 	)
 }