use env when set

cmd/legacy/daemon.go

@@ -94,11 +94,18 @@ func (d *Daemon) Start() error {
 	}
 
 	fmt.Println("init client-go")
-
 	var cfg *rest.Config
-	cfg, err = kcfg.GetConfig()
-	if err != nil {
-		panic(err)
+	if kubeconfig := os.Getenv("KUBECONFIG"); kubeconfig != "" {
+		fmt.Println("KUBECONFIG set, using kubeconfig: ", kubeconfig)
+		cfg, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
+		if err != nil {
+			return fmt.Errorf("creating controller-runtime manager: %w", err)
+		}
+	} else {
+		cfg, err = kcfg.GetConfig()
+		if err != nil {
+			panic(err)
+		}
 	}
 
 	fmt.Println("api server: ", cfg.Host)
@@ -192,25 +199,8 @@ func (d *Daemon) Start() error {
 
 	mgr, err := crmgr.New(cfg, mgrOption)
 	if err != nil {
-		env := "KUBECONFIG"
-		fmt.Println("failed to load kubeconfig via controller runtime: ", err)
-		fmt.Println("checking with env: ", env)
-		kubeconfig := os.Getenv("KUBECONFIG")
-		if kubeconfig == "" {
-			hardcode := "./kubeconfig"
-			fmt.Println("kubeconfig not found in env, using hardcoded path", hardcode)
-			kubeconfig = hardcode
-		}
-		cfg, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
-		if err != nil {
-			mainLogger.Error("Unable build kubeconfig", zap.Error(err))
-			return fmt.Errorf("creating controller-runtime manager: %w", err)
-		}
-		mgr, err = crmgr.New(cfg, mgrOption)
-		if err != nil {
-			mainLogger.Error("Unable to start manager", zap.Error(err))
-			return fmt.Errorf("creating controller-runtime manager: %w", err)
-		}
+		mainLogger.Error("Unable to start manager", zap.Error(err))
+		return fmt.Errorf("creating controller-runtime manager: %w", err)
 	}
 
 	//+kubebuilder:scaffold:builder
@@ -222,6 +212,7 @@ func (d *Daemon) Start() error {
 		mainLogger.Fatal("Unable to set up ready check", zap.Error(addReadyCheckErr))
 	}
 
+	// k8s Client used for informers
 	cl := kubernetes.NewForConfigOrDie(mgr.GetConfig())
 
 	serverVersion, err := cl.Discovery().ServerVersion()

cmd/root.go

@@ -42,7 +42,9 @@ func init() {
 	rootCmd.Flags().StringVar(&probeAddr, "health-probe-bind-address", ":18081", "The address the probe endpoint binds to.")
 	rootCmd.Flags().BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
 	rootCmd.Flags().StringVar(&cfgFile, "config", configFileName, "config file")
-	rootCmd.Flags().StringVar(&kubeConfigFileName, "kubeconfig", kubeConfigFileName, "noop we just need cobra to not check since controller runtime can use this flag") // this is read during GetConfigOrDie, not explicitly passed to any of our logic
+
+	// this is read during GetConfigOrDie, not explicitly passed to any of our logic
+	rootCmd.Flags().StringVar(&kubeConfigFileName, "kubeconfig", kubeConfigFileName, "noop we just need cobra to not check since controller runtime can use this flag")
 }
 
 func Execute() {