Skip to content

Commit

Permalink
Merge pull request #1439 from yanggangtony/fix-typos
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
windsonsea authored May 3, 2023
2 parents b5d13fb + 0a75be3 commit 947440e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docs/en/docs/network/intro/what-is-net.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Different IP pools meets various scenarios of application communication. The mai
The installation of SpiderPool is not a must, if Underlay CNI is not installed in the application scenario.
3. Cilium, a high-performance Overlay CNI, provides many capabilities, including eBPF kernel acceleration, cross-cluster Pod communication, cross-cluster Service communication, flexible fine-grained network policy distribution, and traffic observation.
Cilium is a must-have network CNI in this portfolio.
4. The external access IP provided through SpiderFlat / MacVLAN CNI / SRI-OV CNI enables Pod Layer 2 external communication. Complemented by Calico dynamic virtual network, it reduces chores of network operation and maintenance and also saves IP resources.
4. The external access IP provided through SpiderFlat / MacVLAN CNI / SR-IOV CNI enables Pod Layer 2 external communication. Complemented by Calico dynamic virtual network, it reduces chores of network operation and maintenance and also saves IP resources.
If there is no external access requirement in the application scenario, you do not need to install Underlay CNI.


Expand All @@ -29,7 +29,7 @@ This solution is suitable for low kernel versions of Linux OS, and applicable fo
The installation of Multus is not a must, if the application does not require multiple Pod NICs and different network modes.
2. Spiderpool serves as the IPAM management component of Underlay CNI to achieve fine-grained IP management and flexible IP planning and allocation.
The installation of SpiderPool is not a must, if Underlay CNI is not installed in the application scenario.
3. The external access IP provided through SpiderFlat / MacVLAN CNI / SRI-OV CNI enables Pod Layer 2 external communication. Complemented by Calico dynamic virtual network, it reduces chores of network operation and maintenance and also saves IP resources.
3. The external access IP provided through SpiderFlat / MacVLAN CNI / SR-IOV CNI enables Pod Layer 2 external communication. Complemented by Calico dynamic virtual network, it reduces chores of network operation and maintenance and also saves IP resources.
Calico is a must-have network CNI in this portfolio. If there is no external access requirement in the application scenario, you do not need to install Underlay CNI.
4. The Submariner component provides cross-cluster Pod communication.Both Submariner and Core DNS service discovery makes cross-cluster service discovery possible. Submariner can be installed according to your demand.

Expand Down
4 changes: 2 additions & 2 deletions docs/zh/docs/network/intro/what.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DCE 5.0 云原生网络基于多个开源技术构建,不仅提供单个 CNI

> 在此方案组合中,Cilium 为必备的网络 CNI。
4. 通过 SpiderFlat / MacVLAN CNI / SRI-OV CNI 提供对外访问 IP,实现 Pod 二层对外通信能力。
4. 通过 SpiderFlat / MacVLAN CNI / SR-IOV CNI 提供对外访问 IP,实现 Pod 二层对外通信能力。
搭配 Calico 动态虚拟网络,降低网络运维难度,并节省 IP 资源。

> 如果在应用落地场景中没有对外访问需求,可以不安装 Underlay CNI。
Expand All @@ -41,7 +41,7 @@ DCE 5.0 云原生网络基于多个开源技术构建,不仅提供单个 CNI

> 如果在应用落地场景中,未安装 Underlay CNI,可以不安装 SpiderPool。
3. 通过 SpiderFlat / MacVLAN CNI / SRI-OV CNI 提供对外访问 IP,实现 Pod 二层对外通信能力。
3. 通过 SpiderFlat / MacVLAN CNI / SR-IOV CNI 提供对外访问 IP,实现 Pod 二层对外通信能力。
搭配 Calico 动态虚拟网络,降低网络运维难度,节省 IP 资源。

> 在此方案组合中,Calico 为必备的网络 CNI。如果在应用落地场景中,没有对外访问需求,可以不安装 Underlay CNI。
Expand Down
5 changes: 3 additions & 2 deletions docs/zh/docs/network/modules/cilium/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@
默认使用 “crd” 模式,可以通过以下参数进行设置:

```yaml
cilium_identity_allocation_mode: crd
cilium_identity_allocation_mode: crd
```


- 资源限制

默认的值为:
Expand All @@ -86,7 +87,7 @@ cilium_identity_allocation_mode: crd

- Cilium DaemonSet 再次准备就绪的时间

Cilium DaemonSet 再次准备就绪的时间可以通过以下参数进行设置
可以通过以下参数进行设置

```yaml
cilium_rolling_restart_wait_retries_count: 30
Expand Down
1 change: 1 addition & 0 deletions docs/zh/docs/network/performance/cni-performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
- Service 吞吐量

![service](https://docs.daocloud.io/daocloud-docs-images/docs/network/images/cni-perf2.png)

|测试用例|结论|
|----|----|
|Service 和节点间, 位于同节点|macvlan 性能最好,cilium 次之,calico 三种模式表现相近,性能都较差|
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/docs/network/plans/netplan.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ hide:
本页主要描述基于[网卡规划](./ethplan.md)中的 Overlay + Underlay CNI 网络方案中的的最佳实践,主要覆盖场景为:

1. Calico 搭配 Macvlan CNI
2. Calico 搭配 Macvlan 及 SRI-OV CNI
2. Calico 搭配 Macvlan 及 SR-IOV CNI

在如下场景中,最佳实践均为 2 张网卡,不同网卡承载流量如下:

Expand All @@ -30,7 +30,7 @@ hide:
创建的业务应用 Pod 使用对应网段地址,可满足多 VLAN 多子网场景。
- eth1.1,eth1.2 VLAN 子接口可不设置 IP 地址。

## Calico 搭配 Macvlan 及 SRI-OV CNI
## Calico 搭配 Macvlan 及 SR-IOV CNI

![macvlan-sriov](https://docs.daocloud.io/daocloud-docs-images/docs/network/images/macvlan-sriov.jpg)

Expand Down

0 comments on commit 947440e

Please sign in to comment.