Skip to content

Commit 73edd86

Browse files
authored
Merge pull request #45648 from asa3311/sync-zh-108
[zh] sync kube-scheduler taint-and-toleration topology-spread-constraints
2 parents 7ee3207 + fb93730 commit 73edd86

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/kube-scheduler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ kube-scheduler 给一个 Pod 做调度选择时包含两个步骤:
122122
<!--
123123
The _filtering_ step finds the set of Nodes where it's feasible to
124124
schedule the Pod. For example, the PodFitsResources filter checks whether a
125-
candidate Node has enough available resource to meet a Pod's specific
125+
candidate Node has enough available resources to meet a Pod's specific
126126
resource requests. After this step, the node list contains any suitable
127127
Nodes; often, there will be more than one. If the list is empty, that
128128
Pod isn't (yet) schedulable.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ An empty `effect` matches all effects with key `key1`.
141141
{{< /note >}}
142142

143143
<!--
144-
The above example used `effect` of `NoSchedule`. Alternatively, you can use `effect` of `PreferNoSchedule`.
144+
The above example used the `effect` of `NoSchedule`. Alternatively, you can use the `effect` of `PreferNoSchedule`.
145145
-->
146146
上述例子中 `effect` 使用的值为 `NoSchedule`,你也可以使用另外一个值 `PreferNoSchedule`。
147147

@@ -389,7 +389,7 @@ are true. The following taints are built in:
389389
* `node.kubernetes.io/network-unavailable`: Node's network is unavailable.
390390
* `node.kubernetes.io/unschedulable`: Node is unschedulable.
391391
* `node.cloudprovider.kubernetes.io/uninitialized`: When the kubelet is started
392-
with "external" cloud provider, this taint is set on a node to mark it
392+
with an "external" cloud provider, this taint is set on a node to mark it
393393
as unusable. After a controller from the cloud-controller-manager initializes
394394
this node, the kubelet removes this taint.
395395
-->

content/zh-cn/docs/concepts/scheduling-eviction/topology-spread-constraints.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ can use a manifest similar to:
496496
497497
<!--
498498
From that manifest, `topologyKey: zone` implies the even distribution will only be applied
499-
to nodes that are labelled `zone: <any value>` (nodes that don't have a `zone` label
499+
to nodes that are labeled `zone: <any value>` (nodes that don't have a `zone` label
500500
are skipped). The field `whenUnsatisfiable: DoNotSchedule` tells the scheduler to let the
501501
incoming Pod stay pending if the scheduler can't find a way to satisfy the constraint.
502502
@@ -780,7 +780,7 @@ There are some implicit conventions worth noting here:
780780
above example, if you remove the incoming Pod's labels, it can still be placed onto
781781
nodes in zone `B`, since the constraints are still satisfied. However, after that
782782
placement, the degree of imbalance of the cluster remains unchanged - it's still zone `A`
783-
having 2 Pods labelled as `foo: bar`, and zone `B` having 1 Pod labelled as
783+
having 2 Pods labeled as `foo: bar`, and zone `B` having 1 Pod labeled as
784784
`foo: bar`. If this is not what you expect, update the workload's
785785
`topologySpreadConstraints[*].labelSelector` to match the labels in the pod template.
786786
-->
@@ -981,7 +981,7 @@ section of the enhancement proposal about Pod topology spread constraints.
981981
because, in this case, those topology domains won't be considered until there is
982982
at least one node in them.
983983

984-
You can work around this by using an cluster autoscaling tool that is aware of
984+
You can work around this by using a cluster autoscaling tool that is aware of
985985
Pod topology spread constraints and is also aware of the overall set of topology
986986
domains.
987987
-->

0 commit comments

Comments
 (0)