Skip to content

Commit 6fe9d33

Browse files
authored
Merge pull request #41439 from asa3311/sync-zh1
[zh-cn] sync container-runtimes kubelet-integration download
2 parents efdd2a3 + 8c2f472 commit 6fe9d33

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

content/zh-cn/docs/setup/production-environment/container-runtimes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ There are two cgroup drivers available:
182182
<!--
183183
### cgroupfs driver {#cgroupfs-cgroup-driver}
184184
185-
The `cgroupfs` driver is the [default cgroup driver in the kubelet](docs/reference/config-api/kubelet-config.v1beta1).
185+
The `cgroupfs` driver is the [default cgroup driver in the kubelet](/docs/reference/config-api/kubelet-config.v1beta1).
186186
When the `cgroupfs` driver is used, the kubelet and the container runtime directly interface with
187187
the cgroup filesystem to configure cgroups.
188188
@@ -194,8 +194,8 @@ cgroup driver instead of `cgroupfs`.
194194
-->
195195
### cgroupfs 驱动 {#cgroupfs-cgroup-driver}
196196

197-
`cgroupfs` 驱动是 kubelet 中默认的 cgroup 驱动。当使用 `cgroupfs` 驱动时,
198-
kubelet 和容器运行时将直接对接 cgroup 文件系统来配置 cgroup。
197+
`cgroupfs` 驱动是 [kubelet 中默认的 cgroup 驱动](/zh-cn/docs/reference/config-api/kubelet-config.v1beta1)
198+
当使用 `cgroupfs` 驱动时, kubelet 和容器运行时将直接对接 cgroup 文件系统来配置 cgroup。
199199

200200
[systemd](https://www.freedesktop.org/wiki/Software/systemd/) 是初始化系统时,
201201
**** 推荐使用 `cgroupfs` 驱动,因为 systemd 期望系统上只有一个 cgroup 管理器。

content/zh-cn/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ It augments the basic
310310
{{< note >}}
311311
<!--
312312
The contents below are just an example. If you don't want to use a package manager
313-
follow the guide outlined in the [Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2))
313+
follow the guide outlined in the ([Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2))
314314
section.
315315
-->
316316
下面的内容只是一个例子。如果你不想使用包管理器,
317-
请遵循[没有包管理器](/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2))
317+
请遵循([没有包管理器](/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2))
318318
章节的指南。
319319
{{< /note >}}
320320

content/zh-cn/releases/download.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,35 @@ signatures:
4545
-->
4646
| 容器镜像 | 支持架构 |
4747
| ------------------------------------------------------------------- | --------------------------------- |
48-
| registry.k8s.io/kube-apiserver:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x |
49-
| registry.k8s.io/kube-controller-manager:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x |
50-
| registry.k8s.io/kube-proxy:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x |
51-
| registry.k8s.io/kube-scheduler:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x |
52-
| registry.k8s.io/conformance:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x |
48+
| registry.k8s.io/kube-apiserver:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
49+
| registry.k8s.io/kube-controller-manager:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
50+
| registry.k8s.io/kube-proxy:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
51+
| registry.k8s.io/kube-scheduler:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
52+
| registry.k8s.io/conformance:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
5353

5454
<!--
5555
All container images are available for multiple architectures, whereas the
5656
container runtime should choose the correct one based on the underlying
5757
platform. It is also possible to pull a dedicated architecture by suffixing the
5858
container image name, for example
59-
`registry.k8s.io/kube-apiserver-arm64:{{< param "fullversion" >}}`. All
59+
`registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`. All
6060
those derivations are signed in the same way as the multi-architecture manifest lists.
6161
-->
6262
所有容器镜像都支持多架构,容器运行时应根据下层平台选择正确的镜像。
6363
也可以通过给容器镜像名称加后缀来拉取适合特定架构的镜像,例如
64-
`registry.k8s.io/kube-apiserver-arm64:{{< param "fullversion" >}}`
64+
`registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`
6565
所有这些派生镜像都以与多架构清单列表相同的方式签名。
6666

6767
<!--
6868
The Kubernetes project publishes a list of signed Kubernetes container images
69-
in [SPDX 2.2](https://spdx.dev/specifications/) format.
69+
in [SPDX 2.3](https://spdx.dev/specifications/) format.
7070
You can fetch that list using:
7171
-->
72-
Kubernetes 项目以 [SPDX 2.2](https://spdx.dev/specifications/) 格式发布已签名的 Kubernetes 容器镜像列表。
72+
Kubernetes 项目以 [SPDX 2.3](https://spdx.dev/specifications/) 格式发布已签名的 Kubernetes 容器镜像列表。
7373
你可以使用以下方法获取该列表:
7474

7575
```shell
76-
curl -Ls "https://sbom.k8s.io/$(curl -Ls https://dl.k8s.io/release/latest.txt)/release" | awk '/Package: registry.k8s.io\// {print $3}'
76+
curl -Ls "https://sbom.k8s.io/$(curl -Ls https://dl.k8s.io/release/stable.txt)/release" | grep "SPDXID: SPDXRef-Package-registry.k8s.io" | grep -v sha256 | cut -d- -f3- | sed 's/-/\//' | sed 's/-v1/:v1/'
7777
```
7878

7979
<!--

0 commit comments

Comments
 (0)