Skip to content

Commit 2ad70e3

Browse files
authored
updated inferencemodel predicate (#397)
Signed-off-by: Nir Rozenbaum <[email protected]>
1 parent 2a88b3b commit 2ad70e3

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

cmd/epp/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func run() error {
166166
Provider: provider,
167167
}
168168
if err := serverRunner.SetupWithManager(mgr); err != nil {
169-
setupLog.Error(err, "Failed to setup ext-proc server")
169+
setupLog.Error(err, "Failed to setup ext-proc controllers")
170170
return err
171171
}
172172

@@ -177,7 +177,7 @@ func run() error {
177177

178178
// Register ext-proc server.
179179
if err := mgr.Add(serverRunner.AsRunnable(ctrl.Log.WithName("ext-proc"))); err != nil {
180-
setupLog.Error(err, "Failed to register ext-proc server")
180+
setupLog.Error(err, "Failed to register ext-proc gRPC server")
181181
return err
182182
}
183183

pkg/epp/controller/inferencemodel_reconciler.go

+14-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import (
2626
"k8s.io/client-go/tools/record"
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
29+
"sigs.k8s.io/controller-runtime/pkg/event"
2930
"sigs.k8s.io/controller-runtime/pkg/log"
31+
"sigs.k8s.io/controller-runtime/pkg/predicate"
3032
"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha2"
3133
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
3234
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
@@ -41,10 +43,6 @@ type InferenceModelReconciler struct {
4143
}
4244

4345
func (c *InferenceModelReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
44-
if req.Namespace != c.PoolNamespacedName.Namespace {
45-
return ctrl.Result{}, nil
46-
}
47-
4846
logger := log.FromContext(ctx)
4947
loggerDefault := logger.V(logutil.DEFAULT)
5048
loggerDefault.Info("Reconciling InferenceModel", "name", req.NamespacedName)
@@ -85,5 +83,17 @@ func (c *InferenceModelReconciler) updateDatastore(logger logr.Logger, infModel
8583
func (c *InferenceModelReconciler) SetupWithManager(mgr ctrl.Manager) error {
8684
return ctrl.NewControllerManagedBy(mgr).
8785
For(&v1alpha2.InferenceModel{}).
86+
WithEventFilter(predicate.Funcs{
87+
CreateFunc: func(e event.CreateEvent) bool { return c.eventPredicate(e.Object.(*v1alpha2.InferenceModel)) },
88+
UpdateFunc: func(e event.UpdateEvent) bool {
89+
return c.eventPredicate(e.ObjectOld.(*v1alpha2.InferenceModel)) || c.eventPredicate(e.ObjectNew.(*v1alpha2.InferenceModel))
90+
},
91+
DeleteFunc: func(e event.DeleteEvent) bool { return c.eventPredicate(e.Object.(*v1alpha2.InferenceModel)) },
92+
GenericFunc: func(e event.GenericEvent) bool { return c.eventPredicate(e.Object.(*v1alpha2.InferenceModel)) },
93+
}).
8894
Complete(c)
8995
}
96+
97+
func (c *InferenceModelReconciler) eventPredicate(infModel *v1alpha2.InferenceModel) bool {
98+
return (infModel.Spec.PoolRef.Name == c.PoolNamespacedName.Name) && (infModel.GetNamespace() == c.PoolNamespacedName.Namespace)
99+
}

0 commit comments

Comments
 (0)