github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try in cluster config when input KubeConfig is empty

Browse Source
This commit is contained in:
Timothy St. Clair
2017-04-12 20:33:10 -05:00
parent 7a1687dc93
commit d401627a10
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/util.go
View File

@@ -1886,8 +1886,12 @@ func LoadConfig() (*restclient.Config, error) {
} }
c, err := RestclientConfig(TestContext.KubeContext) c, err := RestclientConfig(TestContext.KubeContext)
if err != nil { if err != nil {
if TestContext.KubeConfig == "" {
return restclient.InClusterConfig()
} else {
return nil, err return nil, err
} }
}
return clientcmd.NewDefaultClientConfig(*c, &clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: TestContext.Host}}).ClientConfig() return clientcmd.NewDefaultClientConfig(*c, &clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: TestContext.Host}}).ClientConfig()
} }