Merge pull request #46376 from my-git9/pt-29611

[zh-cn]sync kubeadm_join_phase_preflight kubeadm_upgrade_apply
kubernetes · May 15, 2024 · 821dd22 · 821dd22
2 parents 96809f4 + d8d0f22
commit 821dd22
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_preflight.md b/...cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_preflight.md
@@ -74,10 +74,13 @@ kubeadm join phase preflight --config kubeadm-config.yaml
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
-<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
+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.
 -->
-<p>使用此密钥可以解密由 `init` 操作上传的证书 Secret。</p>
+使用此密钥可以解密由 `init` 操作上传的证书 Secret。
+证书密钥为十六进制编码的字符串，是大小为 32 字节的 AES 密钥。
+</p>
 </td>
 </tr>
 

diff --git a/...ent/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_apply.md b/...ent/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_apply.md
@@ -125,17 +125,19 @@ Perform the upgrade of etcd.
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
 A set of key=value pairs that describe feature gates for various features. Options are:<br/>
-EtcdLearnerMode=true|false (ALPHA - default=false)<br/>
-PublicKeysECDSA=true|false (ALPHA - default=false)<br/>
+EtcdLearnerMode=true|false (BETA - default=true)<br/>
+PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
 RootlessControlPlane=true|false (ALPHA - default=false)<br/>
-UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
+UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
+WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
 -->
 <p>
 一组键值对，用于描述各种功能。选项包括：<br/>
 EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
-PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
-RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
+PublicKeysECDSA=true|false (BETA - 默认值=true)<br/>
+RootlessControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
 UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
+WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
 </p>
 </td>
 </tr>