bump multus to v4.1.1 (#4532)

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

.github/workflows/build-x86-image.yaml

@@ -24,7 +24,7 @@ env:
   GO_VERSION: ''
   KIND_VERSION: v0.24.0
   GOLANGCI_LINT_VERSION: 'v1.61.0'
-  HELM_VERSION: v3.15.4
+  HELM_VERSION: v3.16.1
   SUBMARINER_VERSION: '0.18.0'
 
 jobs:

Makefile

@@ -30,9 +30,9 @@ CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/co
 FRR_VERSION = 9.1.1
 FRR_IMAGE = quay.io/frrouting/frr:$(FRR_VERSION)
 
-CLAB_IMAGE = ghcr.io/srl-labs/clab:0.56.0
+CLAB_IMAGE = ghcr.io/srl-labs/clab:0.57.2
 
-MULTUS_VERSION = v4.1.0
+MULTUS_VERSION = v4.1.1
 MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:$(MULTUS_VERSION)-thick
 MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/$(MULTUS_VERSION)/deployments/multus-daemonset-thick.yml
 

yamls/clab-bgp-ha.yaml.j2

@@ -87,10 +87,52 @@ topology:
       - ip route replace default nexthop via 10.0.2.1 weight 1 nexthop via 10.0.2.2 weight 1
 
   links:
-  - endpoints: ["switch:net1", "router-1:net1"]
-  - endpoints: ["switch:net2", "router-1:net2"]
-  - endpoints: ["switch:net3", "router-2:net1"]
-  - endpoints: ["switch:net4", "router-2:net2"]
-  - endpoints: ["switch:net5", "kube-ovn-control-plane::net1"]
-  - endpoints: ["switch:net6", "kube-ovn-worker:net1"]
-  - endpoints: ["switch:net7", "ext:net1"]
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net1
+    - node: router-1
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net2
+    - node: router-1
+      interface: net2
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net3
+    - node: router-2
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net4
+    - node: router-2
+      interface: net2
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net5
+    - node: kube-ovn-control-plane
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net6
+    - node: kube-ovn-worker
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: switch
+      interface: net7
+    - node: ext
+      interface: net1

yamls/clab-bgp.yaml.j2

@@ -53,6 +53,24 @@ topology:
       - ip route replace default via 10.0.2.1
 
   links:
-  - endpoints: ["router:net1", "kube-ovn-control-plane::net1"]
-  - endpoints: ["router:net2", "kube-ovn-worker:net1"]
-  - endpoints: ["router:net3", "ext:net1"]
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: router
+      interface: net1
+    - node: kube-ovn-control-plane
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: router
+      interface: net2
+    - node: kube-ovn-worker
+      interface: net1
+  - type: veth
+    mtu: 1500
+    endpoints:
+    - node: router
+      interface: net3
+    - node: ext
+      interface: net1