Skip to content

Commit d8d0f22

Browse files
committed
[zh-cn]sync kubeadm_join_phase_preflight kubeadm_upgrade_apply
Signed-off-by: xin.li <[email protected]>
1 parent 2edb736 commit d8d0f22

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,13 @@ kubeadm join phase preflight --config kubeadm-config.yaml
7474
</tr>
7575
<tr>
7676
<td></td><td style="line-height: 130%; word-wrap: break-word;">
77+
<p>
7778
<!--
78-
<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
79+
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.
7980
-->
80-
<p>使用此密钥可以解密由 `init` 操作上传的证书 Secret。</p>
81+
使用此密钥可以解密由 `init` 操作上传的证书 Secret。
82+
证书密钥为十六进制编码的字符串,是大小为 32 字节的 AES 密钥。
83+
</p>
8184
</td>
8285
</tr>
8386

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,19 @@ Perform the upgrade of etcd.
125125
<td></td><td style="line-height: 130%; word-wrap: break-word;">
126126
<!--
127127
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
128-
EtcdLearnerMode=true|false (ALPHA - default=false)<br/>
129-
PublicKeysECDSA=true|false (ALPHA - default=false)<br/>
128+
EtcdLearnerMode=true|false (BETA - default=true)<br/>
129+
PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
130130
RootlessControlPlane=true|false (ALPHA - default=false)<br/>
131-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
131+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
132+
WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
132133
-->
133134
<p>
134135
一组键值对,用于描述各种功能。选项包括:<br/>
135136
EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
136-
PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
137-
RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
137+
PublicKeysECDSA=true|false (BETA - 默认值=true)<br/>
138+
RootlessControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
138139
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
140+
WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
139141
</p>
140142
</td>
141143
</tr>

0 commit comments

Comments
 (0)