Skip to content

Commit ddba407

Browse files
authored
Merge pull request #41418 from asa3311/sync-controller-manager-leader-migration-reserve-compute-resources-cpu-default-namespace
[zh-cn] sync cpu-default-namespace reserve-compute-resources controller-manager-leader-migration
2 parents 67e3a2d + 1275e03 commit ddba407

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

content/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ The migrated controllers, as specified in the configuration, are running under e
274274
version N or `cloud-controller-manager` of version N + 1 depending on which controller manager holds the migration lease.
275275
No controller will ever be running under both controller managers at any time.
276276

277-
In a rolling manner, create a new control plane node of version N + 1 and bring down one of version N + 1 until the control plane contains only nodes of version N + 1.
277+
In a rolling manner, create a new control plane node of version N + 1 and bring down one of version N until the control plane contains only nodes of version N + 1.
278278
If a rollback from version N + 1 to N is required, add nodes of version N with Leader Migration enabled for `kube-controller-manager` back to the control plane, replacing one of version N + 1 each time until there are only nodes of version N.
279279
-->
280280
### 升级控制平面

content/zh-cn/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ kubectl apply -f https://k8s.io/examples/admin/resource/cpu-defaults-pod-2.yaml
168168
```
169169

170170
<!--
171-
View the [specification](/docs/concepts/overview/working-with-objects/kubernetes-objects/#object-spec-and-status)
171+
View the [specification](/docs/concepts/overview/working-with-objects/#object-spec-and-status)
172172
of the Pod that you created:
173173
-->
174-
查看你所创建的 Pod 的[规约](/zh-cn/docs/concepts/overview/working-with-objects/kubernetes-objects/#object-spec-and-status)
174+
查看你所创建的 Pod 的[规约](/zh-cn/docs/concepts/overview/working-with-objects/#object-spec-and-status)
175175

176176
```
177177
kubectl get pod default-cpu-demo-2 --output=yaml --namespace=default-cpu-example
@@ -213,10 +213,9 @@ kubectl apply -f https://k8s.io/examples/admin/resource/cpu-defaults-pod-3.yaml
213213
```
214214

215215
<!--
216-
View the [specification](/docs/concepts/overview/working-with-objects/kubernetes-objects/#object-spec-and-status)
217-
of the Pod that you created:
216+
View the specification of the Pod that you created:
218217
-->
219-
查看你所创建的 Pod [规约](/zh-cn/docs/concepts/overview/working-with-objects/kubernetes-objects/#object-spec-and-status)
218+
查看你所创建的 Pod 的规约
220219

221220
```
222221
kubectl get pod default-cpu-demo-3 --output=yaml --namespace=default-cpu-example

content/zh-cn/docs/tasks/administer-cluster/reserve-compute-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ Under this scenario, 'Allocatable' will be 14.5 CPUs, 28.5Gi of memory and
437437
Scheduler ensures that the total memory `requests` across all pods on this node does
438438
not exceed 28.5Gi and storage doesn't exceed 88Gi.
439439
Kubelet evicts pods whenever the overall memory usage across pods exceeds 28.5Gi,
440-
or if overall disk usage exceeds 88Gi If all processes on the node consume as
440+
or if overall disk usage exceeds 88Gi. If all processes on the node consume as
441441
much CPU as they can, pods together cannot consume more than 14.5 CPUs.
442442
-->
443443
在这个场景下,'Allocatable' 将会是 14.5 CPUs、28.5Gi 内存以及 `88Gi` 本地存储。

0 commit comments

Comments
 (0)