From f6872299e7b5db04b20e23948a13a4670a8a5139 Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Thu, 22 Aug 2024 09:40:41 -0700
Subject: [PATCH] Fix delayed ingress startup in tests (#438)

* Fix delayed ingress startup in tests

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

* Fix lint

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

---------

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
---
 .github/tests/common.sh               | 10 ++++++++++
 examples/nested-full/run-tests.sh     |  2 +-
 examples/nested-security/run-tests.sh |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/tests/common.sh b/.github/tests/common.sh
index 0566665..d833cf6 100755
--- a/.github/tests/common.sh
+++ b/.github/tests/common.sh
@@ -72,6 +72,16 @@ $(helm ls -A | sed 's/\t/ | /g' | sed 's/^/| /' | sed 's/$/ |/' | sed '/^| NAME.
 EOF
 }
 
+common_test_url () (
+count=10
+while true; do
+        if curl "$1"; then exit 0; fi
+        sleep 2
+        count=$((count-1))
+        [ $count -le 0 ] && exit 1
+done
+)
+
 # Used just for testing. You should provide your own values as described in the install instructions.
 common_test_your_values () {
 cat > /tmp/$$.example-your-values.yaml <<EOF
diff --git a/examples/nested-full/run-tests.sh b/examples/nested-full/run-tests.sh
index 6d51cbc..67049b8 100755
--- a/examples/nested-full/run-tests.sh
+++ b/examples/nested-full/run-tests.sh
@@ -61,7 +61,7 @@ helm upgrade --install ingress-nginx ingress-nginx --version "$VERSION_INGRESS_N
   --wait
 
 # Test the ingress controller. Should 404 as there is no services yet.
-curl "$IP"
+common_test_url "$IP"
 
 kubectl get configmap -n kube-system coredns -o yaml | grep hosts || kubectl get configmap -n kube-system coredns -o yaml | sed "/ready/a\        hosts {\n           fallthrough\n        }" | kubectl apply -f -
 kubectl get configmap -n kube-system coredns -o yaml | grep production.other || kubectl get configmap -n kube-system coredns -o yaml | sed "/hosts/a\           $IP oidc-discovery.production.other\n           $IP spire-server.production.other\n" | kubectl apply -f -
diff --git a/examples/nested-security/run-tests.sh b/examples/nested-security/run-tests.sh
index ba139c0..8551b03 100755
--- a/examples/nested-security/run-tests.sh
+++ b/examples/nested-security/run-tests.sh
@@ -61,7 +61,7 @@ helm upgrade --install ingress-nginx ingress-nginx --version "$VERSION_INGRESS_N
   --wait
 
 # Test the ingress controller. Should 404 as there is no services yet.
-curl "$IP"
+common_test_url "$IP"
 
 kubectl get configmap -n kube-system coredns -o yaml | grep hosts || kubectl get configmap -n kube-system coredns -o yaml | sed "/ready/a\        hosts {\n           fallthrough\n        }" | kubectl apply -f -
 kubectl get configmap -n kube-system coredns -o yaml | grep production.other || kubectl get configmap -n kube-system coredns -o yaml | sed "/hosts/a\           $IP oidc-discovery.production.other\n           $IP spire-server.production.other\n" | kubectl apply -f -