Skip to content

Commit

Permalink
bump multus to v4.1.1 (#4532)
Browse files Browse the repository at this point in the history
Signed-off-by: zhangzujian <[email protected]>
  • Loading branch information
zhangzujian committed Sep 18, 2024
1 parent e98cc19 commit 65312b2
Show file tree
Hide file tree
Showing 4 changed files with 217 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-x86-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
GO_VERSION: ''
KIND_VERSION: v0.24.0
GOSEC_VERSION: '2.20.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
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,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
138 changes: 138 additions & 0 deletions yamls/clab-bgp-ha.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
name: bgp
topology:
kinds:
linux:
image: kubeovn/kube-ovn:{{ kube_ovn_version }}
cmd: bash

nodes:
switch:
kind: linux
exec:
- ip link add br0 type bridge
- ip link set net1 master br0
- ip link set net2 master br0
- ip link set net3 master br0
- ip link set net4 master br0
- ip link set net5 master br0
- ip link set net6 master br0
- ip link set net7 master br0
- ip link set br0 up
router-1:
kind: linux
image: {{ frr_image }}
labels:
app: frr
exec:
- ip link delete eth0
- ip address add 10.0.1.1/24 dev net1
- ip address add 10.0.2.1/24 dev net2
- touch /etc/frr/vtysh.conf
- sed -i -e 's/bgpd=no/bgpd=yes/g' /etc/frr/daemons
- /usr/lib/frr/frrinit.sh start
- >-
vtysh -c 'conf t'
-c 'frr defaults datacenter'
-c 'router bgp 65001'
-c ' bgp router-id 10.0.1.1'
-c ' no bgp ebgp-requires-policy'
-c ' neighbor SERVERS peer-group'
-c ' neighbor SERVERS remote-as external'
-c ' neighbor 10.0.1.101 peer-group SERVERS'
-c ' neighbor 10.0.1.102 peer-group SERVERS'
-c ' address-family ipv4 unicast'
-c ' redistribute connected'
-c ' exit-address-family'
-c '!'
router-2:
kind: linux
image: {{ frr_image }}
labels:
app: frr
exec:
- ip link delete eth0
- ip address add 10.0.1.2/24 dev net1
- ip address add 10.0.2.2/24 dev net2
- touch /etc/frr/vtysh.conf
- sed -i -e 's/bgpd=no/bgpd=yes/g' /etc/frr/daemons
- /usr/lib/frr/frrinit.sh start
- >-
vtysh -c 'conf t'
-c 'frr defaults datacenter'
-c 'router bgp 65001'
-c ' bgp router-id 10.0.1.2'
-c ' no bgp ebgp-requires-policy'
-c ' neighbor SERVERS peer-group'
-c ' neighbor SERVERS remote-as external'
-c ' neighbor 10.0.1.101 peer-group SERVERS'
-c ' neighbor 10.0.1.102 peer-group SERVERS'
-c ' address-family ipv4 unicast'
-c ' redistribute connected'
-c ' exit-address-family'
-c '!'
kube-ovn-control-plane:
kind: ext-container
exec:
- ip address add 10.0.1.101/24 dev net1
- ip route add 10.0.0.0/16 via 10.0.1.1
kube-ovn-worker:
kind: ext-container
exec:
- ip address add 10.0.1.102/24 dev net1
- ip route add 10.0.0.0/16 via 10.0.1.1
ext:
kind: linux
exec:
- ip address add 10.0.2.101/24 dev net1
- ip route replace default nexthop via 10.0.2.1 weight 1 nexthop via 10.0.2.2 weight 1

links:
- 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
76 changes: 76 additions & 0 deletions yamls/clab-bgp.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: bgp
topology:
kinds:
linux:
image: kubeovn/kube-ovn:{{ kube_ovn_version }}
cmd: bash

nodes:
router:
kind: linux
image: {{ frr_image }}
labels:
app: frr
exec:
- ip link delete eth0
- ip link add br0 type bridge
- ip link set net1 master br0
- ip link set net2 master br0
- ip link set br0 up
- ip address add 10.0.1.1/24 dev br0
- ip address add 10.0.2.1/24 dev net3
- touch /etc/frr/vtysh.conf
- sed -i -e 's/bgpd=no/bgpd=yes/g' /etc/frr/daemons
- /usr/lib/frr/frrinit.sh start
- >-
vtysh -c 'conf t'
-c 'frr defaults datacenter'
-c 'router bgp 65001'
-c ' bgp router-id 10.0.1.1'
-c ' no bgp ebgp-requires-policy'
-c ' neighbor SERVERS peer-group'
-c ' neighbor SERVERS remote-as external'
-c ' neighbor 10.0.1.2 peer-group SERVERS'
-c ' neighbor 10.0.1.3 peer-group SERVERS'
-c ' address-family ipv4 unicast'
-c ' redistribute connected'
-c ' exit-address-family'
-c '!'
kube-ovn-control-plane:
kind: ext-container
exec:
- ip address add 10.0.1.2/24 dev net1
- ip route add 10.0.0.0/16 via 10.0.1.1
kube-ovn-worker:
kind: ext-container
exec:
- ip address add 10.0.1.3/24 dev net1
- ip route add 10.0.0.0/16 via 10.0.1.1
ext:
kind: linux
exec:
- ip address add 10.0.2.2/24 dev net1
- ip route replace default via 10.0.2.1

links:
- 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

0 comments on commit 65312b2

Please sign in to comment.