From 9ad0d386aa48ffc33656c28aa65acce174be93f9 Mon Sep 17 00:00:00 2001 From: zhangzujian Date: Wed, 18 Sep 2024 01:49:23 +0000 Subject: [PATCH 1/2] bump multus to v4.1.1 Signed-off-by: zhangzujian --- .github/workflows/build-x86-image.yaml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 78d1db3f3e2..c4b9a13aad0 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.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: diff --git a/Makefile b/Makefile index e5622233cf3..c849c722675 100644 --- a/Makefile +++ b/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 From 63ed887a41cbf15808054b32227a551a8241694c Mon Sep 17 00:00:00 2001 From: zhangzujian Date: Wed, 18 Sep 2024 06:12:40 +0000 Subject: [PATCH 2/2] fix clab template Signed-off-by: zhangzujian --- yamls/clab-bgp-ha.yaml.j2 | 56 ++++++++++++++++++++++++++++++++++----- yamls/clab-bgp.yaml.j2 | 24 ++++++++++++++--- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/yamls/clab-bgp-ha.yaml.j2 b/yamls/clab-bgp-ha.yaml.j2 index f0f41b5317a..fd0fea11a8c 100644 --- a/yamls/clab-bgp-ha.yaml.j2 +++ b/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 diff --git a/yamls/clab-bgp.yaml.j2 b/yamls/clab-bgp.yaml.j2 index d7bae1cf16c..0d729eb8353 100644 --- a/yamls/clab-bgp.yaml.j2 +++ b/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