github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-04 00:24:59 +00:00
Code Issues Projects Releases Wiki Activity

clientcmd: fix NPE in NewNonInteractiveDeferredLoadingClientConfig with nil overrides

Browse Source 
Kubernetes-commit: 945991b40275b096707c7b9eb0f192e99bd15b6d
This commit is contained in:
Dr. Stefan Schimanski
2020-06-26 15:59:17 +02:00
committed by Kubernetes Publisher
parent db5293afc7
commit 8f2b164e09
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/clientcmd/merged_client_builder.go
View File

@@ -71,10 +71,14 @@ func (config *DeferredLoadingClientConfig) createClientConfig() (ClientConfig, e
return nil, err
}
var currentContext string
if config.overrides != nil {
currentContext = config.overrides.CurrentContext
}
if config.fallbackReader != nil {
config.clientConfig = NewInteractiveClientConfig(*mergedConfig, config.overrides.CurrentContext, config.overrides, config.fallbackReader, config.loader)
config.clientConfig = NewInteractiveClientConfig(*mergedConfig, currentContext, config.overrides, config.fallbackReader, config.loader)
} else {
config.clientConfig = NewNonInteractiveClientConfig(*mergedConfig, config.overrides.CurrentContext, config.overrides, config.loader)
config.clientConfig = NewNonInteractiveClientConfig(*mergedConfig, currentContext, config.overrides, config.loader)
}
return config.clientConfig, nil
}