Skip to content

Commit 4cfd541

Browse files
authored
Merge pull request #43656 from asa3311/sync-zh-75
[zh] sync high-availability install-kubeadm
2 parents f8fe5ab + dec0608 commit 4cfd541

File tree

2 files changed

+9
-35
lines changed

2 files changed

+9
-35
lines changed

content/zh-cn/docs/setup/production-environment/tools/kubeadm/high-availability.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,14 @@ option. Your cluster requirements may need a different configuration.
375375
```shell
376376
kubeadm certs certificate-key
377377
```
378+
<!--
379+
The certificate key is a hex encoded string that is an AES key of size 32 bytes.
380+
-->
381+
证书密钥是一个十六进制编码的字符串,它是一个 32 字节大小的 AES 密钥。
378382

379383
{{< note >}}
380384
<!--
381-
The `kubeadm-certs` Secret and decryption key expire after two hours.
385+
The `kubeadm-certs` Secret and the decryption key expire after two hours.
382386
-->
383387
`kubeadm-certs` Secret 和解密密钥会在两个小时后失效。
384388
{{< /note >}}

content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,7 @@ see the [Creating a cluster with kubeadm](/docs/setup/production-environment/too
3030
有关在执行此安装过程后如何使用 kubeadm 创建集群的信息,
3131
请参见[使用 kubeadm 创建集群](/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/)
3232

33-
<!--
34-
This installation guide is for Kubernetes {{< skew currentVersion >}}. If you want to use a different
35-
Kubernetes version, please refer to the following pages instead:
36-
-->
37-
本安装指南适用于 Kubernetes {{< skew currentVersion >}}。
38-
如果你想使用不同版本的 Kubernetes,请参阅以下页面:
39-
40-
<!--
41-
- [Installing kubeadm for Kubernetes {{< skew currentVersionAddMinor -1 "." >}}](https://v{{< skew currentVersionAddMinor -1 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
42-
- [Installing kubeadm for Kubernetes {{< skew currentVersionAddMinor -2 "." >}}](https://v{{< skew currentVersionAddMinor -2 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
43-
- [Installing kubeadm for Kubernetes {{< skew currentVersionAddMinor -3 "." >}}](https://v{{< skew currentVersionAddMinor -3 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
44-
- [Installing kubeadm for Kubernetes {{< skew currentVersionAddMinor -4 "." >}}](https://v{{< skew currentVersionAddMinor -4 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
45-
-->
46-
- [为 Kubernetes {{< skew currentVersionAddMinor -1 "." >}} 安装 kubeadm](https://v{{< skew currentVersionAddMinor -1 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
47-
- [为 Kubernetes {{< skew currentVersionAddMinor -2 "." >}} 安装 kubeadm](https://v{{< skew currentVersionAddMinor -2 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
48-
- [为 Kubernetes {{< skew currentVersionAddMinor -3 "." >}} 安装 kubeadm](https://v{{< skew currentVersionAddMinor -3 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
49-
- [为 Kubernetes {{< skew currentVersionAddMinor -4 "." >}} 安装 kubeadm](https://v{{< skew currentVersionAddMinor -4 "-" >}}.docs.kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/)
33+
{{< doc-versions-list "installation guide" >}}
5034

5135
## {{% heading "prerequisites" %}}
5236

@@ -309,30 +293,16 @@ For more information on version skews, see:
309293
* Kubernetes [版本与版本间的偏差策略](/zh-cn/releases/version-skew-policy/)
310294
* kubeadm 特定的[版本偏差策略](/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#version-skew-policy)
311295

312-
{{< note >}}
313-
<!--
314-
Kubernetes has [new package repositories hosted at `pkgs.k8s.io`](/blog/2023/08/15/pkgs-k8s-io-introduction/)
315-
starting from August 2023. The legacy package repositories (`apt.kubernetes.io` and `yum.kubernetes.io`)
316-
have been frozen starting from September 13, 2023. Please read our
317-
[deprecation and freezing announcement](/blog/2023/08/31/legacy-package-repository-deprecation/)
318-
for more details.
319-
-->
320-
Kubernetes 从 2023 年 8 月开始使用托管在 `pkgs.k8s.io`
321-
上的[新软件包仓库](/zh-cn/blog/2023/08/15/pkgs-k8s-io-introduction/)
322-
自 2023 年 9 月 13 日起,老旧的软件包仓库(`apt.kubernetes.io``yum.kubernetes.io`)已被冻结。
323-
更多细节参阅[弃用和冻结公告](/zh-cn/blog/2023/08/31/legacy-package-repository-deprecation/)
324-
{{< /note >}}
296+
{{% legacy-repos-deprecation %}}
325297

326298
{{< note >}}
327299
<!--
328300
There's a dedicated package repository for each Kubernetes minor version. If you want to install
329301
a minor version other than {{< skew currentVersion >}}, please see the installation guide for
330-
your desired minor version. The official Kubernetes package repositories provide downloads for
331-
Kubernetes versions starting with v1.24.0.
302+
your desired minor version.
332303
-->
333304
每个 Kubernetes 小版本都有一个专用的软件包仓库。
334305
如果你想安装 {{< skew currentVersion >}} 以外的次要版本,请参阅所需次要版本的安装指南。
335-
官方 Kubernetes 软件包仓库提供 Kubernetes v1.24.0 及更高版本软件包的下载。
336306
{{< /note >}}
337307

338308
{{< tabs name="k8s_install" >}}
@@ -351,7 +321,7 @@ These instructions are for Kubernetes {{< skew currentVersion >}}.
351321
```shell
352322
sudo apt-get update
353323
# apt-transport-https 可能是一个虚拟包(dummy package);如果是的话,你可以跳过安装这个包
354-
sudo apt-get install -y apt-transport-https ca-certificates curl
324+
sudo apt-get install -y apt-transport-https ca-certificates curl gpg
355325
```
356326

357327
<!--

0 commit comments

Comments
 (0)