Skip to content

Commit

Permalink
optimize doc (#2484)
Browse files Browse the repository at this point in the history
* optimize doc

Signed-off-by: [email protected] <[email protected]>

* optimize doc

Signed-off-by: [email protected] <[email protected]>

* a

Signed-off-by: [email protected] <[email protected]>

* a

Signed-off-by: [email protected] <[email protected]>

* a

Signed-off-by: [email protected] <[email protected]>

* s

Signed-off-by: [email protected] <[email protected]>

* optimize docs

---------

Signed-off-by: [email protected] <[email protected]>
Co-authored-by: Jeanine-tw <[email protected]>
  • Loading branch information
weizhoublue and Jeanine-tw authored Oct 31, 2023
1 parent 3e6f146 commit 335fc01
Show file tree
Hide file tree
Showing 42 changed files with 196 additions and 360 deletions.
30 changes: 16 additions & 14 deletions docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ markdown_extensions:

nav:
- README.md
- GetStarted: usage/readme.md
- Get Started: usage/readme.md
- Installation:
- Underlay installation:
- Underlay Installation:
- Calico: usage/install/underlay/get-started-calico.md
- Weave: usage/install/underlay/get-started-weave.md
- Macvlan: usage/install/underlay/get-started-kind.md
- Ovs: usage/install/underlay/get-started-ovs.md
- SRIOV: usage/install/underlay/get-started-sriov.md
- Overlay installation:
- SR-IOV: usage/install/underlay/get-started-sriov.md
- Overlay Installation:
- Calico: usage/install/overlay/get-started-calico.md
- Cilium: usage/install/overlay/get-started-cilium.md
- Public cloud installation:
- alibaba cloud: usage/install/cloud/get-started-alibaba.md
- vmware vsphere: usage/install/cloud/get-started-vmware.md
- openstack: usage/install/cloud/get-started-openstack.md
- Public Cloud Installation:
- Alibaba Cloud: usage/install/cloud/get-started-alibaba.md
- VWware vSphere: usage/install/cloud/get-started-vmware.md
- OpenStack: usage/install/cloud/get-started-openstack.md
- Upgrading: usage/install/upgrade.md
- Usage:
- SpiderMultusConfig: usage/spider-multus-config.md
Expand All @@ -71,20 +71,22 @@ nav:
- IPAM for custom controllers: usage/third-party-controller.md
- IPAM for StatefulSet: usage/statefulset.md
- IPAM of Reserved IP: usage/reserved-ip.md
- Multiple interfaces: usage/multi-interfaces-annotation.md
- IPv6 support: usage/ipv6.md
- Route support: usage/route.md
- MultipleInterfaces: usage/multi-interfaces-annotation.md
- Egress Policy: usage/egress.md
- IPv6 Support: usage/ipv6.md
- Route Support: usage/route.md
- Service Support: usage/service.md
- Plugin coordinator: usage/coordinator.md
- Plugin ifacer: usage/ifacer.md
- node-based topology: usage/network-topology.md
- Node-based Topology: usage/network-topology.md
- RDMA: usage/rdma.md
- Kubevirt: usage/kubevirt.md
- FAQ: usage/debug.md
- Concepts:
- Architecture: concepts/arch.md
- IPAM: concepts/ipam.md
- IPAM Performance: concepts/ipam-performance.md
- IO Performance: concepts/io-performance.md
- I/O Performance: concepts/io-performance.md
- Blogs: concepts/blog.md
- Reference:
- Annotations: reference/annotation.md
Expand All @@ -99,7 +101,7 @@ nav:
- CRD SpiderEndpoint: reference/crd-spiderendpoint.md
- CRD SpiderReservedIP: reference/crd-spiderreservedip.md
- Coordinatorr plugin: reference/plugin-coordinator.md
- Ifacer plugin: reference/plugin-ifacer.md
- ifacer plugin: reference/plugin-ifacer.md
- IPAM plugin: reference/plugin-ipam.md
- Development:
- Contribution Guide: develop/contributing.md
Expand Down
3 changes: 3 additions & 0 deletions docs/usage/egress-zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Egress Policy

[**English**](./egress.md) | **简体中文**
3 changes: 3 additions & 0 deletions docs/usage/egress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Egress Policy

**English** | [**简体中文**](./egress-zh_CN.md)
2 changes: 1 addition & 1 deletion docs/usage/install/cloud/get-started-alibaba-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ helm install spiderpool spiderpool/spiderpool --namespace kube-system --set ipam
>
> Spiderpool 可以为控制器类型为:`Statefulset` 的应用副本固定 IP 地址。在公有云的 Underlay 网络场景中,云主机只能使用限定的 IP 地址,当 StatefulSet 类型的应用副本漂移到其他节点,但由于原固定的 IP 在其他节点是非法不可用的,新的 Pod 将出现网络不可用的问题。对此场景,将 `ipam.enableStatefulSet` 设置为 `false`,禁用该功能。
>
> 通过 `multus.multusCNI.defaultCniCRName` 指定集群的 Multus clusterNetwork,clusterNetwork 是 Multus 插件的一个特定字段,用于指定 Pod 的默认网络接口
> 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装
### 安装 CNI 配置

Expand Down
6 changes: 3 additions & 3 deletions docs/usage/install/cloud/get-started-alibaba.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ helm install spiderpool spiderpool/spiderpool --namespace kube-system --set ipam
```

> If IPVlan is not installed in your cluster, you can specify the Helm parameter `--set plugins.installCNI=true` to install IPVlan in your cluster.
>
>
> If you are using a cloud server from a Chinese mainland cloud provider, you can enhance image pulling speed by specifying the parameter `--set global.imageRegistryOverride=ghcr.m.daocloud.io`.
>
> Spiderpool allows for fixed IP addresses for application replicas with a controller type of `StatefulSet`. However, in the underlay network scenario of public clouds, cloud instances are limited to using specific IP addresses. When StatefulSet replicas migrate to different nodes, the original fixed IP becomes invalid and unavailable on the new node, causing network unavailability for the new Pods. To address this issue, set `ipam.enableStatefulSet` to `false` to disable this feature.
>
> Specify the Multus clusterNetwork for the cluster using `multus.multusCNI.defaultCniCRName`. `clusterNetwork` is a specific field within the Multus plugin used to define the default network interface for Pods.
> Specify the name of the NetworkAttachmentDefinition instance for the default CNI used by Multus via `multus.multusCNI.defaultCniCRName`. If the `multus.multusCNI.defaultCniCRName` option is provided, an empty NetworkAttachmentDefinition instance will be automatically generated upon installation. Otherwise, Multus will attempt to create a NetworkAttachmentDefinition instance based on the first CNI configuration found in the /etc/cni/net.d directory. If no suitable configuration is found, a NetworkAttachmentDefinition instance named `default` will be created to complete the installation of Multus.
### Install CNI

Expand Down Expand Up @@ -116,7 +116,7 @@ ipvlan-eth0 10m
ipvlan-eth1 10m
```

### Create IPPools
### Create IP Pools

The Spiderpool's CRD, `SpiderIPPool`, introduces the following fields: `nodeName`, `multusName`, and `ips`:

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/install/cloud/get-started-aws-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ helm install spiderpool spiderpool/spiderpool --namespace kube-system --set ipam
>
> - Spiderpool 可以为控制器类型为:`Statefulset` 的应用副本固定 IP 地址。在公有云的 Underlay 网络场景中,云主机只能使用限定的 IP 地址,当 StatefulSet 类型的应用副本漂移到其他节点,但由于原固定的 IP 在其他节点是非法不可用的,新的 Pod 将出现网络不可用的问题。对此场景,将 `ipam.enableStatefulSet` 设置为 `false`,禁用该功能。
>
> - 通过 `multus.multusCNI.defaultCniCRName` 指定 Multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 Multus 的安装。
> - 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装。

### 安装 CNI 配置

Expand Down
12 changes: 3 additions & 9 deletions docs/usage/install/overlay/get-started-calico-zh_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
~# kubectl wait --for=condition=ready -l k8s-app=calico-node pod -n kube-system
```

- 如果你的集群中每个节点 `/opt/cni/bin`下未安装 [cni plugins](https://www.cni.dev/plugins/current/) 。可参考以下的命令安装:

```shell
~# wget https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-amd64-v1.3.0.tgz
~# tar xvfzp ./cni-plugins-linux-amd64-v1.3.0.tgz -C /opt/cni/bin
```

- Helm 二进制

## 安装 Spiderpool
Expand All @@ -39,8 +32,9 @@
~# helm install spiderpool spiderpool/spiderpool --namespace kube-system --set coordinator.mode=overlay --wait
```

> 默认情况下,Spiderpool 会自动安装 Multus 组件, 如果您已经在本地安装了 Multus, 你可以使用以下命令跳过安装 Multus: `helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.install=false`
> 需要指定 coordinator 运行在 overlay 模式
> 如果您的集群未安装 Macvlan CNI, 可指定 Helm 参数 `--set plugins.installCNI=true` 安装 Macvlan 到每个节点。
>
> 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装。

等待安装完成,查看 Spiderpool 组件状态:

Expand Down
11 changes: 3 additions & 8 deletions docs/usage/install/overlay/get-started-calico.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ This page showcases the utilization of `Spiderpool`, a comprehensive Underlay ne
~# kubectl wait --for=condition=ready -l k8s-app=calico-node pod -n kube-system
```

- If the [cni plugins](https://www.cni.dev/plugins/current/) are not installed under `/opt/cni/bin` on each node of your cluster, follow the commands below for installation:

```shell
~# wget https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-amd64-v1.3.0.tgz
~# tar xvfzp ./cni-plugins-linux-amd64-v1.3.0.tgz -C /opt/cni/bin
```

- Helm binary

Expand All @@ -39,8 +33,9 @@ Follow the command below to install Spiderpool:
~# helm install spiderpool spiderpool/spiderpool --namespace kube-system --set coordinator.mode=overlay --wait
```

> By default, Spiderpool automatically installs Multus. However, if Multus has been already installed, you can skip the installation via the following command: `helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.install=false`
> It is necessary to specify that the coordinator operates in overlay mode
> If Macvlan CNI is not installed in your cluster, you can install it on each node by using the Helm parameter `--set plugins.installCNI=true`.
>
> Specify the name of the NetworkAttachmentDefinition instance for the default CNI used by Multus via `multus.multusCNI.defaultCniCRName`. If the `multus.multusCNI.defaultCniCRName` option is provided, an empty NetworkAttachmentDefinition instance will be automatically generated upon installation. Otherwise, Multus will attempt to create a NetworkAttachmentDefinition instance based on the first CNI configuration found in the /etc/cni/net.d directory. If no suitable configuration is found, a NetworkAttachmentDefinition instance named `default` will be created to complete the installation of Multus.

Check the status of Spiderpool after the installation is complete:

Expand Down
12 changes: 3 additions & 9 deletions docs/usage/install/overlay/get-started-cilium-zh_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
~# kubectl wait --for=condition=ready -l k8s-app=cilium pod -n kube-system
```

- 如果你的集群中每个节点 `/opt/cni/bin`下未安装 [cni plugins](https://www.cni.dev/plugins/current/) 。可参考以下的命令安装:

```shell
~# wget https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-amd64-v1.3.0.tgz
~# tar xvfzp ./cni-plugins-linux-amd64-v1.3.0.tgz -C /opt/cni/bin
```

- Helm 二进制

## 安装 Spiderpool
Expand All @@ -40,8 +33,9 @@
~# helm install spiderpool spiderpool/spiderpool --namespace kube-system --set coordinator.mode=overlay --wait
```

> 默认情况下,Spiderpool 会自动安装 Multus 组件, 如果您已经在本地安装了 Multus, 你可以使用以下命令跳过安装 Multus: `helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.install=false`
> 需要指定 coordinator 运行在 overlay 模式
> 如果您的集群未安装 Macvlan CNI, 可指定 Helm 参数 `--set plugins.installCNI=true` 安装 Macvlan 到每个节点。
>
> 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装。

等待安装完成,查看 Spiderpool 组件状态:

Expand Down
12 changes: 3 additions & 9 deletions docs/usage/install/overlay/get-started-cilium.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ This page showcases the utilization of `Spiderpool`, a comprehensive Underlay ne
~# kubectl wait --for=condition=ready -l k8s-app=cilium pod -n kube-system
```

- If the [cni plugins](https://www.cni.dev/plugins/current/) are not installed under `/opt/cni/bin` on each node of your cluster, follow the commands below for installation:

```shell
~# wget https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-amd64-v1.3.0.tgz
~# tar xvfzp ./cni-plugins-linux-amd64-v1.3.0.tgz -C /opt/cni/bin
```

- Helm binary

## Install Spiderpool
Expand All @@ -40,8 +33,9 @@ Follow the command below to install Spiderpool:
~# helm install spiderpool spiderpool/spiderpool --namespace kube-system --set coordinator.mode=overlay --wait
```

> By default, Spiderpool automatically installs Multus. However, if Multus has been already installed, you can skip the installation via the following command: `helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.install=false`
> It is necessary to specify that coordinator operates in overlay mode
> If Macvlan CNI is not installed in your cluster, you can install it on each node by using the Helm parameter `--set plugins.installCNI=true`.
>
> Specify the name of the NetworkAttachmentDefinition instance for the default CNI used by Multus via `multus.multusCNI.defaultCniCRName`. If the `multus.multusCNI.defaultCniCRName` option is provided, an empty NetworkAttachmentDefinition instance will be automatically generated upon installation. Otherwise, Multus will attempt to create a NetworkAttachmentDefinition instance based on the first CNI configuration found in the /etc/cni/net.d directory. If no suitable configuration is found, a NetworkAttachmentDefinition instance named `default` will be created to complete the installation of Multus.

Check the status of Spiderpool after the installation is complete:

Expand Down
2 changes: 2 additions & 0 deletions docs/usage/install/underlay/get-started-calico-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ helm install spiderpool spiderpool/spiderpool --namespace kube-system --set mult
```

> 如果您是国内用户,可以指定参数 `--set global.imageRegistryOverride=ghcr.m.daocloud.io` 避免 Spiderpool 的镜像拉取失败。
>
> 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装。
创建 Pod 使用的 SpiderIPPool 实例:

Expand Down
2 changes: 2 additions & 0 deletions docs/usage/install/underlay/get-started-calico.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ helm install spiderpool spiderpool/spiderpool --namespace kube-system --set mult
```

> If you are mainland user who is not available to access ghcr.io,You can specify the parameter `-set global.imageRegistryOverride=ghcr.m.daocloud.io` to avoid image pulling failures for Spiderpool.
>
> Specify the name of the NetworkAttachmentDefinition instance for the default CNI used by Multus via `multus.multusCNI.defaultCniCRName`. If the `multus.multusCNI.defaultCniCRName` option is provided, an empty NetworkAttachmentDefinition instance will be automatically generated upon installation. Otherwise, Multus will attempt to create a NetworkAttachmentDefinition instance based on the first CNI configuration found in the /etc/cni/net.d directory. If no suitable configuration is found, a NetworkAttachmentDefinition instance named `default` will be created to complete the installation of Multus.
Create the SpiderIPPool instance used by the Pod:

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/install/underlay/get-started-macvlan-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Spiderpool 可用作 Underlay 网络场景下提供固定 IP 的一种解决方
>
> 如果您是国内用户,可以指定参数 `--set global.imageRegistryOverride=ghcr.m.daocloud.io` 避免 Spiderpool 的镜像拉取失败。
>
> 通过 `multus.multusCNI.defaultCniCRName` 指定集群的 Multus clusterNetwork,clusterNetwork 是 Multus 插件的一个特定字段,用于指定 Pod 的默认网络接口
> 通过 `multus.multusCNI.defaultCniCRName` 指定 multus 默认使用的 CNI 的 NetworkAttachmentDefinition 实例名。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,则安装后会自动生成一个数据为空的 NetworkAttachmentDefinition 对应实例。如果 `multus.multusCNI.defaultCniCRName` 选项不为空,会尝试通过 /etc/cni/net.d 目录下的第一个 CNI 配置来创建对应的 NetworkAttachmentDefinition 实例,否则会自动生成一个名为 `default` 的 NetworkAttachmentDefinition 实例,以完成 multus 的安装

2. 创建 SpiderIPPool 实例。

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/install/underlay/get-started-macvlan.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Spiderpool provides a solution for assigning static IP addresses in underlay net
>
> If you are mainland user who is not available to access ghcr.io,You can specify the parameter `-set global.imageRegistryOverride=ghcr.m.daocloud.io` to avoid image pulling failures for Spiderpool.
>
> Specify the Multus clusterNetwork of the cluster through `multus.multusCNI.defaultCniCRName`, clusterNetwork is a specific field of the Multus plugin, which is used to specify the default network interface of the Pod.
> Specify the name of the NetworkAttachmentDefinition instance for the default CNI used by Multus via `multus.multusCNI.defaultCniCRName`. If the `multus.multusCNI.defaultCniCRName` option is provided, an empty NetworkAttachmentDefinition instance will be automatically generated upon installation. Otherwise, Multus will attempt to create a NetworkAttachmentDefinition instance based on the first CNI configuration found in the /etc/cni/net.d directory. If no suitable configuration is found, a NetworkAttachmentDefinition instance named `default` will be created to complete the installation of Multus.

2. Create a SpiderIPPool instance.

Expand Down
Loading

0 comments on commit 335fc01

Please sign in to comment.