github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6479 from TamerTas/refactor

Browse Source 
Refactor kubectl/cmd/config/getConfigFromFileOrDie
This commit is contained in:
Rohit Jnagal 2015-04-06 13:43:44 -07:00
commit dbbfac3b54
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/config/config.go
View File

@ -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 // 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 { func getConfigFromFileOrDie(filename string) *clientcmdapi.Config {
var err error
config, err := clientcmd.LoadFromFile(filename) config, err := clientcmd.LoadFromFile(filename)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
glog.FatalDepth(1, err) glog.FatalDepth(1, err)
} }
if config == nil { if config == nil {
config = clientcmdapi.NewConfig() return clientcmdapi.NewConfig()
} }
return config return config