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

Do not return original config, i.e. mergeConfig, when it is empty and default config is invalid.

pull/6/head
Madhusudan.C.S 2016-09-13 15:33:47 -07:00
parent a96bd93c0f
commit 0433fe0d72
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/unversioned/clientcmd/merged_client_builder.go
View File

@ -112,11 +112,11 @@ func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, e
// "empty due to defaults"
// TODO: this shouldn't be a global - the client config rules should be
// handling this.
defaultConfig, err := DefaultClientConfig.ClientConfig()
if IsConfigurationInvalid(err) {
defaultConfig, defErr := DefaultClientConfig.ClientConfig()
if IsConfigurationInvalid(defErr) && !IsEmptyConfig(err) {
return mergedConfig, nil
}
if err == nil && !reflect.DeepEqual(mergedConfig, defaultConfig) {
if defErr == nil && !reflect.DeepEqual(mergedConfig, defaultConfig) {
return mergedConfig, nil
}
}