updated logging in inferencepool reconciler (#399)

* updated logging + predicate in inferencepool reconciler

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

* removed irrelevant unit test.

after adding predicate to the controller registration, the reconcile function no longer contains the filtering logic.
therefore, it's not relecant to test the reconcile function with pool2.

in runtime, this event will be filtered out much earlier

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

---------

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

Author: nirrozenbaum

pkg/epp/controller/inferencepool_reconciler.go

@@ -27,6 +27,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha2"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
@@ -44,31 +45,28 @@ type InferencePoolReconciler struct {
 }
 
 func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	if req.NamespacedName.Name != c.PoolNamespacedName.Name || req.NamespacedName.Namespace != c.PoolNamespacedName.Namespace {
-		return ctrl.Result{}, nil
-	}
+	logger := log.FromContext(ctx).WithValues("inferencePool", req.NamespacedName).V(logutil.DEFAULT)
+	ctx = ctrl.LoggerInto(ctx, logger)
 
-	logger := log.FromContext(ctx)
-	loggerDefault := logger.V(logutil.DEFAULT)
-	loggerDefault.Info("Reconciling InferencePool", "name", req.NamespacedName)
+	logger.Info("Reconciling InferencePool")
 
-	serverPool := &v1alpha2.InferencePool{}
+	infPool := &v1alpha2.InferencePool{}
 
-	if err := c.Get(ctx, req.NamespacedName, serverPool); err != nil {
+	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, infPool)
 
 	return ctrl.Result{}, nil
 }
@@ -92,5 +90,8 @@ func (c *InferencePoolReconciler) updateDatastore(ctx context.Context, newPool *
 func (c *InferencePoolReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v1alpha2.InferencePool{}).
+		WithEventFilter(predicate.NewPredicateFuncs(func(object client.Object) bool {
+			return (object.GetNamespace() == c.PoolNamespacedName.Namespace) && (object.GetName() == c.PoolNamespacedName.Name)
+		})).
 		Complete(c)
 }

pkg/epp/controller/inferencepool_reconciler_test.go

@@ -102,15 +102,7 @@ func TestReconcile_InferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
-	// Step 2: A reconcile on pool2 should not change anything.
-	if _, err := inferencePoolReconciler.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Name: pool2.Name, Namespace: pool2.Namespace}}); err != nil {
-		t.Errorf("Unexpected InferencePool reconcile error: %v", err)
-	}
-	if diff := diffPool(datastore, pool1, []string{"pod1", "pod2"}); diff != "" {
-		t.Errorf("Unexpected diff (+got/-want): %s", diff)
-	}
-
-	// Step 3: update the pool selector to include more pods
+	// Step 2: update the pool selector to include more pods
 	newPool1 := &v1alpha2.InferencePool{}
 	if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
 		t.Errorf("Unexpected pool get error: %v", err)
@@ -127,7 +119,7 @@ func TestReconcile_InferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
-	// Step 4: update the pool port
+	// Step 3: update the pool port
 	if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
 		t.Errorf("Unexpected pool get error: %v", err)
 	}
@@ -142,7 +134,7 @@ func TestReconcile_InferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
-	// Step 5: delete the pool to trigger a datastore clear
+	// Step 4: delete the pool to trigger a datastore clear
 	if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
 		t.Errorf("Unexpected pool get error: %v", err)
 	}