Skip to content

Commit dfa4f72

Browse files
committed
BFD Implementation - changes for cicd scripts
1 parent d9f2ea6 commit dfa4f72

File tree

6 files changed

+36
-108
lines changed

6 files changed

+36
-108
lines changed

cicd/k3s-flannel/bird_config/bird.conf

+14-6
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ protocol static {
127127
# };
128128
# };
129129
#}
130-
130+
#
131131
# Define simple filter as an example for BGP import filter
132132
# See https://gitlab.labs.nic.cz/labs/bird/wikis/BGP_filtering for more examples
133133
# filter rt_import
@@ -203,22 +203,30 @@ protocol static {
203203
# neighbor 10.0.3.1;
204204
# }
205205
#
206+
filter import_my_routes {
207+
if (net = 0.0.0.0/0) then
208+
{
209+
reject;
210+
}
211+
accept;
212+
}
213+
206214
protocol bgp llb1 {
207-
local as 64512;
215+
local 12.12.12.254 as 64514;
208216
neighbor 12.12.12.1 as 64512;
209217

210218
ipv4 {
211-
import all;
219+
import filter import_my_routes;
212220
export all;
213221
};
214222
}
215223

216224
protocol bgp llb2 {
217-
local 14.14.14.254 as 64512;
218-
neighbor 14.14.14.1 as 64512;
225+
local 12.12.12.254 as 64514;
226+
neighbor 12.12.12.2 as 64512;
219227

220228
ipv4 {
221-
import all;
229+
import filter import_my_routes;
222230
export all;
223231
};
224232
}

cicd/k3s-flannel/config.sh

+13-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ echo "#########################################"
77
echo "Spawning all hosts"
88
echo "#########################################"
99

10-
spawn_docker_host --dock-type loxilb --dock-name llb1 --with-bgp yes --bgp-config $(pwd)/llb1_gobgp_config --with-ka in
11-
spawn_docker_host --dock-type loxilb --dock-name llb2 --with-bgp yes --bgp-config $(pwd)/llb2_gobgp_config --with-ka in
10+
spawn_docker_host --dock-type loxilb --dock-name llb1 --with-bgp yes --with-ka in
11+
spawn_docker_host --dock-type loxilb --dock-name llb2 --with-bgp yes --with-ka in
1212
spawn_docker_host --dock-type host --dock-name ep1
1313
spawn_docker_host --dock-type host --dock-name ep2
1414
spawn_docker_host --dock-type host --dock-name ep3
@@ -37,16 +37,22 @@ sleep 3
3737
sudo ip -n llb1 link set ellb1sys up
3838
sudo ip -n llb1 addr add 12.12.12.1/24 dev ellb1sys
3939
sudo ip link set esysllb1 up
40-
sudo ip addr add 12.12.12.254/24 dev esysllb1
40+
#sudo ip addr add 12.12.12.254/24 dev esysllb1
4141

4242
sudo ip link add ellb2sys type veth peer name esysllb2
4343
sleep 3
4444
sudo ip link set ellb2sys netns llb2
4545
sleep 3
4646
sudo ip -n llb2 link set ellb2sys up
47-
sudo ip -n llb2 addr add 14.14.14.1/24 dev ellb2sys
47+
sudo ip -n llb2 addr add 12.12.12.2/24 dev ellb2sys
4848
sudo ip link set esysllb2 up
49-
sudo ip addr add 14.14.14.254/24 dev esysllb2
49+
#sudo ip addr add 14.14.14.254/24 dev esysllb2
50+
51+
sudo brctl addbr k3sbr
52+
sudo brctl addif k3sbr esysllb2
53+
sudo brctl addif k3sbr esysllb1
54+
sudo ip link set k3sbr up
55+
sudo ip addr add 12.12.12.254/24 dev k3sbr
5056

5157
#node1 config
5258
config_docker_host --host1 user --host2 r1 --ptype phy --addr 1.1.1.1/24 --gw 1.1.1.254
@@ -99,8 +105,8 @@ $hexec r1 ip route add 20.20.20.1/32 via 11.11.11.11
99105
#add_route llb2 1.1.1.0/24 11.11.11.254
100106

101107
## host network
102-
sudo ip route add 11.11.11.11/32 via 14.14.14.1
103-
sudo ip route add 123.123.123.1/32 via 14.14.14.1
108+
#sudo ip route add 11.11.11.11/32 via 14.14.14.1
109+
#sudo ip route add 123.123.123.1/32 via 14.14.14.1
104110

105111
sleep 1
106112
##Create LB rule

cicd/k3s-flannel/kube-loxilb.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,11 @@ spec:
110110
command:
111111
- /bin/kube-loxilb
112112
args:
113-
- --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
113+
- --loxiURL=http://12.12.12.1:11111,http://12.12.12.2:11111
114114
- --externalCIDR=123.123.123.1/24
115115
#- --monitor
116-
#- --setBGP
116+
- --setBGP=64512
117+
- --extBGPPeers=10.10.10.254:64512,12.12.12.254:64514,11.11.11.254:64511
117118
#- --setLBMode=1
118119
#- --config=/opt/loxilb/agent/kube-loxilb.conf
119120
resources:

cicd/k3s-flannel/llb1_gobgp_config/gobgp.conf

-46
This file was deleted.

cicd/k3s-flannel/llb2_gobgp_config/gobgp.conf

-45
This file was deleted.

cicd/k3s-flannel/rmconfig.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ fi
1010

1111
source ../common.sh
1212

13-
sudo ip route del 11.11.11.11/32 via 14.14.14.1
14-
sudo ip route del 123.123.123.1/32 via 14.14.14.1
13+
#sudo ip route del 11.11.11.11/32 via 14.14.14.1
14+
#sudo ip route del 123.123.123.1/32 via 14.14.14.1
1515

1616
sudo kubectl $KUBECONFIG delete -f nginx-svc-lb1.yml >> /dev/null 2>&1
1717
sudo kubectl $KUBECONFIG delete -f nginx-svc-lb.yml >> /dev/null 2>&1
@@ -39,6 +39,10 @@ delete_docker_host r2
3939
delete_docker_host ep1
4040
delete_docker_host ep2
4141
delete_docker_host ep3
42+
sudo brctl delif k3sbr esysllb2
43+
sudo brctl delif k3sbr esysllb1
44+
sudo ip link set k3sbr down
45+
sudo brctl delbr k3sbr
4246
sudo ip link del esysllb1
4347
sudo ip link del esysllb2
4448

0 commit comments

Comments
 (0)