Skip to content

Commit 5b2632d

Browse files
authored
Merge pull request #34585 from tengqm/zh-resync-createcluster
[zh-cn] Resync cerate cluster using kubeadm
2 parents 99dfe36 + 240ac74 commit 5b2632d

File tree

1 file changed

+29
-24
lines changed

1 file changed

+29
-24
lines changed

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

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -970,12 +970,13 @@ Kubernetes 版本可以通过使用 `--kubeadm init` 的 `--kubernetes-version`
970970

971971
<!--
972972
Example:
973-
* kubeadm is at {{< skew latestVersion >}}
974-
* `kubernetesVersion` must be at {{< skew latestVersion >}} or {{< skew prevMinorVersion >}}
973+
* kubeadm is at {{< skew currentVersion >}}
974+
* `kubernetesVersion` must be at {{< skew currentVersion >}} or {{< skew currentVersionAddMinor -1 >}}
975975
-->
976976
例子:
977-
* kubeadm 的版本为 {{< skew latestVersion >}}。
978-
* `kubernetesVersion` 必须为 {{< skew latestVersion >}} 或者 {{< skew prevMinorVersion >}}。
977+
978+
* kubeadm 的版本为 {{< skew currentVersion >}}。
979+
* `kubernetesVersion` 必须为 {{< skew currentVersion >}} 或者 {{< skew currentVersionAddMinor -1 >}}。
979980

980981
<!--
981982
### kubeadm's skew against the kubelet
@@ -991,12 +992,13 @@ version as kubeadm or one version older.
991992

992993
<!--
993994
Example:
994-
* kubeadm is at {{< skew latestVersion >}}
995-
* kubelet on the host must be at {{< skew latestVersion >}} or {{< skew prevMinorVersion >}}
995+
* kubeadm is at {{< skew currentVersion >}}
996+
* kubelet on the host must be at {{< skew currentVersion >}} or {{< skew currentVersionAddMinor -1 >}}
996997
-->
997998
例子:
998-
* kubeadm 的版本为 {{< skew latestVersion >}}
999-
* 主机上的 kubelet 版本必须为 {{< skew latestVersion >}} 或者 {{< skew prevMinorVersion >}}
999+
1000+
* kubeadm 的版本为 {{< skew currentVersion >}}。
1001+
* 主机上的 kubelet 必须为 {{< skew currentVersion >}} 或者 {{< skew currentVersionAddMinor -1 >}}。
10001002

10011003
<!--
10021004
### kubeadm's skew against kubeadm
@@ -1021,12 +1023,13 @@ with the exception of `kubeadm upgrade`.
10211023

10221024
<!--
10231025
Example for `kubeadm join`:
1024-
* kubeadm version {{< skew latestVersion >}} was used to create a cluster with `kubeadm init`
1025-
* Joining nodes must use a kubeadm binary that is at version {{< skew latestVersion >}}
1026+
* kubeadm version {{< skew currentVersion >}} was used to create a cluster with `kubeadm init`
1027+
* Joining nodes must use a kubeadm binary that is at version {{< skew currentVersion >}}
10261028
-->
10271029
`kubeadm join` 的例子:
1028-
* 使用 `kubeadm init` 创建集群时使用版本为 {{< skew latestVersion >}} 的 kubeadm。
1029-
* 加入的节点必须使用版本为 {{< skew latestVersion >}} 的 kubeadm 二进制文件。
1030+
1031+
* 使用 `kubeadm init` 创建集群时使用版本为 {{< skew currentVersion >}} 的 kubeadm。
1032+
* 添加节点所用的 kubeadm 可执行文件为版本 {{< skew currenttVersion >}}。
10301033

10311034
<!--
10321035
Nodes that are being upgraded must use a version of kubeadm that is the same MINOR
@@ -1038,13 +1041,13 @@ MINOR 版本或比后者新一个 MINOR 版本。
10381041

10391042
<!--
10401043
Example for `kubeadm upgrade`:
1041-
* kubeadm version {{< skew prevMinorVersion >}} was used to create or upgrade the node
1042-
* The version of kubeadm used for upgrading the node must be at {{< skew prevMinorVersion >}}
1043-
or {{< skew latestVersion >}}
1044+
* kubeadm version {{< skew currentVersionAddMinor -1 >}} was used to create or upgrade the node
1045+
* The version of kubeadm used for upgrading the node must be at {{< skew currentVersionAddMinor -1 >}}
1046+
or {{< skew currentVersion >}}
10441047
-->
10451048
`kubeadm upgrade` 的例子:
1046-
* 用于创建或升级节点的 kubeadm 版本为 {{< skew prevMinorVersion >}}。
1047-
* 用于升级节点的 kubeadm 版本必须为 {{< skew prevMinorVersion >}} 或 {{< skew latestVersion >}}。
1049+
* 用于创建或升级节点的 kubeadm 版本为 {{< skew currentVersionAddMinor -1 >}}。
1050+
* 用于升级节点的 kubeadm 版本必须为 {{< skew currentVersionAddMinor -1 >}} 或 {{< skew currentVersion >}}。
10481051

10491052
<!--
10501053
To learn more about the version skew between the different Kubernetes component see
@@ -1055,12 +1058,11 @@ the [Version Skew Policy](https://kubernetes.io/releases/version-skew-policy/).
10551058

10561059
<!--
10571060
## Limitations {#limitations}
1058-
-->
1059-
## 局限性 {#limitations}
10601061
1061-
<!--
10621062
### Cluster resilience {#resilience}
10631063
-->
1064+
## 局限性 {#limitations}
1065+
10641066
### 集群弹性 {#resilience}
10651067

10661068
<!--
@@ -1100,9 +1102,10 @@ Workarounds:
11001102
<!--
11011103
kubeadm deb/rpm packages and binaries are built for amd64, arm (32-bit), arm64, ppc64le, and s390x
11021104
following the [multi-platform
1103-
proposal](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/multi-platform.md).
1105+
proposal](https://git.k8s.io/design-proposals-archive/multi-platform.md).
11041106
-->
1105-
kubeadm deb/rpm 软件包和二进制文件是为 amd64、arm (32-bit)、arm64、ppc64le 和 s390x 构建的遵循[多平台提案](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/multi-platform.md)
1107+
kubeadm deb/rpm 软件包和二进制文件是为 amd64、arm (32-bit)、arm64、ppc64le 和 s390x
1108+
构建的遵循[多平台提案](https://git.k8s.io/design-proposals-archive/multi-platform.md)
11061109

11071110
<!--
11081111
Multiplatform container images for the control plane and addons are also supported since v1.12.
@@ -1114,7 +1117,8 @@ Only some of the network providers offer solutions for all platforms. Please con
11141117
network providers above or the documentation from each provider to figure out whether the provider
11151118
supports your chosen platform.
11161119
-->
1117-
只有一些网络提供商为所有平台提供解决方案。请查阅上方的网络提供商清单或每个提供商的文档以确定提供商是否支持你选择的平台。
1120+
只有一些网络提供商为所有平台提供解决方案。
1121+
请查阅上方的网络提供商清单或每个提供商的文档以确定提供商是否支持你选择的平台。
11181122

11191123
<!--
11201124
## Troubleshooting {#troubleshooting}
@@ -1124,4 +1128,5 @@ supports your chosen platform.
11241128
<!--
11251129
If you are running into difficulties with kubeadm, please consult our [troubleshooting docs](/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/).
11261130
-->
1127-
如果你在使用 kubeadm 时遇到困难,请查阅我们的[故障排除文档](/zh-cn/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/)
1131+
如果你在使用 kubeadm 时遇到困难,
1132+
请查阅我们的[故障排除文档](/zh-cn/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/)

0 commit comments

Comments
 (0)