From 0623f7bcf8d7507d8b4c7eed6d346906c78907a8 Mon Sep 17 00:00:00 2001
From: xiangpengzhao <zhao.xiangpeng@zte.com.cn>
Date: Mon, 1 Aug 2016 13:31:21 -0400
Subject: [PATCH] Return nil directly when err is nil.

---
 federation/pkg/federation-controller/cluster/cluster_client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go
index bfc59c35cc9..450b4a9c2cc 100644
--- a/federation/pkg/federation-controller/cluster/cluster_client.go
+++ b/federation/pkg/federation-controller/cluster/cluster_client.go
@@ -60,7 +60,7 @@ func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error)
 			return nil, nil
 		}
 	}
-	return &clusterClientSet, err
+	return &clusterClientSet, nil
 }
 
 // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz"