remove owner references from grafana config map

apis/quay/v1/quayregistry_types.go

@@ -357,6 +357,16 @@ func EnsureOwnerReference(quay *QuayRegistry, obj runtime.Object) (runtime.Objec
 	return obj, nil
 }
 
+// RemoveOwnerReference removes the `ownerReference` on the given object.
+func RemoveOwnerReference(obj runtime.Object) (runtime.Object, error) {
+	objectMeta, err := meta.Accessor(obj)
+	if err != nil {
+		return nil, err
+	}
+	objectMeta.SetOwnerReferences([]metav1.OwnerReference{})
+	return obj, nil
+}
+
 const ManagedKeysName = "quay-registry-managed-secret-keys"
 
 // ManagedKeysSecretNameFor returns the name of the `Secret` in which generated secret keys are stored.

controllers/quay/quayregistry_controller.go

@@ -69,9 +69,9 @@ const (
 // QuayRegistryReconciler reconciles a QuayRegistry object
 type QuayRegistryReconciler struct {
 	client.Client
-	Log           logr.Logger
-	Scheme        *runtime.Scheme
-	EventRecorder record.EventRecorder
+	Log            logr.Logger
+	Scheme         *runtime.Scheme
+	EventRecorder  record.EventRecorder
 	WatchNamespace string
 }
 
@@ -475,10 +475,18 @@ func (r *QuayRegistryReconciler) createOrUpdateObject(ctx context.Context, obj k
 	obj, err := v1.EnsureOwnerReference(&quay, obj)
 	if err != nil {
 		log.Error(err, "could not ensure `ownerReferences` before creating object", objectMeta.GetName(), "GroupVersionKind", groupVersionKind)
-
 		return err
 	}
 
+	// Remove owner reference to prevent cross-namespace owner reference
+	if isGrafanaConfigMap(obj) {
+		obj, err = v1.RemoveOwnerReference(obj)
+		if err != nil {
+			log.Error(err, "could not remove `ownerReferences` before creating object", objectMeta.GetName(), "GroupVersionKind", groupVersionKind)
+			return err
+		}
+	}
+
 	// managedFields cannot be set on a PATCH.
 	objectMeta.SetManagedFields([]metav1.ManagedFieldsEntry{})