Merge pull request #41060 from asa3311/sync-version-skew-policy.md-and-configure-upgrade-etcd.md

[zh-cn] sync version-skew-policy.md and configure-upgrade-etcd.md

content/zh-cn/docs/tasks/administer-cluster/configure-upgrade-etcd.md

@@ -702,3 +702,26 @@ Before you start an upgrade, please back up your etcd cluster first.
 在开始升级之前，请先备份你的 etcd 集群。
 {{< /note >}}
 
+<!--
+## Maintaining etcd clusters
+
+Fore more details on etcd maintenance, please refer to the [etcd maintenance](https://etcd.io/docs/latest/op-guide/maintenance/) documentation.
+-->
+## 维护 etcd 集群    {#maintaining-etcd-clusters}
+
+有关 etcd 维护的更多详细信息，请参阅 [etcd 维护](https://etcd.io/docs/latest/op-guide/maintenance/)文档。
+
+{{% thirdparty-content single="true" %}}
+
+{{< note >}}
+<!--
+Defragmentation is an expensive operation, so it should be executed as infrequent
+as possible. On the other hand, it's also necessary to make sure any etcd member
+will not run out of the storage quota. The Kubernetes project recommends that when
+you perform defragmentation, you use a tool such as [etcd-defrag](https://github.com/ahrtr/etcd-defrag).
+-->
+碎片整理是一种昂贵的操作，因此应尽可能少地执行此操作。
+另一方面，也有必要确保任何 etcd 成员都不会用尽存储配额。
+Kubernetes 项目建议在执行碎片整理时，
+使用诸如 [etcd-defrag](https://github.com/ahrtr/etcd-defrag) 之类的工具。
+{{< /note >}}

content/zh-cn/releases/version-skew-policy.md

@@ -125,6 +125,49 @@ Example:
   （不支持 **{{< skew currentVersion >}}** 版本，因为这将比
   `kube-apiserver` **{{< skew currentVersionAddMinor -1 >}}** 版本的实例新）
 
+<!--
+### kube-proxy
+
+`kube-proxy` must not be newer than `kube-apiserver`, and may be up to two minor versions older.
+`kube-proxy` may be up to two minor versions older or newer than the `kubelet` instance it runs alongside.
+
+Example:
+
+* `kube-apiserver` is at **{{< skew currentVersion >}}**
+* `kube-proxy` is supported at **{{< skew currentVersion >}}**, **{{< skew currentVersionAddMinor -1 >}}**, and **{{< skew currentVersionAddMinor -2 >}}**
+-->
+### kube-proxy  {#kube-proxy}
+
+`kube-proxy` 不能比 `kube-apiserver` 新，并且可以比它旧两个次版本。
+`kube-proxy` 可以比一起运行的 `kubelet` 实例旧或新两个次版本。
+
+例如：
+
+* `kube-apiserver` 的版本是 **{{< skew currentVersion >}}**
+* `kube-proxy` 支持的版本是 **{{< skew currentVersion >}}**， 
+  **{{< skew currentVersionAddMinor -1 >}}** 和 **{{< skew currentVersionAddMinor -2 >}}**
+
+{{< note >}}
+<!--
+If version skew exists between `kube-apiserver` instances in an HA cluster, this narrows the allowed `kube-proxy` versions.
+-->
+如果在 HA 集群中的 `kube-apiserver` 实例之间存在版本偏差，
+所允许的 `kube-proxy` 版本范围会被缩小。
+{{</ note >}}
+
+<!--
+Example:
+
+* `kube-apiserver` instances are at **{{< skew currentVersion >}}** and **{{< skew currentVersionAddMinor -1 >}}**
+* `kube-proxy` is supported at **{{< skew currentVersionAddMinor -1 >}}**, and **{{< skew currentVersionAddMinor -2 >}}** (**{{< skew currentVersion >}}** is not supported because that would be newer than the `kube-apiserver` instance at version **{{< skew currentVersionAddMinor -1 >}}**)
+-->
+例如：
+
+* `kube-apiserver` 实例的版本是 **{{< skew currentVersion >}}** 和 **{{< skew currentVersionAddMinor -1 >}}**
+* `kube-proxy` 版本为 **{{< skew currentVersionAddMinor -1 >}}** 和 
+  **{{< skew currentVersionAddMinor -2 >}}**。（**{{< skew currentVersion >}}** 将不被支持，
+  因为该版本将比 **{{< skew currentVersionAddMinor -1 >}}** 的 kube-apiserver 实例更新）
+
 <!-- 
 ### kube-controller-manager, kube-scheduler, and cloud-controller-manager
 
@@ -354,38 +397,31 @@ In-place minor version `kubelet` upgrades are not supported.
 
 {{< warning >}}
 <!-- 
-Running a cluster with `kubelet` instances that are persistently two minor versions behind `kube-apiserver` is not recommended:
-
-* they must be upgraded within one minor version of `kube-apiserver` before the control plane can be upgraded
-* it increases the likelihood of running `kubelet` versions older than the three maintained minor releases
+Running a cluster with `kubelet` instances that are persistently two minor versions behind `kube-apiserver` means they must be upgraded before the control plane can be upgraded.
 -->
-不建议运行 `kubelet` 实例始终落后 `kube-apiserver` 两个次要版本的集群：
-
-* 它们必须在 `kube-apiserver` 的一个次要版本中升级，然后才能升级控制平面
-* 它增加了运行早于三个处于维护状态的次要版本的 `kubelet` 的可能性
+在一个集群中运行持续比 `kube-apiserver` 落后两个次版本的 `kubelet` 实例意味着在升级控制平面之前必须先升级它们。
 {{</ warning >}}
 
 <!-- 
 ### kube-proxy
 
-* `kube-proxy` must not be newer than `kube-apiserver`.
-* `kube-proxy` must be at most two minor versions older than `kube-apiserver.`
+Pre-requisites:
 
-Example:
+* The `kube-apiserver` instances `kube-proxy` communicates with are at **{{< skew currentVersion >}}**
 
-If `kube-proxy` version is **{{< skew currentVersionAddMinor -2 >}}**:
-
-* `kubelet` version must be at the same minor version as **{{< skew currentVersionAddMinor -2 >}}**.
-* `kube-apiserver` version must be between **{{< skew currentVersionAddMinor -2 >}}** and **{{< skew currentVersion >}}**, inclusive.
+Optionally upgrade `kube-proxy` instances to **{{< skew currentVersion >}}** (or they can be left at **{{< skew currentVersionAddMinor -1 >}}** or **{{< skew currentVersionAddMinor -2 >}}**)
 -->
 ### kube-proxy  {#kube-proxy}
 
-* `kube-proxy` 版本不能比 `kube-apiserver` 版本新。
-* `kube-proxy` 最多只能比 `kube-apiserver` 落后两个次要版本。
+前提条件：
 
-例如：
+* 与 kube-proxy 通信的 kube-apiserver 实例的版本是 **{{< skew currentVersion >}}**。
+  可以选择升级 kube-proxy 实例到 **{{< skew currentVersion >}}** 
+  （或者它们可以保持在 **{{< skew currentVersionAddMinor -1 >}}** 或 **{{< skew currentVersionAddMinor -2 >}}**）
 
-如果 `kube-proxy` 版本处于 **{{< skew currentVersionAddMinor -2 >}}** 版本：
-
-* `kubelet` 必须处于相同的次要版本 **{{< skew currentVersionAddMinor -2 >}}**。
-* `kube-apiserver` 版本必须介于 **{{< skew currentVersionAddMinor -2 >}}** 和 **{{< skew currentVersion >}}** 之间，包括两者。
+{{< warning >}}
+<!--
+Running a cluster with `kube-proxy` instances that are persistently two minor versions behind `kube-apiserver` means they must be upgraded before the control plane can be upgraded.
+-->
+在一个集群中运行持续比 `kube-apiserver` 落后两个次版本的 `kube-proxy` 实例意味着在升级控制平面之前必须先升级它们。
+{{</ warning >}}