Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable cluster local TLS tests for Contour #15378

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Enable cluster local TLS tests for Contour #15378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a0439c
enable cluster local tls tests for contour
dprotaso Jul 8, 2024
151b64d
include more tests for contour
dprotaso Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused, should not we remove skipping for contour?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check is inverted, so only run for kourier and now contour.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually the second clause isn't inverted

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I missed that. Maybe use brackets around it then to make it more obvious?

}

t.Parallel()
Expand Down Expand Up @@ -96,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()
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/systeminternaltls/system_internal_tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
}

Expand Down Expand Up @@ -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()
Expand Down
Loading