Skip to content

Commit 894a08c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33964 from howieyuen/release-patch
[zh]translate Node and Patch Releases of releases section
2 parents 4d9e6d7 + 61a0de2 commit 894a08c

File tree

2 files changed

+346
-0
lines changed

2 files changed

+346
-0
lines changed

‎content/zh/releases/notes.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
linktitle: 发行版本说明
3+
title: 说明
4+
type: docs
5+
description: >
6+
Kubernetes 发行版本说明。
7+
sitemap:
8+
priority: 0.5
9+
---
10+
<!--
11+
linktitle: Release Notes
12+
title: Notes
13+
type: docs
14+
description: >
15+
Kubernetes release notes.
16+
sitemap:
17+
priority: 0.5
18+
-->
19+
20+
<!--
21+
Release notes can be found by reading the [Changelog](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) that matches your Kubernetes version. View the changelog for {{< skew currentVersionAddMinor 0 >}} on [GitHub](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-{{< skew currentVersionAddMinor 0 >}}.md).
22+
23+
Alternately, release notes can be searched and filtered online at: [relnotes.k8s.io](https://relnotes.k8s.io). View filtered release notes for {{< skew currentVersionAddMinor 0 >}} on [relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew currentVersionAddMinor 0 >}}.0).
24+
-->
25+
26+
可以通过阅读与你的 Kubernetes 版本对应的
27+
[Changelog](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG)
28+
找到发行版本说明。
29+
在 [GitHub](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-{{< skew currentVersionAddMinor 0 >}}.md)
30+
上查看 {{< skew currentVersionAddMinor 0 >}} 的变更日志。
31+
32+
或者，可以在以下位置在线搜索和筛选发行版本说明：[relnotes.k8s.io](https://relnotes.k8s.io)。
33+
在 [relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew currentVersionAddMinor 0 >}}.0)
34+
上查看 {{< skew currentVersionAddMinor 0 >}} 的筛选后的版本说明。

‎content/zh/releases/patch-releases.md

Lines changed: 312 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,312 @@
1+
---
2+
title: 补丁版本
3+
type: docs
4+
---
5+
<!--
6+
title: Patch Releases
7+
type: docs
8+
-->
9+
10+
<!--
11+
Schedule and team contact information for Kubernetes patch releases.
12+
13+
For general information about Kubernetes release cycle, see the
14+
[release process description].
15+
-->
16+
Kubernetes 补丁版本的发布时间表和团队联系信息。
17+
18+
有关 Kubernetes 发布周期的常规信息，请参阅[发布流程说明]。
19+
20+
<!--
21+
## Cadence
22+
23+
Our typical patch release cadence is monthly. It is
24+
commonly a bit faster (1 to 2 weeks) for the earliest patch releases
25+
after a 1.X minor release. Critical bug fixes may cause a more
26+
immediate release outside of the normal cadence. We also aim to not make
27+
releases during major holiday periods.
28+
-->
29+
## 节奏 {#cadence}
30+
31+
我们的补丁发布节奏通常是每月一次。
32+
在 1.X 次要版本之后，最早的补丁版本通常要快一些（提前 1 到 2 周）。
33+
严重错误修复可能会导致超出正常节奏而更快速的发布。
34+
我们尽量避免在主假期期间发布。
35+
36+
<!--
37+
## Contact
38+
39+
See the [Release Managers page][release-managers] for full contact details on the Patch Release Team.
40+
41+
Please give us a business day to respond - we may be in a different timezone!
42+
43+
In between releases the team is looking at incoming cherry pick requests on a weekly basis. The team will get in touch with submitters via GitHub PR, SIG channels in Slack, and direct messages
44+
in Slack and [email](mailto:[email protected]) if there are questions on the PR.
45+
-->
46+
## 联系 {#contact}
47+
48+
有关补丁发布团队的完整联系方式，请参阅[发布管理员页面][release-managers]。
49+
50+
请给我们一个工作日回复，因为我们可能在不同的时区！
51+
52+
在两次发布之间，团队每周都会查看收到的 cherry pick 请求。
53+
如果对 PR 有任何问题，团队将通过 GitHub PR、Slack 中的 SIG 频道以及 Slack 中的直接消息和
54+
[email](mailto:[email protected]) 与提交者取得联系。
55+
56+
<!--
57+
## Cherry picks
58+
59+
Please follow the [cherry pick process][cherry-picks].
60+
61+
Cherry picks must be merge-ready in GitHub with proper labels (e.g.,
62+
`approved`, `lgtm`, `release-note`) and passing CI tests ahead of the
63+
cherry pick deadline. This is typically two days before the target
64+
release, but may be more. Earlier PR readiness is better, as we
65+
need time to get CI signal after merging your cherry picks ahead
66+
of the actual release.
67+
68+
Cherry pick PRs which miss merge criteria will be carried over and tracked
69+
for the next patch release.
70+
-->
71+
72+
## Cherry Pick
73+
74+
请遵循 [Cherry Pick 流程][cherry-picks]。
75+
76+
Cherry Pick 必须在 GitHub 中准备好合并，带有适当的标签（例如 `approved`、`lgtm`、`release-note`），
77+
并在 Cherry Pick 截止日期之前通过 CI 测试。这通常是目标发布前两天，但可能更早。
78+
PR 越早准备好越好，因为在实际发布之前，合并了你的 Cherry Pick 后，我们需要时间来获取 CI 信号。
79+
80+
不符合合并标准的 Cherry Pick PR 将被带入下一个补丁版本中跟踪。
81+
82+
<!--
83+
## Support Period
84+
85+
In accordance with the [yearly support KEP][yearly-support], the Kubernetes
86+
Community will support active patch release series for a period of roughly
87+
fourteen (14) months.
88+
89+
The first twelve months of this timeframe will be considered the standard
90+
period.
91+
92+
Towards the end of the twelve month, the following will happen:
93+
94+
- [Release Managers][release-managers] will cut a release
95+
- The patch release series will enter maintenance mode
96+
-->
97+
## 支持周期 {#support-period}
98+
99+
根据[年度 KEP][yearly-support]，Kubernetes 社区将在大约 14 个月的时间内支持活跃的补丁发布系列。
100+
101+
此时间范围的前 12 个月将被视为标准周期。
102+
103+
在 12 个月后，将发生以下事情：
104+
105+
- [发布管理员][release-managers]将删除一个版本
106+
- 补丁发布系列将进入维护模式
107+
108+
<!--
109+
During the two-month maintenance mode period, Release Managers may cut
110+
additional maintenance releases to resolve:
111+
112+
- CVEs (under the advisement of the Security Response Committee)
113+
- dependency issues (including base image updates)
114+
- critical core component issues
115+
116+
At the end of the two-month maintenance mode period, the patch release series
117+
will be considered EOL (end of life) and cherry picks to the associated branch
118+
are to be closed soon afterwards.
119+
120+
Note that the 28th of the month was chosen for maintenance mode and EOL target
121+
dates for simplicity (every month has it).
122+
-->
123+
在两个月的维护模式期间，发布管理员可能会删减额外的维护版本以解决：
124+
125+
- CVE（在安全响应委员会的建议下）
126+
- 依赖问题（包括基础镜像更新）
127+
- 关键核心组件问题
128+
129+
在两个月的维护模式期结束时，补丁发布系列将被视为 EOL（生命周期结束），相关分支的 Cherry Pick 将很快关闭。
130+
131+
请注意，为简单起见，选择每月 28 日作为维护模式和 EOL 目标日期（每个月都有）。
132+
133+
<!--
134+
## Upcoming Monthly Releases
135+
136+
Timelines may vary with the severity of bug fixes, but for easier planning we
137+
will target the following monthly release points. Unplanned, critical
138+
releases may also occur in between these.
139+
-->
140+
## 未来发布的月度版本 {#upcoming-monthly-releases}
141+
142+
时间表可能会因错误修复的严重程度而有所不同，但为了便于规划，我们将针对以下每月发布点。
143+
计划外的关键版本也可能发生在这些版本之间。
144+
145+
<!--
146+
| Monthly Patch Release | Cherry Pick Deadline | Target date |
147+
| --------------------- | -------------------- | ----------- |
148+
| May 2022 | 2022-05-20 | 2022-05-24 |
149+
| June 2022 | 2022-06-10 | 2022-06-15 |
150+
| July 2022 | 2022-07-08 | 2022-07-13 |
151+
| August 2022 | 2022-08-12 | 2022-08-16 |
152+
-->
153+
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
154+
| ------------ | ------------------ | ----------- |
155+
| 2022 年 5 月 | 2022-05-20 | 2022-05-24 |
156+
| 2022 年 6 月 | 2022-06-10 | 2022-06-15 |
157+
| 2022 年 7 月 | 2022-07-08 | 2022-07-13 |
158+
| 2022 年 8 月 | 2022-08-12 | 2022-08-16 |
159+
160+
<!--
161+
## Detailed Release History for Active Branches
162+
163+
### 1.24
164+
165+
Next patch release is **1.24.1**
166+
167+
End of Life for **1.24** is **2023-09-29**
168+
169+
| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
170+
|---------------|----------------------|-------------|------|
171+
| 1.24.1 | 2022-05-20 | 2022-05-24 | |
172+
-->
173+
## 活动分支的详细发布历史 {#detailed-release-history-for-active-branches}
174+
175+
### 1.24
176+
177+
下一个补丁版本是 **1.24.1**
178+
179+
**1.24** 的生命周期结束时间为 **2023-09-29**
180+
181+
| 补丁发布 | Cherry Pick 截止日期 | 目标日期 | 说明 |
182+
|--------|---------------------|------------|-----|
183+
| 1.24.1 | 2022-05-20 | 2022-05-24 | |
184+
185+
### 1.23
186+
187+
<!--
188+
**1.23** enters maintenance mode on **2022-12-28**.
189+
190+
End of Life for **1.23** is **2023-02-28**.
191+
-->
192+
**1.23** 于 **2022-12-28** 进入维护模式。
193+
194+
**1.23** 的生命周期结束时间为 **2023-02-28**。
195+
196+
<!--
197+
| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
198+
199+
[Out-of-Band Release](https://groups.google.com/u/2/a/kubernetes.io/g/dev/c/Xl1sm-CItaY)
200+
-->
201+
| 补丁发布 | Cherry Pick 截止日期 | 目标日期 | 说明 |
202+
|---------------|----------------------|-------------|------|
203+
| 1.23.7 | 2022-05-20 | 2022-05-24 | |
204+
| 1.23.6 | 2022-04-08 | 2022-04-13 | |
205+
| 1.23.5 | 2022-03-11 | 2022-03-16 | |
206+
| 1.23.4 | 2022-02-11 | 2022-02-16 | |
207+
| 1.23.3 | 2022-01-24 | 2022-01-25 | [带外发布](https://groups.google.com/u/2/a/kubernetes.io/g/dev/c/Xl1sm-CItaY) |
208+
| 1.23.2 | 2022-01-14 | 2022-01-19 | |
209+
| 1.23.1 | 2021-12-14 | 2021-12-16 | |
210+
211+
### 1.22
212+
213+
<!--
214+
**1.22** enters maintenance mode on **2022-08-28**
215+
216+
End of Life for **1.22** is **2022-10-28**
217+
-->
218+
**1.22** 于 **2022-08-28** 进入维护模式
219+
220+
**1.22** 的生命周期结束时间为 **2022-10-28**
221+
222+
<!--
223+
| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
224+
-->
225+
| 补丁发布 | Cherry Pick 截止日期 | 目标日期 | 说明 |
226+
|---------------|----------------------|-------------|------|
227+
| 1.22.10 | 2022-05-20 | 2022-05-24 | |
228+
| 1.22.9 | 2022-04-08 | 2022-04-13 | |
229+
| 1.22.8 | 2022-03-11 | 2022-03-16 | |
230+
| 1.22.7 | 2022-02-11 | 2022-02-16 | |
231+
| 1.22.6 | 2022-01-14 | 2022-01-19 | |
232+
| 1.22.5 | 2021-12-10 | 2021-12-15 | |
233+
| 1.22.4 | 2021-11-12 | 2021-11-17 | |
234+
| 1.22.3 | 2021-10-22 | 2021-10-27 | |
235+
| 1.22.2 | 2021-09-10 | 2021-09-15 | |
236+
| 1.22.1 | 2021-08-16 | 2021-08-19 | |
237+
238+
### 1.21
239+
240+
<!--
241+
**1.21** enters maintenance mode on **2022-04-28**
242+
243+
End of Life for **1.21** is **2022-06-28**
244+
-->
245+
**1.21** 于 **2022-04-28** 进入维护模式
246+
247+
**1.21** 的生命周期结束时间为 **2022-06-28**
248+
249+
<!--
250+
| Patch Release | Cherry Pick Deadline | Target Date | Note |
251+
252+
[Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs)
253+
-->
254+
| 补丁发布 | Cherry Pick 截止日期 | 目标日期 | 说明 |
255+
| ------------- | -------------------- | ----------- | ---------------------------------------------------------------------- |
256+
| 1.21.13 | 2022-05-20 | 2022-05-24 | |
257+
| 1.21.12 | 2022-04-08 | 2022-04-13 | |
258+
| 1.21.11 | 2022-03-11 | 2022-03-16 | |
259+
| 1.21.10 | 2022-02-11 | 2022-02-16 | |
260+
| 1.21.9 | 2022-01-14 | 2022-01-19 | |
261+
| 1.21.8 | 2021-12-10 | 2021-12-15 | |
262+
| 1.21.7 | 2021-11-12 | 2021-11-17 | |
263+
| 1.21.6 | 2021-10-22 | 2021-10-27 | |
264+
| 1.21.5 | 2021-09-10 | 2021-09-15 | |
265+
| 1.21.4 | 2021-08-07 | 2021-08-11 | |
266+
| 1.21.3 | 2021-07-10 | 2021-07-14 | |
267+
| 1.21.2 | 2021-06-12 | 2021-06-16 | |
268+
| 1.21.1 | 2021-05-07 | 2021-05-12 | [版本回退](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs) |
269+
270+
<!--
271+
## Non-Active Branch History
272+
273+
These releases are no longer supported.
274+
-->
275+
## 非活动分支历史 {#non-active-branch-history}
276+
277+
不再支持这些版本。
278+
279+
<!--
280+
| Minor Version | Final Patch Release | EOL Date | Note |
281+
282+
Created to resolve regression introduced in 1.18.19
283+
284+
[Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs)
285+
-->
286+
| 次要版本 | 最终补丁发布版本 | EOL 日期 | 说明 |
287+
| ------------- | ------------------- | ---------- | ---------------------------------------------------------------------- |
288+
| 1.20 | 1.20.15 | 2022-02-28 | |
289+
| 1.19 | 1.19.16 | 2021-10-28 | |
290+
| 1.18 | 1.18.20 | 2021-06-18 | 创建用于解决 1.18.19 版本引入的回退 |
291+
| 1.18 | 1.18.19 | 2021-05-12 | [版本回退](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs) |
292+
| 1.17 | 1.17.17 | 2021-01-13 | |
293+
| 1.16 | 1.16.15 | 2020-09-02 | |
294+
| 1.15 | 1.15.12 | 2020-05-06 | |
295+
| 1.14 | 1.14.10 | 2019-12-11 | |
296+
| 1.13 | 1.13.12 | 2019-10-15 | |
297+
| 1.12 | 1.12.10 | 2019-07-08 | |
298+
| 1.11 | 1.11.10 | 2019-05-01 | |
299+
| 1.10 | 1.10.13 | 2019-02-13 | |
300+
| 1.9 | 1.9.11 | 2018-09-29 | |
301+
| 1.8 | 1.8.15 | 2018-07-12 | |
302+
| 1.7 | 1.7.16 | 2018-04-04 | |
303+
| 1.6 | 1.6.13 | 2017-11-23 | |
304+
| 1.5 | 1.5.8 | 2017-10-01 | |
305+
| 1.4 | 1.4.12 | 2017-04-21 | |
306+
| 1.3 | 1.3.10 | 2016-11-01 | |
307+
| 1.2 | 1.2.7 | 2016-10-23 | |
308+
309+
[cherry-picks]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md
310+
[release-managers]: /releases/release-managers
311+
[发布流程说明]: /releases/release
312+
[yearly-support]: https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md

0 commit comments

Comments
 (0)