Skip to content

Commit 96ec9a6

Browse files
authored
Merge pull request #33663 from kinzhi/kinzhi109
[zh]Sync kubeadm-10
2 parents bf46c15 + 2fafe81 commit 96ec9a6

8 files changed

+131
-27
lines changed

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_etcd-ca.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,3 @@ kubeadm init phase certs etcd-ca [flags]
8585

8686
</tbody>
8787
</table>
88-
89-
90-

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubeconfig_all.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,3 @@ kubeadm init phase kubeconfig all [flags]
116116

117117
</tbody>
118118
</table>
119-
120-
121-

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-join_all.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,3 @@ kubeadm join phase control-plane-join all [flags]
9595

9696
</tbody>
9797
</table>
98-
99-
100-

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_reset_phase_cleanup-node.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,3 @@ kubeadm reset phase cleanup-node [flags]
7474

7575
</tbody>
7676
</table>
77-
78-
79-

content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_etcd-ca.md

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
<!--
2+
The file is auto-generated from the Go source code of the component using a generic
3+
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4+
to generate the reference documentation, please read
5+
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6+
To update the reference conent, please follow the
7+
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8+
guide. You can file document formatting bugs against the
9+
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10+
-->
11+
12+
<!--
13+
Generate the self-signed CA to provision identities for etcd
14+
-->
15+
生成用于为 etcd 设置身份的自签名 CA
116

217
<!--
318
### Synopsis
@@ -6,10 +21,10 @@
621
### 概要
722

823
<!--
9-
Generate the self-signed CA to provision identities for etcd, and save them into etcd/ca.cert and etcd/ca.key files.
24+
Generate the self-signed CA to provision identities for etcd, and save them into etcd/ca.crt and etcd/ca.key files.
1025
-->
1126

12-
生成用于为 etcd 设置身份的自签名 CA,并将其保存到 etcd/ca.cert 和 etcd/ca.key 文件中。
27+
生成用于为 etcd 设置身份的自签名 CA,并将其保存到 etcd/ca.crt 和 etcd/ca.key 文件中。
1328

1429
<!--
1530
If both files already exist, kubeadm skips the generation step and existing files will be used.
@@ -53,7 +68,9 @@ kubeadm init phase certs etcd-ca [flags]
5368
<!--
5469
The path where to save and store the certificates.
5570
-->
71+
<p>
5672
证书的存储路径。
73+
</p>
5774
</td>
5875
</tr>
5976

@@ -65,7 +82,9 @@ The path where to save and store the certificates.
6582
<!--
6683
Path to a kubeadm configuration file.
6784
-->
85+
<p>
6886
kubeadm 配置文件的路径。
87+
</p>
6988
</td>
7089
</tr>
7190

@@ -77,7 +96,9 @@ kubeadm 配置文件的路径。
7796
<!--
7897
help for etcd-ca
7998
-->
99+
<p>
80100
etcd-ca 操作的帮助命令
101+
</p>
81102
</td>
82103
</tr>
83104

@@ -94,7 +115,9 @@ etcd-ca 操作的帮助命令
94115
<!--
95116
Choose a specific Kubernetes version for the control plane.
96117
-->
118+
<p>
97119
为控制平面选择特定的 Kubernetes 版本。
120+
</p>
98121
</td>
99122
</tr>
100123

@@ -122,10 +145,11 @@ Choose a specific Kubernetes version for the control plane.
122145
<!--
123146
[EXPERIMENTAL] The path to the 'real' host root filesystem.
124147
-->
148+
<p>
125149
[实验] 到 '真实' 主机根文件系统的路径。
150+
</p>
126151
</td>
127152
</tr>
128153

129154
</tbody>
130155
</table>
131-

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

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
<!--
2+
The file is auto-generated from the Go source code of the component using a generic
3+
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4+
to generate the reference documentation, please read
5+
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6+
To update the reference conent, please follow the
7+
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8+
guide. You can file document formatting bugs against the
9+
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10+
-->
11+
12+
<!--
13+
Generate all kubeconfig files
14+
-->
15+
生成所有 kubeconfig 文件
116

217
<!--
318
### Synopsis
@@ -8,7 +23,6 @@
823
<!--
924
Generate all kubeconfig files
1025
-->
11-
1226
生成所有 kubeconfig 文件
1327

1428
```
@@ -36,7 +50,9 @@ kubeadm init phase kubeconfig all [flags]
3650
<!--
3751
The IP address the API Server will advertise it's listening on. If not set the default network interface will be used.
3852
-->
53+
<p>
3954
API 服务器所公布的其正在监听的 IP 地址。如果没有设置,将使用默认的网络接口。
55+
</p>
4056
</td>
4157
</tr>
4258

@@ -53,7 +69,9 @@ API 服务器所公布的其正在监听的 IP 地址。如果没有设置,将
5369
<!--
5470
Port for the API Server to bind to.
5571
-->
72+
<p>
5673
要绑定到 API 服务器的端口。
74+
</p>
5775
</td>
5876
</tr>
5977

@@ -70,7 +88,9 @@ Port for the API Server to bind to.
7088
<!--
7189
The path where to save and store the certificates.
7290
-->
91+
<p>
7392
保存和存储证书的路径。
93+
</p>
7494
</td>
7595
</tr>
7696

@@ -82,7 +102,9 @@ The path where to save and store the certificates.
82102
<!--
83103
Path to kubeadm configuration file.
84104
-->
105+
<p>
85106
kubeadm 配置文件的路径。
107+
</p>
86108
</td>
87109
</tr>
88110

@@ -94,7 +116,9 @@ kubeadm 配置文件的路径。
94116
<!--
95117
Specify a stable IP address or DNS name for the control plane.
96118
-->
119+
<p>
97120
为控制平面指定一个稳定的 IP 地址或 DNS 名称。
121+
</p>
98122
</td>
99123
</tr>
100124

@@ -106,7 +130,9 @@ Specify a stable IP address or DNS name for the control plane.
106130
<!--
107131
help for all
108132
-->
133+
<p>
109134
all 操作的帮助命令
135+
</p>
110136
</td>
111137
</tr>
112138

@@ -123,7 +149,9 @@ all 操作的帮助命令
123149
<!--
124150
The path where to save the kubeconfig file.
125151
-->
152+
<p>
126153
kubeconfig 文件的保存路径。
154+
</p>
127155
</td>
128156
</tr>
129157

@@ -140,7 +168,9 @@ kubeconfig 文件的保存路径。
140168
<!--
141169
Choose a specific Kubernetes version for the control plane.
142170
-->
171+
<p>
143172
为控制平面指定特定的 Kubernetes 版本。
173+
</p>
144174
</td>
145175
</tr>
146176

@@ -152,7 +182,9 @@ Choose a specific Kubernetes version for the control plane.
152182
<!--
153183
Specify the node name.
154184
-->
185+
<p>
155186
指定节点名称。
187+
</p>
156188
</td>
157189
</tr>
158190

@@ -162,7 +194,6 @@ Specify the node name.
162194
<!--
163195
### Options inherited from parent commands
164196
-->
165-
166197
### 继承于父命令的选项
167198

168199
<table style="width: 100%; table-layout: fixed;">
@@ -180,10 +211,11 @@ Specify the node name.
180211
<!--
181212
[EXPERIMENTAL] The path to the 'real' host root filesystem.
182213
-->
214+
<p>
183215
[实验] 到 '真实' 主机根文件系统的路径。
216+
</p>
184217
</td>
185218
</tr>
186219

187220
</tbody>
188221
</table>
189-

content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-join_all.md

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
<!--
2+
The file is auto-generated from the Go source code of the component using a generic
3+
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4+
to generate the reference documentation, please read
5+
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6+
To update the reference conent, please follow the
7+
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8+
guide. You can file document formatting bugs against the
9+
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10+
-->
11+
12+
<!--
13+
Join a machine as a control plane instance
14+
-->
15+
添加作为控制平面实例的机器
116

217
<!--
318
### Synopsis
@@ -6,9 +21,8 @@
621
### 概要
722

823
<!--
9-
Joins a machine as a control plane instance
24+
Join a machine as a control plane instance
1025
-->
11-
1226
添加作为控制平面实例的机器
1327

1428
```
@@ -18,7 +32,6 @@ kubeadm join phase control-plane-join all [flags]
1832
<!--
1933
### Options
2034
-->
21-
2235
### 选项
2336

2437
<table style="width: 100%; table-layout: fixed;">
@@ -36,7 +49,9 @@ kubeadm join phase control-plane-join all [flags]
3649
<!--
3750
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.
3851
-->
52+
<p>
3953
如果该节点托管一个新的控制平面实例,则 API 服务器将公布其正在侦听的 IP 地址。如果未设置,则使用默认网络接口。
54+
</p>
4055
</td>
4156
</tr>
4257

@@ -48,19 +63,23 @@ If the node should host a new control plane instance, the IP address the API Ser
4863
<!--
4964
Path to kubeadm config file.
5065
-->
66+
<p>
5167
kubeadm 配置文件的路径。
68+
</p>
5269
</td>
5370
</tr>
5471

5572
<tr>
56-
<td colspan="2">--experimental-control-plane</td>
73+
<td colspan="2">--control-plane</td>
5774
</tr>
5875
<tr>
5976
<td></td><td style="line-height: 130%; word-wrap: break-word;">
6077
<!--
6178
Create a new control plane instance on this node
6279
-->
80+
<p>
6381
在此节点上创建一个新的控制平面实例
82+
</p>
6483
</td>
6584
</tr>
6685

@@ -72,7 +91,9 @@ Create a new control plane instance on this node
7291
<!--
7392
help for all
7493
-->
94+
<p>
7595
all 操作的帮助命令
96+
</p>
7697
</td>
7798
</tr>
7899

@@ -84,10 +105,29 @@ all 操作的帮助命令
84105
<!--
85106
Specify the node name.
86107
-->
108+
<p>
87109
指定节点名称。
110+
</p>
88111
</td>
89112
</tr>
90113

114+
<tr>
115+
<td colspan="2">--patches string</td>
116+
</tr>
117+
<tr>
118+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
119+
<!--
120+
Path to a directory that contains files named &quot;target[suffix][+patchtype].extension&quot;. For example, &quot;kube-apiserver0+merge.yaml&quot; or just &quot;etcd.json&quot;. &quot;target&quot; can be one of &quot;kube-apiserver&quot;, &quot;kube-controller-manager&quot;, &quot;kube-scheduler&quot;, &quot;etcd&quot;. &quot;patchtype&quot; can be one of &quot;strategic&quot;, &quot;merge&quot; or &quot;json&quot; and they match the patch formats supported by kubectl. The default &quot;patchtype&quot; is &quot;strategic&quot;. &quot;extension&quot; must be either &quot;json&quot; or &quot;yaml&quot;. &quot;suffix&quot; is an optional string that can be used to determine which patches are applied first alpha-numerically.
121+
-->
122+
包含名为 “target[suffix][+patchtype].extension” 的文件的目录的路径。
123+
例如,“kube-apiserver0+merge.yaml” 或只是 “etcd.json”。
124+
“target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 之一。
125+
“patchtype” 可以是 “strategic”、“merge” 或 “json”,它们匹配 kubectl 支持的补丁格式。
126+
默认的 “patchtype” 是 “strategic”。“extension” 必须是 “json” 或 “yaml”。
127+
“suffix” 是一个可选字符串,可用于基于字母数字顺序确定首先应用哪些补丁。
128+
</p></td>
129+
</tr>
130+
91131
</tbody>
92132
</table>
93133

@@ -112,10 +152,11 @@ Specify the node name.
112152
<!--
113153
[EXPERIMENTAL] The path to the 'real' host root filesystem.
114154
-->
155+
<p>
115156
[实验] 到 '真实' 主机根文件系统的路径。
157+
</p>
116158
</td>
117159
</tr>
118160

119161
</tbody>
120162
</table>
121-

0 commit comments

Comments
 (0)