Merge pull request #392 from TrekkieCoder/main

PR - chore: changed extIP extraction logic in cicd
loxilb-io · Sep 13, 2023 · 9148610 · 9148610
2 parents 34fd714 + b59e0bc
commit 9148610
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/cicd/k0s-weave/validation.sh b/cicd/k0s-weave/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k3s-calico-dual-stack/validation.sh b/cicd/k3s-calico-dual-stack/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k3s-calico/validation.sh b/cicd/k3s-calico/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k3s-cilium/validation.sh b/cicd/k3s-cilium/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k3s-flannel/validation.sh b/cicd/k3s-flannel/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k3s-sctpmh-2/validation.sh b/cicd/k3s-sctpmh-2/validation.sh
@@ -22,7 +22,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     port=${strarr[4]}
     break
   fi
@@ -64,7 +64,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     port=${strarr[4]}
     break
   fi

diff --git a/cicd/k3s-sctpmh/validation.sh b/cicd/k3s-sctpmh/validation.sh
@@ -22,7 +22,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     port=${strarr[4]}
     break
   fi
@@ -64,7 +64,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     port=${strarr[4]}
     break
   fi

diff --git a/cicd/k8s-calico-incluster/validation.sh b/cicd/k8s-calico-incluster/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k8s-calico-ipvs/validation.sh b/cicd/k8s-calico-ipvs/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k8s-calico-ubuntu22/validation.sh b/cicd/k8s-calico-ubuntu22/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"

diff --git a/cicd/k8s-calico/validation.sh b/cicd/k8s-calico/validation.sh
@@ -20,7 +20,7 @@ do
     continue
   fi 
   if [[ ${strarr[3]} != *"none"* ]]; then
-    extIP=${strarr[3]}
+    extIP="$(cut -d'-' -f2 <<<${strarr[3]})"
     break
   fi
   echo "No external LB allocated"