Skip to content

Commit 174b20c

Browse files
authored
Merge pull request #46329 from my-git9/pt-19639
[zh-cn]sync kubeadm_config_images_list kubeadm_config_images_pull
2 parents 5326ca6 + e4121c6 commit 174b20c

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,20 @@ Output format. One of: text|json|yaml|go-template|go-template-file|template|temp
8383
<tr>
8484
<td></td><td style="line-height: 130%; word-wrap: break-word;">
8585
<!--
86-
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/>RootlessControlPlane=true|false (ALPHA - default=false)<br/>UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
86+
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
87+
EtcdLearnerMode=true|false (BETA - default=true)<br/>
88+
PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
89+
RootlessControlPlane=true|false (ALPHA - default=false)<br/>
90+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
91+
WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
8792
-->
8893
<p>
8994
一组键值对(key=value),用于描述各种特性。这些选项是:<br/>
90-
EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
91-
PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
95+
EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
96+
PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
9297
RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
93-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
98+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
99+
WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
94100
</p>
95101
</td>
96102
</tr>

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,19 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
6363
<tr>
6464
<td></td><td style="line-height: 130%; word-wrap: break-word;">
6565
<!--
66-
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/>RootlessControlPlane=true|false (ALPHA - default=false)<br/>UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
66+
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
67+
EtcdLearnerMode=true|false (BETA - default=true)<br/>
68+
PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
69+
RootlessControlPlane=true|false (ALPHA - default=false)<br/>
70+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
71+
WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
6772
-->
6873
一系列键值对(key=value),用于描述各种特性。可选项是:<br/>
69-
EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
70-
PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
74+
EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
75+
PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
7176
RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
72-
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
77+
UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
78+
WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
7379
</td>
7480
</tr>
7581

0 commit comments

Comments
 (0)