name change disableK8sCrdReconcile to startCrdReconcilers

Author: zetxqx

cmd/epp/runner/runner.go

@@ -204,10 +204,13 @@ func (r *Runner) Run(ctx context.Context) error {
 		setupLog.Error(err, "Failed to extract GKNN")
 		return err
 	}
-	disableK8sCrdReconcile := *endpointSelector != ""
-	controllerCfg := runserver.NewControllerConfig(disableK8sCrdReconcile)
-	ds, err := setupDatastore(setupLog, ctx, epf, int32(opts.ModelServerMetricsPort), disableK8sCrdReconcile,
+
+	startCrdReconcilers := *endpointSelector == "" // If endpointSelector is empty, it means it's not in the standalone mode. Then we should start the inferencePool and other CRD Reconciler.
+	controllerCfg := runserver.NewControllerConfig(startCrdReconcilers)
+	ds, err := setupDatastore(setupLog, ctx, epf, int32(opts.ModelServerMetricsPort), startCrdReconcilers,
 		opts.PoolName, opts.PoolNamespace, opts.EndpointSelector, opts.EndpointTargetPorts)
+
+	ds, err := setupDatastore(setupLog, ctx, epf, int32(*modelServerMetricsPort), startCrdReconcilers, *poolName, *poolNamespace, *endpointSelector, *endpointTargetPorts)
 	if err != nil {
 		setupLog.Error(err, "Failed to setup datastore")
 		return err
@@ -368,8 +371,8 @@ func (r *Runner) Run(ctx context.Context) error {
 }
 
 func setupDatastore(setupLog logr.Logger, ctx context.Context, epFactory datalayer.EndpointFactory, modelServerMetricsPort int32,
-	disableK8sCrdReconcile bool, namespace, name, endpointSelector string, endpointTargetPorts []int) (datastore.Datastore, error) {
-	if !disableK8sCrdReconcile {
+	startCrdReconcilers bool, namespace, name, endpointSelector string, endpointTargetPorts []int) (datastore.Datastore, error) {
+	if startCrdReconcilers {
 		return datastore.NewDatastore(ctx, epFactory, modelServerMetricsPort), nil
 	} else {
 		endpointPool := datalayer.NewEndpointPool(namespace, name)

pkg/epp/server/controller_config.go

@@ -25,19 +25,19 @@ import (
 )
 
 type ControllerConfig struct {
-	disableK8sCrdReconcile    bool
+	startCrdReconcilers       bool
 	hasInferenceObjective     bool
 	hasInferenceModelRewrites bool
 }
 
-func NewControllerConfig(disableK8sCrdReconcile bool) ControllerConfig {
+func NewControllerConfig(startCrdReconcilers bool) ControllerConfig {
 	return ControllerConfig{
-		disableK8sCrdReconcile: disableK8sCrdReconcile,
+		startCrdReconcilers: startCrdReconcilers,
 	}
 }
 
 func (cc *ControllerConfig) PopulateControllerConfig(cfg *rest.Config) error {
-	if cc.disableK8sCrdReconcile {
+	if !cc.startCrdReconcilers {
 		return nil
 	}
 	dc, err := discovery.NewDiscoveryClientForConfig(cfg)

pkg/epp/server/controller_config_test.go

@@ -27,13 +27,13 @@ import (
 
 func TestNewControllerConfig(t *testing.T) {
 	c := NewControllerConfig(true)
-	if !c.disableK8sCrdReconcile {
-		t.Error("expected disableK8sCrdReconcile to be true")
+	if !c.startCrdReconcilers {
+		t.Error("expected startCrdReconcilers to be true")
 	}
 
 	c = NewControllerConfig(false)
-	if c.disableK8sCrdReconcile {
-		t.Error("expected disableK8sCrdReconcile to be false")
+	if c.startCrdReconcilers {
+		t.Error("expected startCrdReconcilers to be false")
 	}
 }
 
@@ -96,7 +96,7 @@ func TestPopulateWithDiscovery(t *testing.T) {
 }
 
 func TestPopulateControllerConfig_Disable(t *testing.T) {
-	c := NewControllerConfig(true)
+	c := NewControllerConfig(false)
 	err := c.PopulateControllerConfig(nil)
 	if err != nil {
 		t.Errorf("expected nil error, got %v", err)

pkg/epp/server/controller_manager.go

@@ -59,7 +59,7 @@ func defaultManagerOptions(cfg ControllerConfig, gknn common.GKNN, metricsServer
 		},
 		Metrics: metricsServerOptions,
 	}
-	if !cfg.disableK8sCrdReconcile {
+	if cfg.startCrdReconcilers {
 		if cfg.hasInferenceObjective {
 			opt.Cache.ByObject[&v1alpha2.InferenceObjective{}] = cache.ByObject{Namespaces: map[string]cache.Config{
 				gknn.Namespace: {},

pkg/epp/server/runserver.go

@@ -84,7 +84,7 @@ func NewDefaultExtProcServerRunner() *ExtProcServerRunner {
 	return &ExtProcServerRunner{
 		GrpcPort:                         opts.GRPCPort,
 		GKNN:                             gknn,
-		ControllerCfg:                    ControllerConfig{false, true, true},
+		ControllerCfg:                    ControllerConfig{true, true, true},
 		SecureServing:                    opts.SecureServing,
 		HealthChecking:                   opts.HealthChecking,
 		RefreshPrometheusMetricsInterval: opts.RefreshPrometheusMetricsInterval,
@@ -96,7 +96,7 @@ func NewDefaultExtProcServerRunner() *ExtProcServerRunner {
 // SetupWithManager sets up the runner with the given manager.
 func (r *ExtProcServerRunner) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
 	// Create the controllers and register them with the manager
-	if !r.ControllerCfg.disableK8sCrdReconcile {
+	if r.ControllerCfg.startCrdReconcilers {
 		if err := (&controller.InferencePoolReconciler{
 			Datastore: r.Datastore,
 			Reader:    mgr.GetClient(),