From b19ad9e7a78fea0ecdffe7aa53bbe309d9d346ee Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 12 Apr 2018 09:42:25 -0400 Subject: [PATCH] stop defaulting kubeconfig to http://localhost:8080 --- .../k8s.io/client-go/tools/clientcmd/client_config.go | 11 +---------- test/cmd/legacy-script.sh | 1 + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go index 44115130d99..788e7ea7aa5 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go @@ -35,7 +35,7 @@ import ( var ( // ClusterDefaults has the same behavior as the old EnvVar and DefaultCluster fields // DEPRECATED will be replaced - ClusterDefaults = clientcmdapi.Cluster{Server: getDefaultServer()} + ClusterDefaults = clientcmdapi.Cluster{Server: os.Getenv("KUBERNETES_MASTER")} // DefaultClientConfig represents the legacy behavior of this package for defaulting // DEPRECATED will be replace DefaultClientConfig = DirectClientConfig{*clientcmdapi.NewConfig(), "", &ConfigOverrides{ @@ -43,15 +43,6 @@ var ( }, nil, NewDefaultClientConfigLoadingRules(), promptedCredentials{}} ) -// getDefaultServer returns a default setting for DefaultClientConfig -// DEPRECATED -func getDefaultServer() string { - if server := os.Getenv("KUBERNETES_MASTER"); len(server) > 0 { - return server - } - return "http://localhost:8080" -} - // ClientConfig is used to make it easy to get an api server client type ClientConfig interface { // RawConfig returns the merged result of all overrides diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh index d81755e3ba6..9d0473e14af 100755 --- a/test/cmd/legacy-script.sh +++ b/test/cmd/legacy-script.sh @@ -325,6 +325,7 @@ runTests() { exit 1 fi kube::log::status "Checking kubectl version" + export KUBERNETES_MASTER=http://127.0.0.1:${API_PORT} kubectl version # Generate a random namespace name, based on the current time (to make