Skip to content

Commit e952ef5

Browse files
authored
Merge pull request #39239 from Zhuzhenghao/kubeadm-config.v1beta2
[zh] Resync kubeadm-config.v1beta2.md
2 parents 83faa29 + 7dfb17c commit e952ef5

File tree

1 file changed

+51
-52
lines changed

1 file changed

+51
-52
lines changed

content/zh-cn/docs/reference/config-api/kubeadm-config.v1beta2.md

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ auto_generated: true
1313
-->
1414
<!--
1515
<h2>Overview</h2>
16+
<p>Package v1beta2 has been DEPRECATED by v1beta3.</p>
1617
<p>Package v1beta2 defines the v1beta2 version of the kubeadm configuration file format.
1718
This version improves on the v1beta1 format by fixing some minor issues and adding a few new fields.</p>
1819
<p>A list of changes since v1beta1:</p>
1920
-->
2021
<h2>概述</h2>
22+
<p>包 v1beta2 已被 v1beta3 所弃用。</p>
2123

2224
<p>包 v1beta2 定义 kubeadm 配置文件格式的 v1beta2 版本。
2325
此版本改进了 v1beta1 的格式,修复了一些小问题并添加了一些新的字段。</p>
@@ -43,15 +45,15 @@ This version improves on the v1beta1 format by fixing some minor issues and addi
4345
<p>参阅 Kubernetes 1.15 的变更记录以了解详细信息。</p>
4446

4547
<!--
46-
<p>Migration from old kubeadm config versions</p>
48+
<h1>Migration from old kubeadm config versions</h1>
4749
<p>Please convert your v1beta1 configuration files to v1beta2 using the &quot;kubeadm config migrate&quot; command of kubeadm v1.15.x
4850
(conversion from older releases of kubeadm config files requires older release of kubeadm as well e.g.</p>
4951
<ul>
5052
<li>kubeadm v1.11 should be used to migrate v1alpha1 to v1alpha2; kubeadm v1.12 should be used to translate v1alpha2 to v1alpha3;</li>
5153
<li>kubeadm v1.13 or v1.14 should be used to translate v1alpha3 to v1beta1)</li>
5254
</ul>
5355
-->
54-
<p>从老的 kubeadm 配置版本迁移:</p>
56+
<h1>从老的 kubeadm 配置版本迁移:</h1>
5557
<p>请使用 kubeadm v1.15.x 的 &quot;kubeadm config migrate&quot; 命令将 v1beta1
5658
版本的配置文件转换为 v1beta2。
5759
(从更老版本的 kubeadm 配置文件迁移需要使用更老版本的 kubeadm。例如:</p>
@@ -169,7 +171,7 @@ use it to customize the node name, the CRI socket to use or any other settings t
169171
node only (e.g. the node ip).</p>
170172
</li>
171173
<li>
172-
<p><code>apiServer</code>, that represents the endpoint of the instance of the API server to be deployed on this node;
174+
<p><code>localAPIEndpoint</code>, that represents the endpoint of the instance of the API server to be deployed on this node;
173175
use it e.g. to customize the API server advertise address.</p>
174176
</li>
175177
</ul>
@@ -181,20 +183,20 @@ use it e.g. to customize the API server advertise address.</p>
181183
<li><code>nodeRegistration</code>:其中包含与向集群注册新节点相关的字段;
182184
使用这个类型来定制节点名称、要使用的 CRI 套接字或者其他仅对当前节点起作用的设置
183185
(例如节点 IP 地址)。</li>
184-
<li><code>apiServer</code>:代表的是要部署到此节点上的 API 服务器示例的端点;
186+
<li><code>localAPIEndpoint</code>:代表的是要部署到此节点上的 API 服务器示例的端点;
185187
使用这个类型可以完成定制 API 服务器公告地址这类操作。</li>
186188
</ul>
187189

188190
<pre style="background-color:#fff"><span style="color:#000;font-weight:bold">apiVersion</span>:<span style="color:#bbb"> </span>kubeadm.k8s.io/v1beta2<span style="color:#bbb">
189191
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">kind</span>:<span style="color:#bbb"> </span>ClusterConfiguration<span style="color:#bbb">
190192
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">networking</span>:<span style="color:#bbb">
191-
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
193+
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
192194
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">etcd</span>:<span style="color:#bbb">
193-
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
195+
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
194196
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">apiServer</span>:<span style="color:#bbb">
195-
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">extraArgs</span>:<span style="color:#bbb">
196-
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
197-
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">extraVolumes</span>:<span style="color:#bbb">
197+
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">extraArgs</span>:<span style="color:#bbb">
198+
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
199+
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">extraVolumes</span>:<span style="color:#bbb">
198200
</span><span style="color:#bbb"> </span>...<span style="color:#bbb">
199201
</span><span style="color:#bbb"></span>...<span style="color:#bbb">
200202
</span></pre>
@@ -395,12 +397,12 @@ are the discovery method used for accessing the cluster info and all the setting
395397
to the node where kubeadm is executed, including:</p>
396398
<ul>
397399
<li>
398-
<p><code>NodeRegistration</code>, that holds fields that relate to registering the new node to the cluster;
400+
<p><code>nodeRegistration</code>, that holds fields that relate to registering the new node to the cluster;
399401
use it to customize the node name, the CRI socket to use or any other settings that should apply to this
400402
node only (e.g. the node IP).</p>
401403
</li>
402404
<li>
403-
<p><code>APIEndpoint</code>, that represents the endpoint of the instance of the API server to be eventually deployed on this node.</p>
405+
<p><code>apiEndpoint</code>, that represents the endpoint of the instance of the API server to be eventually deployed on this node.</p>
404406
</li>
405407
</ul>
406408
-->
@@ -426,8 +428,8 @@ node only (e.g. the node IP).</p>
426428
- [InitConfiguration](#kubeadm-k8s-io-v1beta2-InitConfiguration)
427429
- [JoinConfiguration](#kubeadm-k8s-io-v1beta2-JoinConfiguration)
428430

429-
## `ClusterConfiguration` {#kubeadm-k8s-io-v1beta2-ClusterConfiguration}
430-
431+
## `ClusterConfiguration` {#kubeadm-k8s-io-v1beta2-ClusterConfiguration}
432+
431433
<!--
432434
<p>ClusterConfiguration contains cluster-wide configuration for a kubeadm cluster</p>
433435
-->
@@ -617,8 +619,8 @@ when this set to true, and at some point it may become ignored.</p>
617619
</tbody>
618620
</table>
619621

620-
## `ClusterStatus` {#kubeadm-k8s-io-v1beta2-ClusterStatus}
621-
622+
## `ClusterStatus` {#kubeadm-k8s-io-v1beta2-ClusterStatus}
623+
622624
<!--
623625
<p>ClusterStatus contains the cluster status. The ClusterStatus will be stored in
624626
the kubeadm-config ConfigMap in the cluster, and then updated by kubeadm when
@@ -650,8 +652,8 @@ The key of the map is the IP of the host's default interface.</p>
650652
</tbody>
651653
</table>
652654

653-
## `InitConfiguration` {#kubeadm-k8s-io-v1beta2-InitConfiguration}
654-
655+
## `InitConfiguration` {#kubeadm-k8s-io-v1beta2-InitConfiguration}
656+
655657
<!--
656658
<p>InitConfiguration contains a list of elements that is specific &quot;kubeadm init&quot;-only runtime
657659
information.</p>
@@ -790,8 +792,8 @@ on the joining node. If nil, no additional control plane instance will be deploy
790792
</tbody>
791793
</table>
792794

793-
## `APIEndpoint` {#kubeadm-k8s-io-v1beta2-APIEndpoint}
794-
795+
## `APIEndpoint` {#kubeadm-k8s-io-v1beta2-APIEndpoint}
796+
795797
<!--
796798
**Appears in:**
797799
-->
@@ -838,8 +840,8 @@ Defaults to 6443.</p>
838840
</tbody>
839841
</table>
840842

841-
## `APIServer` {#kubeadm-k8s-io-v1beta2-APIServer}
842-
843+
## `APIServer` {#kubeadm-k8s-io-v1beta2-APIServer}
844+
843845
<!--
844846
**Appears in:**
845847
-->
@@ -907,7 +909,6 @@ to appear.</p>
907909

908910
- [InitConfiguration](#kubeadm-k8s-io-v1beta2-InitConfiguration)
909911

910-
911912
<!--p>BootstrapToken describes one bootstrap token, stored as a Secret in the cluster</p-->
912913
<p>BootstrapToken 描述的是一个启动引导令牌,以 Secret 形式存储在集群中。</p>
913914

@@ -946,7 +947,7 @@ for, so other administrators can know its purpose.</p-->
946947
</td>
947948
</tr>
948949
<tr><td><code>expires</code> <B><!--[Required]-->[必需]</B><br/>
949-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#time-v1-meta"><code>meta/v1.Time</code></a>
950+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#time-v1-meta"><code>meta/v1.Time</code></a>
950951
</td>
951952
<td>
952953
<!--p><code>expires</code> specifies the timestamp when this token expires. Defaults to being set
@@ -1102,8 +1103,8 @@ of view and as an authentication method for the node in the bootstrap phase of
11021103
</tbody>
11031104
</table>
11041105

1105-
## `ControlPlaneComponent` {#kubeadm-k8s-io-v1beta2-ControlPlaneComponent}
1106-
1106+
## `ControlPlaneComponent` {#kubeadm-k8s-io-v1beta2-ControlPlaneComponent}
1107+
11071108
<!--
11081109
**Appears in:**
11091110
-->
@@ -1154,16 +1155,15 @@ without leading dash(es).
11541155
</tbody>
11551156
</table>
11561157

1157-
## `DNS` {#kubeadm-k8s-io-v1beta2-DNS}
1158-
1158+
## `DNS` {#kubeadm-k8s-io-v1beta2-DNS}
1159+
11591160
<!--
11601161
**Appears in:**
11611162
-->
11621163
**出现在:**
11631164

11641165
- [ClusterConfiguration](#kubeadm-k8s-io-v1beta2-ClusterConfiguration)
11651166

1166-
11671167
<p>
11681168
<!--
11691169
DNS defines the DNS addon that should be used in the cluster
@@ -1204,7 +1204,7 @@ DNS 结构定义要在集群中使用的 DNS 插件。
12041204

12051205
## `DNSAddOnType` {#kubeadm-k8s-io-v1beta2-DNSAddOnType}
12061206

1207-
<!--
1207+
<!--
12081208
(Alias of `string`)
12091209
12101210
**Appears in:**
@@ -1220,8 +1220,8 @@ DNS 结构定义要在集群中使用的 DNS 插件。
12201220
-->
12211221
<p>DNSAddOnType 定义的是用来辨识 DNS 插件类型的字符串。</p>
12221222

1223-
## `Discovery` {#kubeadm-k8s-io-v1beta2-Discovery}
1224-
1223+
## `Discovery` {#kubeadm-k8s-io-v1beta2-Discovery}
1224+
12251225
<!--
12261226
**Appears in:**
12271227
-->
@@ -1303,8 +1303,8 @@ contain any other authentication information.
13031303
</tbody>
13041304
</table>
13051305

1306-
## `Etcd` {#kubeadm-k8s-io-v1beta2-Etcd}
1307-
1306+
## `Etcd` {#kubeadm-k8s-io-v1beta2-Etcd}
1307+
13081308
<!--
13091309
**Appears in:**
13101310
-->
@@ -1354,8 +1354,8 @@ Etcd 包含用来描述 etcd 配置的元素。
13541354
</tbody>
13551355
</table>
13561356

1357-
## `ExternalEtcd` {#kubeadm-k8s-io-v1beta2-ExternalEtcd}
1358-
1357+
## `ExternalEtcd` {#kubeadm-k8s-io-v1beta2-ExternalEtcd}
1358+
13591359
<!--
13601360
**Appears in:**
13611361
-->
@@ -1381,9 +1381,9 @@ kubeadm 不清楚证书文件的存放位置,因此必须单独提供证书信
13811381
</td>
13821382
<td>
13831383
<!--
1384-
<p><code>endpoints</code> of etcd members.</p>
1384+
<p><code>endpoints</code> of etcd members. Required for external etcd.</p>
13851385
-->
1386-
<p><code>endpoints</code> 包含一组 etcd 成员的列表。</p>
1386+
<p><code>endpoints</code> 包含一组 etcd 成员的列表。外部 etcd 需要。</p>
13871387
</td>
13881388
</tr>
13891389
<tr><td><code>caFile</code> <B><!--[Required]-->[必需]</B><br/>
@@ -1426,8 +1426,8 @@ Required if using a TLS connection.</p>
14261426
</tbody>
14271427
</table>
14281428

1429-
## `FileDiscovery` {#kubeadm-k8s-io-v1beta2-FileDiscovery}
1430-
1429+
## `FileDiscovery` {#kubeadm-k8s-io-v1beta2-FileDiscovery}
1430+
14311431
<!--
14321432
**Appears in:**
14331433
-->
@@ -1461,8 +1461,8 @@ file from which to load cluster information.</p>
14611461
</tbody>
14621462
</table>
14631463

1464-
## `HostPathMount` {#kubeadm-k8s-io-v1beta2-HostPathMount}
1465-
1464+
## `HostPathMount` {#kubeadm-k8s-io-v1beta2-HostPathMount}
1465+
14661466
<!--
14671467
**Appears in:**
14681468
-->
@@ -1511,7 +1511,7 @@ file from which to load cluster information.</p>
15111511
</td>
15121512
</tr>
15131513
<tr><td><code>pathType</code> <B><!--[Required]-->[必需]</B><br/>
1514-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
1514+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
15151515
</td>
15161516
<td>
15171517
<!--p><code>pathType</code> is the type of the HostPath.</p-->
@@ -1521,8 +1521,8 @@ file from which to load cluster information.</p>
15211521
</tbody>
15221522
</table>
15231523

1524-
## `ImageMeta` {#kubeadm-k8s-io-v1beta2-ImageMeta}
1525-
1524+
## `ImageMeta` {#kubeadm-k8s-io-v1beta2-ImageMeta}
1525+
15261526
<!--
15271527
**Appears in:**
15281528
-->
@@ -1609,8 +1609,8 @@ Secret 中的证书的秘钥。对应的加密秘钥在 InitConfiguration 结构
16091609
</tbody>
16101610
</table>
16111611

1612-
## `LocalEtcd` {#kubeadm-k8s-io-v1beta2-LocalEtcd}
1613-
1612+
## `LocalEtcd` {#kubeadm-k8s-io-v1beta2-LocalEtcd}
1613+
16141614
<!--
16151615
**Appears in:**
16161616
-->
@@ -1693,8 +1693,8 @@ signing certificate.</p>
16931693
</tbody>
16941694
</table>
16951695

1696-
## `Networking` {#kubeadm-k8s-io-v1beta2-Networking}
1697-
1696+
## `Networking` {#kubeadm-k8s-io-v1beta2-Networking}
1697+
16981698
<!--
16991699
**Appears in:**
17001700
-->
@@ -1742,8 +1742,8 @@ signing certificate.</p>
17421742
</tbody>
17431743
</table>
17441744

1745-
## `NodeRegistrationOptions` {#kubeadm-k8s-io-v1beta2-NodeRegistrationOptions}
1746-
1745+
## `NodeRegistrationOptions` {#kubeadm-k8s-io-v1beta2-NodeRegistrationOptions}
1746+
17471747
<!--
17481748
**Appears in:**
17491749
-->
@@ -1793,7 +1793,7 @@ be annotated to the Node API object, for later re-use.</p>
17931793
</td>
17941794
</tr>
17951795
<tr><td><code>taints</code> <B><!--[Required]-->[必需]</B><br/>
1796-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#taint-v1-core"><code>[]core/v1.Taint</code></a>
1796+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#taint-v1-core"><code>[]core/v1.Taint</code></a>
17971797
</td>
17981798
<td>
17991799
<!--
@@ -1843,4 +1843,3 @@ the current node is registered.</p>
18431843
</tr>
18441844
</tbody>
18451845
</table>
1846-

0 commit comments

Comments
 (0)