Merge branch 'main' into fix-6620

Author: zhaohuabing

.github/workflows/build_and_test.yaml

@@ -102,6 +102,9 @@ jobs:
         - version: v1.33.1
           ipFamily: dual  # only run dual test on latest version to save time
           profile: gateway-namespace-mode
+        - version: v1.33.1
+          ipFamily: ipv4
+          profile: xds-name-scheme-v2
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
     - uses: ./tools/github-actions/setup-deps
@@ -149,6 +152,10 @@ jobs:
         - version: v1.33.1
           ipFamily: dual  # only run dual test on latest version to save time
           profile: gateway-namespace-mode
+        - version: v1.33.1
+          ipFamily: ipv4
+          profile: xds-name-scheme-v2
+
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
     - uses: ./tools/github-actions/setup-deps

api/v1alpha1/envoygateway_helpers.go

@@ -109,6 +109,32 @@ func (e *EnvoyGateway) GatewayNamespaceMode() bool {
 		*e.Provider.Kubernetes.Deploy.Type == KubernetesDeployModeTypeGatewayNamespace
 }
 
+// defaultRuntimeFlags are the default runtime flags for Envoy Gateway.
+var defaultRuntimeFlags = map[RuntimeFlag]bool{
+	XDSNameSchemeV2: false,
+}
+
+// IsEnabled checks if a runtime flag is enabled in the EnvoyGateway configuration.
+func (f *RuntimeFlags) IsEnabled(flag RuntimeFlag) bool {
+	if f != nil {
+		for _, disable := range f.Disabled {
+			if disable == flag {
+				return false
+			}
+		}
+		for _, enable := range f.Enabled {
+			if enable == flag {
+				return true
+			}
+		}
+	}
+
+	if defaultValue, found := defaultRuntimeFlags[flag]; found {
+		return defaultValue
+	}
+	return false
+}
+
 // DefaultLeaderElection returns a new LeaderElection with default configuration parameters.
 func DefaultLeaderElection() *LeaderElection {
 	return &LeaderElection{

api/v1alpha1/envoygateway_types.go

@@ -101,11 +101,14 @@ type EnvoyGatewaySpec struct {
 
 // RuntimeFlag defines a runtime flag used to guard breaking changes or risky experimental features in new Envoy Gateway releases.
 // A runtime flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource.
+// +enum
+// +kubebuilder:validation:Enum=XDSNameSchemeV2
 type RuntimeFlag string
 
 const (
-	// UseAddressAsListenerName indicates that the listener name should be derived from the address and port.
-	UseAddressAsListenerName RuntimeFlag = "UseAddressAsListenerName"
+	// XDSNameSchemeV2 indicates that the xds name scheme v2 is used.
+	// * The listener name will be generated using the protocol and port of the listener.
+	XDSNameSchemeV2 RuntimeFlag = "XDSNameSchemeV2"
 )
 
 // RuntimeFlags provide a mechanism to guard breaking changes or risky experimental features in new Envoy Gateway releases.

internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml

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

internal/gatewayapi/listener.go

@@ -119,11 +119,12 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 			case gwapiv1.HTTPProtocolType, gwapiv1.HTTPSProtocolType:
 				irListener := &ir.HTTPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
-						Name:     irListenerName(listener),
-						Address:  address,
-						Port:     uint32(containerPort),
-						Metadata: buildListenerMetadata(listener, gateway),
-						IPFamily: ipFamily,
+						Name:         irListenerName(listener),
+						Address:      address,
+						Port:         uint32(containerPort),
+						ExternalPort: uint32(listener.Port),
+						Metadata:     buildListenerMetadata(listener, gateway),
+						IPFamily:     ipFamily,
 					},
 					TLS: irTLSConfigs(listener.tlsSecrets...),
 					Path: ir.PathSettings{
@@ -146,10 +147,11 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 			case gwapiv1.TCPProtocolType, gwapiv1.TLSProtocolType:
 				irListener := &ir.TCPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
-						Name:     irListenerName(listener),
-						Address:  address,
-						Port:     uint32(containerPort),
-						IPFamily: ipFamily,
+						Name:         irListenerName(listener),
+						Address:      address,
+						Port:         uint32(containerPort),
+						ExternalPort: uint32(listener.Port),
+						IPFamily:     ipFamily,
 					},
 
 					// Gateway is processed firstly, then ClientTrafficPolicy, then xRoute.
@@ -162,9 +164,10 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 			case gwapiv1.UDPProtocolType:
 				irListener := &ir.UDPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
-						Name:    irListenerName(listener),
-						Address: address,
-						Port:    uint32(containerPort),
+						Name:         irListenerName(listener),
+						Address:      address,
+						Port:         uint32(containerPort),
+						ExternalPort: uint32(listener.Port),
 					},
 				}
 				xdsIR[irKey].UDP = append(xdsIR[irKey].UDP, irListener)

internal/gatewayapi/testdata/accesslog-als-backend.out.yaml

@@ -215,6 +215,7 @@ xdsIR:
           protocol: TCP
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml

@@ -117,6 +117,7 @@ xdsIR:
           protocol: TCP
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/gatewayapi/testdata/accesslog.out.yaml

@@ -141,6 +141,7 @@ xdsIR:
           protocol: TCP
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml

@@ -173,6 +173,7 @@ xdsIR:
           protocol: TCP
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false

internal/gatewayapi/testdata/backend-tls-settings.out.yaml

@@ -557,6 +557,7 @@ xdsIR:
           protocol: TCP
     http:
     - address: 0.0.0.0
+      externalPort: 80
       hostnames:
       - '*'
       isHTTP2: false