diff --git a/cicd/k0s-weave/config.sh b/cicd/k0s-weave/config.sh index 46d8bf7e3..fbe620d47 100755 --- a/cicd/k0s-weave/config.sh +++ b/cicd/k0s-weave/config.sh @@ -175,6 +175,15 @@ else sudo k0s kubectl apply -f https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s.yaml sleep 30 + + if [ ! -f /opt/cni/bin/loopback ]; then + git clone https://github.com/containernetworking/plugins.git + cd plugins + ./build_linux.sh + sudo cp -f bin/* /opt/cni/bin/ + cd - + fi + # Check kubectl works sudo k0s kubectl get pods -A diff --git a/cicd/k0s-weave/k0s.yaml b/cicd/k0s-weave/k0s.yaml index 47c0b8712..8769cde0e 100644 --- a/cicd/k0s-weave/k0s.yaml +++ b/cicd/k0s-weave/k0s.yaml @@ -10,7 +10,6 @@ spec: port: 6443 sans: - 192.169.20.59 - tunneledNetworkingMode: false controllerManager: {} extensions: helm: diff --git a/cicd/k0s-weave/rmconfig.sh b/cicd/k0s-weave/rmconfig.sh index ade906d7a..543b655d1 100755 --- a/cicd/k0s-weave/rmconfig.sh +++ b/cicd/k0s-weave/rmconfig.sh @@ -39,6 +39,8 @@ delete_docker_host ep3 sudo ip link del esysllb1 sudo ip link del esysllb2 +./rmweave.sh + # If k3s setup exists, remove it if [[ -f "/usr/local/bin/k0s" ]]; then sudo k0s stop diff --git a/cicd/tcplb/config.sh b/cicd/tcplb/config.sh index 98ef5994c..e1201ba88 100755 --- a/cicd/tcplb/config.sh +++ b/cicd/tcplb/config.sh @@ -34,6 +34,9 @@ config_docker_host --host1 llb1 --host2 l3ep1 --ptype phy --addr 31.31.31.254/24 config_docker_host --host1 llb1 --host2 l3ep2 --ptype phy --addr 32.32.32.254/24 config_docker_host --host1 llb1 --host2 l3ep3 --ptype phy --addr 33.33.33.254/24 +$dexec llb1 ip addr add 10.10.10.3/32 dev lo + sleep 5 create_lb_rule llb1 20.20.20.1 --tcp=2020:8080 --endpoints=31.31.31.1:1,32.32.32.1:1,33.33.33.1:1 create_lb_rule llb1 10.10.10.254 --tcp=2020:8080 --endpoints=31.31.31.1:1,32.32.32.1:1,33.33.33.1:1 +create_lb_rule llb1 10.10.10.3 --tcp=2020:8080 --endpoints=31.31.31.1:1,32.32.32.1:1,33.33.33.1:1 diff --git a/cicd/tcplb/validation.sh b/cicd/tcplb/validation.sh index 8b87eaf92..e7447fb9d 100755 --- a/cicd/tcplb/validation.sh +++ b/cicd/tcplb/validation.sh @@ -7,7 +7,7 @@ $hexec l3ep3 node ../common/tcp_server.js server3 & sleep 5 code=0 -servIP=( "10.10.10.254" "20.20.20.1" ) +servIP=( "10.10.10.254" "20.20.20.1" "10.10.10.3" ) servArr=( "server1" "server2" "server3" ) ep=( "31.31.31.1" "32.32.32.1" "33.33.33.1" ) j=0 @@ -34,7 +34,7 @@ do sleep 1 done -for k in {0..1} +for k in {0..2} do echo "Testing Service IP: ${servIP[k]}" lcode=0 diff --git a/loxilb-ebpf b/loxilb-ebpf index cc86c3ad5..fe66f3a20 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit cc86c3ad574c6745be19fd89f5a02716edbfa714 +Subproject commit fe66f3a202877edd93f32b4c7b436a5bed964ae1