Skip to content

Commit e2dc91d

Browse files
authored
Merge pull request #46238 from windsonsea/alphad
[zh] Sync 9 reference files in setup-tools/kubeadm
2 parents 7456476 + 9638aa0 commit e2dc91d

9 files changed

+120
-45
lines changed

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,25 @@ kubeadm certs check-expiration [flags]
2929
</colgroup>
3030
<tbody>
3131

32+
<tr>
33+
<td colspan="2">
34+
<!--
35+
--allow-missing-template-keys&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: true
36+
-->
37+
--allow-missing-template-keys&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:true
38+
</td>
39+
</tr>
40+
<tr>
41+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
42+
<p>
43+
<!--
44+
If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats.
45+
-->
46+
如果为 true,忽略模板中缺少某字段或映射键的错误。仅适用于 golang 和 jsonpath 输出格式。
47+
</p>
48+
</td>
49+
</tr>
50+
3251
<tr>
3352
<!--
3453
<td colspan="2">--cert-dir string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/pki"</td>
@@ -56,6 +75,26 @@ kubeadm certs check-expiration [flags]
5675
</td>
5776
</tr>
5877

78+
<tr>
79+
<td colspan="2">
80+
<!--
81+
-o, --experimental-output string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "text"
82+
-->
83+
-o, --experimental-output string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"text"
84+
</td>
85+
</tr>
86+
<tr>
87+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
88+
<p>
89+
<!--
90+
Output format. One of: text|json|yaml|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-as-json|jsonpath-file.
91+
-->
92+
输出格式。可选值为:
93+
text|json|yaml|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-as-json|jsonpath-file。
94+
</p>
95+
</td>
96+
</tr>
97+
5998
<tr>
6099
<td colspan="2">-h, --help</td>
61100
</tr>
@@ -86,6 +125,20 @@ kubeadm certs check-expiration [flags]
86125
</td>
87126
</tr>
88127

128+
<tr>
129+
<td colspan="2">--show-managed-fields</td>
130+
</tr>
131+
<tr>
132+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
133+
<p>
134+
<!--
135+
If true, keep the managedFields when printing objects in JSON or YAML format.
136+
-->
137+
如果为 true,在以 JSON 或 YAML 格式打印对象时保留 managedFields。
138+
</p>
139+
</td>
140+
</tr>
141+
89142
</tbody>
90143
</table>
91144

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_apiserver-etcd-client.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ If both files already exist, kubeadm skips the generation step and existing file
1818
-->
1919
如果两个文件都已存在,则 kubeadm 将跳过生成步骤,使用现有文件。
2020

21-
<!--
22-
Alpha Disclaimer: this command is currently alpha.
23-
-->
24-
Alpha 免责声明:此命令目前处于 Alpha 阶段。
25-
2621
```
2722
kubeadm init phase certs apiserver-etcd-client [flags]
2823
```

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ If both files already exist, kubeadm skips the generation step and existing file
1818
-->
1919
如果两个文件都已存在,则 kubeadm 将跳过生成步骤,使用现有文件。
2020

21-
<!--
22-
Alpha Disclaimer: this command is currently alpha.
23-
-->
24-
Alpha 免责声明:此命令目前处于 Alpha 阶段。
25-
2621
```
2722
kubeadm init phase certs apiserver [flags]
2823
```

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ If both files already exist, kubeadm skips the generation step and existing file
2323
-->
2424
如果两个文件都已存在,则 kubeadm 将跳过生成步骤,使用现有文件。
2525

26-
<!--
27-
Alpha Disclaimer: this command is currently alpha.
28-
-->
29-
Alpha 免责声明:此命令当前为 Alpha 功能。
30-
3126
```
3227
kubeadm init phase certs etcd-peer [flags]
3328
```

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ If both files already exist, kubeadm skips the generation step and existing file
2323
-->
2424
如果两个文件都已存在,则 kubeadm 将跳过生成步骤,使用现有文件。
2525

26-
<!--
27-
Alpha Disclaimer: this command is currently alpha.
28-
-->
29-
Alpha 免责声明:此命令当前为 Alpha 功能。
30-
3126
```
3227
kubeadm init phase certs etcd-server [flags]
3328
```

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_front-proxy-ca.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ If both files already exist, kubeadm skips the generation step and existing file
1818
-->
1919
如果两个文件都已存在,kubeadm 将跳过生成步骤并将使用现有文件。
2020

21-
<!--
22-
Alpha Disclaimer: this command is currently alpha.
23-
-->
24-
Alpha 免责声明:此命令目前是 Alpha 阶段。
25-
2621
```
2722
kubeadm init phase certs front-proxy-ca [flags]
2823
```

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_front-proxy-client.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ Generate the certificate for the front proxy client
1212
Generate the certificate for the front proxy client, and save them into front-proxy-client.crt and front-proxy-client.key files.
1313
1414
If both files already exist, kubeadm skips the generation step and existing files will be used.
15-
16-
Alpha Disclaimer: this command is currently alpha.
1715
-->
1816
为前端代理客户端生成证书,并将其保存到 front-proxy-client.crt 和 front-proxy-client.key 文件中。
1917

2018
如果两个文件都已存在,kubeadm 将跳过生成步骤并将使用现有文件。
2119

22-
Alpha 免责声明:此命令目前是 Alpha 阶段。
23-
2420
```
2521
kubeadm init phase certs front-proxy-client [flags]
2622
```

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,25 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
116116
</td>
117117
</tr>
118118

119+
<tr>
120+
<td colspan="2">
121+
<!--
122+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "registry.k8s.io"
123+
-->
124+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"registry.k8s.io"
125+
</td>
126+
</tr>
127+
<tr>
128+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
129+
<p>
130+
<!--
131+
Choose a container registry to pull control plane images from
132+
-->
133+
选择拉取控制平面镜像的容器仓库。
134+
</p>
135+
</td>
136+
</tr>
137+
119138
</tbody>
120139
</table>
121140

content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-reset.md

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,93 @@ title: kubeadm reset
33
content_type: concept
44
weight: 60
55
---
6-
<!-- ---
6+
<!--
77
reviewers:
8-
- mikedanese
98
- luxas
109
- jbeda
1110
title: kubeadm reset
1211
content_type: concept
1312
weight: 60
14-
--- -->
13+
-->
1514

1615
<!-- overview -->
17-
<!-- Performs a best effort revert of changes made by `kubeadm init` or `kubeadm join`. -->
16+
<!--
17+
Performs a best effort revert of changes made by `kubeadm init` or `kubeadm join`.
18+
-->
1819
该命令尽力还原由 `kubeadm init``kubeadm join` 所做的更改。
1920

2021

2122
<!-- body -->
2223
{{< include "generated/kubeadm_reset.md" >}}
2324

24-
<!-- ### Reset workflow {#reset-workflow} -->
25+
<!--
26+
### Reset workflow {#reset-workflow}
27+
-->
2528
### Reset 工作流程 {#reset-workflow}
2629

27-
<!-- `kubeadm reset` is responsible for cleaning up a node local file system from files that were created using
30+
<!--
31+
`kubeadm reset` is responsible for cleaning up a node local file system from files that were created using
2832
the `kubeadm init` or `kubeadm join` commands. For control-plane nodes `reset` also removes the local stacked
2933
etcd member of this node from the etcd cluster.
3034
-->
3135
`kubeadm reset` 负责从使用 `kubeadm init``kubeadm join` 命令创建的文件中清除节点本地文件系统。
3236
对于控制平面节点,`reset` 还从 etcd 集群中删除该节点的本地 etcd Stacked 部署的成员。
3337

34-
<!-- `kubeadm reset phase` can be used to execute the separate phases of the above workflow.
38+
<!--
39+
`kubeadm reset phase` can be used to execute the separate phases of the above workflow.
3540
To skip a list of phases you can use the `--skip-phases` flag, which works in a similar way to
36-
the `kubeadm join` and `kubeadm init` phase runners. -->
41+
the `kubeadm join` and `kubeadm init` phase runners.
42+
-->
3743
`kubeadm reset phase` 可用于执行上述工作流程的各个阶段。
3844
要跳过阶段列表,你可以使用 `--skip-phases` 参数,该参数的工作方式类似于 `kubeadm join``kubeadm init` 阶段运行器。
3945

40-
<!-- ### External etcd clean up -->
46+
<!--
47+
### External etcd clean up
48+
-->
4149
### 外部 etcd 清理
4250

43-
<!-- `kubeadm reset` will not delete any etcd data if external etcd is used. This means that if you run `kubeadm init` again using the same etcd endpoints, you will see state from previous clusters. -->
44-
如果使用了外部 etcd,`kubeadm reset` 将不会删除任何 etcd 中的数据。这意味着,如果再次使用相同的 etcd 端点运行 `kubeadm init`,你将看到先前集群的状态。
51+
<!--
52+
`kubeadm reset` will not delete any etcd data if external etcd is used. This means that if you run `kubeadm init` again using the same etcd endpoints, you will see state from previous clusters.
53+
-->
54+
如果使用了外部 etcd,`kubeadm reset` 将不会删除任何 etcd 中的数据。
55+
这意味着,如果再次使用相同的 etcd 端点运行 `kubeadm init`,你将看到先前集群的状态。
4556

46-
<!-- To wipe etcd data it is recommended you use a client like etcdctl, such as: -->
57+
<!--
58+
To wipe etcd data it is recommended you use a client like etcdctl, such as:
59+
-->
4760
要清理 etcd 中的数据,建议你使用 etcdctl 这样的客户端,例如:
4861

4962
```bash
5063
etcdctl del "" --prefix
5164
```
5265

53-
<!-- See the [etcd documentation](https://github.com/coreos/etcd/tree/master/etcdctl) for more information. -->
66+
<!--
67+
See the [etcd documentation](https://github.com/coreos/etcd/tree/master/etcdctl) for more information.
68+
-->
5469
更多详情请参考 [etcd 文档](https://github.com/coreos/etcd/tree/master/etcdctl)
5570

71+
<!--
72+
### Graceful kube-apiserver shutdown
73+
74+
If you have your `kube-apiserver` configured with the `--shutdown-delay-duration` flag,
75+
you can run the following commands to attempt a graceful shutdown for the running API server Pod,
76+
before you run `kubeadm reset`:
77+
-->
78+
### 体面关闭 kube-apiserver
79+
80+
如果你为 `kube-apiserver` 配置了 `--shutdown-delay-duration` 标志,
81+
你可以在运行 `kubeadm reset` 之前,运行以下命令尝试体面关闭正在运行的 API 服务器 Pod:
82+
83+
```bash
84+
yq eval -i '.spec.containers[0].command = []' /etc/kubernetes/manifests/kube-apiserver.yaml
85+
timeout 60 sh -c 'while pgrep kube-apiserver >/dev/null; do sleep 1; done' || true
86+
```
5687

5788
## {{% heading "whatsnext" %}}
5889

59-
<!-- * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes control-plane node
60-
* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster -->
90+
<!--
91+
* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes control-plane node
92+
* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster
93+
-->
6194
* 参考 [kubeadm init](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init/) 来初始化 Kubernetes 主节点。
6295
* 参考 [kubeadm join](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-join/) 来初始化 Kubernetes 工作节点并加入集群。
63-

0 commit comments

Comments
 (0)