Skip to content

Commit e7955c7

Browse files
authored
Merge pull request #46330 from my-git9/pt-26195
[zh-cn]sync kubeadm_init kubeadm_init_phase_control-plane_apiserver
2 parents 174b20c + e06dcef commit e7955c7

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ certs Certificate generation
3434
/sa Generate a private key for signing service account tokens along with its public key
3535
kubeconfig Generate all kubeconfig files necessary to establish the control plane and the admin kubeconfig file
3636
/admin Generate a kubeconfig file for the admin to use and for kubeadm itself
37+
/super-admin Generate a kubeconfig file for the super-admin
3738
/kubelet Generate a kubeconfig file for the kubelet to use *only* for cluster bootstrapping purposes
3839
/controller-manager Generate a kubeconfig file for the controller manager to use
3940
/scheduler Generate a kubeconfig file for the scheduler to use
@@ -146,10 +147,11 @@ The path where to save and store the certificates.
146147
<tr>
147148
<td></td><td style="line-height: 130%; word-wrap: break-word;">
148149
<!--
149-
Key used to encrypt the control-plane certificates in the kubeadm-certs Secret.
150+
Key used to encrypt the control-plane certificates in the kubeadm-certs Secret. The certificate key is a hex encoded string that is an AES key of size 32 bytes.
150151
-->
151152
<p>
152153
用于加密 kubeadm-certs Secret 中的控制平面证书的密钥。
154+
证书密钥为十六进制编码的字符串,是大小为 32 字节的 AES 密钥。
153155
</p>
154156
</td>
155157
</tr>
@@ -218,16 +220,18 @@ Don't apply any changes; just output what would be done.
218220
<td></td><td style="line-height: 130%; word-wrap: break-word;">
219221
<!--
220222
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
221-
EtcdLearnerMode=true|false (ALPHA - default=false)<br/>
222-
PublicKeysECDSA=true|false (ALPHA - default=false)<br/>
223+
EtcdLearnerMode=true|false (BETA - default=true)<br/>
224+
PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
223225
RootlessControlPlane=true|false (ALPHA - default=false)<br/>
224-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
226+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
227+
WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
225228
-->
226229
一组用来描述各种功能特性的键值(key=value)对。选项是:<br/>
227-
EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
228-
PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
230+
EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
231+
PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
229232
RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
230-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
233+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
234+
WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
231235
</td>
232236
</tr>
233237

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,19 @@ Don't apply any changes; just output what would be done.
144144
<td></td><td style="line-height: 130%; word-wrap: break-word;">
145145
<!--
146146
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
147-
EtcdLearnerMode=true|false (ALPHA - default=false)<br/>
148-
PublicKeysECDSA=true|false (ALPHA - default=false)<br/>
147+
EtcdLearnerMode=true|false (BETA - default=true)<br/>
148+
PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
149149
RootlessControlPlane=true|false (ALPHA - default=false)<br/>
150-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
150+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
151+
WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
151152
-->
152153
<p>
153154
一组键值对,用于描述各种功能特性的特性门控。选项是:<br/>
154-
EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
155-
PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
155+
EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
156+
PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
156157
RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
157-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
158+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
159+
WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
158160
</p>
159161
</td>
160162
</tr>

0 commit comments

Comments
 (0)