admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue #30 missing pod count in nodes api

Browse Source
This commit is contained in:
Calvin Yu
2018-05-29 10:55:01 +08:00
parent 55478b5d9b
commit 2646b74a41
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/models/nodes.go
View File

@@ -26,6 +26,7 @@ import (
"kubesphere.io/kubesphere/pkg/client" "kubesphere.io/kubesphere/pkg/client"
ksutil "kubesphere.io/kubesphere/pkg/util" ksutil "kubesphere.io/kubesphere/pkg/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"fmt" "fmt"
"strconv" "strconv"
@@ -35,9 +36,11 @@ type ResultNodes struct {
Nodes []ResultNode `json:"nodes"` Nodes []ResultNode `json:"nodes"`
} }
type ResultNode struct { type ResultNode struct {
NodeName string `json:"node_name"` NodeName string `json:"node_name"`
CPU []CPUNode `json:"cpu"` PodsCount string `json:"pods_count"`
Memory []MemoryNode `json:"memory"` PodsCapacity string `json:"pods_capacity"`
CPU []CPUNode `json:"cpu"`
Memory []MemoryNode `json:"memory"`
} }
type CPUNode struct { type CPUNode struct {
@@ -136,9 +139,25 @@ func FormatNodeMetrics(nodeName string) ResultNode {
} }
resultNode.NodeName = nodeName resultNode.NodeName = nodeName
resultNode.PodsCount = strconv.Itoa(len(GetPodsForNode(nodeName,"")))
resultNode.PodsCapacity = getPodsCapacity(nodeName)
resultNode.CPU = nodeCPUMetrics resultNode.CPU = nodeCPUMetrics
resultNode.Memory = nodeMemMetrics resultNode.Memory = nodeMemMetrics
return resultNode return resultNode
} }
func getPodsCapacity(nodeName string) string {
var pods_capacity string
cli := client.NewK8sClient()
node, err := cli.CoreV1().Nodes().Get(nodeName,metav1.GetOptions{})
if err != nil {
glog.Error(err)
} else {
pods_capacity = node.Status.Capacity.Pods().String()
}
fmt.Println(pods_capacity)
return pods_capacity
}