diff --git a/backend/controller/k8s_node.go b/backend/controller/k8s_node.go
index 0d8e000..f3dd9da 100644
--- a/backend/controller/k8s_node.go
+++ b/backend/controller/k8s_node.go
@@ -49,7 +49,44 @@ func (h *KubernetesHandler) ListNodes(c *gin.Context) {
// Metrics absolute (for detail pages)
CPUUsageM string `json:"cpu_usage_m,omitempty"` // e.g. "122m"
MemUsageMi string `json:"mem_usage_mi,omitempty"` // e.g. "2105Mi"
+
+ // Request 占用（分配率 = 该节点 Pod 已申请 / 可分配）// Logan.Li
+ PodCount int `json:"pod_count"`
+ CPURequestM int `json:"cpu_request_m"`
+ MemRequestMi int64 `json:"mem_request_mi"`
+ CPUAllocPct float64 `json:"cpu_alloc_pct"`
+ MemAllocPct float64 `json:"mem_alloc_pct"`
}
+
+ // 一次性拉取 Pod 并按节点聚合 Request：列表页展示"Request 占用"所需，
+ // 避免每行单独查一次 Pod 列表。 // Logan.Li
+ type reqAgg struct {
+ cpuM int
+ memMi int64
+ pods int
+ }
+ podReqs := map[string]*reqAgg{}
+ if pods, perr := client.ListPods(); perr == nil && pods != nil {
+ for _, p := range pods.Items {
+ if p.Spec.NodeName == "" {
+ continue
+ }
+ agg := podReqs[p.Spec.NodeName]
+ if agg == nil {
+ agg = &reqAgg{}
+ podReqs[p.Spec.NodeName] = agg
+ }
+ agg.pods++
+ for _, ctr := range p.Spec.Containers {
+ if ctr.Resources.Requests == nil {
+ continue
+ }
+ agg.cpuM += parseCpuToMilli(ctr.Resources.Requests["cpu"])
+ agg.memMi += parseMemToMi(ctr.Resources.Requests["memory"])
+ }
+ }
+ }
+
result := []NodeSummary{}
for _, n := range nodes.Items {
role := "worker"
@@ -100,6 +137,20 @@ func (h *KubernetesHandler) ListNodes(c *gin.Context) {
s.MemoryUsage = float64(memMi) / float64(memCapacity) * 100
}
}
+ // Request 占用：本节点 Pod 已申请 / 可分配。 // Logan.Li
+ if agg := podReqs[n.Metadata.Name]; agg != nil {
+ allocCPU := parseIntResource(n.Status.Allocatable["cpu"])
+ allocMem := parseMemResource(n.Status.Allocatable["memory"])
+ s.PodCount = agg.pods
+ s.CPURequestM = agg.cpuM
+ s.MemRequestMi = agg.memMi
+ if allocCPU > 0 {
+ s.CPUAllocPct = float64(agg.cpuM) / float64(allocCPU*1000) * 100
+ }
+ if allocMem > 0 {
+ s.MemAllocPct = float64(agg.memMi) / float64(allocMem) * 100
+ }
+ }
result = append(result, s)
}
c.JSON(http.StatusOK, model.Response{Code: 200, Message: "success", Data: result})
diff --git a/frontend/src/components/kubernetes/KubernetesNodes.tsx b/frontend/src/components/kubernetes/KubernetesNodes.tsx
index b4461d6..f38026d 100644
--- a/frontend/src/components/kubernetes/KubernetesNodes.tsx
+++ b/frontend/src/components/kubernetes/KubernetesNodes.tsx
@@ -116,15 +116,17 @@ export function KubernetesNodes() {
{i18n.t('system.terminalStatus')}
{i18n.t('deploy.detailDialog.config')}
{i18n.t('server.usage')}
+ {/* Request 占用：已申请 / 可分配，与"使用率"分列，避免一列塞四个条 // Logan.Li */}
+ {i18n.t('k8s.node.requestUsage', { defaultValue: 'Request 占用' })}
Pods
Kubelet
{loading ? (
- {i18n.t('monitor.logPanel.logResults.loading')}
+ {i18n.t('monitor.logPanel.logResults.loading')}
) : filtered.length === 0 ? (
- {selectedCluster ? i18n.t('k8s.empty.nodes') : i18n.t('kubernetes.kubernetesnodes.sf8c38834')}
+ {selectedCluster ? i18n.t('k8s.empty.nodes') : i18n.t('kubernetes.kubernetesnodes.sf8c38834')}
) : (
filtered.map((n) => (
@@ -161,6 +163,38 @@ export function KubernetesNodes() {
);
})()}
+
+ {(() => {
+ // Request 占用 = 该节点 Pod 已申请 / 可分配。
+ // 百分比给直观判断，tooltip 给绝对值（分子/分母一起看才有意义）。 // Logan.Li
+ const cpuPct = n.cpu_alloc_pct || 0;
+ const memPct = n.mem_alloc_pct || 0;
+ const cpuReq = n.cpu_request_m || 0;
+ const memReq = n.mem_request_mi || 0;
+ const bar = (val: number) => val >= 85 ? 'bg-[var(--dg-red)]' : val >= 60 ? 'bg-[var(--dg-orange)]' : 'bg-[var(--dg-blue)]';
+ const txt = (val: number) => val >= 85 ? 'text-[var(--dg-red)]' : val >= 60 ? 'text-[var(--dg-orange)]' : 'text-[var(--dg-text-secondary)]';
+ const cpuCap = (n.cpu || 0) * 1000;
+ const memCap = n.memory || 0;
+ return (
+
+
+
CPU
+
+
{cpuPct.toFixed(0)}%
+
+
+
Mem
+
+
{memPct.toFixed(0)}%
+
+