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

Merge pull request #127 from zryfish/fix_pods_count

Browse Source 
only non-terminated pods will be counted when counting node pods
This commit is contained in:
zryfish
2018-06-28 15:57:11 +08:00
committed by GitHub
parent 9010e16ada 6d3acd7083
commit 06a23e5154
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/models/metrics/nodes.go
View File

@@ -173,10 +173,11 @@ func FormatNodeMetrics(nodeName string) NodeMetrics {
return resultNode return resultNode
} }
// Count non-terminated pods only
func GetPodCountOnNode(nodeName string) int { func GetPodCountOnNode(nodeName string) int {
k8sClient := client.NewK8sClient() k8sClient := client.NewK8sClient()
options := metav1.ListOptions{ options := metav1.ListOptions{
FieldSelector: "spec.nodeName=" + nodeName, FieldSelector: "spec.nodeName=" + nodeName + ",status.phase!=Failed,status.phase!=Succeeded",
} }
podList, err := k8sClient.CoreV1().Pods("").List(options) podList, err := k8sClient.CoreV1().Pods("").List(options)