Skip to content

Commit a4d8c11

Browse files
authored
Merge pull request #47647 from windsonsea/certsy
[zh] Sync kubeadm_certs.md and its dependent files
2 parents b4a0808 + 96e8e0b commit a4d8c11

18 files changed

+53
-52
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ help for certs
4848
<!--
4949
### Options inherited from parent commands
5050
-->
51-
### 继承于父命令的选项
51+
### 从父命令继承的选项
5252

5353
<table style="width: 100%; table-layout: fixed;">
5454
<colgroup>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_check-expiration.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs/kubeadm_certs_check-expiration.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ text|json|yaml|go-template|go-template-file|template|templatefile|jsonpath|jsonp
117117
</tr>
118118
<tr>
119119
<td></td><td style="line-height: 130%; word-wrap: break-word;">
120+
<p>
120121
<!--
121-
<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>
122+
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.
122123
-->
123-
<p>在和集群连接时使用该 kubeconfig 文件。
124-
如果此标志未被设置,那么将会在一些标准的位置去搜索存在的 kubeconfig 文件。</p>
124+
在和集群连接时使用该 kubeconfig 文件。
125+
如果此标志未被设置,那么将会在一些标准的位置去搜索存在的 kubeconfig 文件。
126+
</p>
125127
</td>
126128
</tr>
127129

@@ -145,7 +147,7 @@ If true, keep the managedFields when printing objects in JSON or YAML format.
145147
<!--
146148
### Options inherited from parent commands
147149
-->
148-
### 继承于父命令的选项
150+
### 从父命令继承的选项
149151

150152
<table style="width: 100%; table-layout: fixed;">
151153
<colgroup>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_generate-csr.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs/kubeadm_certs_generate-csr.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
Generate keys and certificate signing requests
33
-->
4-
生成密钥和证书签名请求
4+
生成密钥和证书签名请求
55

66
<!--
77
### Synopsis
@@ -18,7 +18,7 @@ Generates keys and certificate signing requests (CSRs) for all the certificates
1818
<!--
1919
This command is designed for use in [Kubeadm External CA Mode](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#external-ca-mode). It generates CSRs which you can then submit to your external certificate authority for signing.
2020
-->
21-
此命令设计用于 [Kubeadm 外部 CA 模式](https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#external-ca-mode)
21+
此命令设计用于 [Kubeadm 外部 CA 模式](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#external-ca-mode)
2222
它生成你可以提交给外部证书颁发机构进行签名的 CSR。
2323

2424
<!--
@@ -43,7 +43,7 @@ kubeadm certs generate-csr [flags]
4343
kubeadm certs generate-csr --kubeconfig-dir /tmp/etc-k8s --cert-dir /tmp/etc-k8s/pki
4444
```
4545
-->
46-
```
46+
```shell
4747
# 以下命令将为所有控制平面证书和 kubeconfig 文件生成密钥和 CSR:
4848
kubeadm certs generate-csr --kubeconfig-dir /tmp/etc-k8s --cert-dir /tmp/etc-k8s/pki
4949
```
@@ -126,7 +126,7 @@ The path where to save the kubeconfig file.
126126
<!--
127127
### Options inherited from parent commands
128128
-->
129-
### 继承于父命令的选项
129+
### 从父命令继承的选项
130130

131131
<table style="width: 100%; table-layout: fixed;">
132132
<colgroup>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_admin.conf.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs/kubeadm_certs_renew_admin.conf.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ kubeadm certs renew admin.conf [flags]
9191
</tr>
9292
<tr>
9393
<td></td><td style="line-height: 130%; word-wrap: break-word;">
94+
<p>
9495
<!--
95-
<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>
96+
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.
9697
-->
97-
<p>与集群通信时使用的 kubeconfig 文件。
98-
如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。</p>
98+
与集群通信时使用的 kubeconfig 文件。
99+
如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
100+
</p>
99101
</td>
100102
</tr>
101103

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_apiserver.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs/kubeadm_certs_renew_apiserver.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ kubeadm certs renew apiserver [flags]
5555
</tr>
5656
<tr>
5757
<td></td><td style="line-height: 130%; word-wrap: break-word;">
58+
<p>
5859
<!--
5960
The path where to save the certificates.
6061
-->
61-
<p>
6262
保存证书的路径。
6363
</p>
6464
</td>
@@ -69,10 +69,10 @@ The path where to save the certificates.
6969
</tr>
7070
<tr>
7171
<td></td><td style="line-height: 130%; word-wrap: break-word;">
72+
<p>
7273
<!--
7374
Path to a kubeadm configuration file.
7475
-->
75-
<p>
7676
kubeadm 配置文件的路径。
7777
</p>
7878
</td>
@@ -83,10 +83,10 @@ kubeadm 配置文件的路径。
8383
</tr>
8484
<tr>
8585
<td></td><td style="line-height: 130%; word-wrap: break-word;">
86+
<p>
8687
<!--
8788
help for apiserver
8889
-->
89-
<p>
9090
apiserver 子操作的帮助命令。
9191
</p>
9292
</td>
@@ -103,10 +103,10 @@ apiserver 子操作的帮助命令。
103103

104104
<tr>
105105
<td></td><td style="line-height: 130%; word-wrap: break-word;">
106+
<p>
106107
<!--
107108
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.
108109
-->
109-
<p>
110110
与集群通信时使用的 kubeconfig 文件。
111111
如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
112112
</p>
@@ -133,10 +133,10 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
133133
</tr>
134134
<tr>
135135
<td></td><td style="line-height: 130%; word-wrap: break-word;">
136+
<p>
136137
<!--
137138
[EXPERIMENTAL] The path to the 'real' host root filesystem.
138139
-->
139-
<p>
140140
[实验] 到 '真实' 主机根文件系统的路径。
141141
</p>
142142
</td>

0 commit comments

Comments
 (0)