From fc12c57af2af014d97fc0a01fe850b6b64940da6 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 17 Apr 2024 18:09:49 +0200 Subject: [PATCH] fix: remove invalid owner ref on cluster role (#460) Cluster roles aren't namespace-scoped and can't have namespace-scoped owner references. Closes COO-117 Signed-off-by: Simon Pasquier --- pkg/controllers/monitoring/monitoring-stack/alertmanager.go | 3 +-- pkg/reconciler/reconciler.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/controllers/monitoring/monitoring-stack/alertmanager.go b/pkg/controllers/monitoring/monitoring-stack/alertmanager.go index d4173502..063f8680 100644 --- a/pkg/controllers/monitoring/monitoring-stack/alertmanager.go +++ b/pkg/controllers/monitoring/monitoring-stack/alertmanager.go @@ -139,8 +139,7 @@ func newAlertManagerClusterRole(ms *stack.MonitoringStack, rbacResourceName stri Kind: "ClusterRole", }, ObjectMeta: metav1.ObjectMeta{ - Name: rbacResourceName, - Namespace: ms.Namespace, + Name: rbacResourceName, }, Rules: []rbacv1.PolicyRule{{ APIGroups: []string{"security.openshift.io"}, diff --git a/pkg/reconciler/reconciler.go b/pkg/reconciler/reconciler.go index badb49b2..a413c3a6 100644 --- a/pkg/reconciler/reconciler.go +++ b/pkg/reconciler/reconciler.go @@ -25,7 +25,6 @@ type Updater struct { } func (r Updater) Reconcile(ctx context.Context, c client.Client, scheme *runtime.Scheme) error { - if r.resourceOwner.GetNamespace() == r.resource.GetNamespace() { if err := controllerutil.SetControllerReference(r.resourceOwner, r.resource, scheme); err != nil { return fmt.Errorf("%s/%s (%s): updater failed to set owner reference: %w", @@ -39,6 +38,7 @@ func (r Updater) Reconcile(ctx context.Context, c client.Client, scheme *runtime r.resource.GetNamespace(), r.resource.GetName(), r.resource.GetObjectKind().GroupVersionKind().String(), err) } + return nil }