From f7a414425d94bca21d40b1d1af921a4500b6dbd1 Mon Sep 17 00:00:00 2001
From: Adam Letizia <LetiziaAdam@JohnDeere.com>
Date: Thu, 4 Sep 2025 13:39:11 -0500
Subject: [PATCH] fix(kubernetes): fixes calculation of pod cpu utilization

Signed-off-by: Adam Letizia <LetiziaAdam@JohnDeere.com>
---
 .changeset/twelve-guests-sit.md                      |  5 +++++
 .../src/components/Pods/PodsTable.test.tsx           |  2 +-
 plugins/kubernetes-react/src/utils/pod.test.tsx      |  2 +-
 plugins/kubernetes-react/src/utils/pod.tsx           | 12 ++----------
 4 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/twelve-guests-sit.md

diff --git a/.changeset/twelve-guests-sit.md b/.changeset/twelve-guests-sit.md
new file mode 100644
index 0000000000..0d75e07f0c
--- /dev/null
+++ b/.changeset/twelve-guests-sit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-react': patch
+---
+
+Fixes calculation of CPU utilization in the PodTable
diff --git a/plugins/kubernetes-react/src/components/Pods/PodsTable.test.tsx b/plugins/kubernetes-react/src/components/Pods/PodsTable.test.tsx
index fb90d17e2b..76136641af 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodsTable.test.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodsTable.test.tsx
@@ -74,7 +74,7 @@ describe('PodsTable', () => {
           limitTotal: '134217728',
         },
         cpu: {
-          currentUsage: 0.4966115,
+          currentUsage: 0.0496,
           requestTotal: 0.05,
           limitTotal: 0.05,
         },
diff --git a/plugins/kubernetes-react/src/utils/pod.test.tsx b/plugins/kubernetes-react/src/utils/pod.test.tsx
index 3f82c14f86..a75039ceea 100644
--- a/plugins/kubernetes-react/src/utils/pod.test.tsx
+++ b/plugins/kubernetes-react/src/utils/pod.test.tsx
@@ -42,7 +42,7 @@ describe('pod', () => {
       const result = podStatusToCpuUtil({
         cpu: {
           // ~50m
-          currentUsage: 0.4966115,
+          currentUsage: 0.0496,
           // 50m
           requestTotal: 0.05,
           // 100m
diff --git a/plugins/kubernetes-react/src/utils/pod.tsx b/plugins/kubernetes-react/src/utils/pod.tsx
index 97b44d4d24..e033b7c3b8 100644
--- a/plugins/kubernetes-react/src/utils/pod.tsx
+++ b/plugins/kubernetes-react/src/utils/pod.tsx
@@ -139,22 +139,14 @@ export const currentToDeclaredResourceToPerc = (
 export const podStatusToCpuUtil = (podStatus: ClientPodStatus): ReactNode => {
   const cpuUtil = podStatus.cpu;
 
-  let currentUsage: number | string = cpuUtil.currentUsage;
-
-  // current usage number for CPU is a different unit than request/limit total
-  // this might be a bug in the k8s library
-  if (typeof cpuUtil.currentUsage === 'number') {
-    currentUsage = cpuUtil.currentUsage / 10;
-  }
-
   return (
     <SubvalueCell
       value={`requests: ${currentToDeclaredResourceToPerc(
-        currentUsage,
+        cpuUtil.currentUsage,
         cpuUtil.requestTotal,
       )} of ${formatMillicores(cpuUtil.requestTotal)}`}
       subvalue={`limits: ${currentToDeclaredResourceToPerc(
-        currentUsage,
+        cpuUtil.currentUsage,
         cpuUtil.limitTotal,
       )} of ${formatMillicores(cpuUtil.limitTotal)}`}
     />