Skip to content

Commit c37f923

Browse files
authored
Merge pull request #41340 from asa3311/sync-configure-cgroup-driver.md-and-cpu-management-policies.md
[zh-cn] sync configure-cgroup-driver.md and cpu-management-policies.md
2 parents 6885ceb + 29cfeda commit c37f923

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

content/zh-cn/docs/tasks/administer-cluster/cpu-management-policies.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ directives.
3232
然而,为了正常运行,有些工作负载要求在延迟和/或性能方面有更强的保证。
3333
为此,kubelet 提供方法来实现更复杂的负载放置策略,同时保持抽象,避免显式的放置指令。
3434

35+
<!--
36+
For detailed information on resource management, please refer to the
37+
[Resource Management for Pods and Containers](/docs/concepts/configuration/manage-resources-containers)
38+
documentation.
39+
-->
40+
有关资源管理的详细信息,
41+
请参阅 [Pod 和容器的资源管理](/zh-cn/docs/concepts/configuration/manage-resources-containers)文档。
42+
3543
## {{% heading "prerequisites" %}}
3644

3745
{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}

content/zh-cn/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ weight: 10
1212
<!-- overview -->
1313

1414
<!--
15-
This page explains how to configure the kubelet cgroup driver to match the container
15+
This page explains how to configure the kubelet's cgroup driver to match the container
1616
runtime cgroup driver for kubeadm clusters.
1717
-->
1818
本页阐述如何配置 kubelet 的 cgroup 驱动以匹配 kubeadm 集群中的容器运行时的 cgroup 驱动。
@@ -35,11 +35,15 @@ You should be familiar with the Kubernetes
3535
<!--
3636
The [Container runtimes](/docs/setup/production-environment/container-runtimes) page
3737
explains that the `systemd` driver is recommended for kubeadm based setups instead
38-
of the `cgroupfs` driver, because kubeadm manages the kubelet as a systemd service.
38+
of the kubelet's [default](/docs/reference/config-api/kubelet-config.v1beta1) `cgroupfs` driver,
39+
because kubeadm manages the kubelet as a
40+
[systemd service](/docs/setup/production-environment/tools/kubeadm/kubelet-integration).
3941
-->
40-
[容器运行时](/zh-cn/docs/setup/production-environment/container-runtimes)页面提到:
41-
由于 kubeadm 把 kubelet 视为一个系统服务来管理,所以对基于 kubeadm 的安装,
42-
我们推荐使用 `systemd` 驱动,不推荐 `cgroupfs` 驱动。
42+
[容器运行时](/zh-cn/docs/setup/production-environment/container-runtimes)页面提到,
43+
由于 kubeadm 把 kubelet 视为一个
44+
[系统服务](/zh-cn/docs/setup/production-environment/tools/kubeadm/kubelet-integration)来管理,
45+
所以对基于 kubeadm 的安装, 我们推荐使用 `systemd` 驱动,
46+
不推荐 kubelet [默认](/zh-cn/docs/reference/config-api/kubelet-config.v1beta1)`cgroupfs` 驱动。
4347

4448
<!--
4549
The page also provides details on how to set up a number of different container runtimes with the
@@ -61,12 +65,12 @@ kubeadm 支持在执行 `kubeadm init` 时,传递一个 `KubeletConfiguration`
6165
`KubeletConfiguration` 包含 `cgroupDriver` 字段,可用于控制 kubelet 的 cgroup 驱动。
6266

6367
<!--
64-
In v1.22, if the user is not setting the `cgroupDriver` field under `KubeletConfiguration`,
65-
`kubeadm` will default it to `systemd`.
68+
In v1.22 and later, if the user does not set the `cgroupDriver` field under `KubeletConfiguration`,
69+
+kubeadm defaults it to `systemd`.
6670
-->
6771

6872
{{< note >}}
69-
在版本 1.22 ,如果用户没有在 `KubeletConfiguration` 中设置 `cgroupDriver` 字段,
73+
在版本 1.22 及更高版本中,如果用户没有在 `KubeletConfiguration` 中设置 `cgroupDriver` 字段,
7074
`kubeadm` 会将它设置为默认值 `systemd`
7175
{{< /note >}}
7276

@@ -148,11 +152,11 @@ you must refer to the documentation of the container runtime of your choice.
148152
## 迁移到 `systemd` 驱动
149153

150154
<!--
151-
To change the cgroup driver of an existing kubeadm cluster to `systemd` in-place,
155+
To change the cgroup driver of an existing kubeadm cluster from `cgroupfs` to `systemd` in-place,
152156
a similar procedure to a kubelet upgrade is required. This must include both
153157
steps outlined below.
154158
-->
155-
要将现有 kubeadm 集群的 cgroup 驱动就地升级为 `systemd`
159+
要将现有 kubeadm 集群的 cgroup 驱动从 `cgroupfs` 就地升级为 `systemd`
156160
需要执行一个与 kubelet 升级类似的过程。
157161
该过程必须包含下面两个步骤:
158162

0 commit comments

Comments
 (0)