Skip to content

Commit f230e10

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33621 from kinzhi/kinzhi103
[zh]Sync kubeadm-7
2 parents 33b7cad + cf483c5 commit f230e10

File tree

6 files changed

+102
-72
lines changed

6 files changed

+102
-72
lines changed

‎content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_etcd-server.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,3 @@ kubeadm certs renew etcd-server [flags]
8787

8888
</tbody>
8989
</table>
90-
91-
92-

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

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

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,3 @@ kubeadm upgrade node [flags]
117117

118118
</tbody>
119119
</table>
120-
121-
122-

‎content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_etcd-server.md

Lines changed: 26 additions & 35 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+
Renew the certificate for serving etcd
14+
-->
15+
续订用于提供 etcd 服务的证书
116

217
<!--
318
### Synopsis
@@ -21,7 +36,7 @@ Renewal by default tries to use the certificate authority in the local PKI manag
2136
可以使用 K8s 证书 API 进行证书续订，或者作为最后一种选择来生成 CSR 请求。
2237

2338
<!--
24-
After renewal, in order to make changes effective, is is required to restart control-plane components and eventually re-distribute the renewed certificate in case the file is used elsewhere.
39+
After renewal, in order to make changes effective, is required to restart control-plane components and eventually re-distribute the renewed certificate in case the file is used elsewhere.
2540
-->
2641
续订后，为了使更改生效，需要重新启动控制平面组件，并最终重新分发更新的证书，以防文件在其他地方使用。
2742

@@ -54,7 +69,9 @@ kubeadm certs renew etcd-server [flags]
5469
<!--
5570
The path where to save the certificates.
5671
-->
72+
<p>
5773
保存证书的路径。
74+
</p>
5875
</td>
5976
</tr>
6077

@@ -66,31 +83,9 @@ The path where to save the certificates.
6683
<!--
6784
Path to a kubeadm configuration file.
6885
-->
86+
<p>
6987
kubeadm 配置文件的路径。
70-
</td>
71-
</tr>
72-
73-
<tr>
74-
<td colspan="2">--csr-dir string</td>
75-
</tr>
76-
<tr>
77-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
78-
<!--
79-
The path to output the CSRs and private keys to
80-
-->
81-
CSR 和私钥的输出路径
82-
</td>
83-
</tr>
84-
85-
<tr>
86-
<td colspan="2">--csr-only</td>
87-
</tr>
88-
<tr>
89-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
90-
<!--
91-
Create CSRs instead of generating certificates
92-
-->
93-
创建 CSR 而不是生成证书
88+
</p>
9489
</td>
9590
</tr>
9691

@@ -102,7 +97,9 @@ Create CSRs instead of generating certificates
10297
<!--
10398
help for etcd-server
10499
-->
100+
<p>
105101
etcd-server 操作的帮助命令
102+
</p>
106103
</td>
107104
</tr>
108105

@@ -119,30 +116,23 @@ etcd-server 操作的帮助命令
119116
<!--
120117
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.
121118
-->
119+
<p>
122120
与集群通信时使用的 kubeconfig 文件。
123121
如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。
122+
</p>
124123
</td>
125124
</tr>
126125

127126
<tr>
128127
<td colspan="2">--use-api</td>
129128
</tr>
130-
<tr>
131-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
132-
<!--
133-
Use the Kubernetes certificate API to renew certificates
134-
-->
135-
使用 Kubernetes 证书 API 续订证书
136-
</td>
137-
</tr>
138129

139130
</tbody>
140131
</table>
141132

142133
<!--
143134
### Options inherited from parent commands
144135
-->
145-
146136
### 从父命令继承的选项
147137

148138
<table style="width: 100%; table-layout: fixed;">
@@ -160,10 +150,11 @@ Use the Kubernetes certificate API to renew certificates
160150
<!--
161151
[EXPERIMENTAL] The path to the 'real' host root filesystem.
162152
-->
153+
<p>
163154
[实验] 到 '真实' 主机根文件系统的路径。
155+
</p>
164156
</td>
165157
</tr>
166158

167159
</tbody>
168160
</table>
169-

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

Lines changed: 21 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+
Interact with container images used by kubeadm
14+
-->
15+
与 kubeadm 使用的容器镜像交互
116

217
<!--
318
### Synopsis
@@ -36,7 +51,9 @@ kubeadm config images [flags]
3651
<!--
3752
help for images
3853
-->
54+
<p>
3955
images 的帮助命令
56+
</p>
4057
</td>
4158
</tr>
4259

@@ -47,7 +64,6 @@ images 的帮助命令
4764
<!--
4865
### Options inherited from parent commands
4966
-->
50-
5167
### 从父命令继承的选项
5268

5369
<table style="width: 100%; table-layout: fixed;">
@@ -70,7 +86,9 @@ images 的帮助命令
7086
<!--
7187
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.
7288
-->
89+
<p>
7390
用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
91+
</p>
7492
</td>
7593
</tr>
7694

@@ -82,7 +100,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
82100
<!--
83101
[EXPERIMENTAL] The path to the 'real' host root filesystem.
84102
-->
103+
<p>
85104
[实验] 到 '真实' 主机根文件系统的路径。
105+
</p>
86106
</td>
87107
</tr>
88108

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

Lines changed: 55 additions & 27 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+
Upgrade commands for a node in the cluster
14+
-->
15+
升级集群中某个节点的命令
116

217
<!--
318
### Synopsis
@@ -8,7 +23,6 @@
823
<!--
924
Upgrade commands for a node in the cluster
1025
-->
11-
1226
升级集群中某个节点的命令
1327

1428
<!--
@@ -49,14 +63,16 @@ kubeadm upgrade node [flags]
4963
<tbody>
5064

5165
<tr>
52-
<td colspan="2">--certificate-renewal</td>
66+
<td colspan="2">--certificate-renewal&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default-->默认值: true</td>
5367
</tr>
5468
<tr>
5569
<td></td><td style="line-height: 130%; word-wrap: break-word;">
5670
<!--
5771
Perform the renewal of certificates used by component changed during upgrades.
5872
-->
73+
<p>
5974
对升级期间变化的组件所使用的证书执行更新。
75+
</p>
6076
</td>
6177
</tr>
6278

@@ -69,7 +85,9 @@ Perform the renewal of certificates used by component changed during upgrades.
6985
<!--
7086
Do not change any state, just output the actions that would be performed.
7187
-->
88+
<p>
7289
不更改任何状态，只输出将要执行的操作。
90+
</p>
7391
</td>
7492
</tr>
7593

@@ -84,23 +102,9 @@ Do not change any state, just output the actions that would be performed.
84102
<!--
85103
Perform the upgrade of etcd.
86104
-->
105+
<p>
87106
执行 etcd 的升级。
88-
</td>
89-
</tr>
90-
91-
<tr>
92-
<td colspan="2">--experimental-patches string</td>
93-
</tr>
94-
<tr>
95-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
96-
<!--
97-
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.
98-
-->
99-
包含名为 "target[suffix][+patchtype].extension" 的文件的目录的路径。
100-
例如，"kube-apiserver0+merge.yaml" 或仅仅是 "etcd.json"。
101-
"patchtype" 可以是 "strategic"、"merge" 或 "json" 之一，并且它们与 kubectl 支持的补丁格式匹配。
102-
默认的 "patchtype" 为 "strategic"。 "extension" 必须为 "json" 或 "yaml"。
103-
"suffix" 是一个可选字符串，可用于确定首先按字母顺序应用哪些补丁。
107+
</p>
104108
</td>
105109
</tr>
106110

@@ -112,10 +116,23 @@ Path to a directory that contains files named "target[suffix][+patchtype].extens
112116
<!--
113117
help for node
114118
-->
119+
<p>
115120
node 操作的帮助命令
121+
</p>
116122
</td>
117123
</tr>
118124

125+
<tr>
126+
<td colspan="2">--ignore-preflight-errors strings</td>
127+
</tr>
128+
<tr>
129+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
130+
<!-- A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks. -->
131+
其错误将显示为警告的检查列表。示例：'IsPrivilegedUser,Swap'。 值 'all' 忽略所有检查中的错误。
132+
</p></td>
133+
</tr>
134+
135+
119136
<tr>
120137
<!--
121138
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
@@ -127,31 +144,41 @@ node 操作的帮助命令
127144
<!--
128145
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.
129146
-->
147+
<p>
130148
用于与集群交互的 kubeconfig 文件。如果参数未指定，将从一系列标准位置检索存在的 kubeconfig 文件。
149+
</p>
131150
</td>
132151
</tr>
133152

134153
<tr>
135-
<td colspan="2">--kubelet-version string</td>
154+
<td colspan="2">--patches string</td>
136155
</tr>
137156
<tr>
138-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
139-
<!--
140-
The *desired* version for the kubelet config after the upgrade. If not specified, the KubernetesVersion from the kubeadm-config ConfigMap will be used
141-
-->
142-
升级后 *期望的* kubelet 配置版本。如未指定，将使用 kubeadm-config ConfigMap 中的 KubernetesVersion
143-
</td>
157+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
158+
<!-- 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. -->
159+
包含名为 &quot;target[suffix][+patchtype].extension&quot; 的文件的目录的路径。
160+
例如，&quot;kube-apiserver0+merge.yaml&quot;或仅仅是 &quot;etcd.json&quot;。
161+
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;、&quot;kube-controller-manager&quot;、&quot;kube-scheduler&quot;、&quot;etcd&quot; 之一。
162+
&quot;patchtype&quot; 可以是 &quot;strategic&quot;、&quot;merge&quot; 或者 &quot;json&quot; 之一，
163+
并且它们与 kubectl 支持的补丁格式相同。
164+
默认的 &quot;patchtype&quot; 是 &quot;strategic&quot;。
165+
&quot;extension&quot; 必须是&quot;json&quot; 或&quot;yaml&quot;。
166+
&quot;suffix&quot; 是一个可选字符串，可用于确定首先按字母顺序应用哪些补丁。
167+
</p></td>
168+
</tr>
144169
</tr>
145170

146171
<tr>
147-
<td colspan="2">--skip-phases stringSlice</td>
172+
<td colspan="2">--skip-phases strings</td>
148173
</tr>
149174
<tr>
150175
<td></td><td style="line-height: 130%; word-wrap: break-word;">
151176
<!--
152177
List of phases to be skipped
153178
-->
179+
<p>
154180
要跳过的阶段的列表
181+
</p>
155182
</td>
156183
</tr>
157184

@@ -179,10 +206,11 @@ List of phases to be skipped
179206
<!--
180207
[EXPERIMENTAL] The path to the 'real' host root filesystem.
181208
-->
209+
<p>
182210
[实验] 指向 '真实' 宿主机根文件系统的路径。
211+
</p>
183212
</td>
184213
</tr>
185214

186215
</tbody>
187216
</table>
188-

0 commit comments

Comments
 (0)