Skip to content

Commit 4aec7df

Browse files
authored
Merge pull request #41521 from my-git9/path-27993
[zh-cn] sync setup-ha-etcd-with-kubeadm change-runtime-containerd configure-aggregation-layer
2 parents 3e56fe9 + b86479b commit 4aec7df

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

content/zh-cn/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ on Kubernetes dual-stack support see [Dual-stack support with kubeadm](/docs/set
125125
# 将下面的 "systemd" 替换为你的容器运行时所使用的 cgroup 驱动。
126126
# kubelet 的默认值为 "cgroupfs"。
127127
# 如果需要的话,将 "--container-runtime-endpoint " 的值替换为一个不同的容器运行时。
128-
ExecStart=/usr/bin/kubelet --address=127.0.0.1 --pod-manifest-path=/etc/kubernetes/manifests --cgroup-driver=systemd --container-runtime=remote --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock
128+
ExecStart=/usr/bin/kubelet --address=127.0.0.1 --pod-manifest-path=/etc/kubernetes/manifests --cgroup-driver=systemd --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock
129129
Restart=always
130130
EOF
131131

content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,12 @@ then run the following commands:
157157
<!--
158158
## Configure the kubelet to use containerd as its container runtime
159159
160-
Edit the file `/var/lib/kubelet/kubeadm-flags.env` and add the containerd runtime to the flags.
161-
`--container-runtime=remote` and
160+
Edit the file `/var/lib/kubelet/kubeadm-flags.env` and add the containerd runtime to the flags;
162161
`--container-runtime-endpoint=unix:///run/containerd/containerd.sock`.
163162
-->
164163
## 配置 kubelet 使用 containerd 作为其容器运行时
165164

166-
编辑文件 `/var/lib/kubelet/kubeadm-flags.env`,将 containerd 运行时添加到标志中:
167-
`--container-runtime=remote`
165+
编辑文件 `/var/lib/kubelet/kubeadm-flags.env`,将 containerd 运行时添加到标志中;
168166
`--container-runtime-endpoint=unix:///run/containerd/containerd.sock`
169167

170168
<!--

content/zh-cn/docs/tasks/extend-kubernetes/configure-aggregation-layer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ The rest of this section describes these steps in detail.
8383
8484
The flow can be seen in the following diagram.
8585
86-
![aggregation auth flows](/images/docs/aggregation-api-auth-flow.png).
86+
![aggregation auth flows](/images/docs/aggregation-api-auth-flow.png)
8787
8888
The source for the above swimlanes can be found in the source of this document.
8989
-->

0 commit comments

Comments
 (0)