Skip to content

Commit 1f6e079

Browse files
committed
minor change
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
1 parent d33de75 commit 1f6e079

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

internal/xds/translator/listener.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -490,13 +490,6 @@ func (t *Translator) addHCMToXDSListener(
490490
return nil
491491
}
492492

493-
func routeConfigName(irListener *ir.HTTPListener, nameSchemeV2 bool) string {
494-
if irListener.TLS != nil {
495-
return httpsListenerRouteConfigName(irListener)
496-
}
497-
return httpListenerRouteConfigName(irListener, nameSchemeV2)
498-
}
499-
500493
func hcmStatPrefix(irListener *ir.HTTPListener, nameSchemeV2 bool) string {
501494
statPrefix := "http"
502495
if irListener.TLS != nil {
@@ -509,6 +502,13 @@ func hcmStatPrefix(irListener *ir.HTTPListener, nameSchemeV2 bool) string {
509502
return fmt.Sprintf("%s-%d", statPrefix, irListener.Port)
510503
}
511504

505+
func routeConfigName(irListener *ir.HTTPListener, nameSchemeV2 bool) string {
506+
if irListener.TLS != nil {
507+
return httpsListenerRouteConfigName(irListener)
508+
}
509+
return httpListenerRouteConfigName(irListener, nameSchemeV2)
510+
}
511+
512512
// port value is used for the route config name for HTTP listeners. as multiple HTTP listeners on the same port are
513513
// using the same route config.
514514
func httpListenerRouteConfigName(irListener *ir.HTTPListener, nameSchemeV2 bool) string {

test/e2e/tests/connection_limit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ var ConnectionLimitTest = suite.ConformanceTest{
8585
}
8686

8787
prefix := "http-10080"
88-
if XDSNameSchemeV2(){
88+
if XDSNameSchemeV2() {
8989
prefix = "http-80"
9090
}
9191
gtwName := "connection-limit-gateway"

0 commit comments

Comments
 (0)