fix gen

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

Author: zhaohuabing

internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml

@@ -238,6 +238,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml

@@ -206,6 +206,7 @@ xdsIR:
       - path: /dev/stdout
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/xds/translator/listener.go

@@ -482,8 +482,7 @@ func (t *Translator) addHCMToXDSListener(
 		}
 		filterChain.TransportSocket = tSocket
 
-		err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames)
-		if err != nil {
+		if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil {
 			return err
 		}
 
@@ -705,12 +704,7 @@ func (t *Translator) addXdsTCPFilterChain(
 	}
 
 	if isTLSPassthrough {
-		err := addServerNamesMatch(
-			xdsListener,
-			filterChain,
-			irRoute.TLS.TLSInspectorConfig.SNIs,
-		)
-		if err != nil {
+		if err := addServerNamesMatch(xdsListener, filterChain, irRoute.TLS.TLSInspectorConfig.SNIs); err != nil {
 			return err
 		}
 	}
@@ -720,12 +714,7 @@ func (t *Translator) addXdsTCPFilterChain(
 		if cfg := irRoute.TLS.TLSInspectorConfig; cfg != nil {
 			snis = cfg.SNIs
 		}
-		err := addServerNamesMatch(
-			xdsListener,
-			filterChain,
-			snis,
-		)
-		if err != nil {
+		if err := addServerNamesMatch(xdsListener, filterChain, snis); err != nil {
 			return err
 		}
 		tSocket, err := buildXdsDownstreamTLSSocket(irRoute.TLS.Terminate)

internal/xds/translator/translator.go

@@ -489,13 +489,6 @@ func (t *Translator) addRouteToRouteConfig(
 		err               error
 	)
 
-	// If the virtual host already exists, we can skip it.
-	for _, vHost := range xdsRouteCfg.VirtualHosts {
-		if vHost.Name == virtualHostName(httpListener, vHost.Domains[0]) {
-			vHosts[vHost.Domains[0]] = vHost
-		}
-	}
-
 	// Check if an extension is loaded that wants to modify xDS Routes after they have been generated
 	for _, httpRoute := range httpListener.Routes {
 		// 1:1 between IR HTTPRoute Hostname and xDS VirtualHost.
@@ -793,8 +786,13 @@ func (t *Translator) processTCPListenerXdsTranslation(
 				}
 			}
 			if err := t.addXdsTCPFilterChain(
-				xdsListener, route, route.Destination.Name, accesslog,
-				tcpListener.Timeout, tcpListener.Connection); err != nil {
+				xdsListener,
+				route,
+				route.Destination.Name,
+				accesslog,
+				tcpListener.Timeout,
+				tcpListener.Connection,
+			); err != nil {
 				errs = errors.Join(errs, err)
 			}
 		}
@@ -815,8 +813,13 @@ func (t *Translator) processTCPListenerXdsTranslation(
 				},
 			}
 			if err := t.addXdsTCPFilterChain(
-				xdsListener, emptyRoute, emptyClusterName, accesslog,
-				tcpListener.Timeout, tcpListener.Connection); err != nil {
+				xdsListener,
+				emptyRoute,
+				emptyClusterName,
+				accesslog,
+				tcpListener.Timeout,
+				tcpListener.Connection,
+			); err != nil {
 				errs = errors.Join(errs, err)
 			}
 		}

test/e2e/tests/utils.go

@@ -736,7 +736,7 @@ func IsGatewayNamespaceMode() bool {
 
 // TODO(zhaohuabing) remove this after the feature flag is removed.
 func XDSNameSchemeV2() bool {
-	return DeployProfile == "pxds-name-scheme-v2"
+	return DeployProfile == "xds-name-scheme-v2"
 }
 
 func GetGatewayResourceNamespace() string {