Fix secret controller logger mutation

On each secret reconciliation the secret controller is incorrectly being
changed to add data for the current reconciliation. This data is
persisting and snowballing on each reconciliation loop.

Other places which had this mutation behavior were changed as well.

Author: sebsoto

controllers/metric_controller.go

@@ -72,7 +72,7 @@ func NewMetricReconciler(mgr manager.Manager, clusterConfig cluster.Config, cfg
 // Reconcile is part of the main kubernetes reconciliation loop which reads that state of the cluster for a
 // Node object and aims to move the current state of the cluster closer to the desired state.
 func (r *metricReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
-	r.log = r.log.WithValues(MetricController, req.NamespacedName)
+	r.log.V(1).Info("reconciling", "name", req.NamespacedName.String())
 	// validate if cluster monitoring is enabled in the operator namespace
 	enabled, err := r.validate(ctx)
 	if err != nil {

controllers/node_controller.go

@@ -71,7 +71,6 @@ func NewNodeReconciler(mgr manager.Manager, clusterConfig cluster.Config, watchN
 // Reconcile is part of the main kubernetes reconciliation loop which reads that state of the cluster for a
 // Node object and aims to move the current state of the cluster closer to the desired state.
 func (r *nodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
-	r.log = r.log.WithValues(NodeController, req.NamespacedName)
 	// Prevent WMCO upgrades while Node objects are being processed
 	if err := condition.MarkAsBusy(ctx, r.client, r.watchNamespace, r.recorder, NodeController); err != nil {
 		return ctrl.Result{}, err
@@ -93,6 +92,7 @@ func (r *nodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul
 		return ctrl.Result{}, err
 	}
 
+	r.log.V(1).Info("reconciling", "name", req.NamespacedName.String())
 	if _, ok := node.GetAnnotations()[metadata.RebootAnnotation]; ok {
 		// Create a new signer using the private key that the instances will be reconciled with
 		signer, err := signer.Create(ctx, types.NamespacedName{Namespace: r.watchNamespace,

controllers/registry_controller.go

@@ -78,8 +78,7 @@ func NewRegistryReconciler(mgr manager.Manager, clusterConfig cluster.Config,
 // Reconcile is part of the main kubernetes reconciliation loop which reads that state of the cluster for objects
 // related to image registry config and aims to move the current state of the cluster closer to the desired state.
 func (r *registryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
-	r.log = r.log.WithValues(RegistryController, req.NamespacedName)
-
+	r.log.V(1).Info("reconciling", "name", req.NamespacedName.String())
 	configFiles, err := registries.GenerateConfigFiles(ctx, r.client)
 	if err != nil {
 		return ctrl.Result{}, err

controllers/secret_controller.go

@@ -147,8 +147,6 @@ type SecretReconciler struct {
 // Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
 func (r *SecretReconciler) Reconcile(ctx context.Context,
 	request ctrl.Request) (result reconcile.Result, reconcileErr error) {
-	r.log = r.log.WithValues(SecretController, request.NamespacedName)
-
 	var err error
 	// Prevent WMCO upgrades while secret-based resources are being processed
 	if err := condition.MarkAsBusy(ctx, r.client, r.watchNamespace, r.recorder, SecretController); err != nil {
@@ -159,6 +157,7 @@ func (r *SecretReconciler) Reconcile(ctx context.Context,
 			result.Requeue, reconcileErr)
 	}()
 
+	r.log.V(1).Info("reconciling", "secret", request.NamespacedName.String())
 	r.signer, err = signer.Create(ctx, kubeTypes.NamespacedName{Namespace: r.watchNamespace,
 		Name: secrets.PrivateKeySecret}, r.client)
 	if err != nil {