Fix minor metrics bugs and refactor route implementation

pkg/models/controllers/pods.go

@@ -26,6 +26,8 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/tools/cache"
+
+	"kubesphere.io/kubesphere/pkg/models/metrics"
 )
 
 const inUse = "in_use_pods"
@@ -189,6 +191,22 @@ func (ctl *PodCtl) ListWithConditions(conditions string, paging *Paging) (int, i
 
 	listWithConditions(ctl.DB, &total, &object, &list, conditions, paging, order)
 
+	ch := make(chan metrics.PodMetrics)
+
+	for index, _ := range list {
+		go metrics.GetSinglePodMetrics(list[index].Namespace, list[index].Name, ch)
+	}
+
+	var resultMetrics = make(map[string]metrics.PodMetrics)
+	for range list {
+		podMetric := <-ch
+		resultMetrics[podMetric.PodName] = podMetric
+	}
+
+	for index, _ := range list {
+		list[index].Metrics = resultMetrics[list[index].Name]
+	}
+
 	return total, list, nil
 }
 

pkg/models/controllers/types.go

@@ -26,6 +26,8 @@ import (
 	"github.com/jinzhu/gorm"
 	"k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+
+	"kubesphere.io/kubesphere/pkg/models/metrics"
 )
 
 const (
@@ -175,15 +177,16 @@ func (Ingress) TableName() string {
 }
 
 type Pod struct {
-	Name       string     `gorm:"primary_key" json:"name"`
-	Namespace  string     `gorm:"primary_key" json:"namespace"`
-	Status     string     `json:"status,omitempty"`
-	Node       string     `json:"node,omitempty"`
-	NodeIp     string     `json:"nodeIp,omitempty"`
-	PodIp      string     `json:"podIp,omitempty"`
-	Containers Containers `gorm:"type:text" json:"containers,omitempty"`
-	Annotation Annotation `json:"annotations"`
-	CreateTime time.Time  `gorm:"column:createTime" json:"createTime,omitempty"`
+	Name       string             `gorm:"primary_key" json:"name"`
+	Namespace  string             `gorm:"primary_key" json:"namespace"`
+	Status     string             `json:"status,omitempty"`
+	Node       string             `json:"node,omitempty"`
+	NodeIp     string             `json:"nodeIp,omitempty"`
+	PodIp      string             `json:"podIp,omitempty"`
+	Containers Containers         `gorm:"type:text" json:"containers,omitempty"`
+	Annotation Annotation         `json:"annotations"`
+	CreateTime time.Time          `gorm:"column:createTime" json:"createTime,omitempty"`
+	Metrics    metrics.PodMetrics `json:"metrics,omitempty"`
 }
 
 type Container struct {