Skip to content

Commit 98ea70d

Browse files
authored
Merge pull request #43140 from windsonsea/joinyh
[zh] Clean up kubeadm_config files
2 parents 7b11b19 + 88f78e4 commit 98ea70d

File tree

4 files changed

+30
-82
lines changed

4 files changed

+30
-82
lines changed

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
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
Manage configuration for a kubeadm cluster persisted in a ConfigMap in the cluster
143
-->
15-
管理持久化在 ConfigMap 中的 kubeadm 集群的配置
4+
管理持久化在 ConfigMap 中的 kubeadm 集群的配置
165

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

2311
<!--
@@ -28,10 +16,9 @@ initialized your cluster using kubeadm v1.7.x or lower, you must use the 'config
2816
command to create this ConfigMap. This is required so that 'kubeadm upgrade' can configure
2917
your upgraded cluster correctly.
3018
-->
31-
3219
kube-system 命名空间里有一个名为 "kubeadm-config" 的 ConfigMap,kubeadm 用它来存储有关集群的内部配置。
3320
kubeadm CLI v1.8.0+ 通过一个配置自动创建该 ConfigMap,这个配置是和 'kubeadm init' 共用的。
34-
但是您如果使用 kubeadm v1.7.x 或更低的版本初始化集群,那么必须使用 'config upload' 命令创建该 ConfigMap。
21+
但是你如果使用 kubeadm v1.7.x 或更低的版本初始化集群,那么必须使用 'config upload' 命令创建此 ConfigMap。
3522
这是必要的操作,目的是使 'kubeadm upgrade' 能够正确地配置升级后的集群。
3623

3724
```
@@ -41,7 +28,6 @@ kubeadm config [flags]
4128
<!--
4229
### Options
4330
-->
44-
4531
### 选项
4632

4733
<table style="width: 100%; table-layout: fixed;">
@@ -59,7 +45,7 @@ kubeadm config [flags]
5945
<!--
6046
<p>help for config</p>
6147
-->
62-
<p>config 操作的帮助命令</p>
48+
<p>config 操作的帮助命令</p>
6349
</td>
6450
</tr>
6551

@@ -77,7 +63,7 @@ kubeadm config [flags]
7763
<p>The kubeconfig file to use when talking to the cluster.
7864
If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.</p>
7965
-->
80-
<p>用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件
66+
<p>用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。</p>
8167
</td>
8268
</tr>
8369

@@ -87,7 +73,6 @@ If the flag is not set, a set of standard locations can be searched for an exist
8773
<!--
8874
### Options inherited from parent commands
8975
-->
90-
9176
### 从父命令继承的选项
9277

9378
<table style="width: 100%; table-layout: fixed;">

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

Lines changed: 15 additions & 22 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
Print configuration
143
-->
@@ -23,8 +12,8 @@ Print configuration
2312
This command prints configurations for subcommands provided.
2413
For details, see: https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#section-directories
2514
-->
26-
此命令打印子命令所提供的配置信息。
27-
相关细节可参阅: https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#section-directories
15+
此命令打印子命令所提供的配置信息。相关细节可参阅:
16+
https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#section-directories
2817

2918
```
3019
kubeadm config print [flags]
@@ -46,13 +35,12 @@ kubeadm config print [flags]
4635
<td colspan="2">-h, --help</td>
4736
</tr>
4837
<tr>
49-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p><!--help for print-->print 命令的帮助信息</p></td>
38+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p><!--help for print-->print 命令的帮助信息</p></td>
5039
</tr>
5140

5241
</tbody>
5342
</table>
5443

55-
5644
<!--
5745
### Options inherited from parent commands
5846
-->
@@ -69,20 +57,25 @@ kubeadm config print [flags]
6957
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值:"/etc/kubernetes/admin.conf"</td>
7058
</tr>
7159
<tr>
72-
<!--td></td><td style="line-height: 130%; word-wrap: break-word;"><p>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.</p></td -->
73-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>与集群通信时使用的 kubeconfig 文件。如此标志未设置,将在一组标准位置中搜索现有的kubeconfig 文件。</p></td>
60+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<!--
62+
<p>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.</p>
63+
-->
64+
<p>与集群通信时使用的 kubeconfig 文件。如此标志未设置,将在一组标准位置中搜索现有的 kubeconfig 文件。</p>
65+
</td>
7466
</tr>
7567

7668
<tr>
7769
<td colspan="2">--rootfs string</td>
7870
</tr>
7971
<tr>
80-
<!--td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p></td-->
81-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[试验性] 指向“真实”宿主根文件系统的路径。</p></td>
72+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
73+
<!--
74+
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
75+
-->
76+
<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
77+
</td>
8278
</tr>
8379

8480
</tbody>
8581
</table>
86-
87-
88-

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
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
Print default init configuration, that can be used for 'kubeadm init'
143
-->
15-
打印用于 'kubeadm init' 的默认 init 配置
4+
打印用于 'kubeadm init' 的默认 init 配置
165

176
<!--
187
### Synopsis
@@ -22,15 +11,14 @@ Print default init configuration, that can be used for 'kubeadm init'
2211
<!--
2312
This command prints objects such as the default init configuration that is used for 'kubeadm init'.
2413
-->
25-
2614
此命令打印对象,例如用于 'kubeadm init' 的默认 init 配置对象。
2715

2816
<!--
29-
<p>Note that sensitive values like the Bootstrap Token fields are replaced with placeholder values like "abcdef.0123456789abcdef" in order to pass validation but
17+
Note that sensitive values like the Bootstrap Token fields are replaced with placeholder values like "abcdef.0123456789abcdef" in order to pass validation but
3018
not perform the real computation for creating a token.
3119
-->
32-
33-
<p>请注意,Bootstrap Token 字段之类的敏感值已替换为 "abcdef.0123456789abcdef" 之类的占位符值以通过验证,但不执行创建令牌的实际计算。
20+
请注意,Bootstrap Token 字段之类的敏感值已替换为 "abcdef.0123456789abcdef"
21+
之类的占位符值以通过验证,但不执行创建令牌的实际计算。
3422

3523
```
3624
kubeadm config print init-defaults [flags]
@@ -39,7 +27,6 @@ kubeadm config print init-defaults [flags]
3927
<!--
4028
### Options
4129
-->
42-
4330
### 选项
4431

4532
<table style="width: 100%; table-layout: fixed;">
@@ -57,7 +44,8 @@ kubeadm config print init-defaults [flags]
5744
<!--
5845
<p>A comma-separated list for component config API objects to print the default values for. Available values: [KubeProxyConfiguration KubeletConfiguration]. If this flag is not set, no component configs will be printed.</p>
5946
-->
60-
<p>组件配置 API 对象的逗号分隔列表,打印其默认值。可用值:[KubeProxyConfiguration KubeletConfiguration]。如果未设置此参数,则不会打印任何组件配置。</p>
47+
<p>以逗号分隔的组件配置 API 对象的列表,打印其默认值。可用值:[KubeProxyConfiguration KubeletConfiguration]。
48+
如果未设置此参数,则不会打印任何组件配置。</p>
6149
</td>
6250
</tr>
6351

@@ -69,7 +57,7 @@ kubeadm config print init-defaults [flags]
6957
<!--
7058
<p>help for init-defaults</p>
7159
-->
72-
<p>init-defaults 操作的帮助命令</p>
60+
<p>init-defaults 操作的帮助命令</p>
7361
</td>
7462
</tr>
7563

@@ -79,7 +67,6 @@ kubeadm config print init-defaults [flags]
7967
<!--
8068
### Options inherited from parent commands
8169
-->
82-
8370
### 从父命令继承的选项
8471

8572
<table style="width: 100%; table-layout: fixed;">
@@ -120,4 +107,3 @@ kubeadm config print init-defaults [flags]
120107

121108
</tbody>
122109
</table>
123-

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
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-
12-
131
<!--
142
Print default join configuration, that can be used for 'kubeadm join'
153
-->
16-
打印默认的节点添加配置,该配置可用于 'kubeadm join' 命令
4+
打印默认的节点添加配置,该配置可用于 'kubeadm join' 命令
175

186
<!--
197
### Synopsis
208
-->
21-
229
### 概要
2310

2411
<!--
2512
This command prints objects such as the default join configuration that is used for 'kubeadm join'.
2613
-->
27-
2814
此命令打印对象,例如用于 'kubeadm join' 的默认 join 配置对象。
2915

3016
<!--
3117
Note that sensitive values like the Bootstrap Token fields are replaced with placeholder values like "abcdef.0123456789abcdef" in order to pass validation but
3218
not perform the real computation for creating a token.
3319
-->
34-
3520
请注意,诸如启动引导令牌字段之类的敏感值已替换为 "abcdef.0123456789abcdef" 之类的占位符值以通过验证,
3621
但不执行创建令牌的实际计算。
3722

@@ -42,7 +27,6 @@ kubeadm config print join-defaults [flags]
4227
<!--
4328
### Options
4429
-->
45-
4630
### 选项
4731

4832
<table style="width: 100%; table-layout: fixed;">
@@ -61,7 +45,8 @@ kubeadm config print join-defaults [flags]
6145
A comma-separated list for component config API objects to print the default values for. Available values: [KubeProxyConfiguration KubeletConfiguration]. If this flag is not set, no component configs will be printed.
6246
-->
6347
<p>
64-
组件配置 API 对象的逗号分隔列表,打印其默认值。可用值:[KubeProxyConfiguration KubeletConfiguration]。如果未设置此参数,则不会打印任何组件配置。
48+
以逗号分隔的组件配置 API 对象的列表,打印其默认值。可用值:[KubeProxyConfiguration KubeletConfiguration]
49+
如果未设置此参数,则不会打印任何组件配置。
6550
</p>
6651
</td>
6752
</tr>
@@ -75,7 +60,7 @@ A comma-separated list for component config API objects to print the default val
7560
help for join-defaults
7661
-->
7762
<p>
78-
join-defaults 操作的帮助命令
63+
join-defaults 操作的帮助命令
7964
</p>
8065
</td>
8166
</tr>
@@ -86,7 +71,6 @@ join-defaults 操作的帮助命令
8671
<!--
8772
### Options inherited from parent commands
8873
-->
89-
9074
### 从父命令继承的选项
9175

9276
<table style="width: 100%; table-layout: fixed;">

0 commit comments

Comments
 (0)