Skip to content

Commit ccf5bce

Browse files
authored
[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
1 parent 85a1bd7 commit ccf5bce

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/_index.md

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,17 @@ so that Pods with higher Priority can schedule on Nodes. Eviction is the process
3131
of terminating one or more Pods on Nodes.
3232
-->
3333

34-
<!-- ## Scheduling -->
34+
<!--
35+
## Scheduling
36+
37+
* [Kubernetes Scheduler](/docs/concepts/scheduling-eviction/kube-scheduler/)
38+
* [Assigning Pods to Nodes](/docs/concepts/scheduling-eviction/assign-pod-node/)
39+
* [Pod Overhead](/docs/concepts/scheduling-eviction/pod-overhead/)
40+
* [Taints and Tolerations](/docs/concepts/scheduling-eviction/taint-and-toleration/)
41+
* [Scheduling Framework](/docs/concepts/scheduling-eviction/scheduling-framework)
42+
* [Scheduler Performance Tuning](/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
43+
* [Resource Bin Packing for Extended Resources](/docs/concepts/scheduling-eviction/resource-bin-packing/)
44+
-->
3545

3646
## 调度
3747

@@ -43,10 +53,20 @@ of terminating one or more Pods on Nodes.
4353
* [调度器的性能调试](/zh-cn/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
4454
* [扩展资源的资源装箱](/zh-cn/docs/concepts/scheduling-eviction/resource-bin-packing/)
4555

46-
<!-- ## Pod Disruption -->
56+
<!--
57+
## Pod Disruption
58+
59+
{{<glossary_definition term_id="pod-disruption" length="all">}}
60+
61+
* [Pod Priority and Preemption](/docs/concepts/scheduling-eviction/pod-priority-preemption/)
62+
* [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/)
63+
* [API-initiated Eviction](/docs/concepts/scheduling-eviction/api-eviction/)
64+
-->
4765

4866
## Pod 干扰
4967

68+
{{<glossary_definition term_id="pod-disruption" length="all">}}
69+
5070
* [Pod 优先级和抢占](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)
51-
* [节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)
71+
* [节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/)
5272
* [API发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)

content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ During a node-pressure eviction, the kubelet sets the `PodPhase` for the
2222
selected pods to `Failed`. This terminates the pods.
2323
2424
Node-pressure eviction is not the same as
25-
[API-initiated eviction](/docs/reference/generated/kubernetes-api/v1.23/).
25+
[API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/).
2626
-->
2727
{{<glossary_tooltip term_id="kubelet" text="kubelet">}}
2828
监控集群节点的 CPU、内存、磁盘空间和文件系统的 inode 等资源。
@@ -31,7 +31,7 @@ kubelet 可以主动地使节点上一个或者多个 Pod 失效,以回收资
3131

3232
在节点压力驱逐期间,kubelet 将所选 Pod 的 `PodPhase` 设置为 `Failed`。这将终止 Pod。
3333

34-
节点压力驱逐不同于 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)
34+
节点压力驱逐不同于 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)
3535

3636
<!--
3737
The kubelet does not respect your configured `PodDisruptionBudget` or the pod's

content/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ exceeding its requests, it won't be evicted. Another Pod with higher priority
639639
that exceeds its requests may be evicted.
640640
-->
641641
kubelet 使用优先级来确定
642-
[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/) Pod 的顺序。
642+
[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/) Pod 的顺序。
643643
你可以使用 QoS 类来估计 Pod 最有可能被驱逐的顺序。kubelet 根据以下因素对 Pod 进行驱逐排名:
644644

645645
1. 对紧俏资源的使用是否超过请求值
@@ -650,20 +650,20 @@ kubelet 使用优先级来确定
650650
[kubelet 驱逐时 Pod 的选择](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/#pod-selection-for-kubelet-eviction)。
651651

652652
当某 Pod 的资源用量未超过其请求时,kubelet 节点压力驱逐不会驱逐该 Pod。
653-
如果优先级较低的 Pod 没有超过其请求,则不会被驱逐。
654-
另一个优先级高于其请求的 Pod 可能会被驱逐。
653+
如果优先级较低的 Pod 的资源使用量没有超过其请求,则不会被驱逐。
654+
另一个优先级较高且资源使用量超过其请求的 Pod 可能会被驱逐。
655655

656656
## {{% heading "whatsnext" %}}
657657

658658
<!--
659659
* Read about using ResourceQuotas in connection with PriorityClasses:
660660
[limit Priority Class consumption by default](/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default)
661661
* Learn about [Pod Disruption](/docs/concepts/workloads/pods/disruptions/)
662-
* Learn about [API-initiated Eviction](/docs/reference/generated/kubernetes-api/v1.23/)
662+
* Learn about [API-initiated Eviction](/docs/concepts/scheduling-eviction/api-eviction/)
663663
* Learn about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/)
664664
-->
665665
* 阅读有关将 ResourceQuota 与 PriorityClass 结合使用的信息:
666666
[默认限制优先级消费](/zh-cn/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default)
667667
* 了解 [Pod 干扰](/zh-cn/docs/concepts/workloads/pods/disruptions/)
668-
* 了解 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)
669-
* 了解[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)
668+
* 了解 [API 发起的驱逐](/zh-cn/docs/concepts/scheduling-eviction/api-eviction/)
669+
* 了解[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/)

content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,6 @@ arbitrary tolerations to DaemonSets.
528528
* Read about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/) and how you can configure it
529529
* Read about [Pod Priority](/docs/concepts/scheduling-eviction/pod-priority-preemption/)
530530
-->
531-
* 阅读[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/),
531+
* 阅读[节点压力驱逐](/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction/),
532532
以及如何配置其行为
533533
* 阅读 [Pod 优先级](/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption/)

0 commit comments

Comments
 (0)