Skip to content

Commit 0f702d8

Browse files
authored
Merge pull request #43106 from windsonsea/useryh
[zh] Clean up kubeadm_kubeconfig files
2 parents 7421d4e + 9236c2d commit 0f702d8

File tree

4 files changed

+28
-82
lines changed

4 files changed

+28
-82
lines changed

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,21 @@
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 content, 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-
121
<!--
132
Use this command to invoke single phase of the init workflow
143
-->
15-
使用此命令可以调用 init 工作流程的单个阶段
4+
使用此命令可以调用 init 工作流程的单个阶段
165

176
<!--
187
### Synopsis
198
-->
20-
219
### 概要
2210

2311
<!--
2412
Use this command to invoke single phase of the init workflow
2513
-->
26-
27-
使用此命令可以调用 init 工作流程的单个阶段
14+
使用此命令可以调用 init 工作流程的单个阶段。
2815

2916
<!--
3017
### Options
3118
-->
32-
3319
### 选项
3420

3521
<table style="width: 100%; table-layout: fixed;">
@@ -47,7 +33,7 @@ Use this command to invoke single phase of the init workflow
4733
<!--
4834
<p>help for phase</p>
4935
-->
50-
<p>phase 操作的帮助命令</p>
36+
<p>phase 操作的帮助命令</p>
5137
</td>
5238
</tr>
5339

@@ -57,7 +43,6 @@ Use this command to invoke single phase of the init workflow
5743
<!--
5844
### Options inherited from parent commands
5945
-->
60-
6146
### 继承于父命令的选择项
6247

6348
<table style="width: 100%; table-layout: fixed;">
@@ -81,4 +66,3 @@ Use this command to invoke single phase of the init workflow
8166

8267
</tbody>
8368
</table>
84-

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
<!--
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-
<!--
122
Kubeconfig file utilities
133
144
### Synopsis
@@ -17,8 +7,7 @@ Kubeconfig file utilities.
177
188
### Options
199
-->
20-
21-
Kubeconfig 文件工具。
10+
kubeconfig 文件工具。
2211

2312
### 概要
2413

@@ -38,8 +27,10 @@ kubeconfig 文件工具。
3827
</tr>
3928
<tr>
4029
<td></td><td style="line-height: 130%; word-wrap: break-word;">
41-
<!-- help for kubeconfig -->
42-
kubeconfig 操作的帮助命令
30+
<!--
31+
help for kubeconfig
32+
-->
33+
kubeconfig 操作的帮助命令。
4334
</td>
4435
</tr>
4536

@@ -73,4 +64,3 @@ kubeconfig 操作的帮助命令
7364

7465
</tbody>
7566
</table>
76-

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

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
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 content, 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-
121
<!--
132
Output a kubeconfig file for an additional user
143
@@ -29,28 +18,22 @@ kubeadm alpha kubeconfig user [flags]
2918
<!--
3019
### Examples
3120
32-
<!--
33-
# Output a kubeconfig file for an additional user named foo
34-
-->
3521
```
36-
# 为一个名为 foo 的其他用户输出 kubeconfig 文件
22+
# Output a kubeconfig file for an additional user named foo
3723
kubeadm kubeconfig user --client-name=foo
24+
25+
# Output a kubeconfig file for an additional user named foo using a kubeadm config file bar
26+
kubeadm kubeconfig user --client-name=foo --config=bar
3827
```
39-
40-
<!--
41-
# Output a kubeconfig file for an additional user named foo using a kubeadm config file bar
42-
-->
43-
```
44-
# 使用 kubeadm 配置文件 bar 为另一个名为 foo 的用户输出 kubeconfig 文件
45-
kubeadm alpha kubeconfig user --client-name=foo --config=bar
46-
```
47-
4828
-->
4929
### 示例
5030

51-
```
52-
# 使用名为 bar 的 kubeadm 配置文件为名为 foo 的另一用户输出 kubeconfig 文件
53-
kubeadm kubeconfig user --client-name=foo --config=bar
31+
```shell
32+
# 为一个名为 foo 的其他用户输出 kubeconfig 文件
33+
kubeadm kubeconfig user --client-name=foo
34+
35+
# 使用 kubeadm 配置文件 bar 为另一个名为 foo 的用户输出 kubeconfig 文件
36+
kubeadm alpha kubeconfig user --client-name=foo --config=bar
5437
```
5538

5639
<!--
@@ -85,7 +68,7 @@ The name of user. It will be used as the CN if client certificates are created
8568
<!--
8669
Path to a kubeadm configuration file.
8770
-->
88-
指向 kubeadm 配置文件的路径
71+
指向 kubeadm 配置文件的路径
8972
</td>
9073
</tr>
9174

@@ -97,7 +80,7 @@ Path to a kubeadm configuration file.
9780
<!--
9881
help for user
9982
-->
100-
user 操作的帮助命令
83+
user 操作的帮助命令
10184
</td>
10285
</tr>
10386

@@ -122,21 +105,23 @@ The organizations of the client certificate. It will be used as the O if client
122105
<!--
123106
The token that should be used as the authentication mechanism for this kubeconfig, instead of client certificates
124107
-->
125-
应该用此令牌做为 kubeconfig 的身份验证机制,而不是客户端证书
108+
应该用此令牌做为 kubeconfig 的身份验证机制,而不是客户端证书
126109
</td>
127110
</tr>
128111

129112
<tr>
130113
<td colspan="2">--validity-period duration&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: 8760h0m0s</td>
131114
</tr>
132115
<tr>
133-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><!--The validity period of the client certificate. It is an offset from the current time.-->
116+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
117+
<!--
118+
The validity period of the client certificate. It is an offset from the current time.
119+
-->
134120
<p>
135121
客户证书的合法期限。所设置值为相对当前时间的偏移。
136122
</p></td>
137123
</tr>
138124

139-
140125
</tbody>
141126
</table>
142127

@@ -166,4 +151,3 @@ The token that should be used as the authentication mechanism for this kubeconfi
166151

167152
</tbody>
168153
</table>
169-

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
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 content, 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-
121
<!--
132
Run cleanup node.
143
-->
@@ -17,7 +6,6 @@ Run cleanup node.
176
<!--
187
### Synopsis
198
-->
20-
219
### 概要
2210

2311
<!--
@@ -71,7 +59,7 @@ The path to the directory where the certificates are stored. If specified, clean
7159
Cleanup the &quot;/etc/kubernetes/tmp&quot; directory
7260
-->
7361
<p>
74-
清理 &quot;/etc/kubernetes/tmp&quot; 目录
62+
清理 &quot;/etc/kubernetes/tmp&quot; 目录
7563
</p>
7664
</td>
7765
</tr>
@@ -85,7 +73,7 @@ Cleanup the &quot;/etc/kubernetes/tmp&quot; directory
8573
Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this value; use this option only if you have more than one CRI installed or if you have non-standard CRI socket.
8674
-->
8775
<p>
88-
要连接的 CRI 套接字的路径。如果为空,则 kubeadm 将尝试自动检测此值;仅当安装了多个 CRI 或具有非标准 CRI 插槽时,才使用此选项。
76+
要连接的 CRI 套接字的路径。如果为空,则 kubeadm 将尝试自动检测此值;仅当安装了多个 CRI 或具有非标准 CRI 套接字时,才使用此选项。
8977
</p>
9078
</td>
9179
</tr>
@@ -115,7 +103,7 @@ Don't apply any changes; just output what would be done.
115103
help for cleanup-node
116104
-->
117105
<p>
118-
cleanup-node 操作的帮助命令
106+
cleanup-node 操作的帮助命令
119107
</p>
120108
</td>
121109
</tr>

0 commit comments

Comments
 (0)