Skip to content

Commit ef005a2

Browse files
Add named for controller to distinguish components in logs (#1874)
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.
1 parent 19eacb0 commit ef005a2

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

internal/catalogd/controllers/core/clustercatalog_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error {
152152

153153
return ctrl.NewControllerManagedBy(mgr).
154154
For(&ocv1.ClusterCatalog{}).
155+
Named("catalogd-clustercatalog-controller").
155156
Complete(r)
156157
}
157158

internal/catalogd/controllers/core/pull_secret_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
6464
func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
6565
_, err := ctrl.NewControllerManagedBy(mgr).
6666
For(&corev1.Secret{}).
67+
Named("catalogd-pull-secret-controller").
6768
WithEventFilter(newSecretPredicate(r.SecretKey)).
6869
Build(r)
6970

internal/operator-controller/controllers/clustercatalog_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque
9393
// SetupWithManager sets up the controller with the Manager.
9494
func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error {
9595
_, err := ctrl.NewControllerManagedBy(mgr).
96+
Named("controller-operator-clustercatalog-controller").
9697
For(&ocv1.ClusterCatalog{}).
9798
Build(r)
9899

internal/operator-controller/controllers/clusterextension_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ func SetDeprecationStatus(ext *ocv1.ClusterExtension, bundleName string, depreca
407407
func (r *ClusterExtensionReconciler) SetupWithManager(mgr ctrl.Manager) error {
408408
controller, err := ctrl.NewControllerManagedBy(mgr).
409409
For(&ocv1.ClusterExtension{}).
410+
Named("controller-operator-cluster-extension-controller").
410411
Watches(&ocv1.ClusterCatalog{},
411412
crhandler.EnqueueRequestsFromMapFunc(clusterExtensionRequestsForCatalog(mgr.GetClient(), mgr.GetLogger())),
412413
builder.WithPredicates(predicate.Funcs{

internal/operator-controller/controllers/pull_secret_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
6363
// SetupWithManager sets up the controller with the Manager.
6464
func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
6565
_, err := ctrl.NewControllerManagedBy(mgr).
66+
Named("controller-operator-pull-secret-controller").
6667
For(&corev1.Secret{}).
6768
WithEventFilter(newSecretPredicate(r.SecretKey)).
6869
Build(r)

0 commit comments

Comments
 (0)