Skip to content

Commit 54c9c7d

Browse files
committed
ignore wildcard sni
1 parent 4a6589b commit 54c9c7d

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

internal/controlplane/translator/gateway.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ func (t *Translator) translateSecret(tctx *TranslateContext, listener gatewayv1.
4545
}
4646
sslObj := &v1.Ssl{}
4747
sslObj.Snis = []string{}
48-
if listener.Hostname != nil && *listener.Hostname != "" {
48+
// Dashboard doesn't allow wildcard hostname
49+
if listener.Hostname != nil && *listener.Hostname != "" && *listener.Hostname != "*" {
4950
sslObj.Snis = append(sslObj.Snis, string(*listener.Hostname))
5051
}
5152
name := listener.TLS.CertificateRefs[0].Name

test/conformance/conformance_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ import (
1818
"sigs.k8s.io/yaml"
1919
)
2020

21-
var skippedTestsForSSL = []string{
22-
// Reason: https://github.com/kubernetes-sigs/gateway-api/blob/5c5fc388829d24e8071071b01e8313ada8f15d9f/conformance/utils/suite/suite.go#L358. SAN includes '*'
23-
tests.HTTPRouteHTTPSListener.ShortName,
24-
tests.HTTPRouteRedirectPortAndScheme.ShortName,
25-
}
2621
var skippedTestsForTraditionalRoutes = []string{
2722
// TODO: Support ReferenceGrant resource
2823
tests.HTTPRouteInvalidReferenceGrant.ShortName,
@@ -73,8 +68,7 @@ func TestGatewayAPIConformance(t *testing.T) {
7368
opts.CleanupBaseResources = true
7469
opts.GatewayClassName = gatewayClassName
7570
opts.SupportedFeatures = sets.New(gatewaySupportedFeatures...)
76-
opts.SkipTests = skippedTestsForSSL
77-
opts.SkipTests = append(opts.SkipTests, skippedTestsForTraditionalRoutes...)
71+
opts.SkipTests = skippedTestsForTraditionalRoutes
7872
opts.Implementation = conformancev1.Implementation{
7973
Organization: "API7",
8074
Project: "api7-ingress-controller",

0 commit comments

Comments
 (0)