feat/node-view-allocated-res:

 ui: drop requested CPU & memory columns from node view

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

Author: v0y4g3r

internal/render/node.go

@@ -44,14 +44,10 @@ var defaultNOHeader = model1.Header{
 	model1.HeaderColumn{Name: "PODS", Attrs: model1.Attrs{Align: tview.AlignRight}},
 	model1.HeaderColumn{Name: "CPU", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "CPU/A", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
-	model1.HeaderColumn{Name: "CPU/R", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "%CPU", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
-	model1.HeaderColumn{Name: "%CPU/R", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "MEM", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "MEM/A", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
-	model1.HeaderColumn{Name: "MEM/R", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "%MEM", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
-	model1.HeaderColumn{Name: "%MEM/R", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "GPU/A", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "GPU/C", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
 	model1.HeaderColumn{Name: "SH-GPU/A", Attrs: model1.Attrs{Align: tview.AlignRight, MX: true}},
@@ -118,32 +114,6 @@ func (n Node) defaultRow(nwm *NodeWithMetrics, r *model1.Row) error {
 		podCount = NAValue
 	}
 
-	// Format requested resource absolute values
-	var cpuReq, memReq string
-	if nwm.RequestedCPU >= 0 {
-		cpuReq = toMc(nwm.RequestedCPU)
-	} else {
-		cpuReq = NAValue
-	}
-	if nwm.RequestedMemory >= 0 {
-		memReq = toMi(nwm.RequestedMemory)
-	} else {
-		memReq = NAValue
-	}
-
-	// Calculate requested resource percentages
-	var cpuReqPct, memReqPct string
-	if nwm.RequestedCPU >= 0 && a.cpu > 0 {
-		cpuReqPct = client.ToPercentageStr(nwm.RequestedCPU, a.cpu)
-	} else {
-		cpuReqPct = NAValue
-	}
-	if nwm.RequestedMemory >= 0 && a.mem > 0 {
-		memReqPct = client.ToPercentageStr(nwm.RequestedMemory, a.mem)
-	} else {
-		memReqPct = NAValue
-	}
-
 	r.ID = client.FQN("", no.Name)
 	r.Fields = model1.Fields{
 		no.Name,
@@ -159,14 +129,10 @@ func (n Node) defaultRow(nwm *NodeWithMetrics, r *model1.Row) error {
 		podCount,
 		toMc(c.cpu),
 		toMc(a.cpu),
-		cpuReq,
 		client.ToPercentageStr(c.cpu, a.cpu),
-		cpuReqPct,
 		toMi(c.mem),
 		toMi(a.mem),
-		memReq,
 		client.ToPercentageStr(c.mem, a.mem),
-		memReqPct,
 		toMu(a.gpu),
 		toMu(c.gpu),
 		toMu(a.gpuShared),

internal/render/node_test.go

@@ -28,7 +28,7 @@ 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", "n/a", "0", "n/a", "20", "7874", "n/a", "0", "n/a"}
+	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", "n/a", "n/a"}
 	assert.Equal(t, e, r.Fields[:21])
 }