Skip to content

Commit 5310126

Browse files
committed
[zh-cn] sync migrate-dockershim-dockerd enforce-standards-admission-controller
Signed-off-by: xin.li <[email protected]>
1 parent bd661f0 commit 5310126

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,12 @@ instructions for that tool.
146146
1. Open `/var/lib/kubelet/kubeadm-flags.env` on each affected node.
147147
1. Modify the `--container-runtime-endpoint` flag to
148148
`unix:///var/run/cri-dockerd.sock`.
149+
1. Modify the `--container-runtime` flag to `remote`
150+
(unavailable in Kubernetes v1.27 and later).
149151
-->
150152
1. 在每个被影响的节点上,打开 `/var/lib/kubelet/kubeadm-flags.env` 文件;
151153
1.`--container-runtime-endpoint` 标志,将其设置为 `unix:///var/run/cri-dockerd.sock`
154+
1.`--container-runtime` 标志修改为 `remote`(在 Kubernetes v1.27 及更高版本中不可用)。
152155

153156
<!--
154157
The kubeadm tool stores the node's socket as an annotation on the `Node` object

content/zh-cn/docs/tasks/configure-pod-container/enforce-standards-admission-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ For v1.22, use [v1alpha1](https://v1-22.docs.kubernetes.io/docs/tasks/configure-
6262
{{< /note >}}
6363

6464
```yaml
65-
apiVersion: apiserver.config.k8s.io/v1 # 查阅兼容性说明
65+
apiVersion: apiserver.config.k8s.io/v1
6666
kind: AdmissionConfiguration
6767
plugins:
6868
- name: PodSecurity

0 commit comments

Comments
 (0)