refactor: Standardize namespace resolution for kubectl-plugin.

kash2104 · kash2104 · commit f84306ca08a0 · 2026-01-12T20:28:29.000+05:30
diff --git a/kubectl-plugin/pkg/cmd/create/create_cluster.go b/kubectl-plugin/pkg/cmd/create/create_cluster.go
@@ -241,7 +241,10 @@ func (options *CreateClusterOptions) resolveClusterName() (string, error) {
 
 // resolveNamespace resolves the namespace from the CLI flag and the config file
 func (options *CreateClusterOptions) resolveNamespace() (string, error) {
-	namespace := "default"
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace()
+	if err != nil{
+		return "", fmt.Errorf("failed to get current namespace: %w", err)
+	}
 
 	if options.rayClusterConfig.Namespace != nil && *options.rayClusterConfig.Namespace != "" && options.namespace != "" && options.namespace != *options.rayClusterConfig.Namespace {
 		return "", fmt.Errorf("the namespace in the config file %q does not match the namespace %q. You must pass --namespace=%s to perform this operation", *options.rayClusterConfig.Namespace, options.namespace, *options.rayClusterConfig.Namespace)
@@ -268,16 +271,12 @@ func (options *CreateClusterOptions) Run(ctx context.Context, k8sClient client.C
 		}
 		options.rayClusterConfig.Name = &name
 
-		namespace, err := options.resolveNamespace()
+		namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace()
 		if err != nil {
 			return err
 		}
 		options.rayClusterConfig.Namespace = &namespace
 	} else {
-		if options.namespace == "" {
-			options.namespace = "default"
-		}
-
 		options.rayClusterConfig = &generation.RayClusterConfig{
 			Namespace:   &options.namespace,
 			Name:        &options.clusterName,
diff --git a/kubectl-plugin/pkg/cmd/create/create_workergroup.go b/kubectl-plugin/pkg/cmd/create/create_workergroup.go
@@ -108,16 +108,12 @@ func NewCreateWorkerGroupCommand(cmdFactory cmdutil.Factory, streams genericclio
 }
 
 func (options *CreateWorkerGroupOptions) Complete(cmd *cobra.Command, args []string) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
 
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
-
 	if options.rayStartParams == nil {
 		options.rayStartParams = map[string]string{}
 	}
diff --git a/kubectl-plugin/pkg/cmd/delete/delete.go b/kubectl-plugin/pkg/cmd/delete/delete.go
@@ -78,14 +78,11 @@ func NewDeleteCommand(cmdFactory cmdutil.Factory, streams genericclioptions.IOSt
 }
 
 func (options *DeleteOptions) Complete(cmd *cobra.Command, args []string) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace()
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
 
 	if options.resources == nil {
 		options.resources = map[util.ResourceType][]string{}
diff --git a/kubectl-plugin/pkg/cmd/get/get_cluster.go b/kubectl-plugin/pkg/cmd/get/get_cluster.go
@@ -62,14 +62,11 @@ func NewGetClusterCommand(cmdFactory cmdutil.Factory, streams genericclioptions.
 }
 
 func (options *GetClusterOptions) Complete(args []string, cmd *cobra.Command) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
 
 	if len(args) >= 1 {
 		options.cluster = args[0]
diff --git a/kubectl-plugin/pkg/cmd/get/get_nodes.go b/kubectl-plugin/pkg/cmd/get/get_nodes.go
@@ -109,15 +109,11 @@ func (options *GetNodesOptions) Complete(args []string, cmd *cobra.Command) erro
 	if options.allNamespaces {
 		options.namespace = ""
 	} else {
-		namespace, err := cmd.Flags().GetString("namespace")
+		namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 		if err != nil {
 			return fmt.Errorf("failed to get namespace: %w", err)
 		}
 		options.namespace = namespace
-
-		if options.namespace == "" {
-			options.namespace = "default"
-		}
 	}
 
 	if len(args) > 0 {
diff --git a/kubectl-plugin/pkg/cmd/get/get_token.go b/kubectl-plugin/pkg/cmd/get/get_token.go
@@ -55,14 +55,11 @@ func NewGetTokenCommand(cmdFactory cmdutil.Factory, streams genericclioptions.IO
 }
 
 func (options *GetTokenOptions) Complete(args []string, cmd *cobra.Command) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
 	// guarded by cobra.ExactArgs(1)
 	options.cluster = args[0]
 	return nil
diff --git a/kubectl-plugin/pkg/cmd/get/get_workergroup.go b/kubectl-plugin/pkg/cmd/get/get_workergroup.go
@@ -116,15 +116,11 @@ func (options *GetWorkerGroupsOptions) Complete(args []string, cmd *cobra.Comman
 	if options.allNamespaces {
 		options.namespace = ""
 	} else {
-		namespace, err := cmd.Flags().GetString("namespace")
+		namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 		if err != nil {
 			return fmt.Errorf("failed to get namespace: %w", err)
 		}
 		options.namespace = namespace
-
-		if options.namespace == "" {
-			options.namespace = "default"
-		}
 	}
 
 	if len(args) > 0 {
diff --git a/kubectl-plugin/pkg/cmd/job/job_submit.go b/kubectl-plugin/pkg/cmd/job/job_submit.go
@@ -187,14 +187,11 @@ func NewJobSubmitCommand(cmdFactory cmdutil.Factory, streams genericclioptions.I
 }
 
 func (options *SubmitJobOptions) Complete(cmd *cobra.Command) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
 
 	if len(options.runtimeEnv) > 0 {
 		options.runtimeEnv = filepath.Clean(options.runtimeEnv)
diff --git a/kubectl-plugin/pkg/cmd/log/log.go b/kubectl-plugin/pkg/cmd/log/log.go
@@ -153,16 +153,12 @@ func NewClusterLogCommand(cmdFactory cmdutil.Factory, streams genericclioptions.
 }
 
 func (options *ClusterLogOptions) Complete(cmd *cobra.Command, args []string) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
 
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
-
 	typeAndName := strings.Split(args[0], "/")
 	if len(typeAndName) == 1 {
 		options.ResourceType = util.RayCluster
diff --git a/kubectl-plugin/pkg/cmd/scale/scale_cluster.go b/kubectl-plugin/pkg/cmd/scale/scale_cluster.go
@@ -92,15 +92,11 @@ func NewScaleClusterCommand(cmdFactory cmdutil.Factory, streams genericclioption
 }
 
 func (options *ScaleClusterOptions) Complete(args []string, cmd *cobra.Command) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
-
 	options.cluster = args[0]
 
 	return nil
diff --git a/kubectl-plugin/pkg/cmd/session/session.go b/kubectl-plugin/pkg/cmd/session/session.go
@@ -108,14 +108,11 @@ func NewSessionCommand(cmdFactory cmdutil.Factory, streams genericiooptions.IOSt
 }
 
 func (options *SessionOptions) Complete(cmd *cobra.Command, args []string) error {
-	namespace, err := cmd.Flags().GetString("namespace")
+	namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();
 	if err != nil {
 		return fmt.Errorf("failed to get namespace: %w", err)
 	}
 	options.namespace = namespace
-	if options.namespace == "" {
-		options.namespace = "default"
-	}
 
 	context, err := cmd.Flags().GetString("context")
 	if err != nil || context == "" {

Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,12 @@ func NewCreateWorkerGroupCommand(cmdFactory cmdutil.Factory, streams genericclio`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func (options CreateWorkerGroupOptions) Complete(cmd cobra.Command, args []string) error {`
`111`		`- namespace, err := cmd.Flags().GetString("namespace")`
	`111`	`+ namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();`
`112`	`112`	`if err != nil {`
`113`	`113`	`return fmt.Errorf("failed to get namespace: %w", err)`
`114`	`114`	`}`
`115`	`115`	`options.namespace = namespace`
`116`	`116`
`117`		`- if options.namespace == "" {`
`118`		`- options.namespace = "default"`
`119`		`- }`
`120`		`-`
`121`	`117`	`if options.rayStartParams == nil {`
`122`	`118`	`options.rayStartParams = map[string]string{}`
`123`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,11 @@ func NewDeleteCommand(cmdFactory cmdutil.Factory, streams genericclioptions.IOSt`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`func (options DeleteOptions) Complete(cmd cobra.Command, args []string) error {`
`81`		`- namespace, err := cmd.Flags().GetString("namespace")`
	`81`	`+ namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace()`
`82`	`82`	`if err != nil {`
`83`	`83`	`return fmt.Errorf("failed to get namespace: %w", err)`
`84`	`84`	`}`
`85`	`85`	`options.namespace = namespace`
`86`		`- if options.namespace == "" {`
`87`		`- options.namespace = "default"`
`88`		`- }`
`89`	`86`
`90`	`87`	`if options.resources == nil {`
`91`	`88`	`options.resources = map[util.ResourceType][]string{}`
Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,11 @@ func NewGetClusterCommand(cmdFactory cmdutil.Factory, streams genericclioptions.`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func (options GetClusterOptions) Complete(args []string, cmd cobra.Command) error {`
`65`		`- namespace, err := cmd.Flags().GetString("namespace")`
	`65`	`+ namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();`
`66`	`66`	`if err != nil {`
`67`	`67`	`return fmt.Errorf("failed to get namespace: %w", err)`
`68`	`68`	`}`
`69`	`69`	`options.namespace = namespace`
`70`		`- if options.namespace == "" {`
`71`		`- options.namespace = "default"`
`72`		`- }`
`73`	`70`
`74`	`71`	`if len(args) >= 1 {`
`75`	`72`	`options.cluster = args[0]`
Original file line number	Diff line number	Diff line change
`@@ -187,14 +187,11 @@ func NewJobSubmitCommand(cmdFactory cmdutil.Factory, streams genericclioptions.I`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`func (options SubmitJobOptions) Complete(cmd cobra.Command) error {`
`190`		`- namespace, err := cmd.Flags().GetString("namespace")`
	`190`	`+ namespace,_,err := options.cmdFactory.ToRawKubeConfigLoader().Namespace();`
`191`	`191`	`if err != nil {`
`192`	`192`	`return fmt.Errorf("failed to get namespace: %w", err)`
`193`	`193`	`}`
`194`	`194`	`options.namespace = namespace`
`195`		`- if options.namespace == "" {`
`196`		`- options.namespace = "default"`
`197`		`- }`
`198`	`195`
`199`	`196`	`if len(options.runtimeEnv) > 0 {`
`200`	`197`	`options.runtimeEnv = filepath.Clean(options.runtimeEnv)`