Skip to content

Commit 665d2dc

Browse files
authored
Merge pull request #52910 from my-git9/npe-8102
[zh-cn]sync kubeadm_join_phase_control-plane-prepare_{control-plane,kubeconfig}
2 parents cda4317 + cf367a4 commit 665d2dc

File tree

2 files changed

+61
-43
lines changed

2 files changed

+61
-43
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join/kubeadm_join_phase_control-plane-prepare_control-plane.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Generate the manifests for the new control plane components
3-
-->
4-
为新的控制平面组件生成清单。
5-
61
<!--
72
### Synopsis
83
-->
@@ -13,7 +8,7 @@ Generate the manifests for the new control plane components
138
-->
149
为新的控制平面组件生成清单(manifest)。
1510

16-
```
11+
```shell
1712
kubeadm join phase control-plane-prepare control-plane [flags]
1813
```
1914

@@ -22,7 +17,7 @@ kubeadm join phase control-plane-prepare control-plane [flags]
2217
-->
2318
### 选项
2419

25-
<table style="width: 100%; table-layout: fixed;">
20+
<table style="width: 100%; table-layout: fixed;">
2621
<colgroup>
2722
<col span="1" style="width: 10px;" />
2823
<col span="1" />
@@ -34,10 +29,12 @@ kubeadm join phase control-plane-prepare control-plane [flags]
3429
</tr>
3530
<tr>
3631
<td></td><td style="line-height: 130%; word-wrap: break-word;">
32+
<p>
3733
<!--
38-
<p>If the node should host a new control plane instance, the IP address the API Server will advertise it's listening on. If not set the default network interface will be used.</p>
34+
If the node should host a new control plane instance, the IP address the API Server will advertise it's listening on. If not set the default network interface will be used.
3935
-->
40-
<p>对于将要托管新的控制平面实例的节点,指定 API 服务器将公布的其正在侦听的 IP 地址。如果未设置,则使用默认网络接口。</p>
36+
对于将要托管新的控制平面实例的节点,指定 API 服务器将公布的其正在侦听的 IP 地址。如果未设置,则使用默认网络接口。
37+
</p>
4138
</td>
4239
</tr>
4340

@@ -51,10 +48,12 @@ kubeadm join phase control-plane-prepare control-plane [flags]
5148
</tr>
5249
<tr>
5350
<td></td><td style="line-height: 130%; word-wrap: break-word;">
51+
<p>
5452
<!--
55-
<p>If the node should host a new control plane instance, the port for the API Server to bind to.</p>
53+
If the node should host a new control plane instance, the port for the API Server to bind to.
5654
-->
57-
<p>针对将要托管新的控制平面实例的节点,设置 API 服务器要绑定的端口。</p>
55+
针对将要托管新的控制平面实例的节点,设置 API 服务器要绑定的端口。
56+
</p>
5857
</td>
5958
</tr>
6059

@@ -63,10 +62,12 @@ kubeadm join phase control-plane-prepare control-plane [flags]
6362
</tr>
6463
<tr>
6564
<td></td><td style="line-height: 130%; word-wrap: break-word;">
65+
<p>
6666
<!--
67-
<p>Path to a kubeadm configuration file.</p>
67+
Path to a kubeadm configuration file.
6868
-->
69-
<p>kubeadm 配置文件的路径。</p>
69+
kubeadm 配置文件的路径。
70+
</p>
7071
</td>
7172
</tr>
7273

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join/kubeadm_join_phase_control-plane-prepare_kubeconfig.md

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Generate the kubeconfig for the new control plane components
3-
-->
4-
为新的控制平面组件生成 kubeconfig。
5-
61
<!--
72
### Synopsis
83
-->
@@ -14,7 +9,7 @@ Generate the kubeconfig for the new control plane components
149

1510
为新的控制平面组件生成 kubeconfig。
1611

17-
```
12+
```shell
1813
kubeadm join phase control-plane-prepare kubeconfig [api-server-endpoint] [flags]
1914
```
2015

@@ -23,7 +18,7 @@ kubeadm join phase control-plane-prepare kubeconfig [api-server-endpoint] [flags
2318
-->
2419
### 选项
2520

26-
<table style="width: 100%; table-layout: fixed;">
21+
<table style="width: 100%; table-layout: fixed;">
2722
<colgroup>
2823
<col span="1" style="width: 10px;" />
2924
<col span="1" />
@@ -50,10 +45,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
5045
</tr>
5146
<tr>
5247
<td></td><td style="line-height: 130%; word-wrap: break-word;">
48+
<p>
5349
<!--
54-
<p>Path to a kubeadm configuration file.</p>
50+
Path to a kubeadm configuration file.
5551
-->
56-
<p>kubeadm 配置文件的路径。</p>
52+
kubeadm 配置文件的路径。
53+
</p>
5754
</td>
5855
</tr>
5956

@@ -62,10 +59,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
6259
</tr>
6360
<tr>
6461
<td></td><td style="line-height: 130%; word-wrap: break-word;">
62+
<p>
6563
<!--
66-
<p>Create a new control plane instance on this node</p>
64+
Create a new control plane instance on this node
6765
-->
68-
<p>在此节点上创建一个新的控制平面实例。</p>
66+
在此节点上创建一个新的控制平面实例。
67+
</p>
6968
</td>
7069
</tr>
7170

@@ -74,10 +73,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
7473
</tr>
7574
<tr>
7675
<td></td><td style="line-height: 130%; word-wrap: break-word;">
76+
<p>
7777
<!--
78-
<p>For file-based discovery, a file or URL from which to load cluster information.</p>
78+
For file-based discovery, a file or URL from which to load cluster information.
7979
-->
80-
<p>对于基于文件的发现,给出用于加载集群信息的文件或者 URL。</p>
80+
对于基于文件的发现,给出用于加载集群信息的文件或者 URL。
81+
</p>
8182
</td>
8283
</tr>
8384

@@ -86,10 +87,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
8687
</tr>
8788
<tr>
8889
<td></td><td style="line-height: 130%; word-wrap: break-word;">
90+
<p>
8991
<!--
90-
<p>For token-based discovery, the token used to validate cluster information fetched from the API server.</p>
92+
For token-based discovery, the token used to validate cluster information fetched from the API server.
9193
-->
92-
<p>对于基于令牌的发现,该令牌用于验证从 API 服务器获取的集群信息。</p>
94+
对于基于令牌的发现,该令牌用于验证从 API 服务器获取的集群信息。
95+
</p>
9396
</td>
9497
</tr>
9598

@@ -98,10 +101,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
98101
</tr>
99102
<tr>
100103
<td></td><td style="line-height: 130%; word-wrap: break-word;">
104+
<p>
101105
<!--
102-
<p>For token-based discovery, validate that the root CA public key matches this hash (format: "&lt;type&gt;:&lt;value&gt;").</p>
106+
For token-based discovery, validate that the root CA public key matches this hash (format: "&lt;type&gt;:&lt;value&gt;").
103107
-->
104-
<p>对于基于令牌的发现,请验证根 CA 公钥是否匹配此哈希值(格式:"&lt;type&gt;:&lt;value&gt;")。</p>
108+
对于基于令牌的发现,请验证根 CA 公钥是否匹配此哈希值(格式:"&lt;type&gt;:&lt;value&gt;")。
109+
</p>
105110
</td>
106111
</tr>
107112

@@ -110,10 +115,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
110115
</tr>
111116
<tr>
112117
<td></td><td style="line-height: 130%; word-wrap: break-word;">
118+
<p>
113119
<!--
114-
<p>For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.</p>
120+
For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.
115121
-->
116-
<p>对于基于令牌的发现,允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。</p>
122+
对于基于令牌的发现,允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。
123+
</p>
117124
</td>
118125
</tr>
119126

@@ -122,10 +129,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
122129
</tr>
123130
<tr>
124131
<td></td><td style="line-height: 130%; word-wrap: break-word;">
132+
<p>
125133
<!--
126-
<p>Don't apply any changes; just output what would be done.</p>
134+
Don't apply any changes; just output what would be done.
127135
-->
128-
<p>不做任何更改;只输出将要执行的操作。</p>
136+
不做任何更改;只输出将要执行的操作。
137+
</p>
129138
</td>
130139
</tr>
131140

@@ -134,10 +143,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
134143
</tr>
135144
<tr>
136145
<td></td><td style="line-height: 130%; word-wrap: break-word;">
146+
<p>
137147
<!--
138-
<p>help for kubeconfig</p>
148+
help for kubeconfig
139149
-->
140-
<p>kubeconfig 操作的帮助命令。</p>
150+
kubeconfig 操作的帮助命令。
151+
</p>
141152
</td>
142153
</tr>
143154

@@ -146,10 +157,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
146157
</tr>
147158
<tr>
148159
<td></td><td style="line-height: 130%; word-wrap: break-word;">
160+
<p>
149161
<!--
150-
<p>Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.</p>
162+
Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.
151163
-->
152-
<p>指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。</p>
164+
指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。
165+
</p>
153166
</td>
154167
</tr>
155168

@@ -158,10 +171,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
158171
</tr>
159172
<tr>
160173
<td></td><td style="line-height: 130%; word-wrap: break-word;">
174+
<p>
161175
<!--
162-
<p>Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.</p>
176+
Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.
163177
-->
164-
<p>如果未提供这些值,则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。</p>
178+
如果未提供这些值,则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。
179+
</p>
165180
</td>
166181
</tr>
167182

@@ -173,7 +188,7 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
173188
-->
174189
### 从父命令中继承的选项
175190

176-
<table style="width: 100%; table-layout: fixed;">
191+
<table style="width: 100%; table-layout: fixed;">
177192
<colgroup>
178193
<col span="1" style="width: 10px;" />
179194
<col span="1" />
@@ -185,10 +200,12 @@ Use this key to decrypt the certificate secrets uploaded by init. The certificat
185200
</tr>
186201
<tr>
187202
<td></td><td style="line-height: 130%; word-wrap: break-word;">
203+
<p>
188204
<!--
189-
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
205+
[EXPERIMENTAL] The path to the 'real' host root filesystem.
190206
-->
191-
<p>[实验] 指向 '真实' 宿主机根文件系统的路径。</p>
207+
[实验] 指向 '真实' 宿主机根文件系统的路径。
208+
</p>
192209
</td>
193210
</tr>
194211

0 commit comments

Comments
 (0)