From dc2b0104de8fcd62e59fc229ce1a4bb38daca463 Mon Sep 17 00:00:00 2001
From: Benjamin Clauss <github@binarycoded.com>
Date: Tue, 14 Jan 2020 12:55:20 +0100
Subject: [PATCH] Show resource limit % next to request % in Pod view (fix
 #413)

---
 internal/render/helpers.go  |  4 ++--
 internal/render/pod.go      | 26 ++++++++++++++++++++++----
 internal/render/pod_test.go |  4 ++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/internal/render/helpers.go b/internal/render/helpers.go
index 95e033d3..33996772 100644
--- a/internal/render/helpers.go
+++ b/internal/render/helpers.go
@@ -31,11 +31,11 @@ func asSelector(s *metav1.LabelSelector) string {
 }
 
 type metric struct {
-	cpu, mem string
+	cpu, mem, cpuLim, memLim string
 }
 
 func noMetric() metric {
-	return metric{cpu: NAValue, mem: NAValue}
+	return metric{cpu: NAValue, mem: NAValue, cpuLim: NAValue, memLim: NAValue}
 }
 
 // ToSelector flattens a map selector to a string selector.
diff --git a/internal/render/pod.go b/internal/render/pod.go
index dbd299a4..44ebec83 100644
--- a/internal/render/pod.go
+++ b/internal/render/pod.go
@@ -78,8 +78,8 @@ func (Pod) Header(ns string) HeaderRow {
 		Header{Name: "RESTART", Align: tview.AlignRight},
 		Header{Name: "CPU", Align: tview.AlignRight},
 		Header{Name: "MEM", Align: tview.AlignRight},
-		Header{Name: "%CPU", Align: tview.AlignRight},
-		Header{Name: "%MEM", Align: tview.AlignRight},
+		Header{Name: "%CPU (LIM)", Align: tview.AlignRight},
+		Header{Name: "%MEM (LIM)", Align: tview.AlignRight},
 		Header{Name: "IP"},
 		Header{Name: "NODE"},
 		Header{Name: "QOS"},
@@ -116,8 +116,8 @@ func (p Pod) Render(o interface{}, ns string, r *Row) error {
 		strconv.Itoa(rc),
 		c.cpu,
 		c.mem,
-		perc.cpu,
-		perc.mem,
+		perc.cpu+" ("+fmt.Sprintf("%3v",perc.cpuLim)+")",
+		perc.mem+" ("+fmt.Sprintf("%3v",perc.memLim)+")",
 		na(po.Status.PodIP),
 		na(po.Spec.NodeName),
 		p.mapQOS(po.Status.QOSClass),
@@ -159,9 +159,12 @@ func (*Pod) gatherPodMX(pod *v1.Pod, mx *mv1beta1.PodMetrics) (c, p metric) {
 	}
 
 	rc, rm := requestedRes(pod)
+	lc, lm := resourceLimits(pod)
 	p = metric{
 		cpu: AsPerc(toPerc(float64(cpu.MilliValue()), float64(rc.MilliValue()))),
 		mem: AsPerc(toPerc(ToMB(mem.Value()), ToMB(rm.Value()))),
+		cpuLim: AsPerc(toPerc(float64(cpu.MilliValue()), float64(lc.MilliValue()))),
+		memLim: AsPerc(toPerc(ToMB(mem.Value()), ToMB(lm.Value()))),
 	}
 
 	return
@@ -180,6 +183,21 @@ func containerResources(co v1.Container) (cpu, mem *resource.Quantity) {
 	return
 }
 
+func resourceLimits(po *v1.Pod) (cpu, mem resource.Quantity) {
+	for _, co := range po.Spec.Containers {
+		limit := co.Resources.Limits
+		if len(limit) != 0 {
+			if limit.Cpu() != nil {
+				cpu.Add(*limit.Cpu())
+			}
+			if limit.Memory() != nil {
+				mem.Add(*limit.Memory())
+			}
+		}
+	}
+	return
+}
+
 func requestedRes(po *v1.Pod) (cpu, mem resource.Quantity) {
 	for _, co := range po.Spec.Containers {
 		c, m := containerResources(co)
diff --git a/internal/render/pod_test.go b/internal/render/pod_test.go
index 5e70397c..e03ffcfe 100644
--- a/internal/render/pod_test.go
+++ b/internal/render/pod_test.go
@@ -70,7 +70,7 @@ func TestPodRender(t *testing.T) {
 	assert.Nil(t, err)
 
 	assert.Equal(t, "default/nginx", r.ID)
-	e := render.Fields{"default", "nginx", "1/1", "Running", "0", "10", "10", "10", "14", "172.17.0.6", "minikube", "BE"}
+	e := render.Fields{"default", "nginx", "1/1", "Running", "0", "10", "10", "10 (  0)", "14 (  5)", "172.17.0.6", "minikube", "BE"}
 	assert.Equal(t, e, r.Fields[:12])
 }
 
@@ -101,7 +101,7 @@ func TestPodInitRender(t *testing.T) {
 	assert.Nil(t, err)
 
 	assert.Equal(t, "default/nginx", r.ID)
-	e := render.Fields{"default", "nginx", "1/1", "Init:0/1", "0", "10", "10", "10", "14", "172.17.0.6", "minikube", "BE"}
+	e := render.Fields{"default", "nginx", "1/1", "Init:0/1", "0", "10", "10", "10 (  0)", "14 (  5)", "172.17.0.6", "minikube", "BE"}
 	assert.Equal(t, e, r.Fields[:12])
 }