diff --git a/web/src/components/UploadLicenseFile.tsx b/web/src/components/UploadLicenseFile.tsx index 8992f063b2..e08cf5b829 100644 --- a/web/src/components/UploadLicenseFile.tsx +++ b/web/src/components/UploadLicenseFile.tsx @@ -261,13 +261,13 @@ const UploadLicenseFile = (props: Props) => { return; } - if (data.isConfigurable) { - navigate(`/${data.slug}/config`, { replace: true }); + if (props.isHelmVM) { + navigate(`/${data.slug}/cluster/manage`, { replace: true }); return; } - if (props.isHelmVM) { - navigate(`/${data.slug}/cluster/manage`, { replace: true }); + if (data.isConfigurable) { + navigate(`/${data.slug}/config`, { replace: true }); return; } diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx index 01c5f6d4ec..a545de0e75 100644 --- a/web/src/components/apps/HelmVMClusterManagement.tsx +++ b/web/src/components/apps/HelmVMClusterManagement.tsx @@ -65,15 +65,15 @@ const HelmVMClusterManagement = ({ kubeletVersion: string; cpu: { capacity: number; - available: number; + used: number; }; memory: { capacity: number; - available: number; + used: number; }; pods: { capacity: number; - available: number; + used: number; }; labels: string[]; conditions: { @@ -273,13 +273,11 @@ const HelmVMClusterManagement = ({ ), status: n.isReady ? "Ready" : "Not Ready", - cpu: `${(n.cpu.capacity - n.cpu.available).toFixed( + cpu: `${n.cpu.used.toFixed(2)} / ${n.cpu.capacity.toFixed(2)}`, + memory: `${n.memory.used.toFixed(2)}GB / ${n.memory.capacity.toFixed( 2 - )} / ${n.cpu.capacity.toFixed(2)}`, - memory: `${(n.memory.capacity - n.memory.available).toFixed( - 2 - )}GB / ${n.memory.capacity.toFixed(2)}GB`, - pods: `${n.pods.capacity - n.pods.available} / ${n.pods.capacity}`, + )}GB`, + pods: `${n.pods.used} / ${n.pods.capacity}`, pause: ( <> diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx index ef029fdae8..3af18d68ee 100644 --- a/web/src/components/apps/HelmVMViewNode.jsx +++ b/web/src/components/apps/HelmVMViewNode.jsx @@ -79,10 +79,10 @@ const HelmVMViewNode = () => { const mappedPods = useMemo(() => { return node?.podList?.map((p) => ({ - name: p.metadata.name, - status: p.status.phase, - cpu: null, - memory: null, + name: p.name, + status: p.status, + cpu: p.cpu, + memory: `${p.memory}GB`, delete: ( <>