From 6d84838c0f92b3b1c7d417d782ab1b534dc01a63 Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Mon, 6 Apr 2015 22:38:40 +0300 Subject: [PATCH] Refactor kubectl/cmd/config/getConfigFromFileOrDie --- pkg/kubectl/cmd/config/config.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index 8ec9632809a..27bf1dbdb24 100644 --- a/pkg/kubectl/cmd/config/config.go +++ b/pkg/kubectl/cmd/config/config.go @@ -122,14 +122,13 @@ func (o *pathOptions) getStartingConfig() (*clientcmdapi.Config, string, error) // getConfigFromFileOrDie tries to read a kubeconfig file and if it can't, it calls exit. One exception, missing files result in empty configs, not an exit func getConfigFromFileOrDie(filename string) *clientcmdapi.Config { - var err error config, err := clientcmd.LoadFromFile(filename) if err != nil && !os.IsNotExist(err) { glog.FatalDepth(1, err) } if config == nil { - config = clientcmdapi.NewConfig() + return clientcmdapi.NewConfig() } return config