Merge pull request #38096 from my-git9/zh-sync/architecture

[zh-cn]sync concepts/architecture/cgroups.md/cri.md
pull/38145/head
Kubernetes Prow Robot 2022-11-28 19:07:22 -08:00 committed by GitHub
commit 41f78e9afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ constrain resources that are allocated to processes.
The {{< glossary_tooltip text="kubelet" term_id="kubelet" >}} and the
underlying container runtime need to interface with cgroups to enforce
[resource mangement for pods and containers](/docs/concepts/configuration/manage-resources-containers/) which
[resource management for pods and containers](/docs/concepts/configuration/manage-resources-containers/) which
includes cpu/memory requests and limits for containerized workloads.
There are two versions of cgroups in Linux: cgroup v1 and cgroup v2. cgroup v2 is
@ -204,7 +204,7 @@ cgroup v2 使用一个与 cgroup v1 不同的 API因此如果有任何应用
<!--
## Identify the cgroup version on Linux Nodes {#check-cgroup-version}
The cgroup version depends on on the Linux distribution being used and the
The cgroup version depends on the Linux distribution being used and the
default cgroup version configured on the OS. To check which cgroup version your
distribution uses, run the `stat -fc %T /sys/fs/cgroup/` command on
the node:

View File

@ -64,7 +64,7 @@ and doesn't register as a node.
<!--
## Upgrading
When upgrading Kubernetes, then the kubelet tries to automatically select the
When upgrading Kubernetes, the kubelet tries to automatically select the
latest CRI version on restart of the component. If that fails, then the fallback
will take place as mentioned above. If a gRPC re-dial was required because the
container runtime has been upgraded, then the container runtime must also