update the default filter chain name

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

Author: zhaohuabing

internal/xds/translator/listener.go

@@ -457,7 +457,6 @@ func (t *Translator) addHCMToXDSListener(
 
 	filterChain := &listenerv3.FilterChain{
 		Filters: filters,
-		Name:    httpsListenerFilterChainName(irListener),
 	}
 
 	if irListener.TLS != nil {
@@ -481,6 +480,7 @@ func (t *Translator) addHCMToXDSListener(
 			}
 		}
 		filterChain.TransportSocket = tSocket
+		filterChain.Name = httpsListenerFilterChainName(irListener)
 
 		if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil {
 			return err
@@ -490,10 +490,10 @@ func (t *Translator) addHCMToXDSListener(
 	} else {
 		// Add the HTTP filter chain as the default filter chain
 		// Make sure one does not exist
-		// TODO(zhaohuabing): this branch never gets called, clean the code
 		if xdsListener.DefaultFilterChain != nil {
 			return errors.New("default filter chain already exists")
 		}
+		filterChain.Name = httpListenerDefaultFilterChainName(irListener, t.xdsNameSchemeV2() )
 		xdsListener.DefaultFilterChain = filterChain
 	}
 
@@ -505,6 +505,16 @@ func routeConfigName(irListener *ir.HTTPListener) string {
 	return irListener.Name
 }
 
+// port value is used for the default filter chain name for HTTP listeners, as multiple HTTP listeners are merged into
+// one filter chain.
+func httpListenerDefaultFilterChainName(irListener *ir.HTTPListener, nameSchemeV2 bool) string {
+	if nameSchemeV2 {
+		return fmt.Sprint("http-", irListener.ExternalPort)
+	}
+	// For backward compatibility, we use the listener name as the filter chain name.
+	return irListener.Name
+}
+
 // irListener name is used as the filter chain name for HTTPS listener, as Listener is 1:1 mapping to the filter chain
 // The Gateway API layer ensures that each listener has a unique combination of hostname and port.
 func httpsListenerFilterChainName(irListener *ir.HTTPListener) string {

internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml

@@ -29,7 +29,7 @@
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http-10080
         useRemoteAddress: true
-    name: envoy-gateway/gateway-1/http1
+    name: http-80
   maxConnectionsToAcceptPerSocketEvent: 1
   name: tcp-80
   perConnectionBufferLimitBytes: 32768