added inferencemodel predicate + minor changes in logging

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

Author: nirrozenbaum

cmd/epp/main.go

@@ -163,7 +163,7 @@ func run() error {
 		Provider:                                 provider,
 	}
 	if err := serverRunner.SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "Failed to setup ext-proc server")
+		setupLog.Error(err, "Failed to setup ext-proc controllers")
 		return err
 	}
 
@@ -174,7 +174,7 @@ func run() error {
 
 	// Register ext-proc server.
 	if err := mgr.Add(serverRunner.AsRunnable(ctrl.Log.WithName("ext-proc"))); err != nil {
-		setupLog.Error(err, "Failed to register ext-proc server")
+		setupLog.Error(err, "Failed to register ext-proc gRPC server")
 		return err
 	}
 

pkg/epp/controller/inferencemodel_reconciler.go

@@ -26,7 +26,9 @@ import (
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha1"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
@@ -41,25 +43,20 @@ type InferenceModelReconciler struct {
 }
 
 func (c *InferenceModelReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	if req.Namespace != c.PoolNamespacedName.Namespace {
-		return ctrl.Result{}, nil
-	}
-
-	logger := log.FromContext(ctx)
-	loggerDefault := logger.V(logutil.DEFAULT)
-	loggerDefault.Info("Reconciling InferenceModel", "name", req.NamespacedName)
+	logger := log.FromContext(ctx).WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name).V(logutil.DEFAULT)
+	logger.Info("Reconciling InferenceModel")
 
 	infModel := &v1alpha1.InferenceModel{}
 	if err := c.Get(ctx, req.NamespacedName, infModel); err != nil {
 		if errors.IsNotFound(err) {
-			loggerDefault.Info("InferenceModel not found. Removing from datastore since object must be deleted", "name", req.NamespacedName)
+			logger.Info("InferenceModel not found. Removing from datastore since object must be deleted")
 			c.Datastore.ModelDelete(infModel.Spec.ModelName)
 			return ctrl.Result{}, nil
 		}
-		loggerDefault.Error(err, "Unable to get InferenceModel", "name", req.NamespacedName)
+		logger.Error(err, "Unable to get InferenceModel")
 		return ctrl.Result{}, err
 	} else if !infModel.DeletionTimestamp.IsZero() {
-		loggerDefault.Info("InferenceModel is marked for deletion. Removing from datastore", "name", req.NamespacedName)
+		logger.Info("InferenceModel is marked for deletion. Removing from datastore")
 		c.Datastore.ModelDelete(infModel.Spec.ModelName)
 		return ctrl.Result{}, nil
 	}
@@ -69,21 +66,30 @@ func (c *InferenceModelReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 }
 
 func (c *InferenceModelReconciler) updateDatastore(logger logr.Logger, infModel *v1alpha1.InferenceModel) {
-	loggerDefault := logger.V(logutil.DEFAULT)
-
 	if infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name {
-		loggerDefault.Info("Updating datastore", "poolRef", infModel.Spec.PoolRef, "serverPoolName", c.PoolNamespacedName)
-		loggerDefault.Info("Adding/Updating InferenceModel", "modelName", infModel.Spec.ModelName)
+		logger.Info("Adding/Updating InferenceModel", "modelName", infModel.Spec.ModelName)
 		c.Datastore.ModelSet(infModel)
 		return
 	}
-	loggerDefault.Info("Removing/Not adding InferenceModel", "modelName", infModel.Spec.ModelName)
 	// If we get here. The model is not relevant to this pool, remove.
+	logger.Info("Removing/Not adding InferenceModel", "modelName", infModel.Spec.ModelName, "poolRef", infModel.Spec.PoolRef)
 	c.Datastore.ModelDelete(infModel.Spec.ModelName)
 }
 
 func (c *InferenceModelReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v1alpha1.InferenceModel{}).
+		WithEventFilter(predicate.Funcs{
+			CreateFunc: func(e event.CreateEvent) bool { return c.eventPredicate(e.Object.(*v1alpha1.InferenceModel)) },
+			UpdateFunc: func(e event.UpdateEvent) bool {
+				return c.eventPredicate(e.ObjectOld.(*v1alpha1.InferenceModel)) || c.eventPredicate(e.ObjectNew.(*v1alpha1.InferenceModel))
+			},
+			DeleteFunc:  func(e event.DeleteEvent) bool { return c.eventPredicate(e.Object.(*v1alpha1.InferenceModel)) },
+			GenericFunc: func(e event.GenericEvent) bool { return c.eventPredicate(e.Object.(*v1alpha1.InferenceModel)) },
+		}).
 		Complete(c)
 }
+
+func (c *InferenceModelReconciler) eventPredicate(infModel *v1alpha1.InferenceModel) bool {
+	return (infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name) && (infModel.GetNamespace() == c.PoolNamespacedName.Namespace)
+}