From 0433fe0d7293b8757377a703174662cabc420061 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Tue, 13 Sep 2016 15:33:47 -0700 Subject: [PATCH] Do not return original config, i.e. mergeConfig, when it is empty and default config is invalid. --- pkg/client/unversioned/clientcmd/merged_client_builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/client/unversioned/clientcmd/merged_client_builder.go b/pkg/client/unversioned/clientcmd/merged_client_builder.go index 899e656ea80..d9321cd5c0d 100644 --- a/pkg/client/unversioned/clientcmd/merged_client_builder.go +++ b/pkg/client/unversioned/clientcmd/merged_client_builder.go @@ -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 } }