Merge pull request #41439 from asa3311/sync-zh1

[zh-cn] sync container-runtimes kubelet-integration download
pull/41449/head
Kubernetes Prow Robot 2023-06-03 20:16:41 -07:00 committed by GitHub
commit 6fe9d339b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

View File

@ -182,7 +182,7 @@ There are two cgroup drivers available:
<!-- <!--
### cgroupfs driver {#cgroupfs-cgroup-driver} ### cgroupfs driver {#cgroupfs-cgroup-driver}
The `cgroupfs` driver is the [default cgroup driver in the kubelet](docs/reference/config-api/kubelet-config.v1beta1). The `cgroupfs` driver is the [default cgroup driver in the kubelet](/docs/reference/config-api/kubelet-config.v1beta1).
When the `cgroupfs` driver is used, the kubelet and the container runtime directly interface with When the `cgroupfs` driver is used, the kubelet and the container runtime directly interface with
the cgroup filesystem to configure cgroups. the cgroup filesystem to configure cgroups.
@ -194,8 +194,8 @@ cgroup driver instead of `cgroupfs`.
--> -->
### cgroupfs 驱动 {#cgroupfs-cgroup-driver} ### cgroupfs 驱动 {#cgroupfs-cgroup-driver}
`cgroupfs` 驱动是 kubelet 中默认的 cgroup 驱动。当使用 `cgroupfs` 驱动时, `cgroupfs` 驱动是 [kubelet 中默认的 cgroup 驱动](/zh-cn/docs/reference/config-api/kubelet-config.v1beta1)。
kubelet 和容器运行时将直接对接 cgroup 文件系统来配置 cgroup。 当使用 `cgroupfs` 驱动时, kubelet 和容器运行时将直接对接 cgroup 文件系统来配置 cgroup。
当 [systemd](https://www.freedesktop.org/wiki/Software/systemd/) 是初始化系统时, 当 [systemd](https://www.freedesktop.org/wiki/Software/systemd/) 是初始化系统时,
**不** 推荐使用 `cgroupfs` 驱动,因为 systemd 期望系统上只有一个 cgroup 管理器。 **不** 推荐使用 `cgroupfs` 驱动,因为 systemd 期望系统上只有一个 cgroup 管理器。

View File

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

View File

@ -45,35 +45,35 @@ signatures:
--> -->
| 容器镜像 | 支持架构 | | 容器镜像 | 支持架构 |
| ------------------------------------------------------------------- | --------------------------------- | | ------------------------------------------------------------------- | --------------------------------- |
| registry.k8s.io/kube-apiserver:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x | | registry.k8s.io/kube-apiserver:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
| registry.k8s.io/kube-controller-manager:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x | | registry.k8s.io/kube-controller-manager:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
| registry.k8s.io/kube-proxy:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x | | registry.k8s.io/kube-proxy:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
| registry.k8s.io/kube-scheduler:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x | | registry.k8s.io/kube-scheduler:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
| registry.k8s.io/conformance:{{< param "fullversion" >}} | amd64, arm, arm64, ppc64le, s390x | | registry.k8s.io/conformance:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
<!-- <!--
All container images are available for multiple architectures, whereas the All container images are available for multiple architectures, whereas the
container runtime should choose the correct one based on the underlying container runtime should choose the correct one based on the underlying
platform. It is also possible to pull a dedicated architecture by suffixing the platform. It is also possible to pull a dedicated architecture by suffixing the
container image name, for example container image name, for example
`registry.k8s.io/kube-apiserver-arm64:{{< param "fullversion" >}}`. All `registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`. All
those derivations are signed in the same way as the multi-architecture manifest lists. those derivations are signed in the same way as the multi-architecture manifest lists.
--> -->
所有容器镜像都支持多架构,容器运行时应根据下层平台选择正确的镜像。 所有容器镜像都支持多架构,容器运行时应根据下层平台选择正确的镜像。
也可以通过给容器镜像名称加后缀来拉取适合特定架构的镜像,例如 也可以通过给容器镜像名称加后缀来拉取适合特定架构的镜像,例如
`registry.k8s.io/kube-apiserver-arm64:{{< param "fullversion" >}}`。 `registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`。
所有这些派生镜像都以与多架构清单列表相同的方式签名。 所有这些派生镜像都以与多架构清单列表相同的方式签名。
<!-- <!--
The Kubernetes project publishes a list of signed Kubernetes container images The Kubernetes project publishes a list of signed Kubernetes container images
in [SPDX 2.2](https://spdx.dev/specifications/) format. in [SPDX 2.3](https://spdx.dev/specifications/) format.
You can fetch that list using: You can fetch that list using:
--> -->
Kubernetes 项目以 [SPDX 2.2](https://spdx.dev/specifications/) 格式发布已签名的 Kubernetes 容器镜像列表。 Kubernetes 项目以 [SPDX 2.3](https://spdx.dev/specifications/) 格式发布已签名的 Kubernetes 容器镜像列表。
你可以使用以下方法获取该列表: 你可以使用以下方法获取该列表:
```shell ```shell
curl -Ls "https://sbom.k8s.io/$(curl -Ls https://dl.k8s.io/release/latest.txt)/release" | awk '/Package: registry.k8s.io\// {print $3}' 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/'
``` ```
<!-- <!--