From a871738c86a0bdf7c3b8924d1932e6f2c85ea8d8 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Fri, 17 Apr 2020 16:37:15 +0200 Subject: [PATCH] Revert "stop defaulting kubeconfig to http://localhost:8080" This reverts commit b19ad9e7a78fea0ecdffe7aa53bbe309d9d346ee. --- .../k8s.io/client-go/tools/clientcmd/client_config.go | 11 ++++++++++- test/cmd/legacy-script.sh | 1 - 2 files changed, 10 insertions(+), 2 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 5096f51d2f5..a9806384aab 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: os.Getenv("KUBERNETES_MASTER")} + ClusterDefaults = clientcmdapi.Cluster{Server: getDefaultServer()} // DefaultClientConfig represents the legacy behavior of this package for defaulting // DEPRECATED will be replace DefaultClientConfig = DirectClientConfig{*clientcmdapi.NewConfig(), "", &ConfigOverrides{ @@ -43,6 +43,15 @@ 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 ec16f804a41..c9b368de587 100755 --- a/test/cmd/legacy-script.sh +++ b/test/cmd/legacy-script.sh @@ -324,7 +324,6 @@ 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