diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index abe2f5fc6ec..c9f963588c6 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -24,7 +24,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/discovery" restclient "k8s.io/client-go/rest" federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" @@ -38,8 +37,7 @@ const ( ) type ClusterClient struct { - discoveryClient *discovery.DiscoveryClient - kubeClient *clientset.Clientset + kubeClient *clientset.Clientset } func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) { @@ -49,10 +47,6 @@ func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) } 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 @@ -97,7 +91,7 @@ func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterS LastProbeTime: 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 { clusterStatus.Conditions = append(clusterStatus.Conditions, newNodeOfflineCondition) } else {