only non-terminated pods will be counted when counting node pods

2018-06-28 15:44:23 +08:00
parent 9010e16ada
commit 6d3acd7083
1 changed files with 2 additions and 1 deletions
--- a/pkg/models/metrics/nodes.go
+++ b/pkg/models/metrics/nodes.go
@@ -173,10 +173,11 @@ func FormatNodeMetrics(nodeName string) NodeMetrics {
 	return resultNode
 }

+// Count non-terminated pods only
 func GetPodCountOnNode(nodeName string) int {
 	k8sClient := client.NewK8sClient()
 	options := metav1.ListOptions{
-		FieldSelector: "spec.nodeName=" + nodeName,
+		FieldSelector: "spec.nodeName=" + nodeName + ",status.phase!=Failed,status.phase!=Succeeded",
 	}

 	podList, err := k8sClient.CoreV1().Pods("").List(options)