Skip to content

Commit a577a33

Browse files
authored
Merge pull request #51604 from asa3311/sync-zh-189
[zh] sync container-runtimes security-context reconfigure-default-service-ip-ranges
2 parents a0bdb76 + fd39336 commit a577a33

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

content/zh-cn/docs/setup/production-environment/container-runtimes.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,17 @@ On Windows the default CRI endpoint is `npipe://./pipe/containerd-containerd`.
363363
<!--
364364
#### Configuring the `systemd` cgroup driver {#containerd-systemd}
365365

366-
To use the `systemd` cgroup driver in `/etc/containerd/config.toml` with `runc`, set
366+
To use the `systemd` cgroup driver in `/etc/containerd/config.toml` with `runc`,
367+
set the following config based on your Containerd version
368+
369+
Containerd versions 1.x:
367370
-->
368371
#### 配置 `systemd` cgroup 驱动 {#containerd-systemd}
369372

370-
结合 `runc` 使用 `systemd` cgroup 驱动,在 `/etc/containerd/config.toml` 中设置:
373+
要在 `/etc/containerd/config.toml` 中将 `runc` 配置为使用 `systemd` cgroup 驱动,
374+
请根据你使用的 Containerd 版本设置以下配置:
375+
376+
Containerd 1.x 版本:
371377

372378
```
373379
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
@@ -376,6 +382,19 @@ To use the `systemd` cgroup driver in `/etc/containerd/config.toml` with `runc`,
376382
SystemdCgroup = true
377383
```
378384
385+
<!--
386+
Containerd versions 2.x:
387+
-->
388+
Containerd versions 2.x 版本:
389+
390+
```
391+
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc]
392+
...
393+
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc.options]
394+
SystemdCgroup = true
395+
```
396+
397+
379398
<!--
380399
The `systemd` cgroup driver is recommended if you use [cgroup v2](/docs/concepts/architecture/cgroups).
381400
-->

content/zh-cn/docs/tasks/configure-pod-container/security-context.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,12 +633,12 @@ securityContext:
633633
This field has no effect on ephemeral volume types such as
634634
[`secret`](/docs/concepts/storage/volumes/#secret),
635635
[`configMap`](/docs/concepts/storage/volumes/#configmap),
636-
and [`emptydir`](/docs/concepts/storage/volumes/#emptydir).
636+
and [`emptyDir`](/docs/concepts/storage/volumes/#emptydir).
637637
-->
638638
{{< note >}}
639639
此字段对于 [`secret`](/zh-cn/docs/concepts/storage/volumes/#secret)、
640640
[`configMap`](/zh-cn/docs/concepts/storage/volumes/#configmap)
641-
和 [`emptydir`](/zh-cn/docs/concepts/storage/volumes/#emptydir)
641+
和 [`emptyDir`](/zh-cn/docs/concepts/storage/volumes/#emptydir)
642642
这类临时性存储无效。
643643
{{< /note >}}
644644

content/zh-cn/docs/tasks/network/reconfigure-default-service-ip-ranges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ We can categorize Service CIDR reconfiguration into the following scenarios:
113113
replacing the default ServiceCIDR is a complex operation. If the new
114114
ServiceCIDR does not overlap with the existing one, [it will require
115115
renumbering all existing Services and changing the `kubernetes.default`
116-
service](#Illustrative Reconfiguration Steps). The case where the primary IP
116+
service](#illustrative-reconfiguration-steps). The case where the primary IP
117117
family also changes is even more complicated, and may require to change
118118
multiple cluster components (kubelet, network plugins, etc.) to match the new
119119
primary IP family.

0 commit comments

Comments
 (0)