Add event filter to the reconciler builder

pkg/epp/controller/inferencemodel_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"
@@ -41,10 +42,6 @@ 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)
@@ -83,7 +80,11 @@ func (c *InferenceModelReconciler) updateDatastore(logger logr.Logger, infModel
 }
 
 func (c *InferenceModelReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	// Filter inference model within same namespace as the pool
+	p := predicate.NewPredicateFuncs(func(object client.Object) bool {
+		return object.GetNamespace() == c.PoolNamespacedName.Namespace
+	})
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&v1alpha2.InferenceModel{}).
+		For(&v1alpha2.InferenceModel{}).WithEventFilter(p).
 		Complete(c)
 }

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,10 +45,6 @@ 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)
 	loggerDefault := logger.V(logutil.DEFAULT)
 	loggerDefault.Info("Reconciling InferencePool", "name", req.NamespacedName)
@@ -90,7 +87,11 @@ func (c *InferencePoolReconciler) updateDatastore(ctx context.Context, newPool *
 }
 
 func (c *InferencePoolReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	// Filter specific inference pool
+	p := predicate.NewPredicateFuncs(func(object client.Object) bool {
+		return object.GetNamespace() == c.PoolNamespacedName.Namespace && object.GetName() == c.PoolNamespacedName.Name
+	})
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&v1alpha2.InferencePool{}).
+		For(&v1alpha2.InferencePool{}).WithEventFilter(p).
 		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)
 	}

pkg/epp/controller/pod_reconciler.go

@@ -28,11 +28,15 @@ 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/pkg/epp/datastore"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
 
 type PodReconciler struct {
+	// namespace of the InferencePool
+	// we donot support cross namespace pod selection
+	Namespace string
 	client.Client
 	Datastore datastore.Datastore
 	Scheme    *runtime.Scheme
@@ -41,13 +45,11 @@ type PodReconciler struct {
 
 func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
-	inferencePool, err := c.Datastore.PoolGet()
+	_, err := c.Datastore.PoolGet()
 	if err != nil {
 		logger.V(logutil.TRACE).Info("Skipping reconciling Pod because the InferencePool is not available yet", "error", err)
 		// When the inferencePool is initialized it lists the appropriate pods and populates the datastore, so no need to requeue.
 		return ctrl.Result{}, nil
-	} else if inferencePool.Namespace != req.Namespace {
-		return ctrl.Result{}, nil
 	}
 
 	logger.V(logutil.VERBOSE).Info("Pod being reconciled", "name", req.NamespacedName)
@@ -67,8 +69,12 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 }
 
 func (c *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	// Filter specific inference pool
+	p := predicate.NewPredicateFuncs(func(object client.Object) bool {
+		return object.GetNamespace() == c.Namespace
+	})
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&corev1.Pod{}).
+		For(&corev1.Pod{}).WithEventFilter(p).
 		Complete(c)
 }
 

pkg/epp/server/runserver.go

@@ -114,6 +114,7 @@ func (r *ExtProcServerRunner) SetupWithManager(mgr ctrl.Manager) error {
 	}
 
 	if err := (&controller.PodReconciler{
+		Namespace: r.PoolNamespace,
 		Datastore: r.Datastore,
 		Scheme:    mgr.GetScheme(),
 		Client:    mgr.GetClient(),

pkg/epp/test/utils.go

@@ -116,8 +116,11 @@ func FakePodMetrics(index int, metrics datastore.Metrics) *datastore.PodMetrics
 	address := fmt.Sprintf("address-%v", index)
 	pod := datastore.PodMetrics{
 		Pod: datastore.Pod{
-			NamespacedName: types.NamespacedName{Name: fmt.Sprintf("pod-%v", index)},
-			Address:        address,
+			NamespacedName: types.NamespacedName{
+				Name:      fmt.Sprintf("pod-%v", index),
+				Namespace: "default",
+			},
+			Address: address,
 		},
 		Metrics: metrics,
 	}

test/testdata/client.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     app: curl
   name: curl
+  namespace: default
 spec:
   containers:
   - command:

test/testdata/envoy.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: envoy
+  namespace: default
   labels:
     app: envoy
 data:
@@ -203,6 +204,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: envoy
+  namespace: default
   labels:
     app: envoy
 spec:
@@ -283,6 +285,7 @@ metadata:
   labels:
     app: envoy
   name: envoy
+  namespace: default
 spec:
   ports:
   - name: http-8081

test/testdata/model-secret.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: hf-token
+  namespace: default
   labels:
     app: vllm
 stringData: