Skip to content

Commit 4b7d537

Browse files
authored
Merge pull request #36557 from yanrongshi/zh-cn]-Sync-1.25-implementation-details.md
[zh-cn]Sync 1.25 implementation-details.md
2 parents cb4cc03 + fb59e2a commit 4b7d537

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/implementation-details.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,16 +788,16 @@ Please note that:
788788
请注意:
789789

790790
<!--
791-
1. The etcd container image will be pulled from `registry.k8s.io` by default. See
791+
1. The etcd container image will be pulled from `registry.gcr.io` by default. See
792792
[using custom images](/docs/reference/setup-tools/kubeadm/kubeadm-init/#custom-images)
793-
for customizing the image repository
793+
for customizing the image repository.
794794
2. If you run kubeadm in `--dry-run` mode, the etcd static Pod manifest is written
795795
into a temporary folder.
796796
3. You can directly invoke static Pod manifest generation for local etcd, using the
797797
[`kubeadm init phase etcd local`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-etcd)
798798
command.
799799
-->
800-
1. etcd 容器镜像默认从 `registry.k8s.io` 拉取。有关自定义镜像仓库,
800+
1. etcd 容器镜像默认从 `registry.gcr.io` 拉取。有关自定义镜像仓库,
801801
请参阅[使用自定义镜像](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init/#custom-images)
802802
2. 如果你以 `--dry-run` 模式执行 kubeadm 命令,etcd 的静态 Pod 清单将被写入一个临时文件夹。
803803
3. 你可以使用 ['kubeadm init phase etcd local'](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-etcd)
@@ -876,6 +876,9 @@ As soon as the control plane is available, kubeadm executes following actions:
876876
Please note that the phase to mark the control-plane phase can be invoked
877877
individually with the
878878
[`kubeadm init phase mark-control-plane`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-mark-control-plane) command.
879+
880+
- Taints the node with `node-role.kubernetes.io/master:NoSchedule` and
881+
`node-role.kubernetes.io/control-plane:NoSchedule`
879882
-->
880883
- 给节点打上 `node-role.kubernetes.io/control-plane=""` 标签,标记其为控制平面
881884
- 给节点打上 `node-role.kubernetes.io/control-plane:NoSchedule` 污点
@@ -884,6 +887,9 @@ individually with the
884887
[`kubeadm init phase mark-control-plane`](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-mark-control-plane)
885888
命令来实现。
886889

890+
- 给节点打上 `node-role.kubernetes.io/master:NoSchedule`
891+
`node-role.kubernetes.io/control-plane:NoSchedule` 污点
892+
887893
<!--
888894
Please note that:
889895
-->

0 commit comments

Comments
 (0)