From b435630d21c1ea9cec66726e16af212814d07b5f Mon Sep 17 00:00:00 2001 From: howieyuen Date: Tue, 1 Mar 2022 17:20:42 +0800 Subject: [PATCH] [zh]resync node-pressure-eviction.md and fix hyper link issue --- .../scheduling-eviction/node-pressure-eviction.md | 4 ++-- content/zh/docs/reference/glossary/pod-priority.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md index 4c40fac8b0..f35a64425f 100644 --- a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md +++ b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md @@ -449,7 +449,7 @@ QoS 不适用于临时存储(EphemeralStorage)请求, `Guaranteed` pods are guaranteed only when requests and limits are specified for all the containers and they are equal. These pods will never be evicted because of another pod's resource consumption. If a system daemon (such as `kubelet`, -`docker`, and `journald`) is consuming more resources than were reserved via +and `journald`) is consuming more resources than were reserved via `system-reserved` or `kube-reserved` allocations, and the node only has `Guaranteed` or `Burstable` pods using less resources than requests left on it, then the kubelet must choose to evict one of these pods to preserve node stability @@ -458,7 +458,7 @@ will choose to evict pods of lowest Priority first. --> 仅当 `Guaranteed` Pod 中所有容器都被指定了请求和限制并且二者相等时,才保证 Pod 不被驱逐。 这些 Pod 永远不会因为另一个 Pod 的资源消耗而被驱逐。 -如果系统守护进程(例如 `kubelet`、`docker` 和 `journald`) +如果系统守护进程(例如 `kubelet` 和 `journald`) 消耗的资源比通过 `system-reserved` 或 `kube-reserved` 分配保留的资源多, 并且该节点只有 `Guaranteed` 或 `Burstable` Pod 使用的资源少于其上剩余的请求, 那么 kubelet 必须选择驱逐这些 Pod 中的一个以保持节点稳定性并减少资源匮乏对其他 Pod 的影响。 diff --git a/content/zh/docs/reference/glossary/pod-priority.md b/content/zh/docs/reference/glossary/pod-priority.md index 149ac33ee3..d029d0593c 100644 --- a/content/zh/docs/reference/glossary/pod-priority.md +++ b/content/zh/docs/reference/glossary/pod-priority.md @@ -2,7 +2,7 @@ title: Pod 优先级(Pod Priority) id: pod-priority date: 2019-01-31 -full_link: /zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority +full_link: /zh/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority short_description: > Pod 优先级表示一个 Pod 相对于其他 Pod 的重要性。 @@ -15,7 +15,7 @@ tags: title: Pod Priority id: pod-priority date: 2019-01-31 -full_link: /docs/concepts/configuration/pod-priority-preemption/#pod-priority +full_link: /docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority short_description: > Pod Priority indicates the importance of a Pod relative to other Pods. @@ -32,9 +32,9 @@ tags: -[Pod 优先级](/zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority) +[Pod 优先级](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority) 允许用户为 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群 工作负载而言是一个重要的特性。