Skip to content

Commit aa12eb6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33535 from kinzhi/kinzhi95
[zh]Sync kubeadm-1
2 parents b5472b7 + c769481 commit aa12eb6

8 files changed

+160
-112
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ guide. You can file document formatting bugs against the
99
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
1010
-->
1111

12-
1312
Add a new local etcd member
1413

1514
### Synopsis

‎content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_kubelet-start.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,3 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
123123

124124
</tbody>
125125
</table>
126-
127-
128-

‎content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_reset_phase_remove-etcd-member.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,3 @@ kubeadm reset phase remove-etcd-member [flags]
6767

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

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

Lines changed: 41 additions & 16 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+
Add a new local etcd member
14+
-->
15+
添加一个新的本地 etcd 成员
116

217
<!--
318
### Synopsis
@@ -36,7 +51,9 @@ kubeadm join phase control-plane-join etcd [flags]
3651
<!--
3752
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.
3853
-->
54+
<p>
3955
如果该节点托管一个新的控制平面实例，则 API 服务器将公布其正在侦听的 IP 地址。如果未设置，则使用默认网络接口。
56+
</p>
4057
</td>
4158
</tr>
4259

@@ -48,7 +65,9 @@ If the node should host a new control plane instance, the IP address the API Ser
4865
<!--
4966
Path to kubeadm configuration file.
5067
-->
68+
<p>
5169
kubeadm 配置文件的路径。
70+
</p>
5271
</td>
5372
</tr>
5473

@@ -60,23 +79,9 @@ kubeadm 配置文件的路径。
6079
<!--
6180
Create a new control plane instance on this node
6281
-->
82+
<p>
6383
在此节点上创建一个新的控制平面实例
64-
</td>
65-
</tr>
66-
67-
<tr>
68-
<td colspan="2">--experimental-patches string</td>
69-
</tr>
70-
<tr>
71-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
72-
<!--
73-
Path to a directory that contains files named "target[suffix][+patchtype].extension". For example, "kube-apiserver0+merge.yaml" or just "etcd.json". "patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats supported by kubectl. The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". "suffix" is an optional string that can be used to determine which patches are applied first alpha-numerically.
74-
-->
75-
包含名为 "target[suffix][+patchtype].extension" 的文件的目录的路径。
76-
例如，"kube-apiserver0+merge.yaml" 或仅仅是 "etcd.json"。
77-
"patchtype" 可以是"strategic"、"merge" 或 "json" 之一，并且它们与 kubectl 支持的补丁格式匹配。
78-
默认的 "patchtype" 为 "strategic"。 "extension" 必须为 "json" 或 "yaml"。
79-
"suffix" 是一个可选字符串，可用于确定首先按字母顺序应用哪些补丁。
84+
</p>
8085
</td>
8186
</tr>
8287

@@ -88,7 +93,9 @@ Path to a directory that contains files named "target[suffix][+patchtype].extens
8893
<!--
8994
help for etcd
9095
-->
96+
<p>
9197
etcd 操作的帮助命令
98+
</p>
9299
</td>
93100
</tr>
94101

@@ -100,9 +107,25 @@ etcd 操作的帮助命令
100107
<!--
101108
Specify the node name.
102109
-->
110+
<p>
103111
指定节点的名称
112+
</p>
104113
</td>
105114
</tr>
115+
<tr>
116+
<td colspan="2">--patches string</td>
117+
</tr>
118+
<tr>
119+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
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+
包含名为 “target[suffix][+patchtype].extension” 的文件的目录的路径。
122+
例如，“kube-apiserver0+merge.yaml” 或只是 “etcd.json”。
123+
“target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 之一。
124+
“patchtype” 可以是 “strategic”、“merge” 或 “json”，它们匹配 kubectl 支持的补丁格式。
125+
默认的 “patchtype” 是 “strategic”。“extension” 必须是 “json” 或 “yaml”。
126+
“suffix” 是一个可选字符串，可用于基于字母数字顺序确定首先应用哪些补丁。
127+
</p></td>
128+
</tr>
106129

107130
</tbody>
108131
</table>
@@ -128,7 +151,9 @@ Specify the node name.
128151
<!--
129152
[EXPERIMENTAL] The path to the 'real' host root filesystem.
130153
-->
154+
<p>
131155
[实验] 到 '真实' 主机根文件系统的路径。
156+
</p>
132157
</td>
133158
</tr>
134159

‎content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_kubelet-start.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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+
<!--
14+
Write kubelet settings, certificates and (re)start the kubelet
15+
-->
16+
配置 Kubelet、证书并（重新）启动 Kubelet
117

218
<!--
319
### Synopsis
@@ -48,7 +64,9 @@ kubeadm 配置文件的路径。
4864
<!--
4965
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.
5066
-->
67+
<p>
5168
提供给 CRI 套接字建立连接的路径。如果为空，则 kubeadm 将尝试自动检测该值；仅当安装了多个 CRI 或具有非标准 CRI 套接字时，才使用此选项。
69+
</p>
5270
</td>
5371
</tr>
5472

@@ -57,11 +75,12 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
5775
</tr>
5876
<tr>
5977
<td></td><td style="line-height: 130%; word-wrap: break-word;">
60-
For file-based discovery, a file or URL from which to load cluster information.
6178
<!--
6279
For file-based discovery, a file or URL from which to load cluster information.
6380
-->
81+
<p>
6482
对于基于文件的发现，给出用于加载集群信息的文件或者 URL。
83+
</p>
6584
</td>
6685
</tr>
6786

@@ -73,7 +92,9 @@ For file-based discovery, a file or URL from which to load cluster information.
7392
<!--
7493
For token-based discovery, the token used to validate cluster information fetched from the API server.
7594
-->
95+
<p>
7696
对于基于令牌的发现，该令牌用于验证从 API 服务器获取的集群信息。
97+
</p>
7798
</td>
7899
</tr>
79100

@@ -85,7 +106,9 @@ For token-based discovery, the token used to validate cluster information fetche
85106
<!--
86107
For token-based discovery, validate that the root CA public key matches this hash (format: "&lt;type&gt;:&lt;value&gt;").
87108
-->
109+
<p>
88110
对于基于令牌的发现，验证根 CA 公钥是否匹配此哈希值（格式："&lt;type&gt;:&lt;value&gt;"）。
111+
</p>
89112
</td>
90113
</tr>
91114

@@ -97,7 +120,9 @@ For token-based discovery, validate that the root CA public key matches this has
97120
<!--
98121
For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.
99122
-->
123+
<p>
100124
对于基于令牌的发现，允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。
125+
</p>
101126
</td>
102127
</tr>
103128

@@ -109,7 +134,9 @@ For token-based discovery, allow joining without --discovery-token-ca-cert-hash
109134
<!--
110135
help for kubelet-start
111136
-->
137+
<p>
112138
kubelet-start 操作的帮助命令
139+
</p>
113140
</td>
114141
</tr>
115142

@@ -121,7 +148,9 @@ kubelet-start 操作的帮助命令
121148
<!--
122149
Specify the node name.
123150
-->
151+
<p>
124152
指定节点名称。
153+
</p>
125154
</td>
126155
</tr>
127156

@@ -133,7 +162,9 @@ Specify the node name.
133162
<!--
134163
Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.
135164
-->
165+
<p>
136166
指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。
167+
</p>
137168
</td>
138169
</tr>
139170

@@ -145,7 +176,9 @@ Specify the token used to temporarily authenticate with the Kubernetes Control P
145176
<!--
146177
Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.
147178
-->
179+
<p>
148180
如果未提供这些值，则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。
181+
</p>
149182
</td>
150183
</tr>
151184

@@ -173,10 +206,11 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
173206
<!--
174207
[EXPERIMENTAL] The path to the 'real' host root filesystem.
175208
-->
209+
<p>
176210
[实验] 指向 '真实' 宿主机根文件系统的路径。
211+
</p>
177212
</td>
178213
</tr>
179214

180215
</tbody>
181216
</table>
182-

‎content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_reset_phase_remove-etcd-member.md

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
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+
Remove a local etcd member.
14+
-->
15+
删除本地 etcd 成员
16+
117
<!--
218
### Synopsis
319
-->
420

521
### 概要
622

723
<!--
8-
Upload configuration about the current state, so that 'kubeadm upgrade' can later know how to configure the upgraded cluster.
24+
Remove a local etcd member for a control plane node.
925
-->
10-
11-
上传关于当前状态的配置，以便 'kubeadm upgrade' 以后可以知道如何配置升级后的集群。
26+
删除控制平面节点的本地 etcd 成员
1227

1328
```
14-
kubeadm config upload [flags]
29+
kubeadm reset phase remove-etcd-member [flags]
1530
```
1631

1732
<!--
@@ -31,7 +46,23 @@ kubeadm config upload [flags]
3146
<td colspan="2">-h, --help</td>
3247
</tr>
3348
<tr>
34-
<td></td><td style="line-height: 130%; word-wrap: break-word;">upload 操作的帮助信息</td>
49+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
50+
<p>
51+
<!-- help for remove-etcd-member -->
52+
remove-etcd-member 的帮助信息
53+
</p></td>
54+
</tr>
55+
56+
<tr>
57+
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值："/etc/kubernetes/admin.conf"</td>
58+
</tr>
59+
<tr>
60+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<p>
62+
<!-- 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. -->
63+
与集群通信时使用的 Kubeconfig 文件。如果未设置该标志，则可以在默认位置中查找现有的 Kubeconfig 文件。
64+
</p>
65+
</td>
3566
</tr>
3667

3768
</tbody>
@@ -51,23 +82,17 @@ kubeadm config upload [flags]
5182
</colgroup>
5283
<tbody>
5384

54-
<tr>
55-
<!-- td colspan="2">kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td -->
56-
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/admin.conf"</td>
57-
</tr>
58-
<tr>
59-
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">The KubeConfig file to use when talking to the cluster. If the flag is not set, a set of standard locations are searched for an existing KubeConfig file.</td -->
60-
<td></td><td style="line-height: 130%; word-wrap: break-word;">用于和集群通信的 KubeConfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。</td>
61-
</tr>
62-
6385
<tr>
6486
<td colspan="2">--rootfs string</td>
6587
</tr>
6688
<tr>
67-
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td -->
68-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[实验] 到'真实'主机根文件系统的路径。</td>
89+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
90+
<p>
91+
<!-- [EXPERIMENTAL] The path to the 'real' host root filesystem.-->
92+
[实验] 到'真实'主机根文件系统的路径。
93+
</p>
94+
</td>
6995
</tr>
7096

7197
</tbody>
7298
</table>
73-

0 commit comments

Comments
 (0)