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

Merge pull request #99 from zryfish/fix_metrics_result

Browse Source 
fix pod metrics error
This commit is contained in:
calvinyv
2018-06-20 16:33:50 +08:00
committed by GitHub
parent caf2acb839 a12da3b63e
commit 7ce3d6eda0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/heapsterclient.go
View File

@@ -29,7 +29,7 @@ import (
const (
DefaultHeapsterScheme = "http"
DefaultHeapsterService = "heapster.kube-system.svc.cluster.local" //"heapster"
DefaultHeapsterPort = "80" // use the first exposed port on the service
DefaultHeapsterPort = "80" // use the first exposed port on the service
HeapsterApiPath = "/api/v1/model"
HeapsterEndpointUrl = DefaultHeapsterScheme + "://" + DefaultHeapsterService + ":" + DefaultHeapsterPort + HeapsterApiPath
)

16
pkg/models/metrics/pods.go
View File

@@ -94,7 +94,9 @@ func GetPodMetricsInNamespace(namespace string) constants.PageableResponse {
options := v1.ListOptions{}
podList, _ := k8sClient.CoreV1().Pods(namespace).List(options)
podMetrics.Items = append(podMetrics.Items, GetPodsMetrics(podList))
for _, podMetric := range GetPodsMetrics(podList) {
podMetrics.Items = append(podMetrics.Items, podMetric)
}
podMetrics.TotalCount = len(podMetrics.Items)
return podMetrics
@@ -107,7 +109,9 @@ func GetPodMetricsInNode(nodeName string) constants.PageableResponse {
FieldSelector: "spec.nodeName=" + nodeName,
}
podList, _ := k8sClient.CoreV1().Pods("").List(options)
podMetrics.Items = append(podMetrics.Items, GetPodsMetrics(podList))
for _, podMetric := range GetPodsMetrics(podList) {
podMetrics.Items = append(podMetrics.Items, podMetric)
}
podMetrics.TotalCount = len(podMetrics.Items)
return podMetrics
@@ -120,7 +124,9 @@ func GetPodMetricsInNamespaceOfNode(namespace string, nodeName string) constants
FieldSelector: "spec.nodeName=" + nodeName + ",metadata.namespace=" + namespace,
}
podList, _ := k8sClient.CoreV1().Pods("").List(options)
podMetrics.Items = append(podMetrics.Items, GetPodsMetrics(podList))
for _, podMetric := range GetPodsMetrics(podList) {
podMetrics.Items = append(podMetrics.Items, podMetric)
}
podMetrics.TotalCount = len(podMetrics.Items)
return podMetrics
@@ -131,7 +137,9 @@ func GetAllPodMetrics() constants.PageableResponse {
k8sClient := client.NewK8sClient()
options := v1.ListOptions{}
podList, _ := k8sClient.CoreV1().Pods("").List(options)
podMetrics.Items = append(podMetrics.Items, GetPodsMetrics(podList))
for _, podMetric := range GetPodsMetrics(podList) {
podMetrics.Items = append(podMetrics.Items, podMetric)
}
podMetrics.TotalCount = len(podMetrics.Items)
return podMetrics