feat(k8s): M10 Node 详情页 — PID/容器运行时/分配率

- 后端: GetNodeDetail handler — 获取单个节点完整信息
  * 系统信息: container_runtime/architecture/kubelet/os/kernel
  * 资源分配率: 遍历 Pod 计算 CPU/Memory/Pods requested vs allocatable
  * metrics-server 数据注入 (cpu_usage_m/mem_usage_mi)
  * 全量 conditions/taints/labels + 节点上的 Pod 列表
- 后端: K8s 客户端扩展
  * NodeTaint/NodeCondition 扩展字段 (reason/message)
  * NodeInfo 增加 architecture/operatingSystem
  * GetNode(name) 单节点查询方法
  * parseCpuToMilli()/parseMemToMi() 资源解析辅助函数
- 后端: 注册路由
  * GET /kubernetes/:clusterCode/nodes/:name (Kuboard code)
  * GET /kubernetes-clusters/:id/nodes/:name (ID)
- 前端: NodeDetailPage.tsx (~330行)
  * 系统信息卡片 + 资源分配率卡片(进度条)
  * 条件卡片 + 污点卡片 + 标签卡片 + Pod 列表
- 前端: 节点名称可点击跳转 (ClusterOverviewPage)
- 验证: API/SPA/TS/Vite 全部通过
This commit is contained in:
attacker committed 2026-06-23 17:57:09 +08:00
1 parent 28dfc519e1
commit 87b7755094
16 files changed
+921 -52

No files matched your search

@@ -338,11 +338,11 @@ export function KubernetesClusterCard({ clusters }: { clusters: any[] }) {
</div>
<div className="grid grid-cols-4 gap-2 text-center">
<div>
<div className="text-sm font-medium text-slate-200">{cluster.node_count ?? cluster.nodes ?? 0}</div>
<div className="text-sm font-medium text-slate-200">{cluster.node_count ?? 0}</div>
<div className="text-xs text-slate-500">节点</div>
</div>
<div>
<div className="text-sm font-medium text-slate-200">{cluster.pod_count ?? cluster.pods ?? 0}</div>
<div className="text-sm font-medium text-slate-200">{cluster.pod_count ?? 0}</div>
<div className="text-xs text-slate-500">Pod</div>
</div>
<div>
@@ -158,8 +158,9 @@ export default function ClusterOverviewPage() {
const memPct = memMb > 0 ? (memUsageNorm / memMb) * 100 : 0;
const color = (pct: number) => pct > 80 ? 'bg-red-500' : pct > 60 ? 'bg-yellow-500' : 'bg-emerald-500';
return (
<TableRow key={n.name} className="border-slate-800 hover:bg-slate-800/30">
<TableCell className="font-medium text-slate-200">{n.name}</TableCell>
<TableRow key={n.name} className="border-slate-800 hover:bg-slate-800/30 cursor-pointer"
onClick={() => navigate(`/kubernetes/${clusterCode}/nodes/${n.name}`)}>
<TableCell className="font-medium text-blue-400 hover:text-blue-300">{n.name}</TableCell>
<TableCell><Badge className={getNodeRole(n)}>{n.role || 'worker'}</Badge></TableCell>
<TableCell><Badge className={n.status === 'Ready' ? 'bg-emerald-500/20 text-emerald-400' : 'bg-red-500/20 text-red-400'}>{n.status || 'Unknown'}</Badge></TableCell>
<TableCell className="text-sm text-slate-400">{n.ip || '-'}</TableCell>
@@ -30,15 +30,14 @@ export function KubernetesClusterDetail({ cluster, onClose }: { cluster: any; on
if (!nodes || nodes.length === 0) return { cpuPct: 0, memPct: 0 };
let totalCpuPct = 0, totalMemPct = 0, validNodes = 0;
for (const n of nodes) {
// ClusterOverviewPage 读的是 cpu_usage_m / mem_usage_mi(实时路径)
// ClusterDetail 的 nodes 从 getNodes API 获取,也有这些字段
// 后端 ListNodes 返回 cpu_usage_m (如 "122m"), mem_usage_mi (如 "2105Mi"), cpu (核数), memory_mb (MB)
const cpuCores = n.cpu || 0;
const cpuUsageM = n.cpu_usage_m ? parseFloat(String(n.cpu_usage_m).replace('m', '')) : 0;
const cpuPct = cpuCores > 0 ? (cpuUsageM / 1000 / cpuCores) * 100 : (n.cpu_usage || 0);
const memMb = n.memory_mb || n.memory || 0;
const cpuPct = cpuCores > 0 ? (cpuUsageM / 1000 / cpuCores) * 100 : 0;
const memMb = n.memory_mb || 0;
const memUsageMi = n.mem_usage_mi ? parseFloat(String(n.mem_usage_mi).replace('Mi', '').replace('Ki', '')) : 0;
const memUsageNorm = n.mem_usage_mi?.includes?.('Ki') ? memUsageMi / 1024 : n.mem_usage_mi?.includes?.('Gi') ? memUsageMi * 1024 : memUsageMi;
const memPct = memMb > 0 ? (memUsageNorm / memMb) * 100 : (n.memory_usage || 0);
const memPct = memMb > 0 ? (memUsageNorm / memMb) * 100 : 0;
if (cpuPct > 0 || memPct > 0) {
totalCpuPct += cpuPct;
totalMemPct += memPct;
@@ -264,12 +263,12 @@ export function KubernetesClusterDetail({ cluster, onClose }: { cluster: any; on
</Badge>
</td>
<td className="px-4 py-3 text-sm text-slate-300">
{Number(node.cpu_usage || 0).toFixed(1)}% / {node.cpu}核
{node.cpu_usage_m || '0m'} / {node.cpu}核
</td>
<td className="px-4 py-3 text-sm text-slate-300">
{Number(node.memory_usage || 0).toFixed(1)}% / {node.memory}GB
{node.mem_usage_mi || '0Mi'} / {node.memory_mb ? (node.memory_mb / 1024).toFixed(0) + 'GB' : '-'}
</td>
<td className="px-4 py-3 text-sm text-slate-300">{node.pods ?? node.pod_count ?? 0}</td>
<td className="px-4 py-3 text-sm text-slate-300">{node.max_pods ?? 0}</td>
<td className="px-4 py-3 text-sm text-slate-400">{node.os}</td>
</tr>
))
@@ -322,8 +321,8 @@ export function KubernetesClusterDetail({ cluster, onClose }: { cluster: any; on
</Badge>
</td>
<td className="px-4 py-3 text-sm text-slate-300">{pod.restart_count ?? 0}</td>
<td className="px-4 py-3 text-sm text-slate-300">{Number(pod.cpu_usage || 0).toFixed(1)}m</td>
<td className="px-4 py-3 text-sm text-slate-300">{Number(pod.memory_usage || 0).toFixed(0)}Mi</td>
<td className="px-4 py-3 text-sm text-slate-300">{pod.cpu_usage_m || '0m'}</td>
<td className="px-4 py-3 text-sm text-slate-300">{pod.mem_usage_mi || '0Mi'}</td>
<td className="px-4 py-3 text-sm text-slate-400">{pod.node_name}</td>
</tr>
))
@@ -0,0 +1,383 @@
import { useState, useEffect, useCallback } from 'react';
import { useParams, useNavigate, Link } from 'react-router-dom';
import { Card, CardContent } from '@/components/ui/card';
import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge';
import {
Table, TableBody, TableCell, TableHead, TableHeader, TableRow,
} from '@/components/ui/table';
import {
RefreshCw, Loader2, Cpu, Server, Clock, HardDrive, Activity,
ChevronRight, Container, Network, Info, AlertTriangle, CheckCircle2,
} from 'lucide-react';
import { kubernetesApi } from '@/services/api';
export default function NodeDetailPage() {
const { clusterCode, nodeName } = useParams<{ clusterCode: string; nodeName: string }>();
const navigate = useNavigate();
const [data, setData] = useState<any>(null);
const [loading, setLoading] = useState(false);
const loadData = useCallback(async () => {
if (!clusterCode || !nodeName) return;
setLoading(true);
try {
const res: any = await kubernetesApi.getNodeDetail(clusterCode, nodeName);
setData(res);
} catch { setData(null); } finally { setLoading(false); }
}, [clusterCode, nodeName]);
useEffect(() => { loadData(); }, [loadData]);
const formatNum = (v: any, suffix = '') => {
if (v === undefined || v === null || v === '') return '-';
const n = typeof v === 'number' ? v : parseFloat(v);
return isNaN(n) ? '-' : `${n.toLocaleString()}${suffix}`;
};
// Resource bar component
const ResourceBar = ({ label, used, total, unit, pct, color }: { label: string; used: string; total: string; unit: string; pct: number; color: string }) => {
const safePct = Math.min(Math.max(pct || 0, 0), 100);
const barColor = safePct > 80 ? 'bg-red-500' : safePct > 60 ? 'bg-amber-500' : 'bg-emerald-500';
return (
<div className="space-y-1.5">
<div className="flex items-center justify-between text-xs">
<span className="text-slate-400">{label}</span>
<span className="text-slate-300 font-medium">
{used} / {total} {unit}
</span>
</div>
<div className="flex items-center gap-2">
<div className="flex-1 h-2 rounded-full bg-slate-700/50 overflow-hidden">
<div className={`h-full rounded-full ${barColor} transition-all duration-500`} style={{ width: `${safePct}%` }} />
</div>
<span className={`text-xs font-semibold min-w-[40px] text-right ${color}`}>
{safePct.toFixed(0)}%
</span>
</div>
</div>
);
};
const conditionColor = (type: string, status: string) => {
if (status === 'True') {
if (type === 'Ready') return 'bg-emerald-500/20 text-emerald-400';
// Other True conditions (DiskPressure, MemoryPressure, PIDPressure, NetworkUnavailable) are BAD
return 'bg-red-500/20 text-red-400';
}
return 'bg-slate-500/20 text-slate-400';
};
const taintColor = (effect: string) => {
if (effect === 'NoSchedule') return 'bg-red-500/20 text-red-400 border-red-500/30';
if (effect === 'NoExecute') return 'bg-red-600/20 text-red-300 border-red-600/30';
if (effect === 'PreferNoSchedule') return 'bg-amber-500/20 text-amber-400 border-amber-500/30';
return 'bg-slate-500/20 text-slate-400 border-slate-500/30';
};
return (
<div className="space-y-4">
{/* Breadcrumb */}
<div className="flex items-center gap-2 text-sm text-slate-500">
<Link to="/kubernetes" className="hover:text-slate-300 transition-colors">集群</Link>
<ChevronRight className="h-3 w-3" />
<Link to={`/kubernetes/${clusterCode}`} className="hover:text-slate-300 transition-colors">{clusterCode}</Link>
<ChevronRight className="h-3 w-3" />
<span className="text-slate-300">{nodeName}</span>
</div>
{/* Header */}
<div className="flex items-center justify-between">
<div className="flex items-center gap-3">
<div className="flex items-center justify-center w-12 h-12 rounded-xl bg-slate-800 border border-slate-700">
<Server className="h-6 w-6 text-blue-400" />
</div>
<div>
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-slate-100">{nodeName}</h1>
<Badge className={data?.role === 'master' ? 'bg-blue-500/20 text-blue-400 border-blue-500/30' : 'bg-slate-500/20 text-slate-400 border-slate-500/30'}>
{data?.role || 'worker'}
</Badge>
<Badge className={data?.status === 'Ready' ? 'bg-emerald-500/20 text-emerald-400' : 'bg-red-500/20 text-red-400'}>
{data?.status || 'Unknown'}
</Badge>
</div>
<p className="text-sm text-slate-500 mt-0.5">
{data?.internal_ip && `${data.internal_ip}`}
{data?.hostname && ` · ${data.hostname}`}
</p>
</div>
</div>
<Button variant="outline" size="icon" className="h-9 w-9 border-slate-700 text-slate-400"
onClick={loadData} disabled={loading}>
{loading ? <Loader2 className="h-4 w-4 animate-spin" /> : <RefreshCw className="h-4 w-4" />}
</Button>
</div>
{loading && !data ? (
<Card className="bg-slate-900 border-slate-800">
<CardContent className="py-16 flex items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin text-slate-500" />
</CardContent>
</Card>
) : !data ? (
<Card className="bg-slate-900 border-slate-800">
<CardContent className="py-16 text-center text-slate-500">
<AlertTriangle className="h-8 w-8 mx-auto mb-2 opacity-50" />
无法加载节点详情
</CardContent>
</Card>
) : (
<>
{/* Row 1: System Info + Basic Info */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
{/* System Info */}
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-4">
<h2 className="text-sm font-semibold text-slate-200 mb-3 flex items-center gap-2">
<Info className="h-4 w-4 text-cyan-400" />系统信息
</h2>
<div className="space-y-2 text-xs">
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">容器运行时</span>
<span className="text-slate-300 font-mono">{data.container_runtime || '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">Kubelet</span>
<span className="text-slate-300 font-mono">{data.kubelet_version || '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">操作系统</span>
<span className="text-slate-300">{data.os_image || '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">内核版本</span>
<span className="text-slate-300 font-mono">{data.kernel_version || '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">架构</span>
<span className="text-slate-300 font-mono">{data.architecture || '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5 border-b border-slate-800/50">
<span className="text-slate-500">创建时间</span>
<span className="text-slate-300">{data.creation_time ? new Date(data.creation_time).toLocaleString('zh-CN') : '-'}</span>
</div>
<div className="flex items-center justify-between py-1.5">
<span className="text-slate-500">Pod CIDR</span>
<span className="text-slate-300 font-mono">{data.pod_cidr || '-'}</span>
</div>
</div>
</CardContent>
</Card>
{/* Resource Allocation */}
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-4">
<h2 className="text-sm font-semibold text-slate-200 mb-3 flex items-center gap-2">
<Activity className="h-4 w-4 text-emerald-400" />资源分配率
</h2>
<div className="space-y-4 mt-4">
{/* CPU allocation (requested vs allocatable) */}
<ResourceBar
label="CPU 已分配"
used={`${(data.cpu_request_m / 1000).toFixed(2)} 核`}
total={`${data.cpu_allocatable} 核`}
unit=""
pct={data.cpu_alloc_pct}
color="text-emerald-400"
/>
{/* CPU real usage (from metrics) */}
{data.cpu_usage_m && (
<ResourceBar
label="CPU 实时使用"
used={data.cpu_usage_m}
total={`${data.cpu_capacity} 核`}
unit=""
pct={(parseFloat(data.cpu_usage_m.replace('m', '')) / (data.cpu_capacity * 1000)) * 100}
color="text-blue-400"
/>
)}
{/* Memory allocation */}
<ResourceBar
label="内存已分配"
used={`${data.mem_request_mi} Mi`}
total={`${data.mem_allocatable_mb} Mi`}
unit=""
pct={data.mem_alloc_pct}
color="text-emerald-400"
/>
{/* Memory real usage */}
{data.mem_usage_mi && (
<ResourceBar
label="内存实时使用"
used={data.mem_usage_mi}
total={`${data.mem_capacity_mb} Mi`}
unit=""
pct={(parseFloat(data.mem_usage_mi.replace('Mi', '').replace('Ki', '').replace('Gi', '')) / data.mem_capacity_mb) * 100}
color="text-blue-400"
/>
)}
{/* Pod allocation */}
<ResourceBar
label="Pod 数量"
used={`${data.pod_count}`}
total={`${data.pod_allocatable}`}
unit=""
pct={data.pod_alloc_pct}
color="text-emerald-400"
/>
</div>
{/* Capacity vs Allocatable raw */}
<div className="mt-4 pt-3 border-t border-slate-800/50 space-y-1 text-[11px] text-slate-500">
<div className="flex justify-between">
<span>CPU 容量 / 可分配</span>
<span className="font-mono">{data.cpu_capacity} / {data.cpu_allocatable} 核</span>
</div>
<div className="flex justify-between">
<span>内存容量 / 可分配</span>
<span className="font-mono">{data.mem_capacity_mb} / {data.mem_allocatable_mb} Mi</span>
</div>
<div className="flex justify-between">
<span>Pod 容量 / 可分配</span>
<span className="font-mono">{data.pod_capacity} / {data.pod_allocatable}</span>
</div>
</div>
</CardContent>
</Card>
</div>
{/* Row 2: Conditions + Taints */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
{/* Conditions */}
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-4">
<h2 className="text-sm font-semibold text-slate-200 mb-3 flex items-center gap-2">
<CheckCircle2 className="h-4 w-4 text-blue-400" />节点条件
</h2>
{(!data.conditions || data.conditions.length === 0) ? (
<p className="text-xs text-slate-500 py-4 text-center">无条件数据</p>
) : (
<div className="space-y-2">
{data.conditions.map((cond: any, i: number) => (
<div key={i} className="flex items-start gap-2 text-xs py-1.5 border-b border-slate-800/30 last:border-0">
<Badge className={conditionColor(cond.type, cond.status)}>
{cond.status === 'True' ? <CheckCircle2 className="h-3 w-3 mr-1" /> : null}
{cond.type}
</Badge>
<div className="flex-1 min-w-0">
{cond.reason && <span className="text-slate-400 block">{cond.reason}</span>}
{cond.message && <span className="text-slate-600 text-[11px] block truncate">{cond.message}</span>}
</div>
</div>
))}
</div>
)}
</CardContent>
</Card>
{/* Taints */}
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-4">
<h2 className="text-sm font-semibold text-slate-200 mb-3 flex items-center gap-2">
<AlertTriangle className="h-4 w-4 text-amber-400" />污点 (Taints)
</h2>
{(!data.taints || data.taints.length === 0) ? (
<p className="text-xs text-slate-500 py-4 text-center">无污点</p>
) : (
<div className="space-y-2">
{data.taints.map((t: any, i: number) => (
<div key={i} className="flex items-center gap-2 text-xs">
<Badge className={taintColor(t.effect)}>{t.effect}</Badge>
<span className="text-slate-300 font-mono">{t.key}</span>
{t.value && <span className="text-slate-500">= {t.value}</span>}
</div>
))}
</div>
)}
</CardContent>
</Card>
</div>
{/* Row 3: Labels */}
{data.labels && data.labels.length > 0 && (
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-4">
<h2 className="text-sm font-semibold text-slate-200 mb-3 flex items-center gap-2">
<Network className="h-4 w-4 text-slate-400" />标签 ({data.labels.length})
</h2>
<div className="flex flex-wrap gap-1.5">
{data.labels.map((l: any, i: number) => (
<div key={i} className="flex items-center gap-1 bg-slate-800/50 border border-slate-700/50 rounded px-2 py-0.5 text-[11px]">
<span className="text-slate-400">{l.key}</span>
<span className="text-slate-600">:</span>
<span className="text-slate-300">{l.value}</span>
</div>
))}
</div>
</CardContent>
</Card>
)}
{/* Row 4: Pods on this node */}
<Card className="bg-slate-900 border-slate-800">
<CardContent className="p-0">
<div className="px-4 py-3 border-b border-slate-800">
<h2 className="text-sm font-semibold text-slate-200 flex items-center gap-2">
<Container className="h-4 w-4 text-cyan-400" />
节点上的 Pod
<Badge className="bg-slate-700/50 text-slate-300">{data.pods?.length || 0}</Badge>
</h2>
</div>
{(!data.pods || data.pods.length === 0) ? (
<p className="text-xs text-slate-500 py-8 text-center">该节点上暂无 Pod</p>
) : (
<Table>
<TableHeader>
<TableRow className="border-slate-800 hover:bg-transparent">
<TableHead className="text-slate-400">命名空间</TableHead>
<TableHead className="text-slate-400">名称</TableHead>
<TableHead className="text-slate-400">状态</TableHead>
<TableHead className="text-slate-400">IP</TableHead>
<TableHead className="text-slate-400">CPU 请求</TableHead>
<TableHead className="text-slate-400">内存请求</TableHead>
<TableHead className="text-slate-400">重启次数</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{data.pods.map((p: any, i: number) => (
<TableRow key={i} className="border-slate-800 hover:bg-slate-800/30">
<TableCell className="text-sm text-slate-400">{p.namespace}</TableCell>
<TableCell className="text-sm font-medium text-slate-200">{p.name}</TableCell>
<TableCell>
<Badge className={
p.status === 'Running' ? 'bg-emerald-500/20 text-emerald-400' :
p.status === 'Pending' ? 'bg-amber-500/20 text-amber-400' :
'bg-red-500/20 text-red-400'
}>{p.status}</Badge>
</TableCell>
<TableCell className="text-xs text-slate-400 font-mono">{p.ip || '-'}</TableCell>
<TableCell className="text-xs text-slate-400">
{p.cpu_request_m > 0 ? `${p.cpu_request_m}m` : '-'}
</TableCell>
<TableCell className="text-xs text-slate-400">
{p.mem_request_mi > 0 ? `${p.mem_request_mi}Mi` : '-'}
</TableCell>
<TableCell className="text-xs">
{p.restart_count > 0 ? (
<span className="text-amber-400">{p.restart_count}</span>
) : (
<span className="text-slate-600">0</span>
)}
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
)}
</CardContent>
</Card>
</>
)}
</div>
);
}
@@ -45,7 +45,14 @@ export function PodFileBrowser({
setPreview(null);
try {
const res: any = await kubernetesApi.listPodFiles(clusterCode, namespace, podName, path, container || undefined);
const list: FileEntry[] = res?.entries || res?.data?.entries || (Array.isArray(res) ? res : []);
// 兼容后端 {files: [...]} 和 {entries: [...]} 两种返回格式
const raw: any[] = res?.entries || res?.files || res?.data?.entries || res?.data?.files || (Array.isArray(res) ? res : []);
const list: FileEntry[] = raw.map((it: any) => ({
name: it.name ?? it.Name ?? '',
isDir: Boolean(it.isDir ?? it.is_dir ?? it.IsDir ?? it.dir ?? it.directory),
size: typeof it.size === 'number' ? it.size : (it.Size ? Number(it.Size) : undefined),
modTime: it.modTime ?? it.mod_time ?? it.ModTime ?? it.mtime ?? it.modified,
})).filter(e => e.name && e.name !== '.');
setEntries(list);
setCurrentPath(path);
} catch (e: any) {