Skip to content

K
k3s
Commit 75b1e6ec authored by Paul Morie's avatar Paul Morie
Browse files
Options

Fix panic bringing up e2e cluster when kubeconfig is empty

parent b38e1148
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
pkg/kubectl/cmd/config/config.go
View file @ 75b1e6ec
...@@ -225,6 +225,7 @@ func ModifyConfig(configAccess ConfigAccess, newConfig clientcmdapi.Config, rela ...@@ -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 { ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment