Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump multus to v4.1.1 #4532

Merged
merged 2 commits into from
Sep 18, 2024
Merged

bump multus to v4.1.1 #4532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad0d38
bump multus to v4.1.1
zhangzujian Sep 18, 2024
63ed887
fix clab template
zhangzujian Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-x86-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
56 changes: 49 additions & 7 deletions yamls/clab-bgp-ha.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 21 additions & 3 deletions yamls/clab-bgp.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading