Skip to content

Commit

Permalink
Update version-skew-policy.md zh (#18761)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaoguangze111 authored and k8s-ci-robot committed Jan 19, 2020
1 parent ad1e9be commit 59c2b1b
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions content/zh/docs/setup/release/version-skew-policy.md
Expand Up @@ -45,10 +45,9 @@ This decision is owned by the [patch release manager](https://github.com/kuberne
The patch release manager is a member of the [release team for each release](https://github.com/kubernetes/sig-release/tree/master/release-team).
-->
一些 bug 修复,包括安全修复,根据其安全性和可用性,有可能会回合到这些分支。
如果有必要,补丁版本会定期从这些分支中发布。
[补丁发布管理员](https://github.com/kubernetes/sig-release/blob/master/release-engineering/role-handbooks/patch-release-manager.md#release-timing)
来决定是否发布。
补丁发布管理员同时也是[release team for each release](https://github.com/kubernetes/sig-release/tree/master/release-team) 的管理员。
补丁版本会定期或根据需要从这些分支中发布。
最终是否发布是由[patch release team](https://github.com/kubernetes/sig-release/blob/master/release-engineering/role-handbooks/patch-release-manager.md#release-timing)
来决定的。Patch release team同时也是[release managers](https://github.com/kubernetes/sig-release/blob/master/release-managers.md). 如需了解更多信息,请查看 [Kubernetes Patch releases](https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md).

<!--
Minor releases occur approximately every 3 months, so each minor release branch is maintained for approximately 9 months.
Expand Down Expand Up @@ -82,7 +81,7 @@ Example:
-->
`kubelet` 版本号不能高于 `kube-apiserver`,最多可以比 `kube-apiserver` 低两个小版本。

<!--
<!--
Example:
* `kube-apiserver` is at **1.13**
Expand Down Expand Up @@ -271,7 +270,7 @@ Running a cluster with `kubelet` instances that are persistently two minor versi

<!--
* 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
* it increases the likelihood of running `kubelet` versions older than the three maintained minor releases
-->
* 他们必须升级到与 `kube-apiserver` 相差不超过1个小版本,才可以升级其他控制面组件
* 有可能使用低于3个在维护的小版本
Expand Down

0 comments on commit 59c2b1b

Please sign in to comment.