chore: remove unconditional low-quality log messages from controllers

stevekuznetsov · csrwng · commit fc7aa606cbdd · 2026-05-05T15:40:33.000-04:00
These log messages (e.g. log.Info("Reconciling"), log.Info("reconcile
complete")) provide no clear information and are emitted on every
reconcile invocation, leading to excessive log noise. controller-runtime
already provides reconcile lifecycle tracing at debug verbosity.

Remove entry/exit logs and sub-function announcement logs from 18
controllers across the CPO and HO. Clean up unused variables and
imports where applicable.

Signed-off-by: Cesar Wong &lt;cewong@redhat.com&gt;
Commit-Message-Assisted-by: Claude (via Claude Code)
diff --git a/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller.go b/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller.go
@@ -129,7 +129,6 @@ func (r *PrivateServiceObserver) SetupWithManager(ctx context.Context, mgr ctrl.
 }
 
 func (r *PrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	r.log.Info("reconciling")
 
 	// Fetch the Service
 	svc, err := r.clientset.CoreV1().Services(req.Namespace).Get(ctx, req.Name, metav1.GetOptions{})
@@ -181,7 +180,6 @@ func (r *PrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Request
 	}); err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to reconcile AWSEndpointService: %w", err)
 	}
-	r.log.Info("reconcile complete", "request", req)
 	return ctrl.Result{}, nil
 }
 
@@ -412,8 +410,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, fmt.Errorf("logger not found: %w", err)
 	}
 
-	log.Info("reconciling")
-
 	// Fetch the AWSEndpointService
 	obj := &hyperv1.AWSEndpointService{
 		ObjectMeta: metav1.ObjectMeta{
@@ -548,7 +544,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R
 		}
 	}
 
-	log.Info("reconciliation complete")
 	// always requeue to catch and report out of band changes in AWS
 	// NOTICE: if the RequeueAfter interval is short enough, it could result in hitting some AWS request limits.
 	return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil
diff --git a/control-plane-operator/controllers/gcpprivateserviceconnect/observer.go b/control-plane-operator/controllers/gcpprivateserviceconnect/observer.go
@@ -64,8 +64,6 @@ func (r *GCPPrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, nil
 	}
 
-	r.log.Info("reconciling")
-
 	// Fetch the Service
 	svc := &corev1.Service{}
 	if err := r.Get(ctx, req.NamespacedName, svc); err != nil {
@@ -114,7 +112,6 @@ func (r *GCPPrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, fmt.Errorf("failed to reconcile GCPPrivateServiceConnect: %w", err)
 	}
 
-	r.log.Info("reconcile complete", "request", req, "loadBalancerIP", loadBalancerIP)
 	return ctrl.Result{}, nil
 }
 
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/drainer/drainer.go b/control-plane-operator/hostedclusterconfigoperator/controllers/drainer/drainer.go
@@ -43,7 +43,6 @@ type Reconciler struct {
 
 func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	node := &corev1.Node{}
 	err := r.guestClusterClient.Get(ctx, req.NamespacedName, node)
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/globalps/globalps.go b/control-plane-operator/hostedclusterconfigoperator/controllers/globalps/globalps.go
@@ -47,8 +47,6 @@ type Reconciler struct {
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req crreconcile.Request) (crreconcile.Result, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("reconciling global pull secret")
 
 	// Reconcile GlobalPullSecret
 	if err := r.reconcileGlobalPullSecret(ctx); err != nil {
@@ -77,7 +75,6 @@ func (r *Reconciler) reconcileGlobalPullSecret(ctx context.Context) error {
 		ok                          bool
 	)
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("reconciling global pull secret")
 
 	// Create ServiceAccount for global-pull-secret-syncer
 	serviceAccount := manifests.GlobalPullSecretServiceAccount()
@@ -180,8 +177,6 @@ func (r *Reconciler) reconcileGlobalPullSecret(ctx context.Context) error {
 }
 
 func reconcileDaemonSet(ctx context.Context, daemonSet *appsv1.DaemonSet, globalPullSecretName string, originalPullSecretName string, configSeed string, c crclient.Client, createOrUpdate upsert.CreateOrUpdateFN, hccoImage string) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling global pull secret daemon set")
 
 	if _, err := createOrUpdate(ctx, c, daemonSet, func() error {
 		daemonSet.Spec = appsv1.DaemonSetSpec{
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/hcpstatus/hcpstatus.go b/control-plane-operator/hostedclusterconfigoperator/controllers/hcpstatus/hcpstatus.go
@@ -99,7 +99,6 @@ func findClusterOperatorStatusCondition(conditions []configv1.ClusterOperatorSta
 
 func (h *hcpStatusReconciler) reconcile(ctx context.Context, hcp *hyperv1.HostedControlPlane) error {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling hosted cluster version conditions")
 
 	var clusterVersion configv1.ClusterVersion
 	err := h.hostedClusterClient.Get(ctx, crclient.ObjectKey{Name: "version"}, &clusterVersion)
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/inplaceupgrader/inplaceupgrader.go b/control-plane-operator/hostedclusterconfigoperator/controllers/inplaceupgrader/inplaceupgrader.go
@@ -71,7 +71,6 @@ type Reconciler struct {
 
 func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	// Fetch the MachineSet.
 	machineSet := &capiv1.MachineSet{}
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/machine/machine.go b/control-plane-operator/hostedclusterconfigoperator/controllers/machine/machine.go
@@ -32,7 +32,6 @@ const (
 
 func (r *reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	hcp := &hyperv1.HostedControlPlane{}
 	if err := r.client.Get(ctx, r.hcpKey, hcp); err != nil {
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/node/node.go b/control-plane-operator/hostedclusterconfigoperator/controllers/node/node.go
@@ -36,7 +36,6 @@ type reconciler struct {
 
 func (r *reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	node := &corev1.Node{}
 	if err := r.guestClusterClient.Get(ctx, req.NamespacedName, node); err != nil {
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/nodecount/controller.go b/control-plane-operator/hostedclusterconfigoperator/controllers/nodecount/controller.go
@@ -27,7 +27,6 @@ type reconciler struct {
 
 func (r *reconciler) Reconcile(ctx context.Context, _ reconcile.Request) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	var hcp hypershiftv1beta1.HostedControlPlane
 	if err := r.lister.Get(ctx, client.ObjectKey{
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/kas/admissionpolicies.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/kas/admissionpolicies.go
@@ -20,7 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -61,9 +60,6 @@ var (
 // ReconcileKASValidatingAdmissionPolicies will create ValidatingAdmissionPolicies which block certain resources
 // from being updated/deleted from the DataPlane side.
 func ReconcileKASValidatingAdmissionPolicies(ctx context.Context, hcp *hyperv1.HostedControlPlane, client client.Client, createOrUpdate upsert.CreateOrUpdateFN) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("reconciling validating admission policies")
-
 	if err := reconcileConfigValidatingAdmissionPolicy(ctx, hcp, client, createOrUpdate); err != nil {
 		return fmt.Errorf("failed to reconcile Config Validating Admission Policy: %v", err)
 	}
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/registry/admissionpolicies.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/registry/admissionpolicies.go
@@ -38,9 +38,6 @@ var (
 )
 
 func ReconcileRegistryConfigValidatingAdmissionPolicies(ctx context.Context, hcp *hyperv1.HostedControlPlane, client client.Client, createOrUpdate upsert.CreateOrUpdateFN) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("reconciling image registry config validating admission policies")
-
 	if err := reconcileRegistryConfigManagementStateValidatingAdmissionPolicy(ctx, hcp, client, createOrUpdate); err != nil {
 		return fmt.Errorf("failed to reconcile ManagementState Validating Admission Policy: %v", err)
 	}
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
@@ -319,7 +319,6 @@ func Setup(ctx context.Context, opts *operator.HostedClusterConfigOperatorConfig
 
 func (r *reconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	hcp := manifests.HostedControlPlane(r.hcpNamespace, r.hcpName)
 	if err := r.cpClient.Get(ctx, client.ObjectKeyFromObject(hcp), hcp); err != nil {
diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
@@ -339,7 +339,6 @@ func pauseHostedControlPlane(ctx context.Context, c client.Client, hcp *hyperv1.
 
 func (r *HostedClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("reconciling")
 
 	// Look up the HostedCluster instance to reconcile
 	hcluster := &hyperv1.HostedCluster{}
diff --git a/hypershift-operator/controllers/hostedclustersizing/hostedclustersizing_validation_controller.go b/hypershift-operator/controllers/hostedclustersizing/hostedclustersizing_validation_controller.go
@@ -16,7 +16,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	metav1applyconfigurations "k8s.io/client-go/applyconfigurations/meta/v1"
 
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -27,9 +26,6 @@ type validator struct {
 }
 
 func (r *validator) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
-
 	config := schedulingv1alpha1.ClusterSizingConfiguration{}
 	if err := r.lister.Get(ctx, request.NamespacedName, &config); err != nil {
 		return reconcile.Result{}, fmt.Errorf("failed to get cluster sizing configuration %s: %w", request.NamespacedName.String(), err)
diff --git a/hypershift-operator/controllers/nodepool/nodepool_controller.go b/hypershift-operator/controllers/nodepool/nodepool_controller.go
@@ -181,7 +181,6 @@ func (r *NodePoolReconciler) managedResources() []client.Object {
 
 func (r *NodePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
 
 	// Fetch the nodePool instance
 	nodePool := &hyperv1.NodePool{}
diff --git a/hypershift-operator/controllers/platform/aws/controller.go b/hypershift-operator/controllers/platform/aws/controller.go
@@ -265,8 +265,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("no logger found: %w", err)
 	}
-	log.Info("reconciling")
-
 	// Fetch the AWSEndpointService
 	obj := &hyperv1.AWSEndpointService{
 		ObjectMeta: metav1.ObjectMeta{
@@ -373,7 +371,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R
 		}
 	}
 
-	log.Info("reconciliation complete")
 	// always requeue to catch and report out of band changes in AWS
 	// NOTICE: if the RequeueAfter interval is short enough, it could result in hitting some AWS request limits.
 	return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil
diff --git a/hypershift-operator/controllers/scheduler/aws/autoscaler.go b/hypershift-operator/controllers/scheduler/aws/autoscaler.go
@@ -342,8 +342,6 @@ func (r *RequestServingNodeAutoscaler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, nil
 	}
 	log := ctrl.LoggerFrom(ctx)
-	log.Info("Reconciling")
-
 	podList := &corev1.PodList{}
 	if err := r.List(ctx, podList, client.InNamespace(placeholderNamespace), client.HasLabels{PlaceholderLabel}); err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to list placeholder pods: %w", err)
diff --git a/hypershift-operator/controllers/scheduler/azure/controller.go b/hypershift-operator/controllers/scheduler/azure/controller.go
@@ -67,7 +67,6 @@ func (r *Scheduler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
 	}
 
 	if !hc.DeletionTimestamp.IsZero() {
-		log.Info("hostedcluster is being deleted, aborting reconcile")
 		return ctrl.Result{}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ func (r *PrivateServiceObserver) SetupWithManager(ctx context.Context, mgr ctrl.`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`func (r *PrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {`
`132`		`- r.log.Info("reconciling")`
`133`	`132`
`134`	`133`	`// Fetch the Service`
`135`	`134`	`svc, err := r.clientset.CoreV1().Services(req.Namespace).Get(ctx, req.Name, metav1.GetOptions{})`
`@@ -181,7 +180,6 @@ func (r *PrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Request`
`181`	`180`	`}); err != nil {`
`182`	`181`	`return ctrl.Result{}, fmt.Errorf("failed to reconcile AWSEndpointService: %w", err)`
`183`	`182`	`}`
`184`		`- r.log.Info("reconcile complete", "request", req)`
`185`	`183`	`return ctrl.Result{}, nil`
`186`	`184`	`}`
`187`	`185`
`@@ -412,8 +410,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R`
`412`	`410`	`return ctrl.Result{}, fmt.Errorf("logger not found: %w", err)`
`413`	`411`	`}`
`414`	`412`
`415`		`- log.Info("reconciling")`
`416`		`-`
`417`	`413`	`// Fetch the AWSEndpointService`
`418`	`414`	`obj := &hyperv1.AWSEndpointService{`
`419`	`415`	`ObjectMeta: metav1.ObjectMeta{`
`@@ -548,7 +544,6 @@ func (r *AWSEndpointServiceReconciler) Reconcile(ctx context.Context, req ctrl.R`
`548`	`544`	`}`
`549`	`545`	`}`
`550`	`546`
`551`		`- log.Info("reconciliation complete")`
`552`	`547`	`// always requeue to catch and report out of band changes in AWS`
`553`	`548`	`// NOTICE: if the RequeueAfter interval is short enough, it could result in hitting some AWS request limits.`
`554`	`549`	`return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ func (r *GCPPrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Requ`
`64`	`64`	`return ctrl.Result{}, nil`
`65`	`65`	`}`
`66`	`66`
`67`		`- r.log.Info("reconciling")`
`68`		`-`
`69`	`67`	`// Fetch the Service`
`70`	`68`	`svc := &corev1.Service{}`
`71`	`69`	`if err := r.Get(ctx, req.NamespacedName, svc); err != nil {`
`@@ -114,7 +112,6 @@ func (r *GCPPrivateServiceObserver) Reconcile(ctx context.Context, req ctrl.Requ`
`114`	`112`	`return ctrl.Result{}, fmt.Errorf("failed to reconcile GCPPrivateServiceConnect: %w", err)`
`115`	`113`	`}`
`116`	`114`
`117`		`- r.log.Info("reconcile complete", "request", req, "loadBalancerIP", loadBalancerIP)`
`118`	`115`	`return ctrl.Result{}, nil`
`119`	`116`	`}`
`120`	`117`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ type Reconciler struct {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (r *Reconciler) Reconcile(ctx context.Context, req crreconcile.Request) (crreconcile.Result, error) {`
`50`		`- log := ctrl.LoggerFrom(ctx)`
`51`		`- log.Info("reconciling global pull secret")`
`52`	`50`
`53`	`51`	`// Reconcile GlobalPullSecret`
`54`	`52`	`if err := r.reconcileGlobalPullSecret(ctx); err != nil {`
`@@ -77,7 +75,6 @@ func (r *Reconciler) reconcileGlobalPullSecret(ctx context.Context) error {`
`77`	`75`	`ok bool`
`78`	`76`	`)`
`79`	`77`	`log := ctrl.LoggerFrom(ctx)`
`80`		`- log.Info("reconciling global pull secret")`
`81`	`78`
`82`	`79`	`// Create ServiceAccount for global-pull-secret-syncer`
`83`	`80`	`serviceAccount := manifests.GlobalPullSecretServiceAccount()`
`@@ -180,8 +177,6 @@ func (r *Reconciler) reconcileGlobalPullSecret(ctx context.Context) error {`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`func reconcileDaemonSet(ctx context.Context, daemonSet *appsv1.DaemonSet, globalPullSecretName string, originalPullSecretName string, configSeed string, c crclient.Client, createOrUpdate upsert.CreateOrUpdateFN, hccoImage string) error {`
`183`		`- log := ctrl.LoggerFrom(ctx)`
`184`		`- log.Info("Reconciling global pull secret daemon set")`
`185`	`180`
`186`	`181`	`if _, err := createOrUpdate(ctx, c, daemonSet, func() error {`
`187`	`182`	`daemonSet.Spec = appsv1.DaemonSetSpec{`