Use LB for kourier again

ReToCode · May 8, 2024 · ad17f06 · ad17f06
1 parent 42b9e4e
commit ad17f06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh
@@ -133,19 +133,22 @@ function install_serverless(){
   export DOCKER_REPO_OVERRIDE=image-registry.openshift-image-registry.svc:5000/openshift-marketplace
   OPENSHIFT_CI="true" make generated-files images install-serving || return $?
 
+ # Ensure tests trust the OpenShift router CA
+  trust_router_ca || return $?
+
   popd
 }
 
 function install_knative(){
   install_serverless || return $?
 
   # To enable gRPC and HTTP2 tests without OCP Route.
-#  oc patch knativeserving knative-serving \
-#      -n "${SERVING_NAMESPACE}" \
-#      --type merge --patch '{"spec": {"ingress": {"kourier": {"service-type": "LoadBalancer"}}}}'
-#
-#  wait_until_service_has_external_ip $SERVING_INGRESS_NAMESPACE kourier || fail_test "Ingress has no external IP"
-#  wait_until_hostname_resolves "$(kubectl get svc -n $SERVING_INGRESS_NAMESPACE kourier -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
+  oc patch knativeserving knative-serving \
+      -n "${SERVING_NAMESPACE}" \
+      --type merge --patch '{"spec": {"ingress": {"kourier": {"service-type": "LoadBalancer"}}}}'
+
+  wait_until_service_has_external_ip $SERVING_INGRESS_NAMESPACE kourier || fail_test "Ingress has no external IP"
+  wait_until_hostname_resolves "$(kubectl get svc -n $SERVING_INGRESS_NAMESPACE kourier -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
 
   if [[ ${ENABLE_TLS:-} == "true" ]]; then
     configure_cm network system-internal-tls:enabled || fail_test

diff --git a/openshift/e2e-tests.sh b/openshift/e2e-tests.sh
@@ -3,8 +3,6 @@
 # shellcheck disable=SC1090
 source "$(dirname "$0")/e2e-common.sh"
 
-set -x
-
 env
 
 failed=0
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ @@
     # shellcheck disable=SC1090
     source "$(dirname "$0")/e2e-common.sh"
-    set -x
     env
     failed=0
@@ Expand Down @@