title: support host-device cni #3327

GreatLazyMan · 2024-03-20T09:14:52Z

Thanks for contributing!

What type of PR is this?

kind/feature

What this PR does / why we need it:
support host-device cni

Which issue(s) this PR fixes:
Fixes #3303

Special notes for your reviewer:

Signed-off-by: GreatLazyMan <dongweiguo_yewu@cmss.chinamobile.com>

codecov · 2024-03-20T09:34:49Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.12%. Comparing base (39a4e3d) to head (9f5f462).
Report is 24 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3327      +/-   ##
==========================================
- Coverage   81.68%   81.12%   -0.56%     
==========================================
  Files          50       50              
  Lines        5372     5372              
==========================================
- Hits         4388     4358      -30     
- Misses        823      856      +33     
+ Partials      161      158       -3

Flag	Coverage Δ
unittests	`81.12% <ø> (-0.56%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

cyclinder

Thanks for the contribution! @GreatLazyMan.

Could you mind adding some e2e tests for this? you can refer to

spiderpool/test/e2e/spidermultus/spidermultus_test.go

Line 336 in da3d6d9

    
           It("testing creating spiderMultusConfig with cniType: ipvlan and checking the net-attach-conf config if works", Label("M00002"), func() {

Also, After you test the host-device plugin in your local, you can update the docs :)

cyclinder · 2024-03-20T09:30:08Z

pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/spidermultus_types.go

+	// +kubebuilder:validation:Optional
+	HWAddr string `json:"hwAddr,omitempty"`
+	// +kubebuilder:validation:Optional
+	DPDKMode bool `json:"enableDPDK,omitempty"`


I think we don't need DPDKMode, this field can't be configured. The host-device plugin can detect it is in DPDK mode automatically by checking the Device's driver. see https://github.com/containernetworking/plugins/blob/c860b78de419336c418fee93fc5cf0f6c9b115ba/plugins/main/host-device/host-device.go#L113.

cyclinder · 2024-03-20T09:33:25Z

pkg/multuscniconfig/multusconfig_informer.go

+		netConf.IPAM = &spiderpoolcmd.IPAMConfig{
+			Type: constant.Spiderpool,
+		}
+		if multusConfSpec.OvsConfig.SpiderpoolConfigPools != nil {


nit: OvsConfig -> HostDeviceConfig

cyclinder · 2024-03-20T09:34:55Z

pkg/multuscniconfig/utils.go

+	Type       string                    `json:"type"`
+	Device     string                    `json:"deviceName,omitempty"`
+	HWAddr     string                    `json:"hwAddr,omitempty"`
+	DPDKMode   bool                      `json:"enableDPDK,omitempty"`


also need remove this

Icarus9913 · 2024-03-20T09:53:14Z

docs/usage/install/underlay/get-started-host-device-zh_CN.md

+    ```bash
+    helm repo add spiderpool https://spidernet-io.github.io/spiderpool
+    helm repo update spiderpool
+    helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.multusCNI.defaultCniCRName="host-device-conf" --set plugins.installHostDeviceCNI=true


remove --set plugins.installHostDeviceCNI=true because --install-cni would install the whole cni-plugins including host-device.

https://github.com/spidernet-io/spiderpool/blob/main/images/spiderpool-plugins/entrypoint.sh

Icarus9913 · 2024-03-20T09:53:32Z

docs/usage/install/underlay/get-started-host-device-zh_CN.md

+    helm install spiderpool spiderpool/spiderpool --namespace kube-system --set multus.multusCNI.defaultCniCRName="host-device-conf" --set plugins.installHostDeviceCNI=true
+    ```
+
+    > 如果未安装 host-device-cni, 可以通过 Helm 参数 '-set plugins.installHostDeviceCNI=true' 安装它。


Icarus9913 · 2024-03-20T09:56:20Z

docs/usage/install/underlay/get-started-host-device-zh_CN.md

+          {
+            "ipv4": ["ippool-test"]
+          }
+        v1.multus-cni.io/default-network: kube-system/host-device-conf


We also need a SpiderMultusConfig object for host-device, just follow

spiderpool/docs/usage/install/underlay/get-started-macvlan.md

Lines 95 to 108 in da3d6d9

MACVLAN_MASTER_INTERFACE="eth0"

cat <<EOF | kubectl apply -f -

apiVersion: spiderpool.spidernet.io/v2beta1

kind: SpiderMultusConfig

metadata:

name: macvlan-conf

namespace: kube-system

spec:

cniType: macvlan

macvlan:

master:

- ${MACVLAN_MASTER_INTERFACE}

EOF

```

weizhoublue · 2024-03-20T23:47:00Z

docs/usage/install/underlay/get-started-host-device-zh_CN.md

+
+    * 如果你使用 Underlay 模式，`coordinator` 会在主机上创建 veth 接口，为了防止 NetworkManager 干扰 veth 接口, 导致 Pod 访问异常。我们需要配置 NetworkManager，使其不纳管这些 Veth 接口。
+
+    * 如果你通过 `Iface`r 创建 Vlan 和 Bond 接口，NetworkManager 可能会干扰这些接口，导致 Pod 访问异常。我们需要配置 NetworkManager，使其不纳管这些 Veth 接口。


these description is not suitable for host device case

通过 Ifacer

---》

通过 Ifacer

weizhoublue · 2024-04-07T06:34:14Z

@GreatLazyMan could you update the PR according to the comments ? thanks

weizhoublue · 2024-04-07T06:35:00Z

BTW, it needs E2E cases to make sure the feature

GreatLazyMan added 3 commits March 20, 2024 16:57

title: support host-device cni

619410d

Signed-off-by: GreatLazyMan <dongweiguo_yewu@cmss.chinamobile.com>

title: support host-device cni

8fedc40

Signed-off-by: GreatLazyMan <dongweiguo_yewu@cmss.chinamobile.com>

title: support host-device cni

9f5f462

Signed-off-by: GreatLazyMan <dongweiguo_yewu@cmss.chinamobile.com>

GreatLazyMan requested review from weizhoublue, Icarus9913 and windsonsea as code owners March 20, 2024 09:14

cyclinder reviewed Mar 20, 2024

View reviewed changes

cyclinder added release/feature-new release note for new feature kind/feature labels Mar 20, 2024

Icarus9913 reviewed Mar 20, 2024

View reviewed changes

weizhoublue reviewed Mar 20, 2024

View reviewed changes

weizhoublue added the pr/not-ready not ready for merging label Apr 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

title: support host-device cni #3327

title: support host-device cni #3327

GreatLazyMan commented Mar 20, 2024

codecov bot commented Mar 20, 2024 •

edited

cyclinder left a comment

cyclinder Mar 20, 2024

cyclinder Mar 20, 2024

cyclinder Mar 20, 2024

Icarus9913 Mar 20, 2024

Icarus9913 Mar 20, 2024

Icarus9913 Mar 20, 2024

Icarus9913 Mar 20, 2024

weizhoublue Mar 20, 2024

weizhoublue Apr 7, 2024

weizhoublue commented Apr 7, 2024

weizhoublue commented Apr 7, 2024

	MACVLAN_MASTER_INTERFACE="eth0"
	cat <<EOF \| kubectl apply -f -
	apiVersion: spiderpool.spidernet.io/v2beta1
	kind: SpiderMultusConfig
	metadata:
	name: macvlan-conf
	namespace: kube-system
	spec:
	cniType: macvlan
	macvlan:
	master:
	- ${MACVLAN_MASTER_INTERFACE}
	EOF
	```


		* 如果你使用 Underlay 模式，`coordinator` 会在主机上创建 veth 接口，为了防止 NetworkManager 干扰 veth 接口, 导致 Pod 访问异常。我们需要配置 NetworkManager，使其不纳管这些 Veth 接口。

		* 如果你通过 `Iface`r 创建 Vlan 和 Bond 接口，NetworkManager 可能会干扰这些接口，导致 Pod 访问异常。我们需要配置 NetworkManager，使其不纳管这些 Veth 接口。

title: support host-device cni #3327

Are you sure you want to change the base?

title: support host-device cni #3327

Conversation

GreatLazyMan commented Mar 20, 2024

Thanks for contributing!

What type of PR is this?

codecov bot commented Mar 20, 2024 • edited

Codecov Report

cyclinder left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

weizhoublue commented Apr 7, 2024

weizhoublue commented Apr 7, 2024

codecov bot commented Mar 20, 2024 •

edited