diff --git a/web/src/Root.tsx b/web/src/Root.tsx index 86bef0aa94..04a656426b 100644 --- a/web/src/Root.tsx +++ b/web/src/Root.tsx @@ -691,6 +691,7 @@ const Root = () => { snapshotInProgressApps={state.snapshotInProgressApps} ping={ping} isHelmManaged={state.isHelmManaged} + isHelmVM={Boolean(state.adminConsoleMetadata?.isHelmVM)} /> } /> @@ -706,6 +707,7 @@ const Root = () => { snapshotInProgressApps={state.snapshotInProgressApps} ping={ping} isHelmManaged={state.isHelmManaged} + isHelmVM={Boolean(state.adminConsoleMetadata?.isHelmVM)} /> } > diff --git a/web/src/components/apps/AppDetailPage.tsx b/web/src/components/apps/AppDetailPage.tsx index 4aa0d386ee..e969b8535d 100644 --- a/web/src/components/apps/AppDetailPage.tsx +++ b/web/src/components/apps/AppDetailPage.tsx @@ -30,6 +30,7 @@ type Props = { refetchAppsList: () => void; refetchAppMetadata: () => void; snapshotInProgressApps: string[]; + isHelmVM: boolean; }; type State = { @@ -97,6 +98,8 @@ function AppDetailPage(props: Props) { navigate(`/app/${appsList[0].slug}`, { replace: true }); } else if (props.isHelmManaged) { navigate("/install-with-helm", { replace: true }); + } else if (props.isHelmVM) { + navigate(`/${selectedApp?.slug}/cluster/manage`, { replace: true }); } else { navigate("/upload-license", { replace: true }); } diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx index a545de0e75..5825a893b2 100644 --- a/web/src/components/apps/HelmVMClusterManagement.tsx +++ b/web/src/components/apps/HelmVMClusterManagement.tsx @@ -222,11 +222,17 @@ const HelmVMClusterManagement = ({ accessorKey: "cpu", header: "CPU", size: 150, + muiTableBodyCellProps: { + align: "right", + }, }, { accessorKey: "memory", header: "Memory", size: 150, + muiTableBodyCellProps: { + align: "right", + }, }, { accessorKey: "pods", diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx index 3af18d68ee..2efef120ce 100644 --- a/web/src/components/apps/HelmVMViewNode.jsx +++ b/web/src/components/apps/HelmVMViewNode.jsx @@ -53,6 +53,11 @@ const HelmVMViewNode = () => { enableColumnDragging: false, size: 150, }, + { + accessorKey: "namespace", + header: "Namespace", + size: 150, + }, { accessorKey: "status", header: "Status", @@ -62,11 +67,17 @@ const HelmVMViewNode = () => { accessorKey: "cpu", header: "CPU", size: 150, + muiTableBodyCellProps: { + align: "right", + }, }, { accessorKey: "memory", header: "Memory", size: 150, + muiTableBodyCellProps: { + align: "right", + }, }, // { // accessorKey: "delete", @@ -80,9 +91,10 @@ const HelmVMViewNode = () => { const mappedPods = useMemo(() => { return node?.podList?.map((p) => ({ name: p.name, + namespace: p.namespace, status: p.status, cpu: p.cpu, - memory: `${p.memory}GB`, + memory: p.memory, delete: ( <> @@ -128,17 +140,11 @@ const HelmVMViewNode = () => {
kube-proxy version
-{node?.kubeletVersion}
+{node?.kubeProxyVersion}
OS
-{node?.kubeletVersion}
-- kurl version -
-{node?.kubeletVersion}
+{node?.operatingSystem}