Skip to content

Commit 8ce24c2

Browse files
committed
update object filter
1 parent 5a5ed7b commit 8ce24c2

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

Diff for: cmd/epp/main.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"google.golang.org/grpc"
3232
healthPb "google.golang.org/grpc/health/grpc_health_v1"
3333
corev1 "k8s.io/api/core/v1"
34+
"k8s.io/apimachinery/pkg/fields"
3435
"k8s.io/apimachinery/pkg/runtime"
3536
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3637
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -154,7 +155,11 @@ func run() error {
154155
},
155156
&v1alpha2.InferencePool{}: {
156157
Namespaces: map[string]cache.Config{
157-
*poolNamespace: {},
158+
*poolNamespace: {
159+
FieldSelector: fields.SelectorFromSet(fields.Set{
160+
"metadata.name": *poolName,
161+
}),
162+
},
158163
},
159164
},
160165
&v1alpha2.InferenceModel{}: {

Diff for: pkg/epp/controller/inferencemodel_reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,5 @@ func (c *InferenceModelReconciler) SetupWithManager(ctx context.Context, mgr ctr
128128
}
129129

130130
func (c *InferenceModelReconciler) eventPredicate(infModel *v1alpha2.InferenceModel) bool {
131-
return (infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name) && (infModel.GetNamespace() == c.PoolNamespacedName.Namespace)
131+
return infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name
132132
}

Diff for: pkg/epp/controller/inferencepool_reconciler.go

-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
30-
"sigs.k8s.io/controller-runtime/pkg/predicate"
3130
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha2"
3231
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3332
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
@@ -90,8 +89,5 @@ func (c *InferencePoolReconciler) updateDatastore(ctx context.Context, newPool *
9089
func (c *InferencePoolReconciler) SetupWithManager(mgr ctrl.Manager) error {
9190
return ctrl.NewControllerManagedBy(mgr).
9291
For(&v1alpha2.InferencePool{}).
93-
WithEventFilter(predicate.NewPredicateFuncs(func(object client.Object) bool {
94-
return (object.GetNamespace() == c.PoolNamespacedName.Namespace) && (object.GetName() == c.PoolNamespacedName.Name)
95-
})).
9692
Complete(c)
9793
}

Diff for: pkg/epp/controller/pod_reconciler.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/log"
30-
"sigs.k8s.io/controller-runtime/pkg/predicate"
3130
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3231
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3332
)
@@ -66,12 +65,8 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
6665
}
6766

6867
func (c *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
69-
// Filter specific inference pool
70-
p := predicate.NewPredicateFuncs(func(object client.Object) bool {
71-
return object.GetNamespace() == c.Namespace
72-
})
7368
return ctrl.NewControllerManagedBy(mgr).
74-
For(&corev1.Pod{}).WithEventFilter(p).
69+
For(&corev1.Pod{}).
7570
Complete(c)
7671
}
7772

0 commit comments

Comments
 (0)