Skip to content

Commit 3689f41

Browse files
committed
[zh-cn] sync kubeadm-config.v1beta3.md
Signed-off-by: xin.li <[email protected]>
1 parent 80aa5f5 commit 3689f41

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ for, so other administrators can know its purpose.
496496
</td>
497497
</tr>
498498
<tr><td><code>expires</code><br/>
499-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#time-v1-meta"><code>meta/v1.Time</code></a>
499+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#time-v1-meta"><code>meta/v1.Time</code></a>
500500
</td>
501501
<td>
502502
<!--
@@ -579,7 +579,7 @@ of view and as an authentication method for the node in the bootstrap phase of
579579
## `ClusterConfiguration` {#kubeadm-k8s-io-v1beta3-ClusterConfiguration}
580580

581581
<!--
582-
<p>ClusterConfiguration contains cluster-wide configuration for a kubeadm cluster</p>
582+
<p>ClusterConfiguration contains cluster-wide configuration for a kubeadm cluster.</p>
583583
-->
584584
<p>ClusterConfiguration 包含一个 kubeadm 集群的集群范围配置信息。</p>
585585

@@ -818,10 +818,12 @@ interface and use that, but in case that process fails you may set the desired v
818818
<td>
819819
<!--
820820
<p><code>certificateKey</code> sets the key with which certificates and keys are encrypted prior to being
821-
uploaded in a Secret in the cluster during the <code>uploadcerts init</code> phase.</p>
821+
uploaded in a Secret in the cluster during the <code>uploadcerts init</code> phase.
822+
The certificate key is a hex encoded string that is an AES key of size 32 bytes.</p>
822823
-->
823824
<p><code>certificateKey</code> 用来设置一个密钥,该密钥将对 <code>uploadcerts init</code>
824-
阶段上传到集群中某 Secret 内的密钥和证书加密。</p>
825+
阶段上传到集群中某 Secret 内的密钥和证书加密。
826+
证书密钥是十六进制编码的字符串,是长度为 32 字节的 AES 密钥。</p>
825827
</td>
826828
</tr>
827829
<tr><td><code>skipPhases</code><br/>
@@ -1074,7 +1076,7 @@ APIServer 包含集群中 API 服务器部署所必需的设置。
10741076

10751077
<p>
10761078
<!--
1077-
BootstrapTokenDiscovery is used to set the options for bootstrap token based discovery
1079+
BootstrapTokenDiscovery is used to set the options for bootstrap token based discovery.
10781080
-->
10791081
BootstrapTokenDiscovery 用来设置基于引导令牌的服务发现选项。
10801082
</p>
@@ -1529,7 +1531,7 @@ HostPathMount contains elements describing volumes that are mounted from the hos
15291531
</td>
15301532
</tr>
15311533
<tr><td><code>pathType</code><br/>
1532-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
1534+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
15331535
</td>
15341536
<td>
15351537
<!--
@@ -1627,9 +1629,11 @@ deployed on this node.
16271629
<code>certificateKey</code> is the key that is used for decryption of certificates after
16281630
they are downloaded from the secret upon joining a new control plane node.
16291631
The corresponding encryption key is in the InitConfiguration.
1632+
The certificate key is a hex encoded string that is an AES key of size 32 bytes.
16301633
-->
16311634
<p><code>certificateKey</code> 是在添加新的控制面节点时用来解密所下载的
1632-
Secret 中的证书的密钥。对应的加密密钥在 InitConfiguration 结构中。</p>
1635+
Secret 中的证书的密钥。对应的加密密钥在 InitConfiguration 结构中。
1636+
证书密钥是十六进制编码的字符串,是长度为 32 字节的 AES 密钥。</p>
16331637
</td>
16341638
</tr>
16351639
</tbody>
@@ -1645,7 +1649,7 @@ Secret 中的证书的密钥。对应的加密密钥在 InitConfiguration 结构
16451649
- [Etcd](#kubeadm-k8s-io-v1beta3-Etcd)
16461650

16471651
<!--
1648-
LocalEtcd describes that kubeadm should run an etcd cluster locally
1652+
LocalEtcd describes that kubeadm should run an etcd cluster locally.
16491653
-->
16501654
<p>LocalEtcd 描述的是 kubeadm 要使用的本地 etcd 集群。</p>
16511655

@@ -1729,7 +1733,7 @@ signing certificate.
17291733
- [ClusterConfiguration](#kubeadm-k8s-io-v1beta3-ClusterConfiguration)
17301734

17311735
<!--
1732-
Networking contains elements describing cluster's networking configuration
1736+
Networking contains elements describing cluster's networking configuration.
17331737
-->
17341738
<p>Networking 中包含描述集群网络配置的元素。</p>
17351739

@@ -1784,7 +1788,7 @@ Networking contains elements describing cluster's networking configuration
17841788

17851789
<!--
17861790
NodeRegistrationOptions holds fields that relate to registering a new control-plane or
1787-
node to the cluster, either via &quot;kubeadm init&quot; or &quot;kubeadm join&quot;
1791+
node to the cluster, either via <code>kubeadm init</code> or <code>kubeadm join</code>.
17881792
-->
17891793
<p>NodeRegistrationOptions 包含向集群中注册新的控制面或节点所需要的信息;
17901794
节点注册可能通过 &quot;kubeadm init&quot;&quot;kubeadm join&quot; 完成。</p>
@@ -1823,7 +1827,7 @@ This information will be annotated to the Node API object, for later re-use.
18231827
</td>
18241828
</tr>
18251829
<tr><td><code>taints</code> <B><!--[Required]-->[必需]</B><br/>
1826-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#taint-v1-core"><code>[]core/v1.Taint</code></a>
1830+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#taint-v1-core"><code>[]core/v1.Taint</code></a>
18271831
</td>
18281832
<td>
18291833
<!--
@@ -1876,7 +1880,7 @@ the current node is registered, e.g.
18761880
</td>
18771881
</tr>
18781882
<tr><td><code>imagePullPolicy</code><br/>
1879-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#pullpolicy-v1-core"><code>core/v1.PullPolicy</code></a>
1883+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#pullpolicy-v1-core"><code>core/v1.PullPolicy</code></a>
18801884
</td>
18811885
<td>
18821886
<!--

0 commit comments

Comments
 (0)