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

Merge pull request #30940 from madhusudancs/fed-issue-30790 

Automatic merge from submit-queue

Return the current kubeconfig as the starting config in ClientConfigGetter.

This fixes issue #30790.

cc @kubernetes/sig-cluster-federation
pull/6/head
Kubernetes Submit Queue 2016-08-20 19:29:31 -07:00 committed by GitHub
parent 4e39800baa 2b5d689ab2
commit db777bb9a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/unversioned/clientcmd/loader.go
View File

@ -85,7 +85,7 @@ func (g *ClientConfigGetter) GetLoadingPrecedence() []string {
return nil return nil
} }
func (g *ClientConfigGetter) GetStartingConfig() (*clientcmdapi.Config, error) { func (g *ClientConfigGetter) GetStartingConfig() (*clientcmdapi.Config, error) {
return nil, nil return g.kubeconfigGetter()
} }
func (g *ClientConfigGetter) GetDefaultFilename() string { func (g *ClientConfigGetter) GetDefaultFilename() string {
return "" return ""