Skip to content

Commit e7ed940

Browse files
authored
Merge pull request #33604 from kinzhi/kinzhi101
[zh]Sync kubeadm-4
2 parents 06afdec + 960a208 commit e7ed940

File tree

8 files changed

+87
-23
lines changed

8 files changed

+87
-23
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,3 @@ kubeadm certs generate-csr [flags]
9292

9393
</tbody>
9494
</table>
95-
96-
97-

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,3 @@ kubeadm init phase preflight [flags]
8181

8282
</tbody>
8383
</table>
84-
85-
86-

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

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

6868
</tbody>
6969
</table>
70-
71-
72-

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,3 @@ kubeadm token delete [token-value] ...
7979

8080
</tbody>
8181
</table>
82-
83-
84-

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

Lines changed: 20 additions & 6 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 keys and certificate signing requests
14+
-->
15+
生成密钥和证书签名请求
116

217
<!-- ### Synopsis -->
318
### 概要
@@ -60,23 +75,23 @@ kubeadm certs generate-csr --kubeconfig-dir /tmp/etc-k8s --cert-dir /tmp/etc-k8s
6075
</tr>
6176
<tr>
6277
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">The path where to save the certificates</td-->
63-
<td></td><td style="line-height: 130%; word-wrap: break-word;">保存证书的路径</td>
78+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>保存证书的路径</p></td>
6479
</tr>
6580

6681
<tr>
6782
<td colspan="2">--config string</td>
6883
</tr>
6984
<tr>
7085
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td -->
71-
<td></td><td style="line-height: 130%; word-wrap: break-word;">kubeadm 配置文件的路径。</td>
86+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>kubeadm 配置文件的路径。</p></td>
7287
</tr>
7388

7489
<tr>
7590
<td colspan="2">-h, --help</td>
7691
</tr>
7792
<tr>
7893
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">help for generate-csr</td -->
79-
<td></td><td style="line-height: 130%; word-wrap: break-word;">generate-csr 命令的帮助</td>
94+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>generate-csr 命令的帮助</p></td>
8095
</tr>
8196

8297
<tr>
@@ -85,7 +100,7 @@ kubeadm certs generate-csr --kubeconfig-dir /tmp/etc-k8s --cert-dir /tmp/etc-k8s
85100
</tr>
86101
<tr>
87102
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">The path where to save the kubeconfig file.</td-->
88-
<td></td><td style="line-height: 130%; word-wrap: break-word;">保存 kubeconfig 文件的路径。</td>
103+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>保存 kubeconfig 文件的路径。</p></td>
89104
</tr>
90105

91106
</tbody>
@@ -108,9 +123,8 @@ kubeadm certs generate-csr --kubeconfig-dir /tmp/etc-k8s --cert-dir /tmp/etc-k8s
108123
</tr>
109124
<tr>
110125
<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td> -->
111-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[实验] 到'真实'主机根文件系统的路径。</td>
126+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[实验] 到'真实'主机根文件系统的路径。</p></td>
112127
</tr>
113128

114129
</tbody>
115130
</table>
116-

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

Lines changed: 25 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+
Run pre-flight checks
14+
-->
15+
运行启动检查
116

217
<!--
318
### Synopsis
@@ -27,7 +42,7 @@ kubeadm init phase preflight [flags]
2742

2843
```
2944
# 使用配置文件对 kubeadm init 进行启动检查。
30-
kubeadm init phase preflight --config kubeadm-config.yml
45+
kubeadm init phase preflight --config kubeadm-config.yaml
3146
```
3247

3348
<!--
@@ -51,7 +66,9 @@ kubeadm init phase preflight --config kubeadm-config.yml
5166
<!--
5267
Path to a kubeadm configuration file.
5368
-->
69+
<p>
5470
kubeadm 配置文件的路径。
71+
</p>
5572
</td>
5673
</tr>
5774

@@ -63,19 +80,23 @@ kubeadm 配置文件的路径。
6380
<!--
6481
help for preflight
6582
-->
83+
<p>
6684
preflight 操作的帮助命令
85+
</p>
6786
</td>
6887
</tr>
6988

7089
<tr>
71-
<td colspan="2">--ignore-preflight-errors stringSlice</td>
90+
<td colspan="2">--ignore-preflight-errors strings</td>
7291
</tr>
7392
<tr>
7493
<td></td><td style="line-height: 130%; word-wrap: break-word;">
7594
<!--
7695
A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
7796
-->
97+
<p>
7898
错误将显示为警告的检查列表:例如:'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。
99+
</p>
79100
</td>
80101
</tr>
81102

@@ -103,10 +124,11 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
103124
<!--
104125
[EXPERIMENTAL] The path to the 'real' host root filesystem.
105126
-->
127+
<p>
106128
[实验] 到 '真实' 主机根文件系统的路径。
129+
</p>
107130
</td>
108131
</tr>
109132

110133
</tbody>
111134
</table>
112-

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

Lines changed: 19 additions & 1 deletion
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
@@ -54,7 +69,9 @@ kubeadm join phase control-plane-join all
5469
<!--
5570
help for control-plane-join
5671
-->
72+
<p>
5773
control-plane-join 操作的帮助命令
74+
</p>
5875
</td>
5976
</tr>
6077

@@ -82,10 +99,11 @@ control-plane-join 操作的帮助命令
8299
<!--
83100
[EXPERIMENTAL] The path to the 'real' host root filesystem.
84101
-->
102+
<p>
85103
[实验] 到 '真实' 主机根文件系统的路径。
104+
</p>
86105
</td>
87106
</tr>
88107

89108
</tbody>
90109
</table>
91-

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

Lines changed: 23 additions & 1 deletion
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+
Delete bootstrap tokens on the server
14+
-->
15+
删除服务器上的引导令牌
116

217
<!--
318
### Synopsis
@@ -41,7 +56,9 @@ kubeadm token delete [token-value] ...
4156
<!--
4257
help for delete
4358
-->
59+
<p>
4460
delete 操作的帮助命令
61+
</p>
4562
</td>
4663
</tr>
4764

@@ -69,7 +86,9 @@ delete 操作的帮助命令
6986
<!--
7087
Whether to enable dry-run mode or not
7188
-->
89+
<p>
7290
是否启用 `dry-run` 运行模式
91+
</p>
7392
</td>
7493
</tr>
7594

@@ -86,7 +105,9 @@ Whether to enable dry-run mode or not
86105
<!--
87106
The kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.
88107
-->
108+
<p>
89109
用于和集群通信的 KubeConfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。
110+
</p>
90111
</td>
91112
</tr>
92113

@@ -98,10 +119,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
98119
<!--
99120
[EXPERIMENTAL] The path to the 'real' host root filesystem.
100121
-->
122+
<p>
101123
[实验] 指向 '真实' 宿主机根文件系统的路径。
124+
</p>
102125
</td>
103126
</tr>
104127

105128
</tbody>
106129
</table>
107-

0 commit comments

Comments
 (0)