Skip to content

Commit 5bc70ee

Browse files
authored
Merge pull request #40045 from howieyuen/concept-5
[zh-cn] sync concepts files of task-5
2 parents 82fea73 + ce61ab5 commit 5bc70ee

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

content/zh-cn/docs/concepts/architecture/cgroups.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,16 @@ cgroup v2 使用一个与 cgroup v1 不同的 API,因此如果有任何应用
194194
* If you run [cAdvisor](https://github.com/google/cadvisor) as a stand-alone
195195
DaemonSet for monitoring pods and containers, update it to v0.43.0 or later.
196196
* If you use JDK, prefer to use JDK 11.0.16 and later or JDK 15 and later, which [fully support cgroup v2](https://bugs.openjdk.org/browse/JDK-8230305).
197+
* If you are using the [uber-go/automaxprocs](https://github.com/uber-go/automaxprocs) package, make sure
198+
the version you use is v1.5.1 or higher.
197199
-->
198200
* 一些第三方监控和安全代理可能依赖于 cgroup 文件系统。你要将这些代理更新到支持 cgroup v2 的版本。
199201
* 如果以独立的 DaemonSet 的形式运行 [cAdvisor](https://github.com/google/cadvisor) 以监控 Pod 和容器,
200202
需将其更新到 v0.43.0 或更高版本。
201203
* 如果你使用 JDK,推荐使用 JDK 11.0.16 及更高版本或 JDK 15 及更高版本,
202204
以便[完全支持 cgroup v2](https://bugs.openjdk.org/browse/JDK-8230305)
205+
* 如果你正在使用 [uber-go/automaxprocs](https://github.com/uber-go/automaxprocs) 包,
206+
确保你使用的版本是 v1.5.1 或者更高。
203207

204208
<!--
205209
## Identify the cgroup version on Linux Nodes {#check-cgroup-version}

content/zh-cn/docs/concepts/cluster-administration/addons.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Add-ons 扩展了 Kubernetes 的功能。
2424
2525
* [ACI](https://www.github.com/noironetworks/aci-containers) provides integrated container networking and network security with Cisco ACI.
2626
* [Antrea](https://antrea.io/) operates at Layer 3/4 to provide networking and security services for Kubernetes, leveraging Open vSwitch as the networking data plane. Antrea is a [CNCF project at the Sandbox level](https://www.cncf.io/projects/antrea/).
27-
* [Calico](https://docs.projectcalico.org/latest/introduction/) is a networking and network policy provider. Calico supports a flexible set of networking options so you can choose the most efficient option for your situation, including non-overlay and overlay networks, with or without BGP. Calico uses the same engine to enforce network policy for hosts, pods, and (if using Istio & Envoy) applications at the service mesh layer.
27+
* [Calico](https://www.tigera.io/project-calico/) is a networking and network policy provider. Calico supports a flexible set of networking options so you can choose the most efficient option for your situation, including non-overlay and overlay networks, with or without BGP. Calico uses the same engine to enforce network policy for hosts, pods, and (if using Istio & Envoy) applications at the service mesh layer.
2828
* [Canal](https://projectcalico.docs.tigera.io/getting-started/kubernetes/flannel/flannel) unites Flannel and Calico, providing networking and network policy.
2929
* [Cilium](https://github.com/cilium/cilium) is a networking, observability, and security solution with an eBPF-based data plane. Cilium provides a simple flat Layer 3 network with the ability to span multiple clusters in either a native routing or overlay/encapsulation mode, and can enforce network policies on L3-L7 using an identity-based security model that is decoupled from network addressing. Cilium can act as a replacement for kube-proxy; it also offers additional, opt-in observability and security features. Cilium is a [CNCF project at the Incubation level](https://www.cncf.io/projects/cilium/).
3030
-->
@@ -34,7 +34,7 @@ Add-ons 扩展了 Kubernetes 的功能。
3434
* [Antrea](https://antrea.io/) 在第 3/4 层执行操作,为 Kubernetes
3535
提供网络连接和安全服务。Antrea 利用 Open vSwitch 作为网络的数据面。
3636
Antrea 是一个[沙箱级的 CNCF 项目](https://www.cncf.io/projects/antrea/)
37-
* [Calico](https://docs.projectcalico.org/latest/introduction/) 是一个联网和网络策略供应商。
37+
* [Calico](https://www.tigera.io/project-calico/) 是一个联网和网络策略供应商。
3838
Calico 支持一套灵活的网络选项,因此你可以根据自己的情况选择最有效的选项,包括非覆盖和覆盖网络,带或不带 BGP。
3939
Calico 使用相同的引擎为主机、Pod 和(如果使用 Istio 和 Envoy)应用程序在服务网格层执行网络策略。
4040
* [Canal](https://projectcalico.docs.tigera.io/getting-started/kubernetes/flannel/flannel) 结合 Flannel 和 Calico,提供联网和网络策略。

content/zh-cn/docs/concepts/windows/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,11 @@ work between Windows and Linux:
435435
The following list documents differences between how Pod specifications work between Windows and Linux:
436436
437437
* `hostIPC` and `hostpid` - host namespace sharing is not possible on Windows
438-
* `hostNetwork` - [see below](/docs/concepts/windows/intro#compatibility-v1-pod-spec-containers-hostnetwork)
438+
* `hostNetwork` - [see below](#compatibility-v1-pod-spec-containers-hostnetwork)
439439
* `dnsPolicy` - setting the Pod `dnsPolicy` to `ClusterFirstWithHostNet` is
440440
not supported on Windows because host networking is not provided. Pods always
441441
run with a container network.
442-
* `podSecurityContext` [see below](/docs/concepts/windows/intro#compatibility-v1-pod-spec-containers-securitycontext)
442+
* `podSecurityContext` [see below](#compatibility-v1-pod-spec-containers-securitycontext)
443443
* `shareProcessNamespace` - this is a beta feature, and depends on Linux namespaces
444444
which are not implemented on Windows. Windows cannot share process namespaces or
445445
the container's root filesystem. Only the network can be shared.

0 commit comments

Comments
 (0)