From 4e2602349521a39974b95fe57a56a970ff9600ae Mon Sep 17 00:00:00 2001 From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Date: Thu, 20 Mar 2025 07:38:56 -0300 Subject: [PATCH] Add named for controller to distinguish components in logs This change ensures that catalogd and operator-controller components have distinct controller names (e.g., for clustercatalog). It improves metric aggregation and troubleshooting by clarifying which controller is outputting logs, reducing reliance on user-provided context. --- internal/catalogd/controllers/core/clustercatalog_controller.go | 1 + internal/catalogd/controllers/core/pull_secret_controller.go | 1 + .../operator-controller/controllers/clustercatalog_controller.go | 1 + .../controllers/clusterextension_controller.go | 1 + .../operator-controller/controllers/pull_secret_controller.go | 1 + 5 files changed, 5 insertions(+) diff --git a/internal/catalogd/controllers/core/clustercatalog_controller.go b/internal/catalogd/controllers/core/clustercatalog_controller.go index be9d816fd..d0597d3ee 100644 --- a/internal/catalogd/controllers/core/clustercatalog_controller.go +++ b/internal/catalogd/controllers/core/clustercatalog_controller.go @@ -152,6 +152,7 @@ func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). For(&ocv1.ClusterCatalog{}). + Named("catalogd-clustercatalog-controller"). Complete(r) } diff --git a/internal/catalogd/controllers/core/pull_secret_controller.go b/internal/catalogd/controllers/core/pull_secret_controller.go index 0255309ca..810581047 100644 --- a/internal/catalogd/controllers/core/pull_secret_controller.go +++ b/internal/catalogd/controllers/core/pull_secret_controller.go @@ -64,6 +64,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error { _, err := ctrl.NewControllerManagedBy(mgr). For(&corev1.Secret{}). + Named("catalogd-pull-secret-controller"). WithEventFilter(newSecretPredicate(r.SecretKey)). Build(r) diff --git a/internal/operator-controller/controllers/clustercatalog_controller.go b/internal/operator-controller/controllers/clustercatalog_controller.go index c7e7edb03..da882100e 100644 --- a/internal/operator-controller/controllers/clustercatalog_controller.go +++ b/internal/operator-controller/controllers/clustercatalog_controller.go @@ -93,6 +93,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque // SetupWithManager sets up the controller with the Manager. func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error { _, err := ctrl.NewControllerManagedBy(mgr). + Named("controller-operator-clustercatalog-controller"). For(&ocv1.ClusterCatalog{}). Build(r) diff --git a/internal/operator-controller/controllers/clusterextension_controller.go b/internal/operator-controller/controllers/clusterextension_controller.go index d914b831b..5cbb670b6 100644 --- a/internal/operator-controller/controllers/clusterextension_controller.go +++ b/internal/operator-controller/controllers/clusterextension_controller.go @@ -407,6 +407,7 @@ func SetDeprecationStatus(ext *ocv1.ClusterExtension, bundleName string, depreca func (r *ClusterExtensionReconciler) SetupWithManager(mgr ctrl.Manager) error { controller, err := ctrl.NewControllerManagedBy(mgr). For(&ocv1.ClusterExtension{}). + Named("controller-operator-cluster-extension-controller"). Watches(&ocv1.ClusterCatalog{}, crhandler.EnqueueRequestsFromMapFunc(clusterExtensionRequestsForCatalog(mgr.GetClient(), mgr.GetLogger())), builder.WithPredicates(predicate.Funcs{ diff --git a/internal/operator-controller/controllers/pull_secret_controller.go b/internal/operator-controller/controllers/pull_secret_controller.go index 6db1ae564..d73ccddb3 100644 --- a/internal/operator-controller/controllers/pull_secret_controller.go +++ b/internal/operator-controller/controllers/pull_secret_controller.go @@ -63,6 +63,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) // SetupWithManager sets up the controller with the Manager. func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error { _, err := ctrl.NewControllerManagedBy(mgr). + Named("controller-operator-pull-secret-controller"). For(&corev1.Secret{}). WithEventFilter(newSecretPredicate(r.SecretKey)). Build(r)