github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

extract public function for build cluster config so that other controller can reuse

Browse Source
This commit is contained in:
mfanjie 2016-06-02 17:38:34 +08:00
parent 68097515d8
commit c2dbce68f1
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
federation/pkg/federation-controller/cluster/cluster_client.go
View File

@ -47,19 +47,6 @@ const (
// This is to inject a different kubeconfigGetter in tests. // This is to inject a different kubeconfigGetter in tests.
// We dont use the standard one which calls NewInCluster in tests to avoid having to setup service accounts and mount files with secret tokens. // We dont use the standard one which calls NewInCluster in tests to avoid having to setup service accounts and mount files with secret tokens.
var KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter { var KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter {
return func() (*clientcmdapi.Config, error) {
secretRefName := ""
if c.Spec.SecretRef != nil {
secretRefName = c.Spec.SecretRef.Name
} else {
glog.Infof("didnt find secretRef for cluster %s. Trying insecure access", c.Name)
}
return KubeconfigGetterForSecret(secretRefName)()
}
}
// KubeconfigGettterForSecret is used to get the kubeconfig from the given secret.
var KubeconfigGetterForSecret = func(secretName string) clientcmd.KubeconfigGetter {
return func() (*clientcmdapi.Config, error) { return func() (*clientcmdapi.Config, error) {
// Get the namespace this is running in from the env variable. // Get the namespace this is running in from the env variable.
namespace := os.Getenv("POD_NAMESPACE") namespace := os.Getenv("POD_NAMESPACE")
@ -71,17 +58,14 @@ var KubeconfigGetterForSecret = func(secretName string) clientcmd.KubeconfigGett
if err != nil { if err != nil {
return nil, fmt.Errorf("error in creating in-cluster client: %s", err) return nil, fmt.Errorf("error in creating in-cluster client: %s", err)
} }
data := []byte{} secret, err := client.Secrets(namespace).Get(c.Spec.SecretRef.Name)
if secretName != "" { if err != nil {
secret, err := client.Secrets(namespace).Get(secretName) return nil, fmt.Errorf("error in fetching secret: %s", err)
if err != nil { }
return nil, fmt.Errorf("error in fetching secret: %s", err) ok := false
} data, ok := secret.Data[KubeconfigSecretDataKey]
ok := false if !ok {
data, ok = secret.Data[KubeconfigSecretDataKey] return nil, fmt.Errorf("secret does not have data with key: %s", KubeconfigSecretDataKey)
if !ok {
return nil, fmt.Errorf("secret does not have data with key: %s", KubeconfigSecretDataKey)
}
} }
return clientcmd.Load(data) return clientcmd.Load(data)
} }
@ -93,7 +77,27 @@ type ClusterClient struct {
} }
func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) { func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) {
clusterConfig, err := BuildClusterConfig(c)
if err != nil {
return nil, err
}
var clusterClientSet = ClusterClient{}
if clusterConfig != nil {
clusterClientSet.discoveryClient = discovery.NewDiscoveryClientForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
if clusterClientSet.discoveryClient == nil {
return nil, nil
}
clusterClientSet.kubeClient = clientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
if clusterClientSet.kubeClient == nil {
return nil, nil
}
}
return &clusterClientSet, err
}
func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, error) {
var serverAddress string var serverAddress string
var clusterConfig *restclient.Config
hostIP, err := utilnet.ChooseHostInterface() hostIP, err := utilnet.ChooseHostInterface()
if err != nil { if err != nil {
return nil, err return nil, err
@ -110,25 +114,21 @@ func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error)
break break
} }
} }
var clusterClientSet = ClusterClient{}
if serverAddress != "" { if serverAddress != "" {
kubeconfigGetter := KubeconfigGetterForCluster(c) if c.Spec.SecretRef == nil {
clusterConfig, err := clientcmd.BuildConfigFromKubeconfigGetter(serverAddress, kubeconfigGetter) glog.Infof("didnt find secretRef for cluster %s. Trying insecure access", c.Name)
clusterConfig, err = clientcmd.BuildConfigFromFlags(serverAddress, "")
} else {
kubeconfigGetter := KubeconfigGetterForCluster(c)
clusterConfig, err = clientcmd.BuildConfigFromKubeconfigGetter(serverAddress, kubeconfigGetter)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
clusterConfig.QPS = KubeAPIQPS clusterConfig.QPS = KubeAPIQPS
clusterConfig.Burst = KubeAPIBurst clusterConfig.Burst = KubeAPIBurst
clusterClientSet.discoveryClient = discovery.NewDiscoveryClientForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
if clusterClientSet.discoveryClient == nil {
return nil, nil
}
clusterClientSet.kubeClient = clientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
if clusterClientSet.kubeClient == nil {
return nil, nil
}
} }
return &clusterClientSet, err return clusterConfig, nil
} }
// GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz" // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz"