Merge pull request #121 from zryfish/fix_heapster_client

Add error check to heapsterclient response

pkg/apis/v1alpha/nodes/nodes_handler.go

@@ -60,6 +60,10 @@ func handleNodes(request *restful.Request, response *restful.Response) {
 		result.Items = append(result.Items, <-ch)
 	}
 
+	if result.Items == nil {
+		result.Items = make([]interface{}, 0)
+	}
+
 	result.TotalCount = len(result.Items)
 	response.WriteAsJson(result)
 }

pkg/apis/v1alpha/pods/pods_handler.go

@@ -73,7 +73,8 @@ func handleAllPods(_ *restful.Request, response *restful.Response) {
 // Get pods metrics in namespace
 func handlePodsUnderNameSpace(request *restful.Request, response *restful.Response) {
 	var result constants.PageableResponse
-	result = metrics.GetPodMetricsInNamespace(request.PathParameter("namespace"))
+	labelSelector := request.QueryParameter("labelSelector")
+	result = metrics.GetPodMetricsInNamespace(request.PathParameter("namespace"), labelSelector)
 	response.WriteAsJson(result)
 }