Skip to content

Commit a5d25f8

Browse files
authored
Merge pull request #46540 from my-git9/pt-27857
[zh-cn] sync kubeadm_join kubeadm_join_phase_control-plane-prepare_kubeconfig
2 parents 745b168 + 9eae35e commit a5d25f8

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ The "join [api-server-endpoint]" command executes the following phases:
9595
-->
9696
"join [api-server-endpoint]" 命令执行下列阶段:
9797

98+
<!--
9899
```
99100
preflight Run join pre-flight checks
100101
control-plane-prepare Prepare the machine for serving a control plane
@@ -107,7 +108,21 @@ control-plane-join Join a machine as a control plane instance
107108
/etcd Add a new local etcd member
108109
/update-status Register the new control-plane node into the ClusterStatus maintained in the kubeadm-config ConfigMap (DEPRECATED)
109110
/mark-control-plane Mark a node as a control-plane
111+
wait-control-plane EXPERIMENTAL: Wait for the control plane to start
110112
```
113+
-->
114+
1. preflight:运行接入前检查
115+
2. control-plane-prepare:准备用作控制平面的机器
116+
1. download-certs:[实验] 从 kubeadm-certs Secret 下载控制平面节点之间共享的证书
117+
2. certs:为新的控制平面组件生成证书
118+
3. kubeconfig:为新的控制平面组件生成 kubeconfig
119+
4. control-plane:生成新控制平面组件的清单
120+
3. kubelet-start:写入 kubelet 设置、证书并(重新)启动 kubelet
121+
4. control-plane-join:将机器加入为控制平面实例
122+
1. etcd:添加新的本地 etcd 成员
123+
2. update-status:将新的控制平面节点注册到 kubeadm-config ConfigMap 中维护的 ClusterStatus 中(已弃用)
124+
3. mark-control-plane:将节点标记为控制平面
125+
5. wait-control-plane:[实验] 等待控制平面启动
111126

112127
```
113128
kubeadm join [api-server-endpoint] [flags]
@@ -159,10 +174,13 @@ If not set the default network interface will be used.
159174
</tr>
160175
<tr>
161176
<td></td><td style="line-height: 130%; word-wrap: break-word;">
177+
<p>
162178
<!--
163-
<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
179+
Use this key to decrypt the certificate secrets uploaded by init. The certificate key is a hex encoded string that is an AES key of size 32 bytes.
164180
-->
165-
<p>使用此密钥可以解密由 init 上传的证书 Secret。</p>
181+
使用此密钥可以解密由 init 上传的证书 Secret。
182+
证书密钥为一个十六进制编码的字符串,它是大小为 32 字节的 AES 密钥。
183+
</p>
166184
</td>
167185
</tr>
168186

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare_kubeconfig.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ kubeadm join phase control-plane-prepare kubeconfig [api-server-endpoint] [flags
3535
</tr>
3636
<tr>
3737
<td></td><td style="line-height: 130%; word-wrap: break-word;">
38+
<p>
3839
<!--
39-
<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
40+
Use this key to decrypt the certificate secrets uploaded by init. The certificate key is a hex encoded string that is an AES key of size 32 bytes.
4041
-->
41-
<p>使用此密钥可以解密由 init 上传的证书 Secret。</p>
42+
使用此密钥可以解密由 init 上传的证书 Secret。
43+
证书密钥为一个十六进制编码的字符串,它是大小为 32 字节的 AES 密钥。
44+
</p>
4245
</td>
4346
</tr>
4447

0 commit comments

Comments
 (0)