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

Merge pull request #3674 from liggitt/override_default_cluster

Browse Source 
Allow overriding global default cluster host
This commit is contained in:
Tim Hockin 2015-01-21 10:08:46 -08:00
commit 1c31aa489f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/client/clientcmd/client_config.go
View File

@ -29,9 +29,12 @@ import (
) )
var ( var (
// DefaultCluster is the cluster config used when no other config is specified
// TODO: eventually apiserver should start on 443 and be secure by default // TODO: eventually apiserver should start on 443 and be secure by default
defaultCluster = clientcmdapi.Cluster{Server: "http://localhost:8080"} DefaultCluster = clientcmdapi.Cluster{Server: "http://localhost:8080"}
envVarCluster = clientcmdapi.Cluster{Server: os.Getenv("KUBERNETES_MASTER")}
// EnvVarCluster allows overriding the DefaultCluster using an envvar for the server name
EnvVarCluster = clientcmdapi.Cluster{Server: os.Getenv("KUBERNETES_MASTER")}
) )
// 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
@ -283,8 +286,8 @@ func (config DirectClientConfig) getCluster() clientcmdapi.Cluster {
clusterInfoName := config.getClusterName() clusterInfoName := config.getClusterName()
var mergedClusterInfo clientcmdapi.Cluster var mergedClusterInfo clientcmdapi.Cluster
mergo.Merge(&mergedClusterInfo, defaultCluster) mergo.Merge(&mergedClusterInfo, DefaultCluster)
mergo.Merge(&mergedClusterInfo, envVarCluster) mergo.Merge(&mergedClusterInfo, EnvVarCluster)
if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists { if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists {
mergo.Merge(&mergedClusterInfo, configClusterInfo) mergo.Merge(&mergedClusterInfo, configClusterInfo)
} }