Add time limit to example test curl (#424)

Also refactor so both tests actually have to pass not just the second
one and fix gateway nodeport example

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>

examples/gateway/gateway-nodeport.yaml

@@ -9,7 +9,7 @@ metadata:
   name: contour-gateway-sample
   namespace: contour-operator
 spec:
-  gatewayClassRef: sample-gatewayclass
+  gatewayControllerName: projectcontour.io/sample-controller
   networkPublishing:
     envoy:
       type: NodePortService
@@ -25,13 +25,7 @@ apiVersion: networking.x-k8s.io/v1alpha1
 metadata:
   name: sample-gatewayclass
 spec:
-  controller: projectcontour.io/contour-operator
-  parametersRef:
-    group: operator.projectcontour.io
-    kind: Contour
-    scope: Namespace
-    name: contour-gateway-sample
-    namespace: contour-operator
+  controller: projectcontour.io/sample-controller
 ---
 kind: Gateway
 apiVersion: networking.x-k8s.io/v1alpha1

hack/test-example.sh

@@ -27,7 +27,7 @@ waitForHttpResponse() {
     while [ $attempts -le $retries ]
     do
       echo "Sending http request to $url (attempt #$attempts)"
-      resp=$(curl -w %"{http_code}" -s -o /dev/null "$url")
+      resp=$(curl --max-time 5 -w %"{http_code}" -s -o /dev/null "$url")
       if [ "$resp" = "200" ] ; then
         echo "Received http response from $url"
         RESP=true
@@ -47,6 +47,14 @@ waitForHttpResponse http://local.projectcontour.io 1 100
 kubectl::delete -f https://projectcontour.io/examples/kuard.yaml
 kubectl::delete -f examples/contour/contour-nodeport.yaml
 
+if [ "${RESP}" == "false" ]; then
+  echo "basic ingress test failed"
+  exit 1
+fi
+
+# Reset.
+RESP=false
+
 # Test Gateway
 kubectl::apply -f examples/gateway/gateway-nodeport.yaml
 kubectl::apply -f examples/gateway/kuard/kuard.yaml
@@ -61,10 +69,10 @@ kubectl::delete gatewayclasses --all-namespaces --all
 kubectl::delete -f examples/gateway/gateway-nodeport.yaml
 kubectl::delete -f examples/operator/operator.yaml
 
-if ${RESP} == false ; then
-  echo "examples test passed"
-  exit 0
-else
-  echo "examples test failed"
+if [ "${RESP}" == "false" ]; then
+  echo "gateway test failed"
   exit 1
 fi
+
+echo "all tests passed"
+exit 0