refactor: Standardize namespace resolution for kubectl-plugin.

Author: kash2104

kubectl-plugin/pkg/cmd/create/create_cluster.go

@@ -150,7 +150,7 @@ func NewCreateClusterCommand(cmdFactory cmdutil.Factory, streams genericclioptio
 }
 
 func (options *CreateClusterOptions) 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)
 	}
@@ -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.resolveNamespace();
 		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,

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{}
 	}

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{}

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]

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 {

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

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 {

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)

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

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