github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Use DiscoveryClient from kube clientSet instead of creating new one

Browse Source
This commit is contained in:
shashidharatd 2017-08-12 08:24:08 +05:30
parent 3eee17bf99
commit 103068043c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util"
@ -38,8 +37,7 @@ const (
) )
type ClusterClient struct { type ClusterClient struct {
discoveryClient *discovery.DiscoveryClient kubeClient *clientset.Clientset
kubeClient *clientset.Clientset
} }
func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) { func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) {
@ -49,10 +47,6 @@ func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error)
} }
var clusterClientSet = ClusterClient{} var clusterClientSet = ClusterClient{}
if clusterConfig != nil { 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))) clusterClientSet.kubeClient = clientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
if clusterClientSet.kubeClient == nil { if clusterClientSet.kubeClient == nil {
return nil, nil return nil, nil
@ -97,7 +91,7 @@ func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterS
LastProbeTime: currentTime, LastProbeTime: currentTime,
LastTransitionTime: currentTime, LastTransitionTime: currentTime,
} }
body, err := self.discoveryClient.RESTClient().Get().AbsPath("/healthz").Do().Raw() body, err := self.kubeClient.DiscoveryClient.RESTClient().Get().AbsPath("/healthz").Do().Raw()
if err != nil { if err != nil {
clusterStatus.Conditions = append(clusterStatus.Conditions, newNodeOfflineCondition) clusterStatus.Conditions = append(clusterStatus.Conditions, newNodeOfflineCondition)
} else { } else {