@@ -44,14 +44,10 @@ var defaultNOHeader = model1.Header{
4444 model1.HeaderColumn {Name : "PODS" , Attrs : model1.Attrs {Align : tview .AlignRight }},
4545 model1.HeaderColumn {Name : "CPU" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
4646 model1.HeaderColumn {Name : "CPU/A" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
47- model1.HeaderColumn {Name : "CPU/R" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
4847 model1.HeaderColumn {Name : "%CPU" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
49- model1.HeaderColumn {Name : "%CPU/R" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5048 model1.HeaderColumn {Name : "MEM" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5149 model1.HeaderColumn {Name : "MEM/A" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
52- model1.HeaderColumn {Name : "MEM/R" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5350 model1.HeaderColumn {Name : "%MEM" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
54- model1.HeaderColumn {Name : "%MEM/R" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5551 model1.HeaderColumn {Name : "GPU/A" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5652 model1.HeaderColumn {Name : "GPU/C" , Attrs : model1.Attrs {Align : tview .AlignRight , MX : true }},
5753 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 {
118114 podCount = NAValue
119115 }
120116
121- // Format requested resource absolute values
122- var cpuReq , memReq string
123- if nwm .RequestedCPU >= 0 {
124- cpuReq = toMc (nwm .RequestedCPU )
125- } else {
126- cpuReq = NAValue
127- }
128- if nwm .RequestedMemory >= 0 {
129- memReq = toMi (nwm .RequestedMemory )
130- } else {
131- memReq = NAValue
132- }
133-
134- // Calculate requested resource percentages
135- var cpuReqPct , memReqPct string
136- if nwm .RequestedCPU >= 0 && a .cpu > 0 {
137- cpuReqPct = client .ToPercentageStr (nwm .RequestedCPU , a .cpu )
138- } else {
139- cpuReqPct = NAValue
140- }
141- if nwm .RequestedMemory >= 0 && a .mem > 0 {
142- memReqPct = client .ToPercentageStr (nwm .RequestedMemory , a .mem )
143- } else {
144- memReqPct = NAValue
145- }
146-
147117 r .ID = client .FQN ("" , no .Name )
148118 r .Fields = model1.Fields {
149119 no .Name ,
@@ -159,14 +129,10 @@ func (n Node) defaultRow(nwm *NodeWithMetrics, r *model1.Row) error {
159129 podCount ,
160130 toMc (c .cpu ),
161131 toMc (a .cpu ),
162- cpuReq ,
163132 client .ToPercentageStr (c .cpu , a .cpu ),
164- cpuReqPct ,
165133 toMi (c .mem ),
166134 toMi (a .mem ),
167- memReq ,
168135 client .ToPercentageStr (c .mem , a .mem ),
169- memReqPct ,
170136 toMu (a .gpu ),
171137 toMu (c .gpu ),
172138 toMu (a .gpuShared ),
0 commit comments