updated logging in inferencepool reconciler

Signed-off-by: Nir Rozenbaum <[email protected]>

Author: nirrozenbaum

pkg/epp/controller/inferencepool_reconciler.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -48,33 +49,30 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, nil
 	}
 
-	logger := log.FromContext(ctx)
-	loggerDefault := logger.V(logutil.DEFAULT)
-	loggerDefault.Info("Reconciling InferencePool", "name", req.NamespacedName)
+	logger := log.FromContext(ctx).WithValues("Request.NamespacedName", req.NamespacedName).V(logutil.DEFAULT)
+	logger.Info("Reconciling InferencePool")
 
-	serverPool := &v1alpha1.InferencePool{}
-
-	if err := c.Get(ctx, req.NamespacedName, serverPool); err != nil {
+	infPool := &v1alpha1.InferencePool{}
+	if err := c.Get(ctx, req.NamespacedName, infPool); err != nil {
 		if errors.IsNotFound(err) {
-			loggerDefault.Info("InferencePool not found. Clearing the datastore", "name", req.NamespacedName)
+			logger.Info("InferencePool not found. Clearing the datastore")
 			c.Datastore.Clear()
 			return ctrl.Result{}, nil
 		}
-		loggerDefault.Error(err, "Unable to get InferencePool", "name", req.NamespacedName)
+		logger.Error(err, "Unable to get InferencePool")
 		return ctrl.Result{}, err
-	} else if !serverPool.DeletionTimestamp.IsZero() {
-		loggerDefault.Info("InferencePool is marked for deletion. Clearing the datastore", "name", req.NamespacedName)
+	} else if !infPool.DeletionTimestamp.IsZero() {
+		logger.Info("InferencePool is marked for deletion. Clearing the datastore")
 		c.Datastore.Clear()
 		return ctrl.Result{}, nil
 	}
 
-	c.updateDatastore(ctx, serverPool)
+	c.updateDatastore(ctx, logger, infPool)
 
 	return ctrl.Result{}, nil
 }
 
-func (c *InferencePoolReconciler) updateDatastore(ctx context.Context, newPool *v1alpha1.InferencePool) {
-	logger := log.FromContext(ctx)
+func (c *InferencePoolReconciler) updateDatastore(ctx context.Context, logger logr.Logger, newPool *v1alpha1.InferencePool) {
 	oldPool, err := c.Datastore.PoolGet()
 	c.Datastore.PoolSet(newPool)
 	if err != nil || !reflect.DeepEqual(newPool.Spec.Selector, oldPool.Spec.Selector) {