Merge pull request kubernetes#87030 from jiayingz/test-host

k8s-ci-robot · web-flow · commit fdd575f8dc44 · 2020-01-16T23:20:55.000-08:00
In test framework LoadConfig(), use CurrentContext.Server for TestCon…
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -557,6 +557,14 @@ func LoadConfig() (config *restclient.Config, err error) {
 		}
 		return nil, err
 	}
+	// In case Host is not set in TestContext, sets it as
+	// CurrentContext Server for k8s API client to connect to.
+	if TestContext.Host == "" && c.Clusters != nil {
+		currentContext, ok := c.Clusters[c.CurrentContext]
+		if ok {
+			TestContext.Host = currentContext.Server
+		}
+	}
 
 	return clientcmd.NewDefaultClientConfig(*c, &clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: TestContext.Host}}).ClientConfig()
 }

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,14 @@ func LoadConfig() (config *restclient.Config, err error) {`
`557`	`557`	`}`
`558`	`558`	`return nil, err`
`559`	`559`	`}`
	`560`	`+ // In case Host is not set in TestContext, sets it as`
	`561`	`+ // CurrentContext Server for k8s API client to connect to.`
	`562`	`+ if TestContext.Host == "" && c.Clusters != nil {`
	`563`	`+ currentContext, ok := c.Clusters[c.CurrentContext]`
	`564`	`+ if ok {`
	`565`	`+ TestContext.Host = currentContext.Server`
	`566`	`+ }`
	`567`	`+ }`
`560`	`568`
`561`	`569`	`return clientcmd.NewDefaultClientConfig(*c, &clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: TestContext.Host}}).ClientConfig()`
`562`	`570`	`}`