Skip to content

Commit 1bfa7f9

Browse files
authored
Merge pull request #26746 from gaoguangze111/update-chinese-translation-scheduling-eviction
Update Chinese translation for page scheduling eviction
2 parents d3ce79c + 35fd22c commit 1bfa7f9

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ weight: 40
88
<!--
99
Node affinity, described [here](/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature),
1010
is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attracts* them to
11-
a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a
11+
a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a
1212
hard requirement). Taints are the opposite -they allow a node to repel a set of pods.
1313
-->
1414
节点亲和性(详见[这里](/zh/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity)
@@ -140,7 +140,7 @@ This is a "preference" or "soft" version of `NoSchedule` - the system will *try*
140140
pod that does not tolerate the taint on the node, but it is not required. The third kind of `effect` is
141141
`NoExecute`, described later.
142142
-->
143-
上述例子使用到的 `effect` 的一个值 `NoSchedule`,您也可以使用另外一个值 `PreferNoSchedule`。
143+
上述例子中 `effect` 使用的值为 `NoSchedule`,您也可以使用另外一个值 `PreferNoSchedule`。
144144
这是“优化”或“软”版本的 `NoSchedule` —— 系统会 *尽量* 避免将 Pod 调度到存在其不能容忍污点的节点上,
145145
但这不是强制的。`effect` 的值还可以设置为 `NoExecute`,下文会详细描述这个值。
146146

@@ -438,7 +438,7 @@ by the user already has a toleration for `node.kubernetes.io/unreachable`.
438438

439439
{{< note >}}
440440
Kubernetes 会自动给 Pod 添加一个 key 为 `node.kubernetes.io/not-ready` 的容忍度
441-
并配置 `tolerationSeconds=300`,除非用户提供的 Pod 配置中已经已存在了 key 为
441+
并配置 `tolerationSeconds=300`,除非用户提供的 Pod 配置中已经已存在了 key 为
442442
`node.kubernetes.io/not-ready` 的容忍度。
443443

444444
同样,Kubernetes 会给 Pod 添加一个 key 为 `node.kubernetes.io/unreachable` 的容忍度
@@ -517,5 +517,3 @@ arbitrary tolerations to DaemonSets.
517517
-->
518518
* 阅读[资源耗尽的处理](/zh/docs/tasks/administer-cluster/out-of-resource/),以及如何配置其行为
519519
* 阅读 [Pod 优先级](/zh/docs/concepts/configuration/pod-priority-preemption/)
520-
521-

0 commit comments

Comments
 (0)