github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 21:30:16 +00:00
Code Issues Projects Releases Wiki Activity

stop defaulting kubeconfig to http://localhost:8080

Browse Source
This commit is contained in:
David Eads
2018-04-12 09:42:25 -04:00
committed by Maciej Szulik
parent 39ed64ec4c
commit b19ad9e7a7
2 changed files with 2 additions and 10 deletions
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 ( var (
// ClusterDefaults has the same behavior as the old EnvVar and DefaultCluster fields // ClusterDefaults has the same behavior as the old EnvVar and DefaultCluster fields
// DEPRECATED will be replaced // 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 // DefaultClientConfig represents the legacy behavior of this package for defaulting
// DEPRECATED will be replace // DEPRECATED will be replace
DefaultClientConfig = DirectClientConfig{*clientcmdapi.NewConfig(), "", &ConfigOverrides{ DefaultClientConfig = DirectClientConfig{*clientcmdapi.NewConfig(), "", &ConfigOverrides{
@@ -43,15 +43,6 @@ var (
}, nil, NewDefaultClientConfigLoadingRules(), promptedCredentials{}} }, 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 // ClientConfig is used to make it easy to get an api server client
type ClientConfig interface { type ClientConfig interface {
// RawConfig returns the merged result of all overrides // RawConfig returns the merged result of all overrides

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

@@ -325,6 +325,7 @@ runTests() {
exit 1 exit 1
fi fi
kube::log::status "Checking kubectl version" kube::log::status "Checking kubectl version"
export KUBERNETES_MASTER=http://127.0.0.1:${API_PORT}
kubectl version kubectl version
# Generate a random namespace name, based on the current time (to make # Generate a random namespace name, based on the current time (to make