From 548dae5f6e67d800e86e5471a4dfdc05d236668f Mon Sep 17 00:00:00 2001 From: TrekkieCoder <111065900+TrekkieCoder@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:19:35 +0900 Subject: [PATCH 1/3] Update validation.sh --- cicd/k3s-flannel/validation.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cicd/k3s-flannel/validation.sh b/cicd/k3s-flannel/validation.sh index 4d7f49445..c5f02b751 100755 --- a/cicd/k3s-flannel/validation.sh +++ b/cicd/k3s-flannel/validation.sh @@ -55,6 +55,9 @@ print_debug_info() { echo "**** r1 route-info ****" $dexec r1 ip route + + echo "**** sys route-info ****" + ip route } code=0 From abf4b2c4bbbb5e5b8a6df8d95c72c9385fb1c4ab Mon Sep 17 00:00:00 2001 From: TrekkieCoder <111065900+TrekkieCoder@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:35:49 +0900 Subject: [PATCH 2/3] Update validation.sh --- cicd/k3s-flannel/validation.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cicd/k3s-flannel/validation.sh b/cicd/k3s-flannel/validation.sh index c5f02b751..3b800ce20 100755 --- a/cicd/k3s-flannel/validation.sh +++ b/cicd/k3s-flannel/validation.sh @@ -28,7 +28,7 @@ do done ## Any routing updates ?? -sleep 30 +sleep 60 echo "ExternalIP $extIP" @@ -45,6 +45,8 @@ print_debug_info() { $dexec llb1 loxicmd get ep -o wide echo "**** llb1 route-info ****" $dexec llb1 ip route + echo "**** llb1 bfd-info ****" + $dexec llb1 loxicmd get ha echo "**** llb2 lb-info ****" $dexec llb2 loxicmd get lb -o wide @@ -52,6 +54,8 @@ print_debug_info() { $dexec llb1 loxicmd get ep -o wide echo "**** llb2 route-info ****" $dexec llb2 ip route + echo "**** llb2 bfd-info ****" + $dexec llb2 loxicmd get ha echo "**** r1 route-info ****" $dexec r1 ip route @@ -61,7 +65,9 @@ print_debug_info() { } code=0 -#print_debug_info +echo "********************" +print_debug_info +echo "********************" out=$($hexec user curl -s --connect-timeout 10 http://$extIP:55002) if [[ ${out} == *"Welcome to nginx"* ]]; then From d83d7740f9946bf6541e5dbb78aefbf112a9dae9 Mon Sep 17 00:00:00 2001 From: TrekkieCoder <111065900+TrekkieCoder@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:49:29 +0900 Subject: [PATCH 3/3] Update common.sh --- cicd/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cicd/common.sh b/cicd/common.sh index 47923f1ca..974d57bce 100644 --- a/cicd/common.sh +++ b/cicd/common.sh @@ -156,7 +156,7 @@ get_llb_peerIP() { llb2IP="$A.$B.$C.$((D+1))" fi cluster_opts=" --cluster=$llb2IP --self=0" - ka_opts=" --ka=$llb2IP" + ka_opts=" --ka=$llb2IP:$llb1IP" elif [[ "$1" == "llb2" ]]; then llb2IP=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' llb2) if [[ "lb$llb2IP" == "lb" ]];then @@ -166,7 +166,7 @@ get_llb_peerIP() { llb1IP="$A.$B.$C.$((D-1))" fi cluster_opts=" --cluster=$llb1IP --self=1" - ka_opts=" --ka=$llb1IP" + ka_opts=" --ka=$llb1IP:$llb2IP" fi }