diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 6c9debaca5..91608ba0eb 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.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 diff --git a/api/v1alpha1/envoygateway_helpers.go b/api/v1alpha1/envoygateway_helpers.go index 22a7fcd34c..05a58fcbdc 100644 --- a/api/v1alpha1/envoygateway_helpers.go +++ b/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{ diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index 586b4f49bd..86a6c1f4ea 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/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. diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml index b409e6e2a5..e39a439644 100644 --- a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml +++ b/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 diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go index 3aa0e4bb02..8f58f6129a 100644 --- a/internal/gatewayapi/listener.go +++ b/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) diff --git a/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml b/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml index 04e06e713c..0ecd9d6029 100644 --- a/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml +++ b/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 diff --git a/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml b/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml index b7063e6e25..1a7e328505 100644 --- a/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml +++ b/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 diff --git a/internal/gatewayapi/testdata/accesslog.out.yaml b/internal/gatewayapi/testdata/accesslog.out.yaml index deaa222a10..7086dbcc70 100644 --- a/internal/gatewayapi/testdata/accesslog.out.yaml +++ b/internal/gatewayapi/testdata/accesslog.out.yaml @@ -141,6 +141,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml index c91030a774..47a0a4e61c 100644 --- a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml +++ b/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 diff --git a/internal/gatewayapi/testdata/backend-tls-settings.out.yaml b/internal/gatewayapi/testdata/backend-tls-settings.out.yaml index a839c92635..0c7ac9109d 100644 --- a/internal/gatewayapi/testdata/backend-tls-settings.out.yaml +++ b/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 diff --git a/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml b/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml index e4de0e8f3e..8893fc9414 100644 --- a/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml @@ -159,6 +159,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml index 9a5c7c9f49..f38eaff95b 100644 --- a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml @@ -158,6 +158,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backend-with-hostname.out.yaml b/internal/gatewayapi/testdata/backend-with-hostname.out.yaml index 9514e78736..aaaa568205 100644 --- a/internal/gatewayapi/testdata/backend-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-hostname.out.yaml @@ -160,6 +160,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml b/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml index a0737ab1ff..00454fb20a 100644 --- a/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml @@ -174,6 +174,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml index 17fdda5944..471760166e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml @@ -142,6 +142,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml index 48b6c5860b..58ab4b4208 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml index f9139d93ab..8404a92185 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml index 9f2620201f..1b6ccf8df7 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml index 79fe51e017..3b9eed9e45 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml @@ -285,6 +285,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -363,6 +364,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 81 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml index 738f180a04..4fcd9f059e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -247,6 +247,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml index d83a389deb..b41f343a02 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -153,6 +153,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml index 1ae9530623..8c3a88d23e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml @@ -194,6 +194,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml index d313cec693..130463c247 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml @@ -160,6 +160,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml index 5a55ecfa42..609b9c584e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml @@ -2107,6 +2107,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2158,6 +2159,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2209,6 +2211,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2260,6 +2263,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2311,6 +2315,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2362,6 +2367,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2413,6 +2419,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2464,6 +2471,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2515,6 +2523,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2566,6 +2575,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2617,6 +2627,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2668,6 +2679,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2719,6 +2731,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2770,6 +2783,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2821,6 +2835,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2872,6 +2887,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2923,6 +2939,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2984,6 +3001,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml index ad66981be6..123cf0bf99 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml @@ -157,6 +157,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml index 132f005d08..e5f0348959 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml index c8de0cb343..e7f8e96baa 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml @@ -258,6 +258,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -325,6 +326,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml index 447845165c..4ad2da3c5d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml @@ -258,6 +258,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -325,6 +326,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml index d56807bb20..d6ee45c7a2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml @@ -262,6 +262,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -329,6 +330,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml index 77b67d7681..21f666e1f2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml @@ -150,6 +150,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml index 1e9e1edc8e..3b00a99fac 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml index 62e2b12613..06ad4c9258 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml @@ -151,6 +151,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml index 42c44474ed..8adcc332bc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml @@ -395,6 +395,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml index 12ff441030..daa6c9ddcb 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml index ba9350e02f..7ba9951af1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml @@ -150,6 +150,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml index 5130ffcfd6..468f24e2d1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -292,6 +292,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml index 199f468470..83e01a8065 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml @@ -258,6 +258,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -325,6 +326,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml index 2d6e896f46..135a8fa715 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml @@ -2411,6 +2411,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2464,6 +2465,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2517,6 +2519,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2570,6 +2573,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2623,6 +2627,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2676,6 +2681,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2729,6 +2735,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2782,6 +2789,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2835,6 +2843,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2888,6 +2897,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2941,6 +2951,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2994,6 +3005,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3047,6 +3059,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3100,6 +3113,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3153,6 +3167,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3206,6 +3221,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3259,6 +3275,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3322,6 +3339,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml index 429e0c7cf4..11cc134921 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -544,6 +544,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -568,6 +569,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -624,6 +626,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -676,5 +679,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 53 name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml index 1689b412cf..9cd4988698 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml @@ -338,6 +338,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -406,6 +407,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml index 1ed0f611c8..b3453c8bbf 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml @@ -313,6 +313,7 @@ xdsIR: privateKey: '[redacted]' http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -414,6 +415,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml index ff412d3a3c..8238251910 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml @@ -306,6 +306,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -404,6 +405,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml index 36240e2a8e..21c8270e59 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml @@ -308,6 +308,7 @@ xdsIR: privateKey: '[redacted]' http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -408,6 +409,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml index f70ca2003e..5366ad43f4 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml @@ -308,6 +308,7 @@ xdsIR: privateKey: '[redacted]' http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -412,6 +413,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml index 8d5f570f15..6578e2586e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml @@ -282,6 +282,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -358,6 +359,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml index 817838269e..86d4cf0d61 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml @@ -274,6 +274,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml index c59342e481..39c73307de 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml @@ -167,6 +167,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml index 6db5ed08cf..fe1a0af6d6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml @@ -147,6 +147,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml index 14f031be6e..da08573d4a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml @@ -320,6 +320,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -382,6 +383,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml index 8d21c83d2a..cea3b095b7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml @@ -262,6 +262,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -329,6 +330,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml index e2e2a171fa..ae295caa9c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml @@ -327,6 +327,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -395,6 +396,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml index 16a209d852..20cf9e2af0 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml @@ -761,6 +761,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -912,6 +913,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml index 9580a9c1f1..8e66a0396f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml @@ -260,6 +260,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -326,6 +327,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml index 240209a51b..3ae8ae2426 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml @@ -228,6 +228,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml index f97d3423c5..19ef0dccfc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml @@ -221,6 +221,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index 59e6193ace..787e1b9a97 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -430,6 +430,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -493,6 +494,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml index 51985e551c..c1f6599862 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml @@ -170,6 +170,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml index e2c43571ba..ae2b6cc79f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml @@ -170,6 +170,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml index e9057d3605..c2072dbee6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml @@ -174,6 +174,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml index d5f64cae18..3ee5a0f1cf 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml @@ -177,6 +177,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml index b69e6c9b98..3f2293041d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -173,6 +173,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml index 4102da9e9c..26be5cf95c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml @@ -324,6 +324,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -391,6 +392,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml index d3e8a574dc..18cc73871b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml @@ -254,6 +254,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -317,6 +318,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml index 27aea05116..23f3397225 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml @@ -155,6 +155,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml index b752575c9e..53b0e6aa98 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index a97860a09f..17e9601274 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -291,6 +291,7 @@ xdsIR: privateKey: '[redacted]' http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -373,6 +374,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml index f491d32038..242058fd87 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml @@ -303,6 +303,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -365,6 +366,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml index 69231e32ef..ad5734831e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml @@ -450,6 +450,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -534,6 +535,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml index 9f56acd74c..9457c5e4d8 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml @@ -413,6 +413,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -484,6 +485,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml index 537ab8a411..8eb0257676 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -189,6 +189,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml index b088b3eeb3..f813d89caa 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml @@ -292,6 +292,7 @@ xdsIR: privateKey: '[redacted]' http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -375,6 +376,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml index b41ee8f1e7..a02130e69a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml @@ -258,6 +258,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8089 name: default/tcp-gateway/bar port: 8089 routes: @@ -326,6 +327,7 @@ xdsIR: connectTimeout: 15s udp: - address: 0.0.0.0 + externalPort: 8162 name: default/tcp-gateway/foo port: 8162 route: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml index a1ad3d96e8..68bc27202b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml @@ -331,6 +331,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8089 name: default/tcp-gateway/bar port: 8089 routes: @@ -399,6 +400,7 @@ xdsIR: connectTimeout: 15s udp: - address: 0.0.0.0 + externalPort: 8162 name: default/tcp-gateway/foo port: 8162 route: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml index f2deddd73f..b45309e609 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml @@ -258,6 +258,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -323,6 +324,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml index 9ccb81f167..87ba504410 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -147,6 +147,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml index 682824b7ab..3ff589f8e8 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml @@ -246,6 +246,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -314,6 +315,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml index 7d775e657b..15085fbce5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml @@ -266,6 +266,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -334,6 +335,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml index d8d0000020..269375b667 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml @@ -179,6 +179,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -194,6 +195,7 @@ xdsIR: port: 10080 - address: 0.0.0.0 connection: {} + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml index 2a7b24274b..376eb737f0 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml @@ -180,6 +180,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -195,6 +196,7 @@ xdsIR: port: 10080 - address: 0.0.0.0 connection: {} + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml index 7fd68db9c4..5a597af703 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml @@ -186,6 +186,7 @@ xdsIR: - address: 0.0.0.0 connection: bufferLimit: 50000000 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -201,6 +202,7 @@ xdsIR: port: 10080 - address: 0.0.0.0 connection: {} + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml index 3911d3617f..a939040110 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml @@ -285,6 +285,7 @@ xdsIR: clientIPDetection: xForwardedFor: numTrustedHops: 2 + externalPort: 8081 hostnames: - '*' isHTTP2: false @@ -303,6 +304,7 @@ xdsIR: customHeader: failClosed: false name: x-client-ip-address + externalPort: 8082 hostnames: - '*' isHTTP2: false @@ -321,6 +323,7 @@ xdsIR: customHeader: failClosed: true name: x-client-ip-address + externalPort: 8083 hostnames: - '*' isHTTP2: false @@ -335,6 +338,7 @@ xdsIR: mergeSlashes: true port: 8083 - address: 0.0.0.0 + externalPort: 8084 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml index c0a5972eac..11d7370652 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml @@ -181,6 +181,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -195,6 +196,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml index 51dcd3dae7..e273f70e9a 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml @@ -185,6 +185,7 @@ xdsIR: limit: closeDelay: 10s value: 3 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -200,6 +201,7 @@ xdsIR: port: 10080 - address: 0.0.0.0 connection: {} + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml index 2961b2e160..1d31a97bc7 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml @@ -215,6 +215,7 @@ xdsIR: limit: closeDelay: 10s value: 3 + externalPort: 443 name: envoy-gateway/gateway-1/tls-1 port: 10443 proxyProtocol: {} @@ -286,6 +287,7 @@ xdsIR: limit: closeDelay: 10s value: 3 + externalPort: 8080 name: envoy-gateway/gateway-1/tcp-1 port: 8080 proxyProtocol: {} diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml index 5f743d04f3..f11ce4f86d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml @@ -137,6 +137,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 headers: enableEnvoyHeaders: true requestID: Preserve diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml index e6471efccc..003b2ebdf3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml @@ -161,6 +161,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 headers: earlyAddRequestHeaders: - append: true @@ -190,6 +191,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 headers: earlyAddRequestHeaders: - append: true diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml index cbbab78abe..fe06a56edc 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml @@ -109,6 +109,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 healthCheck: path: /ready hostnames: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml index 1cc96c7a7d..2b403fe25c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml @@ -474,6 +474,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -490,6 +491,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - www.example.com http1: @@ -507,6 +509,7 @@ xdsIR: mergeSlashes: true port: 8080 - address: 0.0.0.0 + externalPort: 8081 hostnames: - '*' http1: {} @@ -522,6 +525,7 @@ xdsIR: mergeSlashes: true port: 8081 - address: 0.0.0.0 + externalPort: 8082 hostnames: - '*' http1: @@ -570,6 +574,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8083 hostnames: - '*' http1: {} diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml index 7668b90645..a01e53751d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml @@ -183,6 +183,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http2: @@ -201,6 +202,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - www.example.com http2: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml index 4a56efb39c..68d343bad3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -151,6 +151,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' http3: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml index d4e58562c6..6f3d013b38 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml @@ -110,6 +110,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml index 1664526e35..c0468e0408 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -165,6 +166,7 @@ xdsIR: http: idleTimeout: 10s - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml index 295866bb4c..cdcfb8f983 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml @@ -823,6 +823,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -904,6 +905,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -954,6 +956,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8443 name: default/gateway-1/tcp-1 port: 8443 tls: @@ -965,6 +968,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 5000 name: default/gateway-1/tcp-2 port: 5000 routes: @@ -993,6 +997,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1019,6 +1024,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1043,6 +1049,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8443 name: default/gateway-2/tcp-1 port: 8443 tls: @@ -1054,6 +1061,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 5000 name: default/gateway-2/tcp-2 port: 5000 default/gateway-3: @@ -1072,6 +1080,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1098,6 +1107,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1122,6 +1132,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8443 name: default/gateway-3/tcp-1 port: 8443 tls: @@ -1133,5 +1144,6 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 5000 name: default/gateway-3/tcp-2 port: 5000 diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml index 5e934b1593..1fefad5098 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml @@ -488,6 +488,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -514,6 +515,7 @@ xdsIR: minVersion: "1.2" requireClientCertificate: true - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false @@ -538,6 +540,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -583,6 +586,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -635,6 +639,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 6443 name: envoy-gateway/gateway-3/tls-1 port: 6443 routes: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml index 5a0ebedf5c..71523be768 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml @@ -561,6 +561,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -591,6 +592,7 @@ xdsIR: minVersion: "1.2" requireClientCertificate: true - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -619,6 +621,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -659,6 +662,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -701,6 +705,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -755,6 +760,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml index 1b314b1316..ad1d248f65 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml @@ -565,6 +565,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -595,6 +596,7 @@ xdsIR: minVersion: "1.2" requireClientCertificate: true - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -623,6 +625,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -663,6 +666,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -705,6 +709,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -759,6 +764,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml index f7812f579b..9ca0f8c576 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml @@ -552,6 +552,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -582,6 +583,7 @@ xdsIR: minVersion: "1.2" requireClientCertificate: true - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -610,6 +612,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -650,6 +653,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -690,6 +694,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -740,6 +745,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml index e16c488685..bffacb1b3a 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml @@ -240,6 +240,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -266,6 +267,7 @@ xdsIR: minVersion: "1.2" requireClientCertificate: true - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false @@ -300,6 +302,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml index 7f551b5eb8..89060d80d7 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -160,6 +161,7 @@ xdsIR: mergeSlashes: false port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml index ae87848d1a..956c452f79 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml @@ -207,6 +207,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -244,6 +245,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -258,6 +260,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml index 767c80c369..9217b579b7 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -163,6 +164,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml index 0473746089..94497b8635 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml @@ -299,6 +299,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 9090 name: envoy-gateway/gateway-legacy-only/tcp-1 port: 9090 proxyProtocol: {} @@ -326,6 +327,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false @@ -351,6 +353,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml index b440cb4c7d..6d6dd4c309 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml @@ -147,6 +147,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -163,6 +164,7 @@ xdsIR: proxyProtocol: optional: true - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml index 666963a068..90b29f3dac 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 headers: disableRateLimitHeaders: true enableEnvoyHeaders: true @@ -164,6 +165,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 headers: disableRateLimitHeaders: true enableEnvoyHeaders: true diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml index f9cbd69ba0..b1d3f1c11e 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml @@ -1610,6 +1610,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1634,6 +1635,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1658,6 +1660,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1682,6 +1685,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1706,6 +1710,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1730,6 +1735,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1754,6 +1760,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1778,6 +1785,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1802,6 +1810,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1826,6 +1835,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1850,6 +1860,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1874,6 +1885,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1898,6 +1910,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1922,6 +1935,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1946,6 +1960,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1970,6 +1985,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -1994,6 +2010,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2028,6 +2045,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml index 62b7fb99d9..c67cacd615 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml @@ -519,6 +519,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -543,6 +544,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -563,6 +565,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 53 name: envoy-gateway/gateway-2/tcp port: 10053 envoy-gateway/gateway-3: @@ -571,6 +574,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -605,6 +609,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml index c2a3de8a17..d872e9cd63 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -167,6 +168,7 @@ xdsIR: requestReceivedTimeout: 5s streamIdleTimeout: 1h0m0s - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml index 4937d5a876..f589e1ffdf 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -181,6 +181,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -199,6 +200,7 @@ xdsIR: interval: 60 probes: 3 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml index c823e6b9c8..eecc453712 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml @@ -110,6 +110,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml index 3cc9e2c0e0..8f4512dfc3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -165,6 +166,7 @@ xdsIR: http: requestReceivedTimeout: 5s - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml index 0d01f0f4d6..c0e2fc4b83 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml @@ -335,6 +335,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -368,6 +369,7 @@ xdsIR: statefulSessionResumption: true statelessSessionResumption: true - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' isHTTP2: false @@ -392,6 +394,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -434,6 +437,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml index de1d4ae453..78952979b2 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml @@ -145,6 +145,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -161,6 +162,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/conflicting-policies.out.yaml b/internal/gatewayapi/testdata/conflicting-policies.out.yaml index 498e86ec5c..0ef3c928db 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -285,6 +285,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.192.168.0.15.nip.io' isHTTP2: false @@ -329,6 +330,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - qccbahgo.qccbahgo isHTTP2: false diff --git a/internal/gatewayapi/testdata/custom-filter-order.out.yaml b/internal/gatewayapi/testdata/custom-filter-order.out.yaml index 16016e4f49..4d9a03ada5 100644 --- a/internal/gatewayapi/testdata/custom-filter-order.out.yaml +++ b/internal/gatewayapi/testdata/custom-filter-order.out.yaml @@ -249,6 +249,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index afe8130567..064c75ec33 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -139,6 +139,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml index 0c6759498b..6efe18f4d8 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml @@ -99,6 +99,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml index 3ec4143149..8b75d2ca25 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml @@ -288,6 +288,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml index 9ad578f7ac..5332b0453c 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml @@ -2411,6 +2411,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2464,6 +2465,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2517,6 +2519,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2570,6 +2573,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2623,6 +2627,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2676,6 +2681,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2729,6 +2735,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2782,6 +2789,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2835,6 +2843,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2888,6 +2897,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2941,6 +2951,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2994,6 +3005,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3047,6 +3059,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3100,6 +3113,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3153,6 +3167,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3206,6 +3221,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3259,6 +3275,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3322,6 +3339,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml index f010748549..ef54e8f3eb 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml @@ -544,6 +544,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -568,6 +569,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -624,6 +626,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -676,5 +679,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 53 name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml index c510804719..9fd1abfe83 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml @@ -150,6 +150,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml index bae51d5f85..59ab828968 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml @@ -150,6 +150,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml index 9f4930a5ec..45698749df 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml index 7a5aa81c2e..b2c70afd59 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml @@ -376,6 +376,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml index 0b94cbca9b..eb2ce3df9b 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml @@ -311,6 +311,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml index d24a5360d7..4bf5a9cdca 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml @@ -194,6 +194,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml index 07df570100..0342cb24b9 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml @@ -302,6 +302,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml index 55dabfdc15..0aeb211ecb 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml @@ -329,6 +329,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml index 5d39b9399d..1333a0503a 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml @@ -167,6 +167,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml index 4b3916749f..4608d5aa4e 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml @@ -254,6 +254,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml index 98e1fe4af3..6765264ec3 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml @@ -243,6 +243,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml index bb37eca72b..ecaa6eecbc 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml @@ -408,6 +408,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml index 2f3ab9e515..33e9d8e085 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml @@ -229,6 +229,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml index 5c48f1427e..4e5f7aa9c9 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml @@ -263,6 +263,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml index 57b5856095..139d7f206e 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml @@ -704,6 +704,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -851,6 +852,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -944,6 +946,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml index 0985f1d72d..0e79746499 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml @@ -231,6 +231,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml index 516b9e57b8..bcdcbc5da4 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml @@ -265,6 +265,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml index 14d9e136a4..3ae4ee6042 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -81,6 +81,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml index 4b39ae9c09..f1ab2865e4 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml @@ -107,6 +107,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml index b62f245960..1a16f55536 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml @@ -109,6 +109,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml index 21fd7f1c32..d9e265c32e 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -100,6 +100,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml index 6b530b018f..cc35cb7f67 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml @@ -136,6 +136,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index 12541dd884..59d64e660a 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -130,6 +130,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml index 7159d9466e..ee4c1374dd 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml @@ -222,6 +222,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml index 88c8989fc4..1d9f8dd345 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml @@ -162,6 +162,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml index c3ae335375..84dce16b8a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml @@ -182,6 +182,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml index 3177d63649..84564b8a2e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml @@ -163,6 +163,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml index ee3fcb8d03..a2dad236b9 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml @@ -213,6 +213,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml index c37cc8fe45..355aacbd87 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml index 60633ee2d3..4553c6867f 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -154,6 +154,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml index aa198c3e67..ae366bf53e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml @@ -525,6 +525,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml index c371fe405e..ae964f298d 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml index f5bbfd6239..34f1b10b51 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml @@ -356,6 +356,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml index 698e92409f..5ef1db83a1 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml @@ -240,6 +240,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 9351cd41a2..7cf63dc36c 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -252,6 +252,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml index b198c9f15b..8996d5934d 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml index d487f4fe1c..28d1c85095 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml index 1a36228ea8..26616be8df 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml @@ -155,6 +155,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml index a4729f98d4..278a017b84 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml index 1596922616..b174f71ecb 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml @@ -151,6 +151,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml b/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml index 1f6fa07173..73a3905f75 100644 --- a/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml @@ -177,6 +177,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml index f6c436f04b..91cdf3a68b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml @@ -303,6 +303,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml index 8cf53c835d..b8f9798136 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml index 1dbd46027b..dc55d50bc6 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml index fe2dd3eadc..45417438de 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml @@ -250,6 +250,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -285,6 +286,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 445 name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml index a77d725678..f3842e949f 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml @@ -249,6 +249,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -284,6 +285,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 445 name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml index 3aa291f9ec..b4b1324663 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml @@ -246,6 +246,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -321,6 +322,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 445 name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml index e01acceb05..63f574a566 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml @@ -155,6 +155,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml index b455b4fd08..ab36d85fcf 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml @@ -196,6 +196,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml index 548d27bcc9..51a95436aa 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml @@ -175,6 +175,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index 083326e8e5..b82f60cc88 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -139,6 +139,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml b/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml index 24d5114499..9c194246aa 100644 --- a/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml @@ -185,6 +185,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml index a7fdc17476..41b161cbc3 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml @@ -251,6 +251,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 80 name: envoy-gateway/gateway-1/tcp1 port: 10080 - address: 0.0.0.0 @@ -281,5 +282,6 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 81 name: envoy-gateway/gateway-1/tcp2 port: 10081 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml index 4ffdeb08f3..6282b46226 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml @@ -251,6 +251,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 162 name: envoy-gateway/gateway-1/udp1 port: 10162 - address: 0.0.0.0 @@ -281,5 +282,6 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 163 name: envoy-gateway/gateway-1/udp2 port: 10163 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml index 6fa38cea0f..c30a5be594 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 81 hostnames: - '*' isHTTP2: false @@ -130,6 +131,7 @@ xdsIR: mergeSlashes: true port: 10081 - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml index dc0f9b1d98..39fb71a8ba 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml @@ -224,6 +224,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 81 hostnames: - '*' isHTTP2: false @@ -315,6 +316,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml index 93ea4d3d0a..5df8dc3518 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml @@ -222,6 +222,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 81 hostnames: - '*' isHTTP2: false @@ -291,6 +292,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml index 49d572cff4..bf91cc836b 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml @@ -130,6 +130,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml index 761949d319..729907ff07 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml index 3b9f55d68f..4e701fb15b 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml index 9caa1425ff..0462d3e050 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml @@ -142,6 +142,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml index c785443618..45342445e2 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml @@ -134,6 +134,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml index 1ba158128d..869e6e3e95 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml @@ -138,6 +138,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml index 85e64e8771..a502972b65 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml @@ -130,6 +130,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml index 5bb2c465b3..2cc334a952 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml index 2132a9251b..7d35e83ead 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml index 36d6497456..768636bf49 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml index c5faad0fa5..0b1b68a2d7 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml index 4e7a8a6bdf..bb868c8c51 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml index 35648866bc..c1c5dc79b9 100644 --- a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml +++ b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml @@ -192,6 +192,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -237,6 +238,7 @@ xdsIR: name: "" prefix: /empty-hostname - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml index a32ed26aa7..3e09cbf20c 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -134,6 +134,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml index 4f63b9aa46..4507655c60 100644 --- a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml @@ -290,6 +290,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -344,6 +345,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -398,6 +400,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml index 4256025f51..7bcd109ee5 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -91,5 +91,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml index e62c79d628..9cfbe322a7 100644 --- a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml @@ -143,6 +143,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml index 2466c72a47..0b221b6d8c 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml index 4ea82f9a39..2d2a001043 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml @@ -143,6 +143,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml index 695eee53ed..52bdef14ca 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml @@ -116,6 +116,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml index 212b0a3df6..231e8bf75e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml @@ -120,6 +120,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/tcp port: 10080 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml index e7528cbfce..d0499b11d4 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml @@ -116,5 +116,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml index 10709ebd54..d6f3a4b44b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml @@ -123,6 +123,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml index c4999ff719..2dbe5506bf 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml @@ -192,6 +192,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.bar.com isHTTP2: false @@ -248,6 +249,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls-passthrough port: 10090 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml index 3d129deb5f..1ed27d5ccb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml @@ -116,6 +116,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml index db4cb47b88..e481e4be41 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml @@ -120,6 +120,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/udp port: 10080 route: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml index 88cf799f29..250b5f108c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml @@ -116,5 +116,6 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/udp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml index 44ea56cf1b..026281989d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml @@ -84,5 +84,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml index 207147d1d1..f887220d35 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml @@ -84,5 +84,6 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/udp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml index 2f9352279f..55d989a617 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml index 592f662d86..b66dd76230 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml index d35a5f864b..3e8939ade6 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml @@ -122,6 +122,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml index 892dd25c48..04c4efce65 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml @@ -209,6 +209,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -261,6 +262,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - bar.example.com isHTTP2: false @@ -313,6 +315,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml index 29ef9aa04a..e65ce259a5 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml @@ -196,6 +196,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -248,6 +249,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - bar.example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml index a3f9da3997..af10989878 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml @@ -173,6 +173,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -225,6 +226,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - bar.example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml index dda89cea10..6ae2e030b6 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml @@ -232,6 +232,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -284,6 +285,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -305,6 +307,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml index 77aa4cbd7a..1fbb4ea642 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml @@ -209,6 +209,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -261,6 +262,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -313,6 +315,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml index d224de9dad..ac31cc491c 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml index 883bd0f4e5..c765a45c50 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml @@ -147,6 +147,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml index 6fd1af0b13..940ffb7d08 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml @@ -147,6 +147,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml index 2c685dad21..e3975c2fb8 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -122,6 +122,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml index b72654d681..da3bfc4c6d 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml @@ -140,6 +140,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp1 port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml index 52898c3572..44db5770b6 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml @@ -143,6 +143,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp1 port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml index c9b589d826..ba9938ca17 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml @@ -188,6 +188,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -261,6 +262,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 81 hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml index 22c43f6ad1..196642a04c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml @@ -183,6 +183,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -233,6 +234,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/tcp port: 10080 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml index 3779468e03..0523fae107 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml @@ -183,6 +183,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -233,6 +234,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-1/udp port: 10080 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml index d14baba87f..105122571e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml @@ -185,6 +185,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp1 port: 10162 routes: @@ -208,6 +209,7 @@ xdsIR: weight: 1 name: tcproute/default/tcproute-1 - address: 0.0.0.0 + externalPort: 163 name: envoy-gateway/gateway-1/tcp2 port: 10163 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml index 2de6dc866e..59d14fac74 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml @@ -181,6 +181,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 161 name: envoy-gateway/gateway-1/tcp1 port: 10161 routes: @@ -204,6 +205,7 @@ xdsIR: weight: 1 name: tcproute/default/tcproute-1 - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp2 port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml index 8c81bebf03..4863e8b0b0 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml @@ -185,6 +185,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp1 port: 10162 route: @@ -208,6 +209,7 @@ xdsIR: weight: 1 name: udproute/default/udproute-1 - address: 0.0.0.0 + externalPort: 163 name: envoy-gateway/gateway-1/udp2 port: 10163 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml index b66e7b2406..a2b0a8cea4 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml @@ -181,6 +181,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 161 name: envoy-gateway/gateway-1/udp1 port: 10161 route: @@ -204,6 +205,7 @@ xdsIR: weight: 1 name: udproute/default/udproute-1 - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp2 port: 10162 route: diff --git a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml index 15603e184e..ab842b1f20 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml @@ -143,6 +143,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml index 83f7517e3f..9b31434af1 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index 9f14870397..500f7b536f 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml index 1e541efd22..9af8397195 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index e6e3bbd76f..7f61d595ae 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -122,6 +122,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml index 44ff750cc0..43583c952e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index 3a878122af..329d9aa696 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -122,6 +122,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml index 2ecccf2f87..c51dcfa30c 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml @@ -154,6 +154,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml index 8102e4fe09..030da60dd2 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml @@ -263,6 +263,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -330,6 +331,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml index 37f29948fc..528b327bcf 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml @@ -376,6 +376,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 81 hostnames: - foo.com isHTTP2: false @@ -420,6 +421,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 82 hostnames: - bar.com isHTTP2: false @@ -464,6 +466,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 83 hostnames: - foo1.com isHTTP2: false @@ -508,6 +511,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 84 hostnames: - bar1.com isHTTP2: false @@ -552,6 +556,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 85 hostnames: - foo2.com isHTTP2: false @@ -596,6 +601,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 86 hostnames: - bar2.com isHTTP2: false @@ -640,6 +646,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 87 hostnames: - foo3.com isHTTP2: false @@ -684,6 +691,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 88 hostnames: - bar3.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml index 1b141b983b..77c14774c6 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml @@ -327,6 +327,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -371,6 +372,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.com isHTTP2: false @@ -415,6 +417,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo1.com isHTTP2: false @@ -459,6 +462,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar1.com isHTTP2: false @@ -503,6 +507,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo2.com isHTTP2: false @@ -547,6 +552,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar2.com isHTTP2: false @@ -591,6 +597,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo3.com isHTTP2: false @@ -635,6 +642,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar3.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml index 0c0aa95e91..a001bd29a5 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml @@ -158,6 +158,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -202,6 +203,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml index 3e67f8b9e2..879b48d0de 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml @@ -147,6 +147,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -191,6 +192,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 943302f3a2..37998b03cc 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -116,6 +116,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml index 2654b04c8d..9d3c6778c3 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml index d55ffa4ebe..6775716805 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -163,6 +164,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml index 45dc72b0c0..cced11f524 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml @@ -222,6 +222,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml index 0926bcec4f..66b838b980 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml @@ -279,6 +279,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml index a63329dc19..29e6d10d4c 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml @@ -362,6 +362,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml index 8e3c12252c..ee5dbfad04 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml @@ -302,6 +302,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml index 96ad51761a..d6a6d9142e 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml @@ -311,6 +311,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml index 0135aba04f..e238339b1c 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml index 1f216ecdcb..dc9f7a4c3e 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml index 28508e256c..b3954e4992 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml index 1ce9537501..750faea337 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml @@ -121,6 +121,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml index 13cc11e5c6..1ad2a36b14 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 780ad57e7b..30b84f3423 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -118,6 +118,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index e24f5ab12f..93c7d40507 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml b/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml index 5499bb05dd..9187db9c87 100644 --- a/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml +++ b/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml @@ -352,6 +352,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml b/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml index f8c20afdf9..35639b069b 100644 --- a/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml +++ b/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml b/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml index b8db844292..5b4e0c4dc5 100644 --- a/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml +++ b/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml @@ -194,6 +194,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml index a5d4ff0868..f5d6ac31bf 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml @@ -119,6 +119,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml b/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml index 1ea373e5f0..9d8b357c28 100644 --- a/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml +++ b/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml @@ -246,6 +246,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index b1c44ab100..09b61c08cd 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-retry.out.yaml b/internal/gatewayapi/testdata/httproute-retry.out.yaml index 7ec651fe31..fa4dded18f 100644 --- a/internal/gatewayapi/testdata/httproute-retry.out.yaml +++ b/internal/gatewayapi/testdata/httproute-retry.out.yaml @@ -247,6 +247,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -281,6 +282,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml index 8e9b4ad565..ed4621fc6e 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml @@ -113,6 +113,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml index 72767a8009..1f5db65ff0 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml index 11b8e5a0a2..78e952a459 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml index 1c2fd4025f..72fdc46793 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml @@ -195,6 +195,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml index fd32e5863f..2cdd3d093d 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml @@ -193,6 +193,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml b/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml index d881cb6a8a..1f3acb7bad 100644 --- a/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml index 415e936d0e..8a2600240a 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml @@ -149,6 +149,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index ab6b66207e..46ed07e988 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -118,6 +118,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml index e14c282c9f..13c3602a92 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml index c503b574a6..026176f2ad 100644 --- a/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml @@ -187,6 +187,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml b/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml index 45e60767fb..22e7169890 100644 --- a/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml @@ -184,6 +184,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml index b643dc2188..c9e04c9364 100644 --- a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml @@ -214,6 +214,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 7fb970d915..e3fc762a8e 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -115,6 +115,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml b/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml index 54d36b3347..35f232762c 100644 --- a/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml @@ -138,6 +138,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml index a0723d0487..5f24c47c37 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml @@ -136,6 +136,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml index d7e743430d..71f237440e 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml index a6f75df795..3e4ade08b0 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml index 501262cdc5..4e7661200c 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml index c6fe6da61f..7ab16881c6 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml @@ -131,6 +131,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml index 61e87c1903..cbb5f3f510 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml index 72bc2a486d..8b3ef7047d 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml index 10f7e6cd10..be1359d242 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml @@ -226,6 +226,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml index c33a745df2..1507fa7bc1 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml index 6e7b838972..9204ce41f8 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml index 7e14234b21..63d4861723 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml index 5795949c74..80df8c2574 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml @@ -172,6 +172,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml index c779cb13a9..c68e039306 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml @@ -169,6 +169,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml b/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml index 7fb0faf549..2a03c85c7d 100644 --- a/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml b/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml index 6ac6fa58e9..a785c24249 100644 --- a/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml @@ -123,6 +123,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml index c10eb83f8b..9cbfd6bf60 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml @@ -118,6 +118,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml index e322e6ddda..15a26afacb 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml @@ -122,6 +122,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml index 133bf9e6b3..c0a6b46705 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml @@ -119,6 +119,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml index 468ebc21ab..7cffdecab7 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml @@ -141,6 +141,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml index d3b2324d78..49ac9980b1 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml @@ -117,6 +117,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml index 9b5ea5e9e7..d74f74ce80 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml index b7fb8943c9..ddde8c227e 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml @@ -118,6 +118,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml index 628a9d7549..01274171d9 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml index 59b775e8ed..f87ea0b3b1 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml @@ -119,6 +119,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml index dcc5beeda8..152a08bc61 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml @@ -162,6 +162,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -196,6 +197,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 81 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml index 1c6c85ec55..d0b00dd3e1 100644 --- a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml index c649b63674..f32e570a38 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -134,6 +134,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml index 8c66d3bb44..05cd68fbc1 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml index 5b23948027..fade76297a 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml @@ -138,6 +138,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml index 4994d4278e..e4ce199405 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml index b548474b49..7bb3c45e8f 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml @@ -129,6 +129,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index 170388c335..467d18528e 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml index 0d521e2d92..762b541fa1 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml @@ -125,6 +125,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -159,6 +160,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml index 3e85463540..e6a97841e4 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml @@ -168,6 +168,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -222,6 +223,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml index b0ea2a20c2..18f8e84ed7 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml @@ -190,6 +190,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.a.example.com' isHTTP2: false @@ -259,6 +260,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.b.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml index 90005dc6eb..239e0fb1ec 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml @@ -185,6 +185,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.a.example.com' isHTTP2: false @@ -237,6 +238,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.b.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml index 100b26b900..729ef4d870 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml @@ -141,6 +141,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 20e09f99ce..52eed23691 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml b/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml index 4abe691211..b485346a3d 100644 --- a/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml @@ -172,6 +172,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml index 0f2ff3e0d8..ed157fc268 100644 --- a/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml @@ -169,6 +169,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml index c9c4467afc..9fa29ac1e9 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml index 40da56518b..5880827996 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml index edf3788bf6..96d6eb39fd 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml index c00cdf03ed..626525a735 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml index 5d2ede790a..7cb10e60a1 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml @@ -123,6 +123,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml index 3f8ed96ed2..57f71e2afb 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml index 43dbedad59..94977c96a3 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml @@ -142,6 +142,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml index f60e484946..e23c084c46 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml @@ -136,6 +136,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml index bb0f6be780..2d994d5fab 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml @@ -146,6 +146,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml index 7d3a46f698..5f51d7db54 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml index a3102ab8db..ef09243c4a 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml index 077b9e8d1d..8b4997b2dd 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml @@ -131,6 +131,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml index 64847c0b33..1ab2c11ef7 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml index c002178581..263b145f73 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml @@ -132,6 +132,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml index d3ab2b42df..e8f47545ac 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml @@ -224,6 +224,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml index c3362c66fd..d3df9c5e3a 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml @@ -124,6 +124,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml index 21ad49572f..28837acf48 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml index 12e0b762b8..2c2017b428 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml index 88c8f6d8f0..2db20ec499 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml @@ -117,6 +117,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml index 59c7123eef..dd3669ac22 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml @@ -115,6 +115,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml index d404c260db..69bcc8024d 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml @@ -148,6 +148,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml index 6ab64924f2..4c42bccd5e 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml @@ -121,6 +121,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml index f4f42620f1..c90bbbd5e1 100644 --- a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml @@ -123,6 +123,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 2f1bae2ee5..59c110f738 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -119,6 +119,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml index d988b00cd1..a166d3a27c 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -120,6 +120,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml index ffa17cd503..dd36635eda 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml index 8c6012af66..2fa926a74f 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml index 0240422fc0..fb735a02a0 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml index 9c2d0b8a24..8ef9dcab29 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml @@ -125,6 +125,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml index e5e3e50084..a8c7a9f23e 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml @@ -131,6 +131,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml index 2955d0423a..cf0bc2a5c1 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml @@ -133,6 +133,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml index d31d70586a..8f147bbf2b 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml @@ -129,6 +129,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml index 29836c7b3e..3b1d4dd197 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml @@ -128,6 +128,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml index 0aff7da662..e0a7168a25 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml @@ -126,6 +126,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml index 4259ead0f8..376cc80e4e 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml @@ -127,6 +127,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml index 639230b097..5d8ad46c8a 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml @@ -265,6 +265,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml index 0f5b40c69a..affde9e211 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml @@ -362,6 +362,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml index a180f5050a..daf5461c08 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml @@ -368,6 +368,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml index 4386638ff4..539583ffc2 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml @@ -269,6 +269,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml index 6dccf8b4e7..cba779fae5 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml @@ -118,6 +118,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index e36c9da708..6c7e8ad7d7 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -303,6 +303,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml index 9589c4cf48..0247a0eb13 100644 --- a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -176,5 +177,6 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 80 name: envoy-gateway/gateway-2/udp port: 10080 diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml index 95ea8f2401..8e29995025 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml @@ -192,6 +192,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -206,6 +207,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8888 hostnames: - company.com isHTTP2: false @@ -220,6 +222,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -234,6 +237,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml index 1b0393ff3f..b3ce3c6188 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml @@ -243,6 +243,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -287,6 +288,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -301,6 +303,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml index 8baee3a938..8d06177302 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml @@ -165,6 +165,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -179,6 +180,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -193,6 +195,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml index 600eea7ad3..572fb5b701 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -521,6 +521,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.example.com isHTTP2: false @@ -589,6 +590,7 @@ xdsIR: http: requestReceivedTimeout: 5s - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.example.com isHTTP2: false @@ -657,6 +659,7 @@ xdsIR: http: requestReceivedTimeout: 5s - address: 0.0.0.0 + externalPort: 81 hostnames: - bar.example.com isHTTP2: false @@ -717,6 +720,7 @@ xdsIR: - x-header-8 maxAge: 33m20s - address: 0.0.0.0 + externalPort: 81 hostnames: - foo.example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml index 681b7c0239..6625c69cd2 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -313,6 +313,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -378,6 +379,7 @@ xdsIR: interval: 60 probes: 3 - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml index 85f9ee144a..e07797a05a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml @@ -110,6 +110,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml index 4ec1439029..fee1d0f8c5 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-1.gateway-1.envoyproxy.io isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml index f56e72fdcb..85179215f1 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml @@ -152,6 +152,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-1.gateway-1.envoyproxy.io isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml index 32a27cfb43..a8d6184b01 100644 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -575,6 +575,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-1.gateway-1.envoyproxy.io isHTTP2: false @@ -832,6 +833,7 @@ xdsIR: remoteJWKS: uri: https://one.example.com/jwt/public-key/jwks.json - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-2.gateway-1.envoyproxy.io isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml index 10a3c288ca..1829bd6f98 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml @@ -256,6 +256,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-1.gateway-1.envoyproxy.io isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml index b9d11b7562..944b880545 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml @@ -2411,6 +2411,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2464,6 +2465,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2517,6 +2519,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2570,6 +2573,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2623,6 +2627,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2676,6 +2681,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2729,6 +2735,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2782,6 +2789,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2835,6 +2843,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2888,6 +2897,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2941,6 +2951,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -2994,6 +3005,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3047,6 +3059,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3100,6 +3113,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3153,6 +3167,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3206,6 +3221,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3259,6 +3275,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -3322,6 +3339,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml index b142d8e62c..3f11863d24 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml @@ -425,6 +425,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -474,6 +475,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -515,5 +517,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 53 name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml index fa1b23fa09..c737fce2f9 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml @@ -305,6 +305,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml index 007209c2ea..cd7e2384e7 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml @@ -161,6 +161,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml index e71ccbc8c3..070ce4c83a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml @@ -174,6 +174,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml index 41337697b6..364de3ad93 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -237,6 +237,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml index fd223bf737..4c53e97e35 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml @@ -355,6 +355,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -411,6 +412,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -459,6 +461,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index facb594868..12847b3c3c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -415,6 +415,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -487,6 +488,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -570,6 +572,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml index def7b4ffcf..46ef87404e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml @@ -383,6 +383,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml index 7f95038a96..e831b53062 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml @@ -248,6 +248,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml index 602ec9ddb8..61bbcfae1d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml @@ -253,6 +253,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml index 712624f736..50f1aab633 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml @@ -223,6 +223,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml index e86217533f..3b203db47d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml index c1cafc3f1a..0938cd5287 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml @@ -156,6 +156,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml index a3fc4d3204..5c667f5013 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml @@ -157,6 +157,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml index acd74fd210..f16bbf8042 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml @@ -568,6 +568,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -687,6 +688,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -752,6 +754,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml index 1a1d51b8e2..1a56039377 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml @@ -203,6 +203,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml index a49afbb451..58de90c7f5 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml @@ -203,6 +203,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml index 2cc4c157c3..50e5cae5ab 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml @@ -222,6 +222,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml index 48b769e201..9e1bcc87bb 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml @@ -246,6 +246,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml index 9fde620dc1..cb86798e5a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -303,6 +303,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml index fc7b808f05..638f8bdd0f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -242,6 +242,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml index 29e4e548cc..8a70ce190f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml @@ -254,6 +254,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml index 01fd268205..7bb8eca404 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml @@ -226,6 +226,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml index 74540fd638..4ea604b714 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml @@ -386,6 +386,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml index a43b1709bc..6b63138f12 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml @@ -290,6 +290,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -371,6 +372,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml index 8d21a5246e..bb4cea5e04 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml @@ -208,6 +208,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml index 6b1ccbc0e7..ca238fb633 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml @@ -289,6 +289,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -370,6 +371,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml index 6eb727f5e5..24a7a27071 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml @@ -281,6 +281,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -362,6 +363,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml index 69c8b9fc73..d319a57740 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml @@ -165,6 +165,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml index cf31eeaa50..60064b6edb 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml @@ -231,6 +231,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml index 81ec452caa..7b875d44f8 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml @@ -221,6 +221,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml index 0818a1dba8..89c8ab5588 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml @@ -162,6 +162,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml index d889dd135d..31f868d9c9 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml @@ -160,6 +160,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml index 9536d69020..63370ea0e5 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml @@ -176,6 +176,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml index b91d27b127..6813979568 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml @@ -117,6 +117,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml index 5922248939..7f0d4acc75 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml @@ -294,6 +294,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -318,6 +319,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -352,6 +354,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml index 572c3a9d59..d1ff5a259a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml @@ -213,6 +213,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml index 00c7e776f0..9f3d3627a9 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -258,6 +258,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml index febf824c8b..d8d4f8d175 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml @@ -191,6 +191,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls port: 10090 routes: @@ -227,6 +228,7 @@ xdsIR: name: envoy-gateway/tls-secret-1 privateKey: '[redacted]' - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls-hostname port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml b/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml index 3e1a948595..2ffc23c67f 100644 --- a/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml @@ -126,6 +126,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tcp port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml index dd26dc1fba..45464ea670 100644 --- a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml @@ -136,6 +136,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tcp port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index baa6219a8e..fef6d969c6 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -119,6 +119,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml b/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml index 8fd49eaf4b..2ffe4b22d6 100644 --- a/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml @@ -122,5 +122,6 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 443 name: gateway-conformance-infra/gateway-tlsroute-referencegrant/https port: 10443 diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index 77e4b88056..c4017f2cd8 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -153,6 +153,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 91 name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml index b8b9be71e4..6d76c27a71 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml @@ -139,6 +139,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index ae8278343b..9ebf2a04f6 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -120,6 +120,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index eb50162a7e..c00a758310 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -118,6 +118,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 91 name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml index 27ec1fc507..eef94c0fee 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -120,6 +120,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 91 name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml index fc8bf9cced..f9e6594765 100644 --- a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml @@ -250,6 +250,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -294,6 +295,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -308,6 +310,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml index a2c3f96f2a..5404919249 100644 --- a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml @@ -264,6 +264,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -350,6 +351,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -364,6 +366,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml b/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml index 6beab5ad7a..84f9183a0f 100644 --- a/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml +++ b/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml @@ -252,6 +252,7 @@ xdsIR: protocol: TCP http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -296,6 +297,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -310,6 +312,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml b/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml index df0c241d72..4dd54fc5cf 100644 --- a/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml +++ b/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml @@ -126,6 +126,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/udp port: 10090 route: diff --git a/internal/gatewayapi/testdata/udproute-with-backend.out.yaml b/internal/gatewayapi/testdata/udproute-with-backend.out.yaml index 3a36c25601..002fae1b29 100644 --- a/internal/gatewayapi/testdata/udproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/udproute-with-backend.out.yaml @@ -136,6 +136,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/udp port: 10090 route: diff --git a/internal/ir/xds.go b/internal/ir/xds.go index 53284390dc..2002e00f23 100644 --- a/internal/ir/xds.go +++ b/internal/ir/xds.go @@ -261,6 +261,8 @@ type CoreListenerDetails struct { Address string `json:"address" yaml:"address"` // Port on which the service can be expected to be accessed by clients. Port uint32 `json:"port" yaml:"port"` + // ExternalPort is the port on which the listener can be accessed by clients. + ExternalPort uint32 `json:"externalPort,omitempty" yaml:"externalPort,omitempty"` // ExtensionRefs holds unstructured resources that were introduced by an extension policy ExtensionRefs []*UnstructuredRef `json:"extensionRefs,omitempty" yaml:"extensionRefs,omitempty"` // Metadata is used to enrich envoy resource metadata with user and provider-specific information diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 9963d5cf0f..f02784e29d 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -7,6 +7,7 @@ package translator import ( "errors" + "fmt" "net" "strconv" "strings" @@ -183,11 +184,8 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin } // buildXdsTCPListener creates a xds Listener resource -// TODO: Improve function parameters -func buildXdsTCPListener( - name, address string, - port uint32, - ipFamily *egv1a1.IPFamily, +func (t *Translator) buildXdsTCPListener( + listenerDetails ir.CoreListenerDetails, keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, @@ -200,7 +198,9 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: name, + Name: xdsListenerName( + listenerDetails.Name, listenerDetails.ExternalPort, + corev3.SocketAddress_TCP, t.xdsNameSchemeV2()), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -209,16 +209,16 @@ func buildXdsTCPListener( Address: &corev3.Address_SocketAddress{ SocketAddress: &corev3.SocketAddress{ Protocol: corev3.SocketAddress_TCP, - Address: address, + Address: listenerDetails.Address, PortSpecifier: &corev3.SocketAddress_PortValue{ - PortValue: port, + PortValue: listenerDetails.Port, }, }, }, }, } - if ipFamily != nil && *ipFamily == egv1a1.DualStack { + if listenerDetails.IPFamily != nil && *listenerDetails.IPFamily == egv1a1.DualStack { socketAddress := listener.Address.GetSocketAddress() socketAddress.Ipv4Compat = true } @@ -226,6 +226,23 @@ func buildXdsTCPListener( return listener, nil } +// xdsListenerName returns the name of the xDS listener in two formats: +// 1. "tcp-80" if xdsNameSchemeV2 is true. +// 2. "default/gateway-1/http" if xdsNameSchemeV2 is false. +// The second format can cause unnecessary listener drains and will be removed in the future. +// https://github.com/envoyproxy/gateway/issues/6534 +func xdsListenerName(name string, externalPort uint32, protocol corev3.SocketAddress_Protocol, xdsNameSchemeV2 bool) string { + if xdsNameSchemeV2 { + protocolType := "tcp" + if protocol == corev3.SocketAddress_UDP { + protocolType = "udp" + } + return fmt.Sprintf("%s-%d", protocolType, externalPort) + } + + return name +} + func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value { if connection != nil && connection.BufferLimitBytes != nil { return wrapperspb.UInt32(*connection.BufferLimitBytes) @@ -244,21 +261,30 @@ func buildMaxAcceptPerSocketEvent(connection *ir.ClientConnection) *wrapperspb.U } // buildXdsQuicListener creates a xds Listener resource for quic -func buildXdsQuicListener(name, address string, port uint32, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog) (*listenerv3.Listener, error) { +func (t *Translator) buildXdsQuicListener( + listenerDetails ir.CoreListenerDetails, + ipFamily *egv1a1.IPFamily, + accesslog *ir.AccessLog, +) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { return nil, err } + // Keep the listener name compatible with the old naming scheme + listenerName := listenerDetails.Name + "-quic" + if t.xdsNameSchemeV2() { + listenerName = xdsListenerName(listenerDetails.Name, listenerDetails.ExternalPort, corev3.SocketAddress_UDP, true) + } xdsListener := &listenerv3.Listener{ - Name: name + "-quic", + Name: listenerName, AccessLog: log, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ SocketAddress: &corev3.SocketAddress{ Protocol: corev3.SocketAddress_UDP, - Address: address, + Address: listenerDetails.Address, PortSpecifier: &corev3.SocketAddress_PortValue{ - PortValue: port, + PortValue: listenerDetails.Port, }, }, }, @@ -290,8 +316,13 @@ func buildXdsQuicListener(name, address string, port uint32, ipFamily *egv1a1.IP // A HCM filter is added to the new TCP filter chain. // The newly created TCP filter chain is configured with a filter chain match to // match the server names(SNI) based on the listener's hostnames. -func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, - accesslog *ir.AccessLog, tracing *ir.Tracing, http3Listener bool, connection *ir.ClientConnection, +func (t *Translator) addHCMToXDSListener( + xdsListener *listenerv3.Listener, + irListener *ir.HTTPListener, + accesslog *ir.AccessLog, + tracing *ir.Tracing, + http3Listener bool, + connection *ir.ClientConnection, ) error { al, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeRoute) if err != nil { @@ -329,7 +360,7 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis Rds: &hcmv3.Rds{ ConfigSource: makeConfigSource(), // Configure route name to be found via RDS. - RouteConfigName: irListener.Name, + RouteConfigName: routeConfigName(irListener), }, }, HttpProtocolOptions: http1ProtocolOptions(irListener.HTTP1), @@ -426,7 +457,6 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: irListener.Name, } if irListener.TLS != nil { @@ -450,6 +480,8 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis } } filterChain.TransportSocket = tSocket + filterChain.Name = httpsListenerFilterChainName(irListener) + if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil { return err } @@ -461,12 +493,39 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis if xdsListener.DefaultFilterChain != nil { return errors.New("default filter chain already exists") } + filterChain.Name = httpListenerDefaultFilterChainName(irListener, t.xdsNameSchemeV2()) xdsListener.DefaultFilterChain = filterChain } return nil } +func routeConfigName(irListener *ir.HTTPListener) string { + // TODO(zhaohuabing): change the routeConfig name for HTTP listeners because they are merged into one route config + 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 { + return irListener.Name +} + +// irRoute name is used as the filter chain name for TLS listener, as TLSRoute is 1:1 mapping to the filter chain. +func tlsListenerFilterChainName(irRoute *ir.TCPRoute) string { + return irRoute.Name +} + func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensionConfig { if headers == nil || (len(headers.EarlyAddRequestHeaders) == 0 && len(headers.EarlyRemoveRequestHeaders) == 0) { return nil @@ -539,6 +598,7 @@ func addServerNamesMatch(xdsListener *listenerv3.Listener, filterChain *listener // 1. nil listeners // 2. UDP (QUIC) listeners used for HTTP3 // 3. wildcard hostnames + // TODO(zhaohuabing): https://github.com/envoyproxy/gateway/issues/5660#issuecomment-3130314740 if xdsListener == nil || (xdsListener.GetAddress() != nil && xdsListener.GetAddress().GetSocketAddress() != nil && xdsListener.GetAddress().GetSocketAddress().GetProtocol() == corev3.SocketAddress_UDP) { @@ -583,9 +643,21 @@ func findXdsHTTPRouteConfigName(xdsListener *listenerv3.Listener) string { return "" } -func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, - clusterName string, accesslog *ir.AccessLog, timeout *ir.ClientTimeout, - connection *ir.ClientConnection, +func hasHCMInDefaultFilterChain(xdsListener *listenerv3.Listener) bool { + if xdsListener == nil || xdsListener.DefaultFilterChain == nil || xdsListener.DefaultFilterChain.Filters == nil { + return false + } + for _, filter := range xdsListener.DefaultFilterChain.Filters { + if filter.Name == wellknown.HTTPConnectionManager { + return true + } + } + return false +} + +func (t *Translator) addXdsTCPFilterChain( + xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, clusterName string, + accesslog *ir.AccessLog, timeout *ir.ClientTimeout, connection *ir.ClientConnection, ) error { if irRoute == nil { return errors.New("tcp listener is nil") @@ -641,8 +713,8 @@ func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute } filterChain := &listenerv3.FilterChain{ + Name: tlsListenerFilterChainName(irRoute), Filters: filters, - Name: irRoute.Name, } if isTLSPassthrough { @@ -923,7 +995,12 @@ func buildXdsTLSCaCertSecret(caCertificate *ir.TLSCACertificate) *tlsv3.Secret { } } -func buildXdsUDPListener(clusterName string, udpListener *ir.UDPListener, accesslog *ir.AccessLog) (*listenerv3.Listener, error) { +func buildXdsUDPListener( + clusterName string, + udpListener *ir.UDPListener, + accesslog *ir.AccessLog, + xdsNameSchemeV2 bool, +) (*listenerv3.Listener, error) { if udpListener == nil { return nil, errors.New("udp listener is nil") } @@ -967,7 +1044,7 @@ func buildXdsUDPListener(clusterName string, udpListener *ir.UDPListener, access return nil, err } xdsListener := &listenerv3.Listener{ - Name: udpListener.Name, + Name: xdsListenerName(udpListener.Name, udpListener.ExternalPort, corev3.SocketAddress_UDP, xdsNameSchemeV2), AccessLog: al, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ diff --git a/internal/xds/translator/runner/runner.go b/internal/xds/translator/runner/runner.go index 5d7f774c04..c3e33c1969 100644 --- a/internal/xds/translator/runner/runner.go +++ b/internal/xds/translator/runner/runner.go @@ -71,6 +71,7 @@ func (r *Runner) subscribeAndTranslate(sub <-chan watchable.Snapshot[string, *ir t := &translator.Translator{ ControllerNamespace: r.ControllerNamespace, FilterOrder: val.FilterOrder, + RuntimeFlags: r.EnvoyGateway.RuntimeFlags, Logger: r.Logger, } diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-request-id.yaml index 37920bb009..a779e2593d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-request-id.yaml @@ -31,4 +31,3 @@ http: - host: "2.2.2.2" port: 8082 name: "second-route-dest/backend/0" - diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml index 2712729f05..d580efcf92 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml @@ -47,4 +47,3 @@ http: timeout: http: requestTimeout: 5s - diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml index 8fa1730df4..73b64d7c01 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml @@ -45,4 +45,3 @@ http: timeout: http: requestTimeout: 5s - diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-overlapping-tls-config.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-overlapping-tls-config.yaml index a7190896c4..93ce3b6ca8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-overlapping-tls-config.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-overlapping-tls-config.yaml @@ -58,22 +58,22 @@ http: port: 10443 routes: - destination: - name: httproute/envoy-gateway/httproute-1/rule/0 + name: httproute/envoy-gateway/httproute-2/rule/0 settings: - addressType: IP endpoints: - host: 7.7.7.7 port: 8080 - name: httproute/envoy-gateway/httproute-1/rule/0/backend/0 + name: httproute/envoy-gateway/httproute-2/rule/0/backend/0 protocol: HTTP weight: 1 hostname: '*.example.com' isHTTP2: false metadata: kind: HTTPRoute - name: httproute-1 + name: httproute-2 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com + name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com pathMatch: distinct: false name: "" @@ -93,30 +93,30 @@ http: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-1 - name: envoy-gateway/gateway-1/https-1 + sectionName: https-3 + name: envoy-gateway/gateway-1/https-3 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8443 routes: - destination: - name: httproute/envoy-gateway/httproute-1/rule/0 + name: httproute/envoy-gateway/httproute-3/rule/0 settings: - addressType: IP endpoints: - host: 7.7.7.7 port: 8080 - name: httproute/envoy-gateway/httproute-1/rule/0/backend/0 + name: httproute/envoy-gateway/httproute-3/rule/0/backend/0 protocol: HTTP weight: 1 hostname: foo.example.com isHTTP2: false metadata: kind: HTTPRoute - name: httproute-1 + name: httproute-3 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com + name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com pathMatch: distinct: false name: "" diff --git a/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml new file mode 100644 index 0000000000..392ea20efc --- /dev/null +++ b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml @@ -0,0 +1,240 @@ +http: +- name: "envoy-gateway/gateway-1/http1" + address: "::" + port: 10080 + externalPort: 80 + hostnames: + - "foo.net" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + routes: + - name: "first-route" + hostname: "foo.net" + destination: + name: "first-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "first-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/http2" + address: "::" + port: 10080 + externalPort: 80 + hostnames: + - "bar.net" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + routes: + - name: "second-route" + hostname: "bar.net" + destination: + name: "second-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "second-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/https1" + address: 0.0.0.0 + port: 10443 + externalPort: 443 + hostnames: + - "foo.com" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + tls: + alpnProtocols: + - h2 + - http/1.1 + certificates: + - name: first-listener + # byte slice representation of "cert-data" + certificate: [99, 101, 114, 116, 45, 100, 97, 116, 97] + # byte slice representation of "key-data" + privateKey: [107, 101, 121, 45, 100, 97, 116, 97] + routes: + - name: "first-route" + hostname: "foo.com" + destination: + name: "first-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "first-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/https2" + address: 0.0.0.0 + port: 10443 + externalPort: 443 + hostnames: + - "bar.com" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + tls: + alpnProtocols: + - h2 + - http/1.1 + certificates: + - name: first-listener + # byte slice representation of "cert-data" + certificate: [99, 101, 114, 116, 45, 100, 97, 116, 97] + # byte slice representation of "key-data" + privateKey: [107, 101, 121, 45, 100, 97, 116, 97] + routes: + - name: "second-route" + hostname: "bar.com" + destination: + name: "second-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "second-route-dest/backend/0" +- name: envoy-gateway/gateway-2/https-http3 + address: 0.0.0.0 + hostnames: + - '*' + http3: + quicPort: 1443 + isHTTP2: false + path: + escapedSlashesAction: UnescapeAndRedirect + mergeSlashes: true + port: 11443 + externalPort: 1443 + routes: + - destination: + metadata: + kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: httproute/default/httproute-1/rule/0/backend/0 + protocol: HTTP + weight: 1 + hostname: '*' + isHTTP2: false + name: httproute/default/httproute-1/rule/0/match/0/* + pathMatch: + distinct: false + name: "" + prefix: / + tls: + alpnProtocols: null + certificates: + - certificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= + name: envoy-gateway/tls-secret-1 + privateKey: '[redacted]' + maxVersion: "1.3" + minVersion: "1.2" +tcp: +- name: "envoy-gateway/gateway-1/tls" + address: 0.0.0.0 + port: 10090 + externalPort: 90 + routes: + - destination: + metadata: + kind: TLSRoute + name: tlsroute-1 + namespace: default + name: tlsroute/default/tlsroute-1/rule/-1 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: tlsroute/default/tlsroute-1/rule/-1/backend/0 + protocol: HTTPS + weight: 1 + name: tlsroute/default/tlsroute-1 + tls: + inspector: + snis: + - foo.com + - destination: + name: tlsroute/default/tlsroute-2/rule/-1 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: tlsroute/default/tlsroute-2/rule/-1/backend/0 + protocol: HTTPS + weight: 1 + name: tlsroute/default/tlsroute-2 + tls: + inspector: + snis: + - bar.com +- name: envoy-gateway/gateway-1/tcp + address: 0.0.0.0 + port: 10091 + externalPort: 91 + routes: + - destination: + metadata: + kind: TCPRoute + name: tcproute-1 + namespace: default + name: tcproute/default/tcproute + settings: + - addressType: IP + endpoints: + - host: 1.1.1.1 + port: 3001 + metadata: + kind: Backend + name: backend-ip + namespace: default + name: tcproute/default/tcprou + protocol: TCP + weight: 1 + name: tcproute/default/tcproute-1 +udp: +- name: envoy-gateway/gateway-1/udp + address: 0.0.0.0 + port: 10090 + externalPort: 90 + route: + destination: + metadata: + kind: UDPRoute + name: udproute-1 + namespace: default + name: udproute/default/udproute + settings: + - addressType: IP + endpoints: + - host: 1.1.1.1 + port: 3001 + metadata: + kind: Backend + name: backend-ip + namespace: default + name: udproute/default/udprou + protocol: UDP + weight: 1 + name: udproute/default/udproute-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v2.yaml b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v2.yaml new file mode 100644 index 0000000000..392ea20efc --- /dev/null +++ b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v2.yaml @@ -0,0 +1,240 @@ +http: +- name: "envoy-gateway/gateway-1/http1" + address: "::" + port: 10080 + externalPort: 80 + hostnames: + - "foo.net" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + routes: + - name: "first-route" + hostname: "foo.net" + destination: + name: "first-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "first-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/http2" + address: "::" + port: 10080 + externalPort: 80 + hostnames: + - "bar.net" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + routes: + - name: "second-route" + hostname: "bar.net" + destination: + name: "second-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "second-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/https1" + address: 0.0.0.0 + port: 10443 + externalPort: 443 + hostnames: + - "foo.com" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + tls: + alpnProtocols: + - h2 + - http/1.1 + certificates: + - name: first-listener + # byte slice representation of "cert-data" + certificate: [99, 101, 114, 116, 45, 100, 97, 116, 97] + # byte slice representation of "key-data" + privateKey: [107, 101, 121, 45, 100, 97, 116, 97] + routes: + - name: "first-route" + hostname: "foo.com" + destination: + name: "first-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "first-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/https2" + address: 0.0.0.0 + port: 10443 + externalPort: 443 + hostnames: + - "bar.com" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + tls: + alpnProtocols: + - h2 + - http/1.1 + certificates: + - name: first-listener + # byte slice representation of "cert-data" + certificate: [99, 101, 114, 116, 45, 100, 97, 116, 97] + # byte slice representation of "key-data" + privateKey: [107, 101, 121, 45, 100, 97, 116, 97] + routes: + - name: "second-route" + hostname: "bar.com" + destination: + name: "second-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + name: "second-route-dest/backend/0" +- name: envoy-gateway/gateway-2/https-http3 + address: 0.0.0.0 + hostnames: + - '*' + http3: + quicPort: 1443 + isHTTP2: false + path: + escapedSlashesAction: UnescapeAndRedirect + mergeSlashes: true + port: 11443 + externalPort: 1443 + routes: + - destination: + metadata: + kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: httproute/default/httproute-1/rule/0/backend/0 + protocol: HTTP + weight: 1 + hostname: '*' + isHTTP2: false + name: httproute/default/httproute-1/rule/0/match/0/* + pathMatch: + distinct: false + name: "" + prefix: / + tls: + alpnProtocols: null + certificates: + - certificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= + name: envoy-gateway/tls-secret-1 + privateKey: '[redacted]' + maxVersion: "1.3" + minVersion: "1.2" +tcp: +- name: "envoy-gateway/gateway-1/tls" + address: 0.0.0.0 + port: 10090 + externalPort: 90 + routes: + - destination: + metadata: + kind: TLSRoute + name: tlsroute-1 + namespace: default + name: tlsroute/default/tlsroute-1/rule/-1 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: tlsroute/default/tlsroute-1/rule/-1/backend/0 + protocol: HTTPS + weight: 1 + name: tlsroute/default/tlsroute-1 + tls: + inspector: + snis: + - foo.com + - destination: + name: tlsroute/default/tlsroute-2/rule/-1 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + metadata: + name: service-1 + namespace: default + sectionName: "8080" + name: tlsroute/default/tlsroute-2/rule/-1/backend/0 + protocol: HTTPS + weight: 1 + name: tlsroute/default/tlsroute-2 + tls: + inspector: + snis: + - bar.com +- name: envoy-gateway/gateway-1/tcp + address: 0.0.0.0 + port: 10091 + externalPort: 91 + routes: + - destination: + metadata: + kind: TCPRoute + name: tcproute-1 + namespace: default + name: tcproute/default/tcproute + settings: + - addressType: IP + endpoints: + - host: 1.1.1.1 + port: 3001 + metadata: + kind: Backend + name: backend-ip + namespace: default + name: tcproute/default/tcprou + protocol: TCP + weight: 1 + name: tcproute/default/tcproute-1 +udp: +- name: envoy-gateway/gateway-1/udp + address: 0.0.0.0 + port: 10090 + externalPort: 90 + route: + destination: + metadata: + kind: UDPRoute + name: udproute-1 + namespace: default + name: udproute/default/udproute + settings: + - addressType: IP + endpoints: + - host: 1.1.1.1 + port: 3001 + metadata: + kind: Backend + name: backend-ip + namespace: default + name: udproute/default/udprou + protocol: UDP + weight: 1 + name: udproute/default/udproute-1 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml index f04949b663..fb8875d973 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml @@ -22,3 +22,51 @@ name: httproute/envoy-gateway/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: httproute/envoy-gateway/httproute-2/rule/0 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: httproute/envoy-gateway/httproute-2/rule/0 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: httproute/envoy-gateway/httproute-3/rule/0 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: httproute/envoy-gateway/httproute-3/rule/0 + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.endpoints.yaml index c210427ccd..cd382d0b11 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.endpoints.yaml @@ -10,3 +10,27 @@ loadBalancingWeight: 1 locality: region: httproute/envoy-gateway/httproute-1/rule/0/backend/0 +- clusterName: httproute/envoy-gateway/httproute-2/rule/0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: httproute/envoy-gateway/httproute-2/rule/0/backend/0 +- clusterName: httproute/envoy-gateway/httproute-3/rule/0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: httproute/envoy-gateway/httproute-3/rule/0/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml index 482ba04e91..5c88ff3986 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml @@ -128,11 +128,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/https-1 + routeConfigName: envoy-gateway/gateway-1/https-3 serverHeaderTransformation: PASS_THROUGH statPrefix: https-8443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https-1 + name: envoy-gateway/gateway-1/https-3 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -152,5 +152,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/https-1 + name: envoy-gateway/gateway-1/https-3 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.routes.yaml index 181066a5d0..41ab5c2ecf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.routes.yaml @@ -49,15 +49,15 @@ envoy-gateway: resources: - kind: HTTPRoute - name: httproute-1 + name: httproute-2 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com + name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com route: - cluster: httproute/envoy-gateway/httproute-1/rule/0 + cluster: httproute/envoy-gateway/httproute-2/rule/0 upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/https-1 + name: envoy-gateway/gateway-1/https-3 virtualHosts: - domains: - foo.example.com @@ -68,8 +68,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-1 - name: envoy-gateway/gateway-1/https-1/foo_example_com + sectionName: https-3 + name: envoy-gateway/gateway-1/https-3/foo_example_com routes: - match: prefix: / @@ -78,10 +78,10 @@ envoy-gateway: resources: - kind: HTTPRoute - name: httproute-1 + name: httproute-3 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com + name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com route: - cluster: httproute/envoy-gateway/httproute-1/rule/0 + cluster: httproute/envoy-gateway/httproute-3/rule/0 upgradeConfigs: - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.clusters.yaml new file mode 100644 index 0000000000..5e095dbe09 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.clusters.yaml @@ -0,0 +1,196 @@ +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: first-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: first-route-dest + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: second-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: second-route-dest + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: httproute/default/httproute-1/rule/0 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tlsroute/default/tlsroute-1/rule/-1 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: TLSRoute + name: tlsroute-1 + namespace: default + name: tlsroute/default/tlsroute-1/rule/-1 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tlsroute/default/tlsroute-2/rule/-1 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: tlsroute/default/tlsroute-2/rule/-1 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcproute/default/tcproute + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: TCPRoute + name: tcproute-1 + namespace: default + name: tcproute/default/tcproute + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: udproute/default/udproute + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: UDPRoute + name: udproute-1 + namespace: default + name: udproute/default/udproute + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.endpoints.yaml new file mode 100644 index 0000000000..1cf72f0db4 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.endpoints.yaml @@ -0,0 +1,122 @@ +- clusterName: first-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: first-route-dest/backend/0 +- clusterName: second-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: second-route-dest/backend/0 +- clusterName: httproute/default/httproute-1/rule/0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: httproute/default/httproute-1/rule/0/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tlsroute/default/tlsroute-1/rule/-1 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tlsroute/default/tlsroute-1/rule/-1/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tlsroute/default/tlsroute-2/rule/-1 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tlsroute/default/tlsroute-2/rule/-1/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tcproute/default/tcproute + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.1.1.1 + portValue: 3001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcproute/default/tcprou + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Backend + name: backend-ip + namespace: default +- clusterName: udproute/default/udproute + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.1.1.1 + portValue: 3001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: udproute/default/udprou + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Backend + name: backend-ip + namespace: default diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.listeners.yaml new file mode 100644 index 0000000000..d192ac67ac --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.listeners.yaml @@ -0,0 +1,313 @@ +- address: + socketAddress: + address: '::' + portValue: 10080 + defaultFilterChain: + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/http1 + serverHeaderTransformation: PASS_THROUGH + statPrefix: http-10080 + useRemoteAddress: true + name: envoy-gateway/gateway-1/http1 + maxConnectionsToAcceptPerSocketEvent: 1 + name: envoy-gateway/gateway-1/http1 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10443 + filterChains: + - filterChainMatch: + serverNames: + - foo.com + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/https1 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/https1 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: first-listener + sdsConfig: + ads: {} + resourceApiVersion: V3 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/https2 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/https2 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: first-listener + sdsConfig: + ads: {} + resourceApiVersion: V3 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + maxConnectionsToAcceptPerSocketEvent: 1 + name: envoy-gateway/gateway-1/https1 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 11443 + protocol: UDP + drainType: MODIFY_ONLY + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codecType: HTTP3 + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + http3ProtocolOptions: {} + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-2/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-11443 + useRemoteAddress: true + name: envoy-gateway/gateway-2/https-http3 + transportSocket: + name: envoy.transport_sockets.quic + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.quic.v3.QuicDownstreamTransport + downstreamTlsContext: + commonTlsContext: + alpnProtocols: + - h3 + tlsCertificateSdsSecretConfigs: + - name: envoy-gateway/tls-secret-1 + sdsConfig: + ads: {} + resourceApiVersion: V3 + tlsParams: + tlsMaximumProtocolVersion: TLSv1_3 + tlsMinimumProtocolVersion: TLSv1_2 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + name: envoy-gateway/gateway-2/https-http3-quic + udpListenerConfig: + downstreamSocketConfig: {} + quicOptions: {} +- address: + socketAddress: + address: 0.0.0.0 + portValue: 11443 + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-2/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-11443 + useRemoteAddress: true + name: envoy-gateway/gateway-2/https-http3 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: envoy-gateway/tls-secret-1 + sdsConfig: + ads: {} + resourceApiVersion: V3 + tlsParams: + tlsMaximumProtocolVersion: TLSv1_3 + tlsMinimumProtocolVersion: TLSv1_2 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + maxConnectionsToAcceptPerSocketEvent: 1 + name: envoy-gateway/gateway-2/https-http3 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10090 + filterChains: + - filterChainMatch: + serverNames: + - foo.com + filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tlsroute/default/tlsroute-1/rule/-1 + statPrefix: tls-passthrough-10090 + name: tlsroute/default/tlsroute-1 + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tlsroute/default/tlsroute-2/rule/-1 + statPrefix: tls-passthrough-10090 + name: tlsroute/default/tlsroute-2 + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + maxConnectionsToAcceptPerSocketEvent: 1 + name: envoy-gateway/gateway-1/tls + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10091 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcproute/default/tcproute + statPrefix: tcp-10091 + name: tcproute/default/tcproute-1 + maxConnectionsToAcceptPerSocketEvent: 1 + name: envoy-gateway/gateway-1/tcp + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10090 + protocol: UDP + listenerFilters: + - name: envoy.filters.udp_listener.udp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig + matcher: + onNoMatch: + action: + name: route + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route + cluster: udproute/default/udproute + statPrefix: service + name: envoy-gateway/gateway-1/udp diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml new file mode 100644 index 0000000000..01d3a93d1b --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml @@ -0,0 +1,72 @@ +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http1 + virtualHosts: + - domains: + - foo.net + name: envoy-gateway/gateway-1/http1/foo_net + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket + - domains: + - bar.net + name: envoy-gateway/gateway-1/http2/bar_net + routes: + - match: + prefix: / + name: second-route + route: + cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https1 + virtualHosts: + - domains: + - foo.com + name: envoy-gateway/gateway-1/https1/foo_com + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https2 + virtualHosts: + - domains: + - bar.com + name: envoy-gateway/gateway-1/https2/bar_com + routes: + - match: + prefix: / + name: second-route + route: + cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-2/https-http3 + virtualHosts: + - domains: + - '*' + name: envoy-gateway/gateway-2/https-http3/* + routes: + - match: + prefix: / + name: httproute/default/httproute-1/rule/0/match/0/* + responseHeadersToAdd: + - append: true + header: + key: alt-svc + value: h3=":1443"; ma=86400 + route: + cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.secrets.yaml new file mode 100644 index 0000000000..87209a295f --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.secrets.yaml @@ -0,0 +1,18 @@ +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= +- name: envoy-gateway/tls-secret-1 + tlsCertificate: + certificateChain: + inlineBytes: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= + privateKey: + inlineBytes: W3JlZGFjdGVkXQ== diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.clusters.yaml new file mode 100644 index 0000000000..5e095dbe09 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.clusters.yaml @@ -0,0 +1,196 @@ +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: first-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: first-route-dest + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: second-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: second-route-dest + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: httproute/default/httproute-1/rule/0 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tlsroute/default/tlsroute-1/rule/-1 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: TLSRoute + name: tlsroute-1 + namespace: default + name: tlsroute/default/tlsroute-1/rule/-1 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tlsroute/default/tlsroute-2/rule/-1 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + name: tlsroute/default/tlsroute-2/rule/-1 + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcproute/default/tcproute + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: TCPRoute + name: tcproute-1 + namespace: default + name: tcproute/default/tcproute + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: udproute/default/udproute + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: UDPRoute + name: udproute-1 + namespace: default + name: udproute/default/udproute + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.endpoints.yaml new file mode 100644 index 0000000000..1cf72f0db4 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.endpoints.yaml @@ -0,0 +1,122 @@ +- clusterName: first-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: first-route-dest/backend/0 +- clusterName: second-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: second-route-dest/backend/0 +- clusterName: httproute/default/httproute-1/rule/0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: httproute/default/httproute-1/rule/0/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tlsroute/default/tlsroute-1/rule/-1 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tlsroute/default/tlsroute-1/rule/-1/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tlsroute/default/tlsroute-2/rule/-1 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tlsroute/default/tlsroute-2/rule/-1/backend/0 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: "" + name: service-1 + namespace: default + sectionName: "8080" +- clusterName: tcproute/default/tcproute + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.1.1.1 + portValue: 3001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcproute/default/tcprou + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Backend + name: backend-ip + namespace: default +- clusterName: udproute/default/udproute + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.1.1.1 + portValue: 3001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: udproute/default/udprou + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Backend + name: backend-ip + namespace: default diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml new file mode 100644 index 0000000000..b1b39aa28e --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml @@ -0,0 +1,313 @@ +- address: + socketAddress: + address: '::' + portValue: 10080 + defaultFilterChain: + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/http1 + serverHeaderTransformation: PASS_THROUGH + statPrefix: http-10080 + useRemoteAddress: true + name: http-80 + maxConnectionsToAcceptPerSocketEvent: 1 + name: tcp-80 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10443 + filterChains: + - filterChainMatch: + serverNames: + - foo.com + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/https1 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/https1 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: first-listener + sdsConfig: + ads: {} + resourceApiVersion: V3 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/https2 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/https2 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: first-listener + sdsConfig: + ads: {} + resourceApiVersion: V3 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + maxConnectionsToAcceptPerSocketEvent: 1 + name: tcp-443 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 11443 + protocol: UDP + drainType: MODIFY_ONLY + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codecType: HTTP3 + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + http3ProtocolOptions: {} + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-2/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-11443 + useRemoteAddress: true + name: envoy-gateway/gateway-2/https-http3 + transportSocket: + name: envoy.transport_sockets.quic + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.quic.v3.QuicDownstreamTransport + downstreamTlsContext: + commonTlsContext: + alpnProtocols: + - h3 + tlsCertificateSdsSecretConfigs: + - name: envoy-gateway/tls-secret-1 + sdsConfig: + ads: {} + resourceApiVersion: V3 + tlsParams: + tlsMaximumProtocolVersion: TLSv1_3 + tlsMinimumProtocolVersion: TLSv1_2 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + name: udp-1443 + udpListenerConfig: + downstreamSocketConfig: {} + quicOptions: {} +- address: + socketAddress: + address: 0.0.0.0 + portValue: 11443 + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-2/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-11443 + useRemoteAddress: true + name: envoy-gateway/gateway-2/https-http3 + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + commonTlsContext: + alpnProtocols: + - h2 + - http/1.1 + tlsCertificateSdsSecretConfigs: + - name: envoy-gateway/tls-secret-1 + sdsConfig: + ads: {} + resourceApiVersion: V3 + tlsParams: + tlsMaximumProtocolVersion: TLSv1_3 + tlsMinimumProtocolVersion: TLSv1_2 + disableStatefulSessionResumption: true + disableStatelessSessionResumption: true + maxConnectionsToAcceptPerSocketEvent: 1 + name: tcp-1443 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10090 + filterChains: + - filterChainMatch: + serverNames: + - foo.com + filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tlsroute/default/tlsroute-1/rule/-1 + statPrefix: tls-passthrough-10090 + name: tlsroute/default/tlsroute-1 + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tlsroute/default/tlsroute-2/rule/-1 + statPrefix: tls-passthrough-10090 + name: tlsroute/default/tlsroute-2 + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + maxConnectionsToAcceptPerSocketEvent: 1 + name: tcp-90 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10091 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcproute/default/tcproute + statPrefix: tcp-10091 + name: tcproute/default/tcproute-1 + maxConnectionsToAcceptPerSocketEvent: 1 + name: tcp-91 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10090 + protocol: UDP + listenerFilters: + - name: envoy.filters.udp_listener.udp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig + matcher: + onNoMatch: + action: + name: route + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route + cluster: udproute/default/udproute + statPrefix: service + name: udp-90 diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.routes.yaml new file mode 100644 index 0000000000..01d3a93d1b --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.routes.yaml @@ -0,0 +1,72 @@ +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http1 + virtualHosts: + - domains: + - foo.net + name: envoy-gateway/gateway-1/http1/foo_net + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket + - domains: + - bar.net + name: envoy-gateway/gateway-1/http2/bar_net + routes: + - match: + prefix: / + name: second-route + route: + cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https1 + virtualHosts: + - domains: + - foo.com + name: envoy-gateway/gateway-1/https1/foo_com + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https2 + virtualHosts: + - domains: + - bar.com + name: envoy-gateway/gateway-1/https2/bar_com + routes: + - match: + prefix: / + name: second-route + route: + cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-2/https-http3 + virtualHosts: + - domains: + - '*' + name: envoy-gateway/gateway-2/https-http3/* + routes: + - match: + prefix: / + name: httproute/default/httproute-1/rule/0/match/0/* + responseHeadersToAdd: + - append: true + header: + key: alt-svc + value: h3=":1443"; ma=86400 + route: + cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.secrets.yaml new file mode 100644 index 0000000000..87209a295f --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.secrets.yaml @@ -0,0 +1,18 @@ +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= +- name: envoy-gateway/tls-secret-1 + tlsCertificate: + certificateChain: + inlineBytes: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= + privateKey: + inlineBytes: W3JlZGFjdGVkXQ== diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 2f5b4627a9..862d8d7133 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -65,7 +65,18 @@ type Translator struct { // FilterOrder holds the custom order of the HTTP filters FilterOrder []egv1a1.FilterPosition - Logger logging.Logger + + // RuntimeFlag holds the feature flags for the translator. + RuntimeFlags *egv1a1.RuntimeFlags + + Logger logging.Logger +} + +func (t *Translator) xdsNameSchemeV2() bool { + if t.RuntimeFlags == nil { + return false + } + return t.RuntimeFlags.IsEnabled(egv1a1.XDSNameSchemeV2) } type GlobalRateLimitSettings struct { @@ -114,7 +125,7 @@ func (t *Translator) Translate(xdsIR *ir.Xds) (*types.ResourceVersionTable, erro errs = errors.Join(errs, err) } - if err := processUDPListenerXdsTranslation(tCtx, xdsIR.UDP, xdsIR.AccessLog, xdsIR.Metrics); err != nil { + if err := t.processUDPListenerXdsTranslation(tCtx, xdsIR.UDP, xdsIR.AccessLog, xdsIR.Metrics); err != nil { errs = errors.Join(errs, err) } @@ -281,10 +292,11 @@ func (t *Translator) processHTTPListenerXdsTranslation( var ( http3Settings *ir.HTTP3Settings // HTTP3 settings for the listener, if any http3Enabled bool - tcpXDSListener *listenerv3.Listener // TCP Listener for HTTP1/HTTP2 traffic - quicXDSListener *listenerv3.Listener // UDP(QUIC) Listener for HTTP3 traffic - xdsListenerOnSameAddressPortExists bool // Whether a listener already exists on the same address + port combination - tlsEnabled bool // Whether TLS is enabled for the listener + tcpXDSListener *listenerv3.Listener // TCP Listener for HTTP1/HTTP2 traffic + quicXDSListener *listenerv3.Listener // UDP(QUIC) Listener for HTTP3 traffic + xdsListenerOnSameAddressPortExists bool // Whether a listener already exists on the same address + port combination + tlsEnabled bool // Whether TLS is enabled for the listener + routeCfgName string xdsRouteCfg *routev3.RouteConfiguration // The route config is used by both the TCP and QUIC listeners addHCM bool // Whether to add an HCM(HTTP Connection Manager filter) to the listener's TCP filter chain err error @@ -293,8 +305,11 @@ func (t *Translator) processHTTPListenerXdsTranslation( http3Settings, http3Enabled = http3EnabledListeners[listenerKey{Address: httpListener.Address, Port: httpListener.Port}] // Search for an existing TCP listener on the same address + port combination. + // Right now, the address is always 0.0.0.0/::, and we need to revisit the logic in the method if we want to support + // listeners on specific addresses. tcpXDSListener = findXdsListenerByHostPort(tCtx, httpListener.Address, httpListener.Port, corev3.SocketAddress_TCP) quicXDSListener = findXdsListenerByHostPort(tCtx, httpListener.Address, httpListener.Port, corev3.SocketAddress_UDP) + xdsListenerOnSameAddressPortExists = tcpXDSListener != nil tlsEnabled = httpListener.TLS != nil @@ -303,8 +318,11 @@ func (t *Translator) processHTTPListenerXdsTranslation( case !xdsListenerOnSameAddressPortExists: // Create a new UDP(QUIC) listener for HTTP3 traffic if HTTP3 is enabled if http3Enabled { - if quicXDSListener, err = buildXdsQuicListener(httpListener.Name, httpListener.Address, - httpListener.Port, httpListener.IPFamily, accessLog); err != nil { + if quicXDSListener, err = t.buildXdsQuicListener( + httpListener.CoreListenerDetails, + httpListener.IPFamily, + accessLog, + ); err != nil { errs = errors.Join(errs, err) continue } @@ -316,9 +334,12 @@ func (t *Translator) processHTTPListenerXdsTranslation( } // Create a new TCP listener for HTTP1/HTTP2 traffic. - if tcpXDSListener, err = buildXdsTCPListener( - httpListener.Name, httpListener.Address, httpListener.Port, httpListener.IPFamily, - httpListener.TCPKeepalive, httpListener.Connection, accessLog); err != nil { + if tcpXDSListener, err = t.buildXdsTCPListener( + httpListener.CoreListenerDetails, + httpListener.TCPKeepalive, + httpListener.Connection, + accessLog, + ); err != nil { errs = errors.Join(errs, err) continue } @@ -341,26 +362,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( // The HCM is configured with a RouteConfiguration, which is used to // route HTTP traffic to the correct virtual host for all the domains // specified in the Gateway HTTP Listener's routes. - var ( - routeConfigName string - hasHCMInDefaultFilterChain bool - ) - - // Find the route config associated with this listener that - // maps to the default filter chain for http traffic - // Routes for this listener will be added to this route config - routeConfigName = findXdsHTTPRouteConfigName(tcpXDSListener) - hasHCMInDefaultFilterChain = routeConfigName != "" - addHCM = !hasHCMInDefaultFilterChain - - if routeConfigName != "" { - xdsRouteCfg = findXdsRouteConfig(tCtx, routeConfigName) - if xdsRouteCfg == nil { - // skip this listener if failed to find xds route config - errs = errors.Join(errs, errors.New("unable to find xds route config")) - continue - } - } + addHCM = !hasHCMInDefaultFilterChain(tcpXDSListener) case xdsListenerOnSameAddressPortExists && tlsEnabled: // If an existing xds listener exists, and Gateway HTTP Listener enables // TLS, we need to create an HCM. @@ -435,11 +437,24 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } + // For backward compatibility, we first try to get the route config name from the xDS listener. + // This is because the legacy rout config name is named after the first ir listener name on the same port(which is not ideal), + // and the current ir Listener has a different name. + // + // For example, the route config name is named after the ir Listener name "default/eg/http1", but the current + // ir Listener is "default/eg/http2". + routeCfgName = findXdsHTTPRouteConfigName(tcpXDSListener) + // If the route config name is not found, we use the current ir Listener name as the route config name to create a new route config. + if routeCfgName == "" { + routeCfgName = routeConfigName(httpListener) + } + // Create a route config if we have not found one yet + xdsRouteCfg = findXdsRouteConfig(tCtx, routeCfgName) if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: httpListener.Name, + Name: routeCfgName, } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { @@ -489,7 +504,7 @@ func (t *Translator) addRouteToRouteConfig( underscoredHostname := strings.ReplaceAll(httpRoute.Hostname, ".", "_") // Allocate virtual host for this httpRoute. vHost = &routev3.VirtualHost{ - Name: fmt.Sprintf("%s/%s", httpListener.Name, underscoredHostname), + Name: virtualHostName(httpListener, underscoredHostname), Domains: []string{httpRoute.Hostname}, Metadata: buildXdsMetadata(httpListener.Metadata), } @@ -638,10 +653,13 @@ func (t *Translator) addRouteToRouteConfig( } } xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, vHostList...) - return errs } +func virtualHostName(httpListener *ir.HTTPListener, underscoredHostname string) string { + return fmt.Sprintf("%s/%s", httpListener.Name, underscoredHostname) +} + func (t *Translator) addHTTPFiltersToHCM(filterChain *listenerv3.FilterChain, httpListener *ir.HTTPListener) error { var ( hcm *hcmv3.HttpConnectionManager @@ -711,13 +729,17 @@ func (t *Translator) processTCPListenerXdsTranslation( // The XDS translation is done in a best-effort manner, so we collect all // errors and return them at the end. var errs, err error + for _, tcpListener := range tcpListeners { // Search for an existing listener, if it does not exist, create one. xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port, corev3.SocketAddress_TCP) if xdsListener == nil { - if xdsListener, err = buildXdsTCPListener( - tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, - tcpListener.TCPKeepalive, tcpListener.Connection, accesslog); err != nil { + if xdsListener, err = t.buildXdsTCPListener( + tcpListener.CoreListenerDetails, + tcpListener.TCPKeepalive, + tcpListener.Connection, + accesslog, + ); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -768,7 +790,14 @@ func (t *Translator) processTCPListenerXdsTranslation( } } } - if err := addXdsTCPFilterChain(xdsListener, route, route.Destination.Name, accesslog, tcpListener.Timeout, tcpListener.Connection); err != nil { + if err := t.addXdsTCPFilterChain( + xdsListener, + route, + route.Destination.Name, + accesslog, + tcpListener.Timeout, + tcpListener.Connection, + ); err != nil { errs = errors.Join(errs, err) } } @@ -788,15 +817,23 @@ func (t *Translator) processTCPListenerXdsTranslation( Name: emptyClusterName, }, } - if err := addXdsTCPFilterChain(xdsListener, emptyRoute, emptyClusterName, accesslog, tcpListener.Timeout, tcpListener.Connection); err != nil { + if err := t.addXdsTCPFilterChain( + xdsListener, + emptyRoute, + emptyClusterName, + accesslog, + tcpListener.Timeout, + tcpListener.Connection, + ); err != nil { errs = errors.Join(errs, err) } } } + return errs } -func processUDPListenerXdsTranslation( +func (t *Translator) processUDPListenerXdsTranslation( tCtx *types.ResourceVersionTable, udpListeners []*ir.UDPListener, accesslog *ir.AccessLog, @@ -835,7 +872,12 @@ func processUDPListenerXdsTranslation( } } - xdsListener, err := buildXdsUDPListener(udpListener.Route.Destination.Name, udpListener, accesslog) + xdsListener, err := buildXdsUDPListener( + udpListener.Route.Destination.Name, + udpListener, + accesslog, + t.xdsNameSchemeV2(), + ) if err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) diff --git a/internal/xds/translator/translator_test.go b/internal/xds/translator/translator_test.go index 130fb086fd..55acbd90e5 100644 --- a/internal/xds/translator/translator_test.go +++ b/internal/xds/translator/translator_test.go @@ -46,6 +46,7 @@ type testFileConfig struct { requireEnvoyPatchPolicies bool dnsDomain string errMsg string + runtimeFlags *egv1a1.RuntimeFlags } func TestTranslateXds(t *testing.T) { @@ -134,6 +135,11 @@ func TestTranslateXds(t *testing.T) { "tracing-unknown-provider-type": { errMsg: "unknown tracing provider type: AwesomeTelemetry", }, + "xds-name-scheme-v2": { + runtimeFlags: &egv1a1.RuntimeFlags{ + Enabled: []egv1a1.RuntimeFlag{egv1a1.XDSNameSchemeV2}, + }, + }, } inputFiles, err := filepath.Glob(filepath.Join("testdata", "in", "xds-ir", "*.yaml")) @@ -162,7 +168,8 @@ func TestTranslateXds(t *testing.T) { GlobalRateLimit: &GlobalRateLimitSettings{ ServiceURL: ratelimit.GetServiceURL("envoy-gateway-system", dnsDomain), }, - FilterOrder: x.FilterOrder, + FilterOrder: x.FilterOrder, + RuntimeFlags: cfg.runtimeFlags, } tCtx, err := tr.Translate(x) if !strings.HasSuffix(inputFileName, "partial-invalid") && len(cfg.errMsg) == 0 { diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 76440b3025..7161532b7a 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -4,6 +4,7 @@ date: Pending breaking changes: | Use gateway name as proxy fleet name for gateway namespace mode. Endpoints that are absent from service discovery are removed even if their active health checks succeed. + The xDS listener name are now renamed based on its listening port and protocol, instead of the Gateway name and section name. This breaks existing EnvoyPatchPolicies and ExtensionManagers as they depend on the old naming scheme. This change is guarded by the `XDSNameSchemeV2` runtime flag. This flag is disabled by default in v1.5, and it will be enabled in v1.6. We recommend users to migrate their EnvoyPatchPolicies and ExtensionManagers to use the new listener names before v1.6. # Updates addressing vulnerabilities, security flaws, or compliance requirements. security updates: | diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index 701a6d75d9..5251643530 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -4462,7 +4462,7 @@ _Appears in:_ | Value | Description | | ----- | ----------- | -| `UseAddressAsListenerName` | UseAddressAsListenerName indicates that the listener name should be derived from the address and port.
| +| `XDSNameSchemeV2` | XDSNameSchemeV2 indicates that the xds name scheme v2 is used.
* The listener name will be generated using the protocol and port of the listener.
| #### RuntimeFlags diff --git a/test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml b/test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml new file mode 100644 index 0000000000..37a3dd9d89 --- /dev/null +++ b/test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: envoy-gateway-config + namespace: envoy-gateway-system +data: + envoy-gateway.yaml: | + apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: EnvoyGateway + provider: + type: Kubernetes + gateway: + controllerName: gateway.envoyproxy.io/gatewayclass-controller + extensionApis: + enableEnvoyPatchPolicy: true + enableBackend: true + rateLimit: + backend: + type: Redis + redis: + url: redis.redis-system.svc.cluster.local:6379 + runtimeFlags: + enabled: + - XDSNameSchemeV2 diff --git a/test/config/helm/xds-name-scheme-v2.yaml b/test/config/helm/xds-name-scheme-v2.yaml new file mode 100644 index 0000000000..290d342c3e --- /dev/null +++ b/test/config/helm/xds-name-scheme-v2.yaml @@ -0,0 +1,5 @@ +config: + envoyGateway: + runtimeFlags: + enabled: + - XDSNameSchemeV2 diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index c7d69f107e..8a335262ee 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -71,6 +71,16 @@ func TestE2E(t *testing.T) { ) } + if tests.XDSNameSchemeV2() { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyTest.ShortName, + ) + } else { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyXDSNameSchemeV2Test.ShortName, + ) + } + enabledFeatures := sets.New(features.SupportGateway) if tests.EnabledClusterTrustBundle() { tlog.Logf(t, "ClusterTrustBundle feature is enabled") diff --git a/test/e2e/testdata/envoy-patch-policy-xds-name-scheme-v2.yaml b/test/e2e/testdata/envoy-patch-policy-xds-name-scheme-v2.yaml new file mode 100644 index 0000000000..f0ede72827 --- /dev/null +++ b/test/e2e/testdata/envoy-patch-policy-xds-name-scheme-v2.yaml @@ -0,0 +1,47 @@ +--- +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: http-envoy-patch-policy + namespace: gateway-conformance-infra +spec: + parentRefs: + - name: same-namespace + rules: + - backendRefs: + - name: infra-backend-v1 + port: 8080 + matches: + - path: + type: PathPrefix + value: /foo +--- +apiVersion: gateway.envoyproxy.io/v1alpha1 +kind: EnvoyPatchPolicy +metadata: + name: custom-response-patch-policy + namespace: gateway-conformance-infra +spec: + targetRef: + group: gateway.networking.k8s.io + kind: Gateway + name: same-namespace + type: JSONPatch + jsonPatches: + - type: "type.googleapis.com/envoy.config.listener.v3.Listener" + name: "tcp-80" + operation: + op: add + path: "/default_filter_chain/filters/0/typed_config/local_reply_config" + value: + mappers: + - filter: + status_code_filter: + comparison: + op: EQ + value: + default_value: 404 + runtime_key: key_b + status_code: 406 + body: + inline_string: "not acceptable" diff --git a/test/e2e/tests/envoy_patch_policy.go b/test/e2e/tests/envoy_patch_policy.go index 2c93872841..27738d8a8e 100644 --- a/test/e2e/tests/envoy_patch_policy.go +++ b/test/e2e/tests/envoy_patch_policy.go @@ -26,35 +26,39 @@ var EnvoyPatchPolicyTest = suite.ConformanceTest{ Manifests: []string{"testdata/envoy-patch-policy.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { t.Run("envoy patch policy", func(t *testing.T) { - ns := "gateway-conformance-infra" - routeNN := types.NamespacedName{Name: "http-envoy-patch-policy", Namespace: ns} - gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns} - gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN) - OkResp := http.ExpectedResponse{ - Request: http.Request{ - Path: "/foo", - }, - Response: http.Response{ - StatusCode: 200, - }, - Namespace: ns, - } - - // Send a request to an valid path and expect a successful response - http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, OkResp) - - customResp := http.ExpectedResponse{ - Request: http.Request{ - Path: "/bar", - }, - Response: http.Response{ - StatusCode: 406, - }, - Namespace: ns, - } - - // Send a request to an invalid path and expect a custom response - http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, customResp) + testEnvoyPatchPolicy(t, suite) }) }, } + +func testEnvoyPatchPolicy(t *testing.T, suite *suite.ConformanceTestSuite) { + ns := "gateway-conformance-infra" + routeNN := types.NamespacedName{Name: "http-envoy-patch-policy", Namespace: ns} + gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns} + gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN) + OkResp := http.ExpectedResponse{ + Request: http.Request{ + Path: "/foo", + }, + Response: http.Response{ + StatusCode: 200, + }, + Namespace: ns, + } + + // Send a request to an valid path and expect a successful response + http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, OkResp) + + customResp := http.ExpectedResponse{ + Request: http.Request{ + Path: "/bar", + }, + Response: http.Response{ + StatusCode: 406, + }, + Namespace: ns, + } + + // Send a request to an invalid path and expect a custom response + http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, customResp) +} diff --git a/test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go b/test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go new file mode 100644 index 0000000000..b7c8ce47d5 --- /dev/null +++ b/test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go @@ -0,0 +1,29 @@ +// Copyright Envoy Gateway Authors +// SPDX-License-Identifier: Apache-2.0 +// The full text of the Apache license is available in the LICENSE file at +// the root of the repo. + +//go:build e2e + +package tests + +import ( + "testing" + + "sigs.k8s.io/gateway-api/conformance/utils/suite" +) + +func init() { + ConformanceTests = append(ConformanceTests, EnvoyPatchPolicyXDSNameSchemeV2Test) +} + +var EnvoyPatchPolicyXDSNameSchemeV2Test = suite.ConformanceTest{ + ShortName: "EnvoyPatchPolicyXDSNameSchemeV2", + Description: "update xds using EnvoyPatchPolicy", + Manifests: []string{"testdata/envoy-patch-policy-xds-name-scheme-v2.yaml"}, + Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { + t.Run("envoy patch policy", func(t *testing.T) { + testEnvoyPatchPolicy(t, suite) + }) + }, +} diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go index 4b51ecb273..286d3c2282 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -734,6 +734,11 @@ func IsGatewayNamespaceMode() bool { return DeployProfile == "gateway-namespace-mode" } +// TODO(zhaohuabing) remove this after the feature flag is removed. +func XDSNameSchemeV2() bool { + return DeployProfile == "xds-name-scheme-v2" +} + func GetGatewayResourceNamespace() string { if IsGatewayNamespaceMode() { return "gateway-conformance-infra"