From ccf5bce952ee819c752d53207fec31f97ed941e5 Mon Sep 17 00:00:00 2001 From: Zach Zhu Date: Tue, 19 Jul 2022 17:36:07 +0800 Subject: [PATCH] [zh-cn] Fix some links and translation in scheduling-eviction (#35045) * [zh-cn] fix some links in scheduling-eviction * [zh-cn] fix translation in pod-priority-preemption * [zh-cn] add missing pod-disruption glossary definition in scheduling-eviction index * [zh-cn] add missing original English text in comments of scheduling-eviction index --- .../concepts/scheduling-eviction/_index.md | 26 ++++++++++++++++--- .../node-pressure-eviction.md | 4 +-- .../pod-priority-preemption.md | 12 ++++----- .../taint-and-toleration.md | 2 +- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/_index.md b/content/zh-cn/docs/concepts/scheduling-eviction/_index.md index 3919a6cfa0..5ff8e6e6ed 100644 --- a/content/zh-cn/docs/concepts/scheduling-eviction/_index.md +++ b/content/zh-cn/docs/concepts/scheduling-eviction/_index.md @@ -31,7 +31,17 @@ so that Pods with higher Priority can schedule on Nodes. Eviction is the process of terminating one or more Pods on Nodes. --> - + ## 调度 @@ -43,10 +53,20 @@ of terminating one or more Pods on Nodes. * [调度器的性能调试](/zh-cn/docs/concepts/scheduling-eviction/scheduler-perf-tuning/) * [扩展资源的资源装箱](/zh-cn/docs/concepts/scheduling-eviction/resource-bin-packing/) - + ## Pod 干扰 +{{}} + * [Pod 优先级和抢占](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/) -* [节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/) +* [节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/) * [API发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/) diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md b/content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md index f3bb84c490..ce17740440 100644 --- a/content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md +++ b/content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md @@ -22,7 +22,7 @@ During a node-pressure eviction, the kubelet sets the `PodPhase` for the selected pods to `Failed`. This terminates the pods. Node-pressure eviction is not the same as -[API-initiated eviction](/docs/reference/generated/kubernetes-api/v1.23/). +[API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/). --> {{}} 监控集群节点的 CPU、内存、磁盘空间和文件系统的 inode 等资源。 @@ -31,7 +31,7 @@ kubelet 可以主动地使节点上一个或者多个 Pod 失效，以回收资 在节点压力驱逐期间，kubelet 将所选 Pod 的 `PodPhase` 设置为 `Failed`。这将终止 Pod。 -节点压力驱逐不同于 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)。 +节点压力驱逐不同于 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)。 kubelet 使用优先级来确定 -[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/) Pod 的顺序。 +[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/) Pod 的顺序。 你可以使用 QoS 类来估计 Pod 最有可能被驱逐的顺序。kubelet 根据以下因素对 Pod 进行驱逐排名： 1. 对紧俏资源的使用是否超过请求值 @@ -650,8 +650,8 @@ kubelet 使用优先级来确定 [kubelet 驱逐时 Pod 的选择](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/#pod-selection-for-kubelet-eviction)。 当某 Pod 的资源用量未超过其请求时，kubelet 节点压力驱逐不会驱逐该 Pod。 -如果优先级较低的 Pod 没有超过其请求，则不会被驱逐。 -另一个优先级高于其请求的 Pod 可能会被驱逐。 +如果优先级较低的 Pod 的资源使用量没有超过其请求，则不会被驱逐。 +另一个优先级较高且资源使用量超过其请求的 Pod 可能会被驱逐。 ## {{% heading "whatsnext" %}} @@ -659,11 +659,11 @@ kubelet 使用优先级来确定 * Read about using ResourceQuotas in connection with PriorityClasses: [limit Priority Class consumption by default](/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default) * Learn about [Pod Disruption](/docs/concepts/workloads/pods/disruptions/) -* Learn about [API-initiated Eviction](/docs/reference/generated/kubernetes-api/v1.23/) +* Learn about [API-initiated Eviction](/docs/concepts/scheduling-eviction/api-eviction/) * Learn about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/) --> * 阅读有关将 ResourceQuota 与 PriorityClass 结合使用的信息： [默认限制优先级消费](/zh-cn/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default) * 了解 [Pod 干扰](/zh-cn/docs/concepts/workloads/pods/disruptions/) -* 了解 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) -* 了解[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/) +* 了解 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/) +* 了解[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/) diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md index 53e60e1cb8..a3c403081a 100644 --- a/content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -528,6 +528,6 @@ arbitrary tolerations to DaemonSets. * Read about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/) and how you can configure it * Read about [Pod Priority](/docs/concepts/scheduling-eviction/pod-priority-preemption/) --> -* 阅读[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)， +* 阅读[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/)， 以及如何配置其行为 * 阅读 [Pod 优先级](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)