From 32dc5c3217fce6d86610bad64711cd09c4931a29 Mon Sep 17 00:00:00 2001
From: Reto Lehmann <retocode@icloud.com>
Date: Mon, 15 Jul 2024 07:42:14 +0200
Subject: [PATCH] Update TLS test matrix for istio and contour

---
 .github/workflows/kind-e2e.yaml |  6 ++++++
 test/e2e-common.sh              | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
index 693c33142c91..f51d27ccf8f0 100644
--- a/.github/workflows/kind-e2e.yaml
+++ b/.github/workflows/kind-e2e.yaml
@@ -93,6 +93,7 @@ jobs:
         # Disabled due to flakiness: https://github.com/knative/serving/issues/14637
         # - istio-ambient
         - contour
+        - contour-tls
         - gateway_istio
         - gateway_contour
 
@@ -116,6 +117,11 @@ jobs:
         - ingress: contour
           namespace-resources: httpproxy
 
+        - ingress: contour-tls
+          ingress-class: contour
+          namespace-resources: httpproxy
+          enable-tls: 1
+
         - ingress: istio
           namespace-resources: virtualservices
 
diff --git a/test/e2e-common.sh b/test/e2e-common.sh
index b4fbdeb91cae..bdd662a295c7 100644
--- a/test/e2e-common.sh
+++ b/test/e2e-common.sh
@@ -389,10 +389,12 @@ function install() {
   fi
 
   if (( ENABLE_TLS )); then
-    echo "Patch config-network to enable encryption features"
-    toggle_feature system-internal-tls enabled config-network
-
-    if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]] || [[ "$INGRESS_CLASS" == "istio.ingress.networking.knative.dev" ]]; then
+	  if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]] || [[ "$INGRESS_CLASS" == "contour.ingress.networking.knative.dev" ]]; then
+      echo "Patch config-network to enable system-internal-tls feature (kourier/contour)"
+      toggle_feature system-internal-tls enabled config-network
+    fi
+    if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]] || [[ "$INGRESS_CLASS" == "istio.ingress.networking.knative.dev" ]] || [[ "$INGRESS_CLASS" == "contour.ingress.networking.knative.dev" ]]; then
+      echo "Patch config-network to enable cluster-local-domain-tls feature (kourier/istio/contour)"
       toggle_feature cluster-local-domain-tls enabled config-network
     fi