remove use of istioctl x wait (#16515)

* fix(tests): remove use of deprecated 'istioctl experimental wait'

* Update tests/util/helpers.sh

Co-authored-by: Daniel Hawton <[email protected]>

* feat: log duration when _wait_for_istio times out

* fix: lint target

* Update test not to look for resources that are not created

* modify wait_for _istio to wait_for_resource

* Revert "modify wait_for _istio to wait_for_resource"

This reverts commit c10ec0c.

* check the tests

* fix function name

* fix function name

* change function name _wait_for_istio to _wait_for_resource

* revert: fucntion name to _wait_for_istio

* renamed fucntion name in archive

* renamed fucntion name in tests dir

* modified helpers.sh

* fix: lint target

* add a sleep of 2s

* refractor: sleep for 2s

* wait for all the pods to be ready

* refractor: sleep for 2s

* modified helpers.sh

* change exit to return

* refarctor: not returning 1

Signed-off-by: Aritra Dey <[email protected]>

* fix: returning 1

Signed-off-by: Aritra Dey <[email protected]>

* revert: duration log

Signed-off-by: Aritra Dey <[email protected]>

* fix: lint target

Signed-off-by: Aritra Dey <[email protected]>

---------

Signed-off-by: Aritra Dey <[email protected]>
Co-authored-by: Daniel Hawton <[email protected]>
Co-authored-by: Craig Box <[email protected]>

Author: 3 people

content/en/docs/tasks/traffic-management/request-timeouts/test.sh

@@ -43,10 +43,8 @@ else
     snip_request_timeouts_3
 
     # wait for rules to propagate
-    _wait_for_istio virtualservice default productpage
     _wait_for_istio virtualservice default reviews
     _wait_for_istio virtualservice default ratings
-    _wait_for_istio virtualservice default details
 fi
 
 get_productpage() {

tests/util/helpers.sh

@@ -105,22 +105,20 @@ _wait_for_statefulset() {
     fi
 }
 
-# Wait for Istio config to propagate
+# Wait for resource to be created
 # usage: _wait_for_istio <kind> <namespace> <name>
 _wait_for_istio() {
-    #local kind="$1"
-    #local namespace="$2"
-    #local name="$3"
-    local start=$(date +%s)
-    sleep 1s
-    # @TODO: Rewrite this to *NOT* use istioctl experimental wait, since it was removed
-    # https://github.com/istio/istio.io/issues/16429
-    #if ! istioctl experimental wait --for=distribution --timeout=10s "$kind" "$name.$namespace"; then
-        #echo "Failed distribution of $kind $name in namespace $namespace"
-        #istioctl ps
-        #echo "TEST: wait for failed, but continuing."
-    #fi
-    echo "Duration: $(($(date +%s)-start)) seconds"
+    local kind="$1"
+    local namespace="$2"
+    local name="$3"
+    local start_time=$(date +%s)
+    if ! kubectl wait --for=create -n "$namespace" "$kind/$name" --timeout 30s; then
+        local end_time=$(date +%s)
+        echo "Timed out waiting for $kind $name in namespace $namespace to be created."
+        echo "Duration: $(( end_time - start_time )) seconds"
+        return 1
+    fi
+    sleep 2s
 }
 
 # Wait for named Gateway API gateway to be ready