Skip to content

Commit f6ed4a1

Browse files
committed
sync configure-access-multiple-clusters configure-cgroup-driver resize-container-resources
1 parent 9782707 commit f6ed4a1

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

content/zh-cn/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ content_type: task
44
weight: 30
55
card:
66
name: tasks
7-
weight: 40
7+
weight: 25
8+
title: 配置对集群的访问
89
---
910
<!--
1011
title: Configure Access to Multiple Clusters
1112
content_type: task
1213
weight: 30
1314
card:
1415
name: tasks
15-
weight: 40
16+
weight: 25
17+
title: Configure access to clusters
1618
-->
1719

1820
<!-- overview -->

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,20 @@ kubeadm 支持在执行 `kubeadm init` 时,传递一个 `KubeletConfiguration`
6666

6767
<!--
6868
In v1.22 and later, if the user does not set the `cgroupDriver` field under `KubeletConfiguration`,
69-
+kubeadm defaults it to `systemd`.
69+
kubeadm defaults it to `systemd`.
70+
71+
In Kubernetes v1.28, you can enable automatic detection of the
72+
cgroup driver as an alpha feature.
73+
See [systemd cgroup driver](/docs/setup/production-environment/container-runtimes/#systemd-cgroup-driver)
74+
for more details.
7075
-->
7176

7277
{{< note >}}
7378
在版本 1.22 及更高版本中,如果用户没有在 `KubeletConfiguration` 中设置 `cgroupDriver` 字段,
7479
`kubeadm` 会将它设置为默认值 `systemd`
80+
81+
在 Kubernetes v1.28 中,你可以以 Alpha 功能启用 cgroup 驱动的自动检测。
82+
有关更多详情,请查看 [systemd cgroup 驱动](/zh-cn/docs/setup/production-environment/container-runtimes/#systemd-cgroup-driver)
7583
{{< /note >}}
7684

7785
<!--

content/zh-cn/docs/tasks/configure-pod-container/resize-container-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ set to `NotRequired` for all Containers in the Pod.
113113

114114
<!--
115115
Below example shows a Pod whose Container's CPU can be resized without restart, but
116-
memory resize memory requires the container to be restarted.
116+
resizing memory requires the container to be restarted.
117117
-->
118118
下面的示例显示了一个 Pod,其中 CPU 可以在不重启容器的情况下进行调整,但是内存调整需要重启容器。
119119

0 commit comments

Comments
 (0)