From 0dfde1374d321d1eeb37e0da3ba8bd4d83e2c541 Mon Sep 17 00:00:00 2001 From: James Player Date: Tue, 25 Mar 2025 10:59:28 +1300 Subject: [PATCH] fix(kubernetes): Cluster reservation CPU not showing R8S-268 (#569) --- .../cluster/ClusterView/ClusterResourceReservation.test.tsx | 2 +- .../ClusterView/queries/useClusterResourceReservationQuery.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx b/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx index ebeecc6c4..b243ab1d4 100644 --- a/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx +++ b/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx @@ -78,7 +78,7 @@ describe('ClusterResourceReservation', () => { ), http.get('/api/kubernetes/3/metrics/applications_resources', () => HttpResponse.json({ - CpuRequest: 1000, + CpuRequest: 1, MemoryRequest: '2Gi', }) ) diff --git a/app/react/kubernetes/cluster/ClusterView/queries/useClusterResourceReservationQuery.ts b/app/react/kubernetes/cluster/ClusterView/queries/useClusterResourceReservationQuery.ts index 50c68fd7d..8479212e1 100644 --- a/app/react/kubernetes/cluster/ClusterView/queries/useClusterResourceReservationQuery.ts +++ b/app/react/kubernetes/cluster/ClusterView/queries/useClusterResourceReservationQuery.ts @@ -15,7 +15,7 @@ export function useClusterResourceReservationQuery( { enabled: !!environmentId && nodes.length > 0, select: (data) => ({ - cpu: data.CpuRequest / 1000, + cpu: data.CpuRequest, memory: KubernetesResourceReservationHelper.megaBytesValue( data.MemoryRequest ),