From 11c6aec3424ba74a7cf5935be677dbbfc1ab11b2 Mon Sep 17 00:00:00 2001 From: "Orwill Q. Song" Date: Mon, 22 Jun 2020 19:42:52 +0800 Subject: [PATCH 1/2] Annotate redundant English part --- content/zh/docs/setup/release/version-skew-policy.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/zh/docs/setup/release/version-skew-policy.md b/content/zh/docs/setup/release/version-skew-policy.md index 25bfbb8cf6..1eeadd2276 100644 --- a/content/zh/docs/setup/release/version-skew-policy.md +++ b/content/zh/docs/setup/release/version-skew-policy.md @@ -58,7 +58,9 @@ Minor releases occur approximately every 3 months, so each minor release branch ### kube-apiserver + 在 [高可用(HA)集群](/docs/setup/production-environment/tools/kubeadm/high-availability/) 中, 多个 `kube-apiserver` 实例小版本号最多差1。 From ae31c48889b464661ec8332a57349108623d8051 Mon Sep 17 00:00:00 2001 From: "Orwill Q. Song" Date: Mon, 22 Jun 2020 20:08:15 +0800 Subject: [PATCH 2/2] Translate few titles to Chinese. --- content/zh/docs/setup/release/version-skew-policy.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/content/zh/docs/setup/release/version-skew-policy.md b/content/zh/docs/setup/release/version-skew-policy.md index 1eeadd2276..0bc7b4e4e0 100644 --- a/content/zh/docs/setup/release/version-skew-policy.md +++ b/content/zh/docs/setup/release/version-skew-policy.md @@ -22,7 +22,10 @@ Specific cluster deployment tools may place additional restrictions on version s + +## 版本支持策略 小版本大约每3个月发布一个,所以每个小版本分支会维护9个月。 + +## 版本倾斜策略 ### kube-apiserver @@ -111,7 +117,10 @@ Example: * 如果 `kube-apiserver` 的多个实例同时存在 **1.13** 和 **1.12** * `kubelet` 只能是 **1.12** 或 **1.11**(**1.13** 不再支持,因为它比**1.12**版本的 `kube-apiserver` 更新) + +### kube-controller-manager、 kube-scheduler 和 cloud-controller-manager +### kube-controller-manager、 kube-scheduler 和 cloud-controller-manager