From 71473e9b7bc77487711c7aa71eb98db57a19ab31 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. Kubernetes-commit: a871738c86a0bdf7c3b8924d1932e6f2c85ea8d8 --- tools/clientcmd/client_config.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/clientcmd/client_config.go b/tools/clientcmd/client_config.go index 5096f51d..a9806384 100644 --- a/tools/clientcmd/client_config.go +++ b/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