register controller.

Author: zetxqx

pkg/epp/controller/inferencemodelrewrite_reconciler.go

@@ -54,7 +54,7 @@ func (c *InferenceModelRewriteReconciler) Reconcile(ctx context.Context, req ctr
 		notFound = true
 	}
 
-	if notFound || !infModelRewrite.DeletionTimestamp.IsZero() || infModelRewrite.Spec.PoolRef.Name != v1alpha2.ObjectName(c.PoolGKNN.Name) {
+	if notFound || !infModelRewrite.DeletionTimestamp.IsZero() || infModelRewrite.Spec.PoolRef == nil || infModelRewrite.Spec.PoolRef.Name != v1alpha2.ObjectName(c.PoolGKNN.Name) || infModelRewrite.Spec.PoolRef.Group != v1alpha2.Group(c.PoolGKNN.Group) {
 		// InferenceModelRewrite object got deleted or changed the referenced pool.
 		c.Datastore.RewriteDelete(req.NamespacedName)
 		return ctrl.Result{}, nil

pkg/epp/datastore/datastore.go

@@ -31,7 +31,6 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
 	"sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2"
 	backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
@@ -101,7 +100,7 @@ type datastore struct {
 	parentCtx context.Context
 	// mu is used to synchronize access to pool, objectives, and rewrites.
 	mu   sync.RWMutex
-	pool *v1.InferencePool
+	pool *datalayer.EndpointPool
 	// key: InferenceObjective name, value: *InferenceObjective
 	objectives map[string]*v1alpha2.InferenceObjective
 	// rewrites store for InferenceModelRewrite objects.
@@ -156,7 +155,7 @@ func (ds *datastore) PoolSet(ctx context.Context, reader client.Reader, endpoint
 	return nil
 }
 
-func (ds *datastore) PoolGet() (*v1.InferencePool, error) {
+func (ds *datastore) PoolGet() (*datalayer.EndpointPool, error) {
 	ds.mu.RLock()
 	defer ds.mu.RUnlock()
 	if !ds.PoolHasSynced() {

pkg/epp/server/controller_manager.go

@@ -55,6 +55,16 @@ func defaultManagerOptions(disableK8sCrdReconcile bool, gknn common.GKNN, metric
 						gknn.Namespace: {},
 					},
 				},
+				&v1alpha2.InferenceObjective{}: {
+					Namespaces: map[string]cache.Config{
+						gknn.Namespace: {},
+					},
+				},
+				&v1alpha2.InferenceModelRewrite{}: {
+					Namespaces: map[string]cache.Config{
+						gknn.Namespace: {},
+					},
+				},
 			},
 		},
 		Metrics: metricsServerOptions,

pkg/epp/server/runserver.go

@@ -131,6 +131,14 @@ func (r *ExtProcServerRunner) SetupWithManager(ctx context.Context, mgr ctrl.Man
 		}
 	}
 
+	if err := (&controller.InferenceModelRewriteReconciler{
+		Datastore: r.Datastore,
+		Reader:    mgr.GetClient(),
+		PoolGKNN:  r.PoolGKNN,
+	}).SetupWithManager(ctx, mgr); err != nil {
+		return fmt.Errorf("failed setting up InferenceModelRewriteReconciler: %w", err)
+	}
+
 	if err := (&controller.PodReconciler{
 		Datastore: r.Datastore,
 		Reader:    mgr.GetClient(),