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

Check if default config is invalid before comparing it

Browse Source 
Changes made in #31947 cause kube-proxy to ignore `--kubeconfig`
and `--master` flags and use in-cluster configuration, which is
unusable due to the fact that VIP hasn't been created yet.
This commit is contained in:
Ilya Dmitrichenko 2016-09-10 09:33:39 +02:00
parent 43710a8714
commit a96bd93c0f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,9 @@ func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, e
// TODO: this shouldn't be a global - the client config rules should be // TODO: this shouldn't be a global - the client config rules should be
// handling this. // handling this.
defaultConfig, err := DefaultClientConfig.ClientConfig() defaultConfig, err := DefaultClientConfig.ClientConfig()
if IsConfigurationInvalid(err) {
return mergedConfig, nil
}
if err == nil && !reflect.DeepEqual(mergedConfig, defaultConfig) { if err == nil && !reflect.DeepEqual(mergedConfig, defaultConfig) {
return mergedConfig, nil return mergedConfig, nil
} }