Skip to content

Commit af329a6

Browse files
authored
Merge pull request #31983 from howieyuen/node-pressure-eviction
[zh]resync node-pressure-eviction.md and fix hyper link issue
2 parents d975200 + b435630 commit af329a6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ QoS 不适用于临时存储(EphemeralStorage)请求,
449449
`Guaranteed` pods are guaranteed only when requests and limits are specified for
450450
all the containers and they are equal. These pods will never be evicted because
451451
of another pod's resource consumption. If a system daemon (such as `kubelet`,
452-
`docker`, and `journald`) is consuming more resources than were reserved via
452+
and `journald`) is consuming more resources than were reserved via
453453
`system-reserved` or `kube-reserved` allocations, and the node only has
454454
`Guaranteed` or `Burstable` pods using less resources than requests left on it,
455455
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.
458458
-->
459459
仅当 `Guaranteed` Pod 中所有容器都被指定了请求和限制并且二者相等时,才保证 Pod 不被驱逐。
460460
这些 Pod 永远不会因为另一个 Pod 的资源消耗而被驱逐。
461-
如果系统守护进程(例如 `kubelet``docker``journald`
461+
如果系统守护进程(例如 `kubelet``journald`
462462
消耗的资源比通过 `system-reserved``kube-reserved` 分配保留的资源多,
463463
并且该节点只有 `Guaranteed``Burstable` Pod 使用的资源少于其上剩余的请求,
464464
那么 kubelet 必须选择驱逐这些 Pod 中的一个以保持节点稳定性并减少资源匮乏对其他 Pod 的影响。

content/zh/docs/reference/glossary/pod-priority.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Pod 优先级(Pod Priority)
33
id: pod-priority
44
date: 2019-01-31
5-
full_link: /zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority
5+
full_link: /zh/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
66
short_description: >
77
Pod 优先级表示一个 Pod 相对于其他 Pod 的重要性。
88
@@ -15,7 +15,7 @@ tags:
1515
title: Pod Priority
1616
id: pod-priority
1717
date: 2019-01-31
18-
full_link: /docs/concepts/configuration/pod-priority-preemption/#pod-priority
18+
full_link: /docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
1919
short_description: >
2020
Pod Priority indicates the importance of a Pod relative to other Pods.
2121
@@ -32,9 +32,9 @@ tags:
3232
<!--more-->
3333

3434
<!--
35-
[Pod Priority](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.
35+
[Pod Priority](/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.
3636
-->
37-
[Pod 优先级](/zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority)
37+
[Pod 优先级](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority)
3838
允许用户为 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群
3939
工作负载而言是一个重要的特性。
4040

0 commit comments

Comments
 (0)