[zh-cn] sync releases/* and training/*

Signed-off-by: xin.li <[email protected]>

content/zh-cn/releases/_index.md

@@ -3,27 +3,35 @@ linktitle: 发行版本历史
 title: 发行版本
 type: docs
 layout: release-info
+notoc: true
 ---
 <!-- 
 linktitle: Release History
 title: Releases
 type: docs
 layout: release-info
+notoc: true
 -->
 
 
 <!-- overview -->
 
 <!-- 
-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.
+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.
 -->
 Kubernetes 项目维护最近三个次要版本（{{< skew latestVersion >}}、{{< skew prevMinorVersion >}}、{{< skew oldestMinorVersion >}}）的发布分支。
 Kubernetes 1.19 和更新版本获得[大约 1 年的补丁支持](/zh-cn/releases/patch-releases/#support-period)。
 Kubernetes 1.18 及更早版本获得了大约 9 个月的补丁支持周期。
 
 <!-- 
 Kubernetes versions are expressed as **x.y.z**,
-where **x** is the major version, **y** is the minor version, and **z** is the patch version, following [Semantic Versioning](https://semver.org/) terminology.
+where **x** is the major version, **y** is the minor version, and **z** is the patch version,
+following [Semantic Versioning](https://semver.org/) terminology.
+
 More information in the [version skew policy](/releases/version-skew-policy/) document.
 -->
 
@@ -47,7 +55,8 @@ Kubernetes 版本表示为 **x.y.z**，
 ## 未来的发行版本 {#upcoming-release}
 
 <!-- 
-Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}}) for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!
+Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}})
+for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!
 -->
 查看[时间表](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}})，
 Kubernetes **{{< skew nextMinorVersion >}}** 版本即将发行！

content/zh-cn/releases/download.md

@@ -92,7 +92,8 @@ To manually verify signed container images of Kubernetes core components, refer
 <!--
 ## Binaries
 
-Find links to download Kubernetes components (and their checksums) in the [CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) files.
+Find links to download Kubernetes components (and their checksums) in the
+[CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) files.
 
 Alternately, use [downloadkubernetes.com](https://www.downloadkubernetes.com/) to filter by version and architecture.
 -->

content/zh-cn/releases/notes.md

@@ -18,9 +18,13 @@ sitemap:
 -->
 
 <!-- 
-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).
+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).
 
-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).
+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).
 -->
 
 可以通过阅读与你的 Kubernetes 版本对应的
@@ -31,4 +35,4 @@ Alternately, release notes can be searched and filtered online at: [relnotes.k8s
 
 或者，可以在以下位置在线搜索和筛选发行版本说明：[relnotes.k8s.io](https://relnotes.k8s.io)。
 在 [relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew currentVersionAddMinor 0 >}}.0)
-上查看 {{< skew currentVersionAddMinor 0 >}} 的筛选后的版本说明。
+上查看 {{< skew currentVersionAddMinor 0 >}} 的筛选后的版本说明。

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

@@ -27,7 +27,6 @@ The responsibilities of each role are described below.
   - [Becoming a Release Manager](#becoming-a-release-manager)
 - [Release Manager Associates](#release-manager-associates)
   - [Becoming a Release Manager Associate](#becoming-a-release-manager-associate)
-- [Build Admins](#build-admins)
 - [SIG Release Leads](#sig-release-leads)
   - [Chairs](#chairs)
   - [Technical Leads](#technical-leads)
@@ -39,7 +38,6 @@ The responsibilities of each role are described below.
    - [成为发布管理员](#becoming-a-release-manager)
 - [发布管理员助理](#release-manager-associates)
    - [成为发布管理员助理](#becoming-a-release-manager-associate)
-- [构建管理员](#build-admins)
 - [SIG 发布负责人](#sig-release-leads)
    - [首席](#chairs)
    - [技术负责人](#technical-leads)
@@ -49,22 +47,25 @@ The responsibilities of each role are described below.
 
 | Mailing List | Slack | Visibility | Usage | Membership |
 | --- | --- | --- | --- | --- |
-| [[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) |
+| [[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) |
 | [[email protected]](mailto:[email protected]) | N/A | Private | Private discussion for privileged Release Managers | Release Managers, SIG Release leadership |
 | [[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]) |
 -->
 ## 联系方式  {#contact}
 
-| 邮件列表 | Slack | 可见范围 | 用法 | 会员资格 |
-| --- | --- | --- | --- | --- |
-| [[email protected]](mailto:[email protected]) | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y)（频道）/@release-managers（用户组）| 公共 | 发布管理员公开讨论 | 所有发布管理员（包括助理、构建管理员和 SIG 主席）|
-| [[email protected]](mailto:[email protected]) | 不适用 | 私人 | 拥有特权的发布管理员私人讨论 | 发布管理员，SIG Release 负责人 |
-| [[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]) |
+| 邮件列表                                                                                     | Slack                                                                                                         | 可见范围  | 用法                      | 会员资格                                                                                                                                                                          |
+| ------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------- | ------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [[email protected]](mailto:[email protected])                    | [#release-management](https://kubernetes.slack.com/messages/CJH2GBF7Y)（频道）/@release-managers（用户组）        | 公共     | 发布管理员公开讨论          | 所有发布管理员（包括助理和 SIG 主席）                                                                                                                                                 |
+| [[email protected]](mailto:[email protected])    | 不适用                                                                                                          | 私人     | 拥有特权的发布管理员私人讨论  | 发布管理员，SIG Release 负责人                                                                                                                                                      |
+| [[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]) |
 
 <!-- 
 ### Security Embargo Policy
 
-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.
+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.
 -->
 ### 安全禁运政策  {#security-embargo-policy}
 
@@ -78,15 +79,13 @@ Some information about releases is subject to embargo and we have defined policy
 
 - [Patch Release Team][handbook-patch-release]
 - [Branch Managers][handbook-branch-mgmt]
-- [Build Admins][handbook-packaging]
 -->
 ## 手册  {#handbooks}
 
 **注意：补丁发布团队和分支管理员手册以后将会删除重复数据。**
 
 - [补丁发布团队][handbook-patch-release]
 - [分支管理员][handbook-branch-mgmt]
-- [构建管理员][handbook-packaging]
 
 <!-- 
 ## Release Managers
@@ -279,32 +278,6 @@ Contributors can become Associates by demonstrating the following:
 - 致力于改进我们与 Testgrid 交互的 kubernetes/release 项目，清理仓库等。
    - 这些工作需要与发布管理员和助理进行互动和合作
 
-<!-- 
-## Build Admins
-
-Build Admins are (currently) Google employees with the requisite access to
-Google build systems/tooling to publish deb/rpm packages on behalf of the
-Kubernetes project. They are responsible for:
-
-- Building, signing, and publishing the deb/rpm packages
-- Being the interlock with Release Managers (and Associates) on the final steps
-of each minor (1.Y) and patch (1.Y.Z) release
-
-GitHub team: [@kubernetes/build-admins](https://github.com/orgs/kubernetes/teams/build-admins)
--->
-## 构建管理员  {#build-admins}
-
-构建管理员（目前）是谷歌员工，他们拥有对谷歌构建系统/工具的必要访问权限，可以代表 Kubernetes 项目发布 deb/rpm 包。他们负责：
-
-- 构建、签名和发布 deb/rpm 包
-- 在每个次要 (1.Y) 和补丁 (1.Y.Z) 版本的最后步骤中与发布管理员（和助理）互锁
-
-GitHub 团队：[@kubernetes/build-admins](https://github.com/orgs/kubernetes/teams/build-admins)
-
-- Aaron Crickenberger ([@spiffxp](https://github.com/spiffxp))
-- Ben Kazemi ([@BenjaminKazemi](https://github.com/BenjaminKazemi))
-- Grant McCloskey ([@MushuEE](https://github.com/MushuEE))
-
 <!-- 
 ## SIG Release Leads
 
@@ -368,7 +341,6 @@ Example: [1.15 Release Team](https://git.k8s.io/sig-release/releases/release-1.1
 
 [community-membership]: https://git.k8s.io/community/community-membership.md#member
 [handbook-branch-mgmt]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/branch-manager.md
-[handbook-packaging]: https://git.k8s.io/release/hack/rapture/README.md
 [handbook-patch-release]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/patch-release-team.md
 [k-sig-release-releases]: https://git.k8s.io/sig-release/releases
 <!--

content/zh-cn/releases/release.md

@@ -12,7 +12,8 @@ auto_generated: true
 
 {{< warning >}}
 <!-- 
-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).
+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).
 -->
 此内容原文是自动生成的，链接可能无法正常访问。
 文档的来源在[这里](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/release.md)。

content/zh-cn/training/_index.html

@@ -24,17 +24,22 @@ <h2>打造你的云原生职业生涯</h2>
         <!-- <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> -->
         <p>Kubernetes 是云原生运动的核心。来自 Linux 基金会和我们培训合作伙伴的培训、认证让您可以投资您的职业生涯，学习 Kubernetes，并使您的云原生项目获得成功。</p>
       </div>
-      <div class="logo-certification cta-image" id="logo-kcnf">
-        <img src="/images/training/kubernetes-kcnf-white.svg" />
-      </div>
-      <div class="logo-certification cta-image" id="logo-cka">
-        <img src="/images/training/kubernetes-cka-white.svg"/>
-      </div>
-      <div class="logo-certification cta-image" id="logo-ckad">
-        <img src="/images/training/kubernetes-ckad-white.svg"/>
-      </div>
-      <div class="logo-certification cta-image" id="logo-cks">
-        <img src="/images/training/kubernetes-cks-white.svg"/>
+      <div class="cta-img-container">
+        <div class="logo-certification cta-image" id="logo-kcnf">
+          <img src="/images/training/kubernetes-kcnf-white.svg" />
+        </div>
+        <div class="logo-certification cta-image" id="logo-kcsa">
+          <img src="/images/training/kubernetes-cksa-white.svg" />
+        </div>
+        <div class="logo-certification cta-image" id="logo-cka">
+          <img src="/images/training/kubernetes-cka-white.svg"/>
+        </div>
+        <div class="logo-certification cta-image" id="logo-ckad">
+          <img src="/images/training/kubernetes-ckad-white.svg"/>
+        </div>
+        <div class="logo-certification cta-image" id="logo-cks">
+          <img src="/images/training/kubernetes-cks-white.svg"/>
+        </div>
       </div>
     </div>
   </div>
@@ -120,6 +125,21 @@ <h5>
         <!-- <a href="https://training.linuxfoundation.org/certification/kubernetes-cloud-native-associate/" target="_blank" class="button">Go to Certification</a> -->
         <a href="https://training.linuxfoundation.org/certification/kubernetes-cloud-native-associate/" target="_blank" class="button">前往认证</a>
       </div>
+      <div class="col-nav">
+
+        <h5>
+          <!--Kubernetes and Cloud Native Security Associate (KCSA)-->
+          <b>Kubernetes 和云原生安全助理 (KCSA)</b>
+        </h5>
+        <!--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.-->
+        <p>KCSA 是一项专业前认证，专为有兴趣通过对云原生生态系统中安全技术的基础知识和技能的了解而提升到专业水平的考生而设计。</p>
+
+        <!--A certified KCSA will confirm an understanding of the baseline security configuration of Kubernetes clusters to meet compliance objectives.-->
+        <p>经过认证的 KCSA 将确认对 Kubernetes 集群的基线安全配置的理解，以满足合规性目标。</p>
+        <br>
+        <!--Go to Certification-->
+        <a href="https://training.linuxfoundation.org/certification/kubernetes-and-cloud-native-security-associate-kcsa/" target="_blank" class="button">前往认证</a>
+      </div>
       <div class="col-nav">
           <h5>
             <!-- <b>Certified Kubernetes Application Developer (CKAD)</b> -->