Skip to content

Commit 29e4b21

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33617 from JarHMJ/kubeadm-11
[zh] sync v1.24 kubeadm-11
2 parents a665f4b + 1992c08 commit 29e4b21

File tree

4 files changed

+167
-82
lines changed

4 files changed

+167
-82
lines changed

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

Lines changed: 57 additions & 9 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+
Check certificates expiration for a Kubernetes cluster
14+
-->
15+
为一个 Kubernetes 集群检查证书的到期时间
16+
117
<!--
218
### Synopsis
319
-->
@@ -31,26 +47,54 @@ kubeadm certs check-expiration [flags]
3147
<td colspan="2">--cert-dir string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "/etc/kubernetes/pki"</td>
3248
</tr>
3349
<tr>
34-
<!--
35-
<td></td><td style="line-height: 130%; word-wrap: break-word;">The path where to save the certificates</td>
50+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
51+
<!--
52+
<p>The path where to save the certificates</p>
3653
-->
37-
<td></td><td style="line-height: 130%; word-wrap: break-word;">保存证书的路径</td>
54+
<p>保存证书的路径</p>
55+
</td>
3856
</tr>
3957

4058
<tr>
4159
<td colspan="2">--config string</td>
4260
</tr>
4361
<tr>
44-
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td -->
45-
<td></td><td style="line-height: 130%; word-wrap: break-word;">kubeadm 配置文件的路径</td>
62+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
63+
<!--
64+
<p>Path to a kubeadm configuration file.</p>
65+
-->
66+
<p>kubeadm 配置文件的路径</p>
67+
</td>
4668
</tr>
4769

4870
<tr>
4971
<td colspan="2">-h, --help</td>
5072
</tr>
5173
<tr>
52-
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">help for check-expiration</td -->
53-
<td></td><td style="line-height: 130%; word-wrap: break-word;">check-expiration 的帮助命令</td>
74+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
75+
<!--
76+
<p>help for check-expiration</p>
77+
-->
78+
<p>check-expiration 的帮助命令</p>
79+
</td>
80+
</tr>
81+
82+
<tr>
83+
<td colspan="2">
84+
<!--
85+
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
86+
-->
87+
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认为: "/etc/kubernetes/admin.conf"
88+
</td>
89+
</tr>
90+
<tr>
91+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
92+
<!--
93+
<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>
94+
-->
95+
<p>在和集群连接时使用该 kubeconfig 文件。
96+
如果该标志没有设置，那么将会在一些标准的位置去搜索存在的 kubeconfig 文件。</p>
97+
</td>
5498
</tr>
5599

56100
</tbody>
@@ -72,8 +116,12 @@ kubeadm certs check-expiration [flags]
72116
<td colspan="2">--rootfs string</td>
73117
</tr>
74118
<tr>
75-
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td -->
76-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[实验] 到'真实'主机根文件系统的路径。</td>
119+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
120+
<!--
121+
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
122+
-->
123+
<p>[实验] 到'真实'主机根文件系统的路径。</p>
124+
</td>
77125
</tr>
78126

79127
</tbody>

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

Lines changed: 26 additions & 33 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 embedded in the kubeconfig file for the admin to use and for kubeadm itself
14+
-->
15+
续订 kubeconfig 文件中嵌入的证书，供管理员 和 kubeadm 自身使用。
116

217
<!--
318
### Synopsis
@@ -51,9 +66,9 @@ kubeadm certs renew admin.conf [flags]
5166
<tr>
5267
<td></td><td style="line-height: 130%; word-wrap: break-word;">
5368
<!--
54-
The path where to save the certificates.
69+
<p>The path where to save the certificates</p>
5570
-->
56-
保存证书的路径。
71+
<p>保存证书的路径。</p>
5772
</td>
5873
</tr>
5974

@@ -62,30 +77,8 @@ The path where to save the certificates.
6277
</tr>
6378
<tr>
6479
<td></td><td style="line-height: 130%; word-wrap: break-word;">
65-
<!-- Path to a kubeadm configuration file. -->
66-
kubeadm 配置文件的路径。
67-
</td>
68-
</tr>
69-
70-
<tr>
71-
<td colspan="2">--csr-dir string</td>
72-
</tr>
73-
<tr>
74-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
75-
<!-- The path to output the CSRs and private keys to -->
76-
CSR 和私钥的输出路径
77-
</td>
78-
</tr>
79-
80-
<tr>
81-
<td colspan="2">--csr-only</td>
82-
</tr>
83-
<tr>
84-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
85-
<!--
86-
Create CSRs instead of generating certificates
87-
-->
88-
创建 CSR 而不是生成证书
80+
<!-- <p>Path to a kubeadm configuration file.</p> -->
81+
<p>kubeadm 配置文件的路径。</p>
8982
</td>
9083
</tr>
9184

@@ -94,8 +87,8 @@ Create CSRs instead of generating certificates
9487
</tr>
9588
<tr>
9689
<td></td><td style="line-height: 130%; word-wrap: break-word;">
97-
<!-- help for admin.conf -->
98-
admin.conf 子操作的帮助命令
90+
<!-- <p>help for admin.conf</p> -->
91+
<p>admin.conf 子操作的帮助命令</p>
9992
</td>
10093
</tr>
10194

@@ -104,9 +97,9 @@ admin.conf 子操作的帮助命令
10497
</tr>
10598
<tr>
10699
<td></td><td style="line-height: 130%; word-wrap: break-word;">
107-
<!-- 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. -->
108-
与集群通信时使用的 kubeconfig 文件。
109-
如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。
100+
<!-- <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> -->
101+
<p>与集群通信时使用的 kubeconfig 文件。
102+
如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。</p>
110103
</td>
111104
</tr>
112105

@@ -143,9 +136,9 @@ Use the Kubernetes certificate API to renew certificates
143136
<tr>
144137
<td></td><td style="line-height: 130%; word-wrap: break-word;">
145138
<!--
146-
[EXPERIMENTAL] The path to the 'real' host root filesystem.
139+
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
147140
-->
148-
[实验] 到 '真实' 主机根文件系统的路径。
141+
<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
149142
</td>
150143
</tr>
151144

‎content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_etcd-healthcheck-client.md

Lines changed: 28 additions & 15 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+
Generate the certificate for liveness probes to healthcheck etcd
15+
-->
16+
生成用于 etcd 健康检查的活跃性探针的证书
117

218
<!--
319
### Synopsis
@@ -6,21 +22,18 @@
622
### 概要
723

824
<!--
9-
Generate the certificate for liveness probes to healthcheck etcd, and save them into etcd/healthcheck-client.cert and etcd/healthcheck-client.key files.
25+
Generate the certificate for liveness probes to healthcheck etcd, and save them into etcd/healthcheck-client.crt and etcd/healthcheck-client.key files
1026
-->
11-
12-
生成用于 etcd 健康检查的活跃性探针的证书，并将其保存到 healthcheck-client.cert 和 etcd/healthcheck-client.key 文件中。
27+
生成用于 etcd 健康检查的活跃性探针的证书，并将其保存到 etcd/healthcheck-client.crt 和 etcd/healthcheck-client.key 文件中。
1328

1429
<!--
1530
If both files already exist, kubeadm skips the generation step and existing files will be used.
1631
-->
17-
1832
如果两个文件都已存在，则 kubeadm 将跳过生成步骤，使用现有文件。
1933

2034
<!--
2135
Alpha Disclaimer: this command is currently alpha.
2236
-->
23-
2437
Alpha 免责声明：此命令当前为 alpha 功能。
2538

2639
```
@@ -51,9 +64,9 @@ kubeadm init phase certs etcd-healthcheck-client [flags]
5164
<tr>
5265
<td></td><td style="line-height: 130%; word-wrap: break-word;">
5366
<!--
54-
The path where to save and store the certificates.
67+
<p>The path where to save and store the certificates.</p>
5568
-->
56-
证书存储的路径。
69+
<p>证书存储的路径。</p>
5770
</td>
5871
</tr>
5972

@@ -63,9 +76,9 @@ The path where to save and store the certificates.
6376
<tr>
6477
<td></td><td style="line-height: 130%; word-wrap: break-word;">
6578
<!--
66-
Path to a kubeadm configuration file.
79+
<p>Path to a kubeadm configuration file.</p>
6780
-->
68-
kubeadm 配置文件的路径。
81+
<p>kubeadm 配置文件的路径。</p>
6982
</td>
7083
</tr>
7184

@@ -75,9 +88,9 @@ kubeadm 配置文件的路径。
7588
<tr>
7689
<td></td><td style="line-height: 130%; word-wrap: break-word;">
7790
<!--
78-
help for etcd-healthcheck-client
91+
<p>help for etcd-healthcheck-client</p>
7992
-->
80-
etcd-healthcheck-client 操作的帮助命令
93+
<p>etcd-healthcheck-client 操作的帮助命令</p>
8194
</td>
8295
</tr>
8396

@@ -92,9 +105,9 @@ etcd-healthcheck-client 操作的帮助命令
92105
<tr>
93106
<td></td><td style="line-height: 130%; word-wrap: break-word;">
94107
<!--
95-
Choose a specific Kubernetes version for the control plane.
108+
<p>Choose a specific Kubernetes version for the control plane.</p>
96109
-->
97-
为控制平面选择特定的 Kubernetes 版本。
110+
<p>为控制平面选择特定的 Kubernetes 版本。</p>
98111
</td>
99112
</tr>
100113

@@ -120,9 +133,9 @@ Choose a specific Kubernetes version for the control plane.
120133
<tr>
121134
<td></td><td style="line-height: 130%; word-wrap: break-word;">
122135
<!--
123-
[EXPERIMENTAL] The path to the 'real' host root filesystem.
136+
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
124137
-->
125-
[实验] 到 '真实' 主机根文件系统的路径。
138+
<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
126139
</td>
127140
</tr>
128141

0 commit comments

Comments
 (0)