diff --git a/cli/command/stack/cmd.go b/cli/command/stack/cmd.go index 463532e972..5fe0795836 100644 --- a/cli/command/stack/cmd.go +++ b/cli/command/stack/cmd.go @@ -27,7 +27,7 @@ func NewStackCommand(dockerCli command.Cli) *cobra.Command { newServicesCommand(dockerCli), ) flags := cmd.PersistentFlags() - flags.String("namespace", "default", "Kubernetes namespace to use") + flags.String("namespace", "", "Kubernetes namespace to use") flags.SetAnnotation("namespace", "kubernetes", nil) flags.SetAnnotation("namespace", "experimentalCLI", nil) flags.String("kubeconfig", "", "Kubernetes config file") diff --git a/cli/command/stack/kubernetes/cli.go b/cli/command/stack/kubernetes/cli.go index b9396bcf79..9749a41e91 100644 --- a/cli/command/stack/kubernetes/cli.go +++ b/cli/command/stack/kubernetes/cli.go @@ -1,12 +1,8 @@ package kubernetes import ( - "os" - "path/filepath" - "github.com/docker/cli/cli/command" "github.com/docker/cli/kubernetes" - "github.com/docker/docker/pkg/homedir" flag "github.com/spf13/pflag" kubeclient "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" @@ -44,19 +40,10 @@ func WrapCli(dockerCli command.Cli, opts Options) (*KubeCli, error) { cli := &KubeCli{ Cli: dockerCli, } - kubeConfig := opts.Config - if kubeConfig == "" { - if config := os.Getenv("KUBECONFIG"); config != "" { - kubeConfig = config - } else { - kubeConfig = filepath.Join(homedir.Get(), ".kube/config") - } - } - - clientConfig := kubernetes.NewKubernetesConfig(kubeConfig) + clientConfig := kubernetes.NewKubernetesConfig(opts.Config) cli.kubeNamespace = opts.Namespace - if opts.Namespace == "default" { + if opts.Namespace == "" { configNamespace, _, err := clientConfig.Namespace() if err != nil { return nil, err