From be77566e4b99d89b0448f7d4e2e58281245f36c0 Mon Sep 17 00:00:00 2001 From: Liang Mingqiang Date: Fri, 10 Aug 2018 01:03:05 -0400 Subject: [PATCH] bugfix (#307) --- cmd/root.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index a7643a8d1..3b703571a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -69,8 +69,9 @@ func init() { // read default node name from environment variable. // it can be overwritten by cli flags if specified. - if os.Getenv("DEFAULT_NODE_NAME") != "" { - nodeName = os.Getenv("DEFAULT_NODE_NAME") + defaultNodeName := os.Getenv("DEFAULT_NODE_NAME") + if defaultNodeName == "" { + defaultNodeName = "virtual-kubelet" } // Here you will define your flags and configuration settings. // Cobra supports persistent flags, which, if defined here, @@ -78,7 +79,7 @@ func init() { //RootCmd.PersistentFlags().StringVar(&kubeletConfig, "config", "", "config file (default is $HOME/.virtual-kubelet.yaml)") RootCmd.PersistentFlags().StringVar(&kubeConfig, "kubeconfig", "", "config file (default is $HOME/.kube/config)") RootCmd.PersistentFlags().StringVar(&kubeNamespace, "namespace", "", "kubernetes namespace (default is 'all')") - RootCmd.PersistentFlags().StringVar(&nodeName, "nodename", "virtual-kubelet", "kubernetes node name") + RootCmd.PersistentFlags().StringVar(&nodeName, "nodename", defaultNodeName, "kubernetes node name") RootCmd.PersistentFlags().StringVar(&operatingSystem, "os", "Linux", "Operating System (Linux/Windows)") RootCmd.PersistentFlags().StringVar(&provider, "provider", "", "cloud provider") RootCmd.PersistentFlags().StringVar(&taint, "taint", "", "apply taint to node, making scheduling explicit")