Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cicd : Fixes to accomodate working with bfd #543

Merged
merged 4 commits into from
Feb 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cicd/common.sh
Original file line number Diff line number Diff line change
@@ -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
}

13 changes: 11 additions & 2 deletions cicd/k3s-flannel/validation.sh
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ do
done

## Any routing updates ??
sleep 30
sleep 60

echo "ExternalIP $extIP"

@@ -45,20 +45,29 @@ 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
echo "**** loxilb ep-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

echo "**** sys route-info ****"
ip route
}

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