mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	stop defaulting kubeconfig to http://localhost:8080
This commit is contained in:
		
				
					committed by
					
						
						Maciej Szulik
					
				
			
			
				
	
			
			
			
						parent
						
							39ed64ec4c
						
					
				
				
					commit
					b19ad9e7a7
				
			@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user