From 9a0439c24fdab8f42d42be25f95d6e3941f77867 Mon Sep 17 00:00:00 2001 From: dprotaso Date: Mon, 8 Jul 2024 11:55:28 -0400 Subject: [PATCH 1/2] enable cluster local tls tests for contour --- .../clusterlocaldomaintls/cluster_local_domain_tls_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go b/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go index 7390e3a527bc..8dd852d73976 100644 --- a/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go +++ b/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go @@ -46,8 +46,9 @@ func TestClusterLocalDomainTLSClusterLocalVisibility(t *testing.T) { t.Skip("Alpha features not enabled") } - if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) { - t.Skip("Skip this test for non-kourier ingress.") + if !strings.Contains(test.ServingFlags.IngressClass, "kourier") || + strings.Contains(test.ServingFlags.IngressClass, "contour") { + t.Skip("Skip this test for non-kourier/contour ingress.") } t.Parallel() From 151b64dc7c2508e6c4ea81ff03a7fb1fef589683 Mon Sep 17 00:00:00 2001 From: dprotaso Date: Thu, 11 Jul 2024 10:17:39 -0400 Subject: [PATCH 2/2] include more tests for contour --- .../cluster_local_domain_tls_test.go | 9 +++++---- test/e2e/systeminternaltls/system_internal_tls_test.go | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go b/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go index 8dd852d73976..589e57d1439b 100644 --- a/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go +++ b/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go @@ -46,8 +46,8 @@ func TestClusterLocalDomainTLSClusterLocalVisibility(t *testing.T) { t.Skip("Alpha features not enabled") } - if !strings.Contains(test.ServingFlags.IngressClass, "kourier") || - strings.Contains(test.ServingFlags.IngressClass, "contour") { + if !strings.Contains(test.ServingFlags.IngressClass, "kourier") && + !strings.Contains(test.ServingFlags.IngressClass, "contour") { t.Skip("Skip this test for non-kourier/contour ingress.") } @@ -97,8 +97,9 @@ func TestClusterLocalDomainTLSClusterExternalVisibility(t *testing.T) { t.Skip("Alpha features not enabled") } - if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) { - t.Skip("Skip this test for non-kourier ingress.") + if !strings.Contains(test.ServingFlags.IngressClass, "kourier") && + !strings.Contains(test.ServingFlags.IngressClass, "contour") { + t.Skip("Skip this test for non-kourier/contour ingress.") } t.Parallel() diff --git a/test/e2e/systeminternaltls/system_internal_tls_test.go b/test/e2e/systeminternaltls/system_internal_tls_test.go index 74e8e1413e96..6251b46a3099 100644 --- a/test/e2e/systeminternaltls/system_internal_tls_test.go +++ b/test/e2e/systeminternaltls/system_internal_tls_test.go @@ -51,9 +51,8 @@ func TestSystemInternalTLS(t *testing.T) { t.Skip("Alpha features not enabled") } - if !strings.Contains(test.ServingFlags.IngressClass, "kourier") || - strings.Contains(test.ServingFlags.IngressClass, "contour") { - + if !strings.Contains(test.ServingFlags.IngressClass, "kourier") && + !strings.Contains(test.ServingFlags.IngressClass, "contour") { t.Skip("Skip this test for non-kourier/contour ingress.") } @@ -118,8 +117,9 @@ func TestTLSCertificateRotation(t *testing.T) { t.Skip("Alpha features not enabled") } - if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) { - t.Skip("Skip this test for non-kourier ingress.") + if !strings.Contains(test.ServingFlags.IngressClass, "kourier") && + !strings.Contains(test.ServingFlags.IngressClass, "contour") { + t.Skip("Skip this test for non-kourier/contour ingress.") } t.Parallel()