feat/node-view-allocated-res:

 render: show “n/a” for negative requested CPU/memory values

Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>

Author: v0y4g3r

internal/dao/node.go

@@ -269,7 +269,6 @@ func (n *Node) CalculateRequestedResources(oo []runtime.Object, nodeName string)
 			continue
 		}
 
-		// Convert to Pod to check phase and calculate resources
 		var pod v1.Pod
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &pod); err != nil {
 			continue
@@ -280,9 +279,6 @@ func (n *Node) CalculateRequestedResources(oo []runtime.Object, nodeName string)
 			continue
 		}
 
-		// Calculate requests from containers
-		// Init containers run sequentially, so we take the max of their requests
-		// Regular containers run in parallel, so we sum their requests
 		var initCPU, initMem *resource.Quantity
 		for i := range pod.Spec.InitContainers {
 			co := pod.Spec.InitContainers[i]
@@ -306,19 +302,16 @@ func (n *Node) CalculateRequestedResources(oo []runtime.Object, nodeName string)
 			}
 		}
 
-		// Calculate pod-level requested resources
 		podCPUQ := resource.NewQuantity(0, resource.DecimalSI)
 		podMemQ := resource.NewQuantity(0, resource.BinarySI)
 
-		// Add max init container resources
 		if initCPU != nil {
 			podCPUQ.Add(*initCPU)
 		}
 		if initMem != nil {
 			podMemQ.Add(*initMem)
 		}
 
-		// Sum regular container requests
 		for i := range pod.Spec.Containers {
 			co := pod.Spec.Containers[i]
 			req := co.Resources.Requests
@@ -346,7 +339,6 @@ func (n *Node) CalculateRequestedResources(oo []runtime.Object, nodeName string)
 			"memory-requested-bytes", podMemQ.Value(),
 		)
 
-		// Add to cumulative totals
 		cpuQ.Add(*podCPUQ)
 		memQ.Add(*podMemQ)
 	}

internal/render/node_test.go

@@ -16,8 +16,10 @@ import (
 
 func TestNodeRender(t *testing.T) {
 	pom := render.NodeWithMetrics{
-		Raw: load(t, "no"),
-		MX:  makeNodeMX("n1", "10m", "20Mi"),
+		Raw:             load(t, "no"),
+		MX:              makeNodeMX("n1", "10m", "20Mi"),
+		RequestedCPU:    -1,
+		RequestedMemory: -1,
 	}
 
 	var no render.Node
@@ -26,8 +28,8 @@ func TestNodeRender(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, "minikube", r.ID)
-	e := model1.Fields{"minikube", "Ready", "master", "amd64", "0", "v1.15.2", "Buildroot 2018.05.3", "4.15.0", "192.168.64.107", "<none>", "0", "10", "4000", "0", "20", "7874", "0", "n/a", "n/a"}
-	assert.Equal(t, e, r.Fields[:19])
+	e := model1.Fields{"minikube", "Ready", "master", "amd64", "0", "v1.15.2", "Buildroot 2018.05.3", "4.15.0", "192.168.64.107", "<none>", "0", "10", "4000", "n/a", "0", "n/a", "20", "7874", "n/a", "0", "n/a"}
+	assert.Equal(t, e, r.Fields[:21])
 }
 
 func BenchmarkNodeRender(b *testing.B) {