Merge pull request #403 from TrekkieCoder/main

PR - cicd:fixed for latest k0s

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
 

cicd/k0s-weave/k0s.yaml

@@ -10,7 +10,6 @@ spec:
     port: 6443
     sans:
     - 192.169.20.59
-    tunneledNetworkingMode: false
   controllerManager: {}
   extensions:
     helm:

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

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

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