@@ -18,17 +18,22 @@ package main
1818
1919import (
2020 "flag"
21+ "fmt"
2122 "log/slog"
2223 "os"
24+ "path/filepath"
25+ stdruntime "runtime"
2326 "strconv"
2427
28+ "github.com/go-logr/logr"
29+
2530 ctrl "sigs.k8s.io/controller-runtime"
26- metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2731
2832 application "github.com/kubeflow/notebooks/workspaces/backend/api"
2933 "github.com/kubeflow/notebooks/workspaces/backend/internal/auth"
3034 "github.com/kubeflow/notebooks/workspaces/backend/internal/config"
3135 "github.com/kubeflow/notebooks/workspaces/backend/internal/helper"
36+ "github.com/kubeflow/notebooks/workspaces/backend/internal/k8sclientfactory"
3237 "github.com/kubeflow/notebooks/workspaces/backend/internal/server"
3338)
3439
@@ -47,7 +52,7 @@ import (
4752// @consumes application/json
4853// @produces application/json
4954
50- func main () {
55+ func run () error {
5156 // Define command line flags
5257 cfg := & config.EnvConfig {}
5358 flag .IntVar (& cfg .Port ,
@@ -93,44 +98,61 @@ func main() {
9398 "Key of request header containing user groups" ,
9499 )
95100
96- // Initialize the logger
97- logger := slog .New (slog .NewTextHandler (os .Stdout , nil ))
101+ var enableEnvTest bool
102+ flag .BoolVar (& enableEnvTest ,
103+ "enable-envtest" ,
104+ getEnvAsBool ("ENABLE_ENVTEST" , false ),
105+ "Enable envtest for local development without a real k8s cluster" ,
106+ )
107+ flag .Parse ()
98108
99- // Build the Kubernetes client configuration
100- kubeconfig , err := ctrl .GetConfig ()
101- if err != nil {
102- logger .Error ("failed to get Kubernetes config" , "error" , err )
103- os .Exit (1 )
104- }
105- kubeconfig .QPS = float32 (cfg .ClientQPS )
106- kubeconfig .Burst = cfg .ClientBurst
109+ // Initialize the logger
110+ slogTextHandler := slog .NewTextHandler (os .Stdout , nil )
111+ logger := slog .New (slogTextHandler )
107112
108113 // Build the Kubernetes scheme
109114 scheme , err := helper .BuildScheme ()
110115 if err != nil {
111116 logger .Error ("failed to build Kubernetes scheme" , "error" , err )
112- os . Exit ( 1 )
117+ return err
113118 }
114119
115- // Create the controller manager
116- mgr , err := ctrl .NewManager (kubeconfig , ctrl.Options {
117- Scheme : scheme ,
118- Metrics : metricsserver.Options {
119- BindAddress : "0" , // disable metrics serving
120- },
121- HealthProbeBindAddress : "0" , // disable health probe serving
122- LeaderElection : false ,
123- })
120+ // Defining CRD's path
121+ crdPath := os .Getenv ("CRD_PATH" )
122+ if crdPath == "" {
123+ _ , currentFile , _ , ok := stdruntime .Caller (0 )
124+ if ! ok {
125+ logger .Info ("Failed to get current file path using stdruntime.Caller" )
126+ }
127+ testFileDir := filepath .Dir (currentFile )
128+ crdPath = filepath .Join (testFileDir , ".." , ".." , "controller" , "config" , "crd" , "bases" )
129+ logger .Info ("CRD_PATH not set, using guessed default" , "path" , crdPath )
130+ }
131+
132+ // ctx creates a context that listens for OS signals (e.g., SIGINT, SIGTERM) for graceful shutdown.
133+ ctx := ctrl .SetupSignalHandler ()
134+
135+ logrlogger := logr .FromSlogHandler (slogTextHandler )
136+
137+ // factory creates a new Kubernetes client factory, configured for envtest if enabled.
138+ factory := k8sclientfactory .NewClientFactory (logrlogger , scheme , enableEnvTest , []string {crdPath }, cfg )
139+
140+ // Create the controller manager, build Kubernetes client configuration
141+ // envtestCleanupFunc is a function to clean envtest if it was created, otherwise it's an empty function.
142+ mgr , kubeconfig , envtestCleanupFunc , err := factory .GetManagerAndConfig (ctx )
143+ defer envtestCleanupFunc ()
124144 if err != nil {
125- logger .Error ("unable to create manager" , "error" , err )
126- os . Exit ( 1 )
145+ logger .Error ("Failed to get Kubernetes manager/config from factory " , "error" , err )
146+ return err
127147 }
148+ kubeconfig .QPS = float32 (cfg .ClientQPS )
149+ kubeconfig .Burst = cfg .ClientBurst
128150
129151 // Create the request authenticator
130152 reqAuthN , err := auth .NewRequestAuthenticator (cfg .UserIdHeader , cfg .UserIdPrefix , cfg .GroupsHeader )
131153 if err != nil {
132154 logger .Error ("failed to create request authenticator" , "error" , err )
133- os . Exit ( 1 )
155+ return err
134156 }
135157
136158 // Create the request authorizer
@@ -143,22 +165,30 @@ func main() {
143165 app , err := application .NewApp (cfg , logger , mgr .GetClient (), mgr .GetScheme (), reqAuthN , reqAuthZ )
144166 if err != nil {
145167 logger .Error ("failed to create app" , "error" , err )
146- os . Exit ( 1 )
168+ return err
147169 }
148170 svr , err := server .NewServer (app , logger )
149171 if err != nil {
150172 logger .Error ("failed to create server" , "error" , err )
151- os . Exit ( 1 )
173+ return err
152174 }
153175 if err := svr .SetupWithManager (mgr ); err != nil {
154176 logger .Error ("failed to setup server with manager" , "error" , err )
155- os .Exit (1 )
177+ return err
178+ }
179+
180+ logger .Info ("Starting manager..." )
181+ if err := mgr .Start (ctx ); err != nil {
182+ logger .Error ("Problem running manager" , "error" , err )
183+ return err
156184 }
157185
158- // Start the controller manager
159- logger .Info ("starting manager" )
160- if err := mgr .Start (ctrl .SetupSignalHandler ()); err != nil {
161- logger .Error ("problem running manager" , "error" , err )
186+ return nil
187+ }
188+
189+ func main () {
190+ if err := run (); err != nil {
191+ fmt .Fprintf (os .Stderr , "Application run failed: %v\n " , err )
162192 os .Exit (1 )
163193 }
164194}
0 commit comments