Move test object yamls to test/artifacts directory in ext-proc, make start manager in main blocking

Author: BenjaminBraunDev

pkg/ext-proc/main.go

@@ -131,12 +131,8 @@ func main() {
 	// Start metrics handler
 	metricsSvr := startMetricsHandler(*metricsPort, cfg)
 
-	// Start the controller manager. Blocking and will return when shutdown is complete.
-	klog.Infof("Starting controller manager")
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
-		klog.Fatalf("Error starting controller manager: %v", err)
-	}
-	klog.Info("Controller manager shutting down")
+	// Start manager, blocking
+	runner.StartManager()
 
 	// Gracefully shutdown servers
 	if healthSvr != nil {

pkg/ext-proc/server/runserver.go

@@ -30,6 +30,7 @@ type ExtProcServerRunner struct {
 	Scheme                 *runtime.Scheme
 	Config                 *rest.Config
 	Datastore              *backend.K8sDatastore
+	manager                *ctrl.Manager
 }
 
 // Setup creates the reconcilers for pools, models, and endpointSlices and starts the manager.
@@ -39,6 +40,7 @@ func (r *ExtProcServerRunner) Setup() {
 	if err != nil {
 		klog.Fatalf("Failed to create controller manager: %v", err)
 	}
+	r.manager = &mgr
 
 	// Create the controllers and register them with the manager
 	if err := (&backend.InferencePoolReconciler{
@@ -77,16 +79,6 @@ func (r *ExtProcServerRunner) Setup() {
 	}).SetupWithManager(mgr); err != nil {
 		klog.Fatalf("Failed setting up EndpointSliceReconciler: %v", err)
 	}
-
-	// Start the controller manager. Blocking and will return when shutdown is complete.
-	errChan := make(chan error)
-	klog.Infof("Starting controller manager")
-	go func() {
-		if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
-			klog.Error(err, "Error running manager")
-			errChan <- err
-		}
-	}()
 }
 
 // Start starts the Envoy external processor server in a goroutine.
@@ -123,3 +115,16 @@ func (r *ExtProcServerRunner) Start(
 	}()
 	return svr
 }
+
+func (r *ExtProcServerRunner) StartManager() {
+	if r.manager == nil {
+		klog.Fatalf("Runner has no manager setup to run: %v", r)
+	}
+	// Start the controller manager. Blocking and will return when shutdown is complete.
+	klog.Infof("Starting controller manager")
+	mgr := *r.manager
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		klog.Fatalf("Error starting controller manager: %v", err)
+	}
+	klog.Info("Controller manager shutting down")
+}

pkg/ext-proc/test/hermetic_test.go

@@ -326,8 +326,13 @@ func setUpHermeticServer(t *testing.T, cfg *rest.Config, pods []*backend.PodMetr
 	}
 	runner.Setup()
 
+	// Start the controller manager in go routine, not blocking
+	go func() {
+		runner.StartManager()
+	}()
+
 	// Unmarshal CRDs from file into structs
-	manifestsPath := filepath.Join("..", "..", "..", "examples", "poc", "manifests", "inferencepool-with-model-hermetic.yaml")
+	manifestsPath := filepath.Join(".", "artifacts", "inferencepool-with-model-hermetic.yaml")
 	docs, err := readDocuments(manifestsPath)
 	if err != nil {
 		log.Fatalf("Can't read object manifests at path %v, %v", manifestsPath, err)