Skip to content

Commit 8415d67

Browse files
authored
Merge pull request #53118 from my-git9/npe-12532
[zh-cn]sync kubeadm_init_phase_certs_etcd-server kubeadm_config_images
2 parents 864676b + 6357072 commit 8415d67

File tree

2 files changed

+56
-44
lines changed

2 files changed

+56
-44
lines changed

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Interact with container images used by kubeadm
3-
-->
4-
与 kubeadm 使用的容器镜像交互
5-
61
<!--
72
### Synopsis
83
-->
@@ -13,7 +8,7 @@ Interact with container images used by kubeadm.
138
-->
149
与 kubeadm 使用的容器镜像交互。
1510

16-
```
11+
```shell
1712
kubeadm config images [flags]
1813
```
1914

@@ -22,7 +17,7 @@ kubeadm config images [flags]
2217
-->
2318
### 选项
2419

25-
<table style="width: 100%; table-layout: fixed;">
20+
<table style="width: 100%; table-layout: fixed;">
2621
<colgroup>
2722
<col span="1" style="width: 10px;" />
2823
<col span="1" />
@@ -33,11 +28,12 @@ kubeadm config images [flags]
3328
<td colspan="2">-h, --help</td>
3429
</tr>
3530
<tr>
36-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
31+
<td></td>
32+
<td style="line-height: 130%; word-wrap: break-word;">
33+
<p>
3734
<!--
3835
help for images
3936
-->
40-
<p>
4137
images 的帮助命令。
4238
</p>
4339
</td>
@@ -51,7 +47,7 @@ images 的帮助命令。
5147
-->
5248
### 从父命令继承的选项
5349

54-
<table style="width: 100%; table-layout: fixed;">
50+
<table style="width: 100%; table-layout: fixed;">
5551
<colgroup>
5652
<col span="1" style="width: 10px;" />
5753
<col span="1" />
@@ -67,12 +63,14 @@ images 的帮助命令。
6763
</td>
6864
</tr>
6965
<tr>
70-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
66+
<td></td>
67+
<td style="line-height: 130%; word-wrap: break-word;">
68+
<p>
7169
<!--
7270
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.
7371
-->
74-
<p>
75-
用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
72+
用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm
73+
将会搜索一个已经存在于标准路径的 kubeconfig 文件。
7674
</p>
7775
</td>
7876
</tr>
@@ -81,11 +79,12 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
8179
<td colspan="2">--rootfs string</td>
8280
</tr>
8381
<tr>
84-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
82+
<td></td>
83+
<td style="line-height: 130%; word-wrap: break-word;">
84+
<p>
8585
<!--
8686
[EXPERIMENTAL] The path to the 'real' host root filesystem.
8787
-->
88-
<p>
8988
[实验] 到 '真实' 主机根文件系统的路径。
9089
</p>
9190
</td>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_certs_etcd-server.md

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1-
<!--
2-
Generate the certificate for serving etcd
3-
-->
4-
生成用于提供 etcd 服务的证书。
5-
6-
<!--
71
### Synopsis
82
-->
93
### 概要
104

115
<!--
126
Generate the certificate for serving etcd, and save them into etcd/server.crt and etcd/server.key files.
137
-->
14-
生成用于提供 etcd 服务的证书,并将其保存到 etcd/server.crt 和 etcd/server.key 文件中。
8+
生成用于提供 etcd 服务的证书,并将其保存到 `etcd/server.crt`
9+
`etcd/server.key` 文件中。
1510

1611
<!--
1712
Default SANs are localhost, 127.0.0.1, 127.0.0.1, ::1
1813
-->
19-
默认 SAN 为 localhost、127.0.0.1、127.0.0.1、:: 1
14+
默认 SAN 为 localhost、127.0.0.1、127.0.0.1、::1
2015

2116
<!--
2217
If both files already exist, kubeadm skips the generation step and existing files will be used.
2318
-->
2419
如果两个文件都已存在,则 kubeadm 将跳过生成步骤,使用现有文件。
2520

26-
```
21+
```shell
2722
kubeadm init phase certs etcd-server [flags]
2823
```
2924

@@ -32,7 +27,7 @@ kubeadm init phase certs etcd-server [flags]
3227
-->
3328
### 选项
3429

35-
<table style="width: 100%; table-layout: fixed;">
30+
<table style="width: 100%; table-layout: fixed;">
3631
<colgroup>
3732
<col span="1" style="width: 10px;" />
3833
<col span="1" />
@@ -48,47 +43,59 @@ kubeadm init phase certs etcd-server [flags]
4843
</td>
4944
</tr>
5045
<tr>
51-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
46+
<td></td>
47+
<td style="line-height: 130%; word-wrap: break-word;">
48+
<p>
5249
<!--
53-
<p>The path where to save and store the certificates.</p>
50+
The path where to save and store the certificates.
5451
-->
55-
<p>保存和存储证书的路径。<p>
52+
保存和存储证书的路径。
53+
<p>
5654
</td>
5755
</tr>
5856

5957
<tr>
6058
<td colspan="2">--config string</td>
6159
</tr>
6260
<tr>
63-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<td></td>
62+
<td style="line-height: 130%; word-wrap: break-word;">
63+
<p>
6464
<!--
65-
<p>Path to a kubeadm configuration file.</p>
65+
Path to a kubeadm configuration file.
6666
-->
67-
<p>kubeadm 配置文件的路径。<p>
67+
kubeadm 配置文件的路径。
68+
<p>
6869
</td>
6970
</tr>
7071

7172
<tr>
7273
<td colspan="2">--dry-run</td>
7374
</tr>
7475
<tr>
75-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
76+
<td></td>
77+
<td style="line-height: 130%; word-wrap: break-word;">
78+
<p>
7679
<!--
77-
<p>Don't apply any changes; just output what would be done.</p>
80+
Don't apply any changes; just output what would be done.
7881
-->
79-
<p>不做任何更改;只输出将要执行的操作。<p>
82+
不做任何更改;只输出将要执行的操作。
83+
<p>
8084
</td>
8185
</tr>
8286

8387
<tr>
8488
<td colspan="2">-h, --help</td>
8589
</tr>
8690
<tr>
87-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
91+
<td></td>
92+
<td style="line-height: 130%; word-wrap: break-word;">
93+
<p>
8894
<!--
89-
<p>help for etcd-server</p>
95+
help for etcd-server
9096
-->
91-
<p>etcd-server 操作的帮助命令。<p>
97+
etcd-server 操作的帮助命令。
98+
<p>
9299
</td>
93100
</tr>
94101

@@ -101,11 +108,14 @@ kubeadm init phase certs etcd-server [flags]
101108
</td>
102109
</tr>
103110
<tr>
104-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
111+
<td></td>
112+
<td style="line-height: 130%; word-wrap: break-word;">
113+
<p>
105114
<!--
106-
<p>Choose a specific Kubernetes version for the control plane.</p>
115+
Choose a specific Kubernetes version for the control plane.
107116
-->
108-
<p>为控制平面指定特定的 Kubernetes 版本。<p>
117+
为控制平面指定特定的 Kubernetes 版本。
118+
<p>
109119
</td>
110120
</tr>
111121

@@ -117,7 +127,7 @@ kubeadm init phase certs etcd-server [flags]
117127
-->
118128
### 继承于父命令的选项
119129

120-
<table style="width: 100%; table-layout: fixed;">
130+
<table style="width: 100%; table-layout: fixed;">
121131
<colgroup>
122132
<col span="1" style="width: 10px;" />
123133
<col span="1" />
@@ -128,11 +138,14 @@ kubeadm init phase certs etcd-server [flags]
128138
<td colspan="2">--rootfs string</td>
129139
</tr>
130140
<tr>
131-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
141+
<td></td>
142+
<td style="line-height: 130%; word-wrap: break-word;">
143+
<p>
132144
<!--
133-
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
145+
[EXPERIMENTAL] The path to the 'real' host root filesystem.
134146
-->
135-
<p>[实验] 到 '真实' 主机根文件系统的路径。<p>
147+
[实验] 到 '真实' 主机根文件系统的路径。
148+
<p>
136149
</td>
137150
</tr>
138151

0 commit comments

Comments
 (0)