github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix panic bringing up e2e cluster when kubeconfig is empty

pull/6/head
Paul Morie 2015-11-02 20:00:22 -05:00
parent b38e114889
commit 75b1e6ec44
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,7 @@ func ModifyConfig(configAccess ConfigAccess, newConfig clientcmdapi.Config, rela
configToWrite := getConfigFromFileOrDie(destinationFile) configToWrite := getConfigFromFileOrDie(destinationFile)
t := *cluster t := *cluster
configToWrite.Clusters[key] = &t configToWrite.Clusters[key] = &t
configToWrite.Clusters[key].LocationOfOrigin = destinationFile configToWrite.Clusters[key].LocationOfOrigin = destinationFile
if relativizePaths { if relativizePaths {
@ -429,6 +430,10 @@ func getConfigFromFileOrDie(filename string) *clientcmdapi.Config {
return clientcmdapi.NewConfig() return clientcmdapi.NewConfig()
} }
if config.Clusters == nil {
config.Clusters = map[string]*clientcmdapi.Cluster{}
}
return config return config
} }