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

Merge pull request #17212 from mnagy/use_logf

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-21 09:41:34 -08:00
commit 748e0bc830
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/util.go
View File

@ -879,13 +879,13 @@ func serviceResponding(c *client.Client, ns, name string) error {
func loadConfig() (*client.Config, error) { func loadConfig() (*client.Config, error) {
switch { switch {
case testContext.KubeConfig != "": case testContext.KubeConfig != "":
fmt.Printf(">>> testContext.KubeConfig: %s\n", testContext.KubeConfig) Logf(">>> testContext.KubeConfig: %s\n", testContext.KubeConfig)
c, err := clientcmd.LoadFromFile(testContext.KubeConfig) c, err := clientcmd.LoadFromFile(testContext.KubeConfig)
if err != nil { if err != nil {
return nil, fmt.Errorf("error loading KubeConfig: %v", err.Error()) return nil, fmt.Errorf("error loading KubeConfig: %v", err.Error())
} }
if testContext.KubeContext != "" { if testContext.KubeContext != "" {
fmt.Printf(">>> testContext.KubeContext: %s\n", testContext.KubeContext) Logf(">>> testContext.KubeContext: %s\n", testContext.KubeContext)
c.CurrentContext = testContext.KubeContext c.CurrentContext = testContext.KubeContext
} }
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()