Skip to content

Commit b30ac00

Browse files
committed
[zh-cn] sync releases/* and training/*
Signed-off-by: xin.li <[email protected]>
1 parent e5b31b8 commit b30ac00

File tree

6 files changed

+64
-57
lines changed

6 files changed

+64
-57
lines changed

content/zh-cn/releases/_index.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,35 @@ linktitle: 发行版本历史
33
title: 发行版本
44
type: docs
55
layout: release-info
6+
notoc: true
67
---
78
<!--
89
linktitle: Release History
910
title: Releases
1011
type: docs
1112
layout: release-info
13+
notoc: true
1214
-->
1315

1416

1517
<!-- overview -->
1618

1719
<!--
18-
The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}). Kubernetes 1.19 and newer receive [approximately 1 year of patch support](/releases/patch-releases/#support-period). Kubernetes 1.18 and older received approximately 9 months of patch support.
20+
The Kubernetes project maintains release branches for the most recent three minor releases
21+
({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}).
22+
Kubernetes 1.19 and newer receive
23+
[approximately 1 year of patch support](/releases/patch-releases/#support-period).
24+
Kubernetes 1.18 and older received approximately 9 months of patch support.
1925
-->
2026
Kubernetes 项目维护最近三个次要版本({{< skew latestVersion >}}、{{< skew prevMinorVersion >}}、{{< skew oldestMinorVersion >}})的发布分支。
2127
Kubernetes 1.19 和更新版本获得[大约 1 年的补丁支持](/zh-cn/releases/patch-releases/#support-period)
2228
Kubernetes 1.18 及更早版本获得了大约 9 个月的补丁支持周期。
2329

2430
<!--
2531
Kubernetes versions are expressed as **x.y.z**,
26-
where **x** is the major version, **y** is the minor version, and **z** is the patch version, following [Semantic Versioning](https://semver.org/) terminology.
32+
where **x** is the major version, **y** is the minor version, and **z** is the patch version,
33+
following [Semantic Versioning](https://semver.org/) terminology.
34+
2735
More information in the [version skew policy](/releases/version-skew-policy/) document.
2836
-->
2937

@@ -47,7 +55,8 @@ Kubernetes 版本表示为 **x.y.z**,
4755
## 未来的发行版本 {#upcoming-release}
4856

4957
<!--
50-
Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}}) for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!
58+
Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}})
59+
for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!
5160
-->
5261
查看[时间表](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}}),
5362
Kubernetes **{{< skew nextMinorVersion >}}** 版本即将发行!

content/zh-cn/releases/download.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ To manually verify signed container images of Kubernetes core components, refer
9292
<!--
9393
## Binaries
9494
95-
Find links to download Kubernetes components (and their checksums) in the [CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) files.
95+
Find links to download Kubernetes components (and their checksums) in the
96+
[CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) files.
9697
9798
Alternately, use [downloadkubernetes.com](https://www.downloadkubernetes.com/) to filter by version and architecture.
9899
-->

content/zh-cn/releases/notes.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ sitemap:
1818
-->
1919

2020
<!--
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).
21+
Release notes can be found by reading the [Changelog](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG)
22+
that matches your Kubernetes version. View the changelog for {{< skew currentVersionAddMinor 0 >}} on
23+
[GitHub](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-{{< skew currentVersionAddMinor 0 >}}.md).
2224
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).
25+
Alternately, release notes can be searched and filtered online at: [relnotes.k8s.io](https://relnotes.k8s.io).
26+
View filtered release notes for {{< skew currentVersionAddMinor 0 >}} on
27+
[relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew currentVersionAddMinor 0 >}}.0).
2428
-->
2529

2630
可以通过阅读与你的 Kubernetes 版本对应的
@@ -31,4 +35,4 @@ Alternately, release notes can be searched and filtered online at: [relnotes.k8s
3135

3236
或者,可以在以下位置在线搜索和筛选发行版本说明:[relnotes.k8s.io](https://relnotes.k8s.io)
3337
[relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew currentVersionAddMinor 0 >}}.0)
34-
上查看 {{< skew currentVersionAddMinor 0 >}} 的筛选后的版本说明。
38+
上查看 {{< skew currentVersionAddMinor 0 >}} 的筛选后的版本说明。

content/zh-cn/releases/release-managers.md

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ The responsibilities of each role are described below.
2727
- [Becoming a Release Manager](#becoming-a-release-manager)
2828
- [Release Manager Associates](#release-manager-associates)
2929
- [Becoming a Release Manager Associate](#becoming-a-release-manager-associate)
30-
- [Build Admins](#build-admins)
3130
- [SIG Release Leads](#sig-release-leads)
3231
- [Chairs](#chairs)
3332
- [Technical Leads](#technical-leads)
@@ -39,7 +38,6 @@ The responsibilities of each role are described below.
3938
- [成为发布管理员](#becoming-a-release-manager)
4039
- [发布管理员助理](#release-manager-associates)
4140
- [成为发布管理员助理](#becoming-a-release-manager-associate)
42-
- [构建管理员](#build-admins)
4341
- [SIG 发布负责人](#sig-release-leads)
4442
- [首席](#chairs)
4543
- [技术负责人](#technical-leads)
@@ -49,22 +47,25 @@ The responsibilities of each role are described below.
4947
5048
| Mailing List | Slack | Visibility | Usage | Membership |
5149
| --- | --- | --- | --- | --- |
52-
| [[email protected]](mailto:[email protected]) | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y) (channel) / @release-managers (user group) | Public | Public discussion for Release Managers | All Release Managers (including Associates, Build Admins, and SIG Chairs) |
50+
| [[email protected]](mailto:[email protected]) | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y) (channel) / @release-managers (user group) | Public | Public discussion for Release Managers | All Release Managers (including Associates, and SIG Chairs) |
5351
| [[email protected]](mailto:[email protected]) | N/A | Private | Private discussion for privileged Release Managers | Release Managers, SIG Release leadership |
5452
| [[email protected]](mailto:[email protected]) | [#security-release-team](https://kubernetes.slack.com/archives/G0162T1RYHG) (channel) / @security-rel-team (user group) | Private | Security release coordination with the Security Response Committee | [[email protected]](mailto:[email protected]), [[email protected]](mailto:[email protected]) |
5553
-->
5654
## 联系方式 {#contact}
5755

58-
| 邮件列表 | Slack | 可见范围 | 用法 | 会员资格 |
59-
| --- | --- | --- | --- | --- |
60-
| [[email protected]](mailto:[email protected]) | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y)(频道)/@release-managers(用户组)| 公共 | 发布管理员公开讨论 | 所有发布管理员(包括助理、构建管理员和 SIG 主席)|
61-
| [[email protected]](mailto:[email protected]) | 不适用 | 私人 | 拥有特权的发布管理员私人讨论 | 发布管理员,SIG Release 负责人 |
62-
| [[email protected]](mailto:[email protected]) | [#security-release-team](https://kubernetes.slack.com/archives/G0162T1RYHG)(频道)/@security-rel-team(用户组)| 私人 | 与安全响应委员会协调安全发布 | [[email protected]](mailto:[email protected]), [[email protected]](mailto:[email protected]) |
56+
| 邮件列表 | Slack | 可见范围 | 用法 | 会员资格 |
57+
| ------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------- | ------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
58+
| [[email protected]](mailto:[email protected]) | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y)(频道)/@release-managers(用户组) | 公共 | 发布管理员公开讨论 | 所有发布管理员(包括助理和 SIG 主席) |
59+
| [[email protected]](mailto:[email protected]) | 不适用 | 私人 | 拥有特权的发布管理员私人讨论 | 发布管理员,SIG Release 负责人 |
60+
| [[email protected]](mailto:[email protected]) | [#security-release-team](https://kubernetes.slack.com/archives/G0162T1RYHG)(频道)/@security-rel-team(用户组) | 私人 | 与安全响应委员会协调安全发布 | [[email protected]](mailto:[email protected]), [[email protected]](mailto:[email protected]) |
6361

6462
<!--
6563
### Security Embargo Policy
6664
67-
Some information about releases is subject to embargo and we have defined policy about how those embargoes are set. Please refer to the [Security Embargo Policy](https://github.com/kubernetes/committee-security-response/blob/main/private-distributors-list.md#embargo-policy) for more information.
65+
Some information about releases is subject to embargo and we have defined policy about
66+
how those embargoes are set. Please refer to the
67+
[Security Embargo Policy](https://github.com/kubernetes/committee-security-response/blob/main/private-distributors-list.md#embargo-policy)
68+
for more information.
6869
-->
6970
### 安全禁运政策 {#security-embargo-policy}
7071

@@ -78,15 +79,13 @@ Some information about releases is subject to embargo and we have defined policy
7879
7980
- [Patch Release Team][handbook-patch-release]
8081
- [Branch Managers][handbook-branch-mgmt]
81-
- [Build Admins][handbook-packaging]
8282
-->
8383
## 手册 {#handbooks}
8484

8585
**注意:补丁发布团队和分支管理员手册以后将会删除重复数据。**
8686

8787
- [补丁发布团队][handbook-patch-release]
8888
- [分支管理员][handbook-branch-mgmt]
89-
- [构建管理员][handbook-packaging]
9089

9190
<!--
9291
## Release Managers
@@ -279,32 +278,6 @@ Contributors can become Associates by demonstrating the following:
279278
- 致力于改进我们与 Testgrid 交互的 kubernetes/release 项目,清理仓库等。
280279
- 这些工作需要与发布管理员和助理进行互动和合作
281280

282-
<!--
283-
## Build Admins
284-
285-
Build Admins are (currently) Google employees with the requisite access to
286-
Google build systems/tooling to publish deb/rpm packages on behalf of the
287-
Kubernetes project. They are responsible for:
288-
289-
- Building, signing, and publishing the deb/rpm packages
290-
- Being the interlock with Release Managers (and Associates) on the final steps
291-
of each minor (1.Y) and patch (1.Y.Z) release
292-
293-
GitHub team: [@kubernetes/build-admins](https://github.com/orgs/kubernetes/teams/build-admins)
294-
-->
295-
## 构建管理员 {#build-admins}
296-
297-
构建管理员(目前)是谷歌员工,他们拥有对谷歌构建系统/工具的必要访问权限,可以代表 Kubernetes 项目发布 deb/rpm 包。他们负责:
298-
299-
- 构建、签名和发布 deb/rpm 包
300-
- 在每个次要 (1.Y) 和补丁 (1.Y.Z) 版本的最后步骤中与发布管理员(和助理)互锁
301-
302-
GitHub 团队:[@kubernetes/build-admins](https://github.com/orgs/kubernetes/teams/build-admins)
303-
304-
- Aaron Crickenberger ([@spiffxp](https://github.com/spiffxp))
305-
- Ben Kazemi ([@BenjaminKazemi](https://github.com/BenjaminKazemi))
306-
- Grant McCloskey ([@MushuEE](https://github.com/MushuEE))
307-
308281
<!--
309282
## SIG Release Leads
310283
@@ -368,7 +341,6 @@ Example: [1.15 Release Team](https://git.k8s.io/sig-release/releases/release-1.1
368341

369342
[community-membership]: https://git.k8s.io/community/community-membership.md#member
370343
[handbook-branch-mgmt]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/branch-manager.md
371-
[handbook-packaging]: https://git.k8s.io/release/hack/rapture/README.md
372344
[handbook-patch-release]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/patch-release-team.md
373345
[k-sig-release-releases]: https://git.k8s.io/sig-release/releases
374346
<!--

content/zh-cn/releases/release.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ auto_generated: true
1212

1313
{{< warning >}}
1414
<!--
15-
This content is auto-generated and links may not function. The source of the document is located [here](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/release.md).
15+
This content is auto-generated and links may not function. The source of the document
16+
is located [here](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/release.md).
1617
-->
1718
此内容原文是自动生成的,链接可能无法正常访问。
1819
文档的来源在[这里](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/release.md)

content/zh-cn/training/_index.html

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,22 @@ <h2>打造你的云原生职业生涯</h2>
2424
<!-- <p>Kubernetes is at the core of the cloud native movement. Training and certifications from the Linux Foundation and our training partners lets you invest in your career, learn Kubernetes, and make your cloud native projects successful.</p> -->
2525
<p>Kubernetes 是云原生运动的核心。来自 Linux 基金会和我们培训合作伙伴的培训、认证让您可以投资您的职业生涯,学习 Kubernetes,并使您的云原生项目获得成功。</p>
2626
</div>
27-
<div class="logo-certification cta-image" id="logo-kcnf">
28-
<img src="/images/training/kubernetes-kcnf-white.svg" />
29-
</div>
30-
<div class="logo-certification cta-image" id="logo-cka">
31-
<img src="/images/training/kubernetes-cka-white.svg"/>
32-
</div>
33-
<div class="logo-certification cta-image" id="logo-ckad">
34-
<img src="/images/training/kubernetes-ckad-white.svg"/>
35-
</div>
36-
<div class="logo-certification cta-image" id="logo-cks">
37-
<img src="/images/training/kubernetes-cks-white.svg"/>
27+
<div class="cta-img-container">
28+
<div class="logo-certification cta-image" id="logo-kcnf">
29+
<img src="/images/training/kubernetes-kcnf-white.svg" />
30+
</div>
31+
<div class="logo-certification cta-image" id="logo-kcsa">
32+
<img src="/images/training/kubernetes-cksa-white.svg" />
33+
</div>
34+
<div class="logo-certification cta-image" id="logo-cka">
35+
<img src="/images/training/kubernetes-cka-white.svg"/>
36+
</div>
37+
<div class="logo-certification cta-image" id="logo-ckad">
38+
<img src="/images/training/kubernetes-ckad-white.svg"/>
39+
</div>
40+
<div class="logo-certification cta-image" id="logo-cks">
41+
<img src="/images/training/kubernetes-cks-white.svg"/>
42+
</div>
3843
</div>
3944
</div>
4045
</div>
@@ -120,6 +125,21 @@ <h5>
120125
<!-- <a href="https://training.linuxfoundation.org/certification/kubernetes-cloud-native-associate/" target="_blank" class="button">Go to Certification</a> -->
121126
<a href="https://training.linuxfoundation.org/certification/kubernetes-cloud-native-associate/" target="_blank" class="button">前往认证</a>
122127
</div>
128+
<div class="col-nav">
129+
130+
<h5>
131+
<!--Kubernetes and Cloud Native Security Associate (KCSA)-->
132+
<b>Kubernetes 和云原生安全助理 (KCSA)</b>
133+
</h5>
134+
<!--The KCSA is a pre-professional certification designed for candidates interested in advancing to the professional level through a demonstrated understanding of foundational knowledge and skills of security technologies in the cloud native ecosystem.-->
135+
<p>KCSA 是一项专业前认证,专为有兴趣通过对云原生生态系统中安全技术的基础知识和技能的了解而提升到专业水平的考生而设计。</p>
136+
137+
<!--A certified KCSA will confirm an understanding of the baseline security configuration of Kubernetes clusters to meet compliance objectives.-->
138+
<p>经过认证的 KCSA 将确认对 Kubernetes 集群的基线安全配置的理解,以满足合规性目标。</p>
139+
<br>
140+
<!--Go to Certification-->
141+
<a href="https://training.linuxfoundation.org/certification/kubernetes-and-cloud-native-security-associate-kcsa/" target="_blank" class="button">前往认证</a>
142+
</div>
123143
<div class="col-nav">
124144
<h5>
125145
<!-- <b>Certified Kubernetes Application Developer (CKAD)</b> -->

0 commit comments

Comments
 (0)