github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "stop defaulting kubeconfig to http://localhost:8080"

Browse Source 
This reverts commit b19ad9e7a7.
This commit is contained in:
Maciej Szulik 2020-04-17 16:37:15 +02:00
parent d24b928629
commit a871738c86
No known key found for this signature in database
GPG Key ID: F15E55D276FA84C4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
View File

@ -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

1
test/cmd/legacy-script.sh
View File

@ -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