From bdef0868abcee9464efe45253e5c35c9fac5a8f5 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 2 Oct 2023 17:34:53 -0400 Subject: [PATCH] Fix Rename ClusterRoles created by OperatorGroups issues. Remove unused function. Remove possibly verbose log statement. Signed-off-by: Todd Short --- pkg/controller/operators/olm/operatorgroup.go | 2 -- pkg/lib/ownerutil/util.go | 5 ----- 2 files changed, 7 deletions(-) diff --git a/pkg/controller/operators/olm/operatorgroup.go b/pkg/controller/operators/olm/operatorgroup.go index 92c70c649f..bcf27c9524 100644 --- a/pkg/controller/operators/olm/operatorgroup.go +++ b/pkg/controller/operators/olm/operatorgroup.go @@ -79,8 +79,6 @@ func (a *Operator) syncOperatorGroups(obj interface{}) error { "namespace": op.GetNamespace(), }) - logger.Infof("syncing OperatorGroup %s/%s", op.GetNamespace(), op.GetName()) - // Query OG in this namespace groups, err := a.lister.OperatorsV1().OperatorGroupLister().OperatorGroups(op.GetNamespace()).List(labels.Everything()) if err != nil { diff --git a/pkg/lib/ownerutil/util.go b/pkg/lib/ownerutil/util.go index 352b2a8025..dafaeaf8b0 100644 --- a/pkg/lib/ownerutil/util.go +++ b/pkg/lib/ownerutil/util.go @@ -271,11 +271,6 @@ func CSVOwnerSelector(owner *operatorsv1alpha1.ClusterServiceVersion) labels.Sel return labels.SelectorFromSet(OwnerLabel(owner, operatorsv1alpha1.ClusterServiceVersionKind)) } -// OperatorGroupOwnerSelector returns a label selector to find generated objects owned by owner -func OperatorGroupOwnerSelector(owner *operatorsv1.OperatorGroup) labels.Selector { - return labels.SelectorFromSet(OwnerLabel(owner, operatorsv1.OperatorGroupKind)) -} - // AddOwner adds an owner to the ownerref list. func AddOwner(object metav1.Object, owner Owner, blockOwnerDeletion, isController bool) { // Most of the time we won't have TypeMeta on the object, so we infer it for types we know about