From 373cc8b91693f3cfa87d6a6a227321f44ab40c51 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Thu, 17 Jul 2025 09:01:01 +0000 Subject: [PATCH 01/44] rename listener using its address and port Signed-off-by: Huabing (Robin) Zhao --- .../translate/out/default-resources.all.yaml | 8 ++++---- .../out/from-gateway-api-to-xds.all.json | 8 ++++---- .../out/from-gateway-api-to-xds.all.yaml | 8 ++++---- .../out/from-gateway-api-to-xds.listener.yaml | 8 ++++---- ...t-single-route-single-match-to-xds.all.json | 2 +- ...t-single-route-single-match-to-xds.all.yaml | 2 +- ...gle-route-single-match-to-xds.listener.yaml | 2 +- .../out/no-service-cluster-ip.all.yaml | 2 +- .../xds/translator/extensionserver_test.go | 12 ++++++------ internal/xds/translator/listener.go | 9 +++++++-- .../extensionpolicy-tcp-udp-http.yaml | 4 ++-- .../http-route-extension-filter.yaml | 2 +- .../http-route-extension-listener-error.yaml | 2 +- .../in/extension-xds-ir/listener-policy.yaml | 2 +- .../multiple-listeners-same-port-error.yaml | 2 +- .../in/xds-ir/jsonpatch-invalid-patch.yaml | 2 +- ...extensionpolicy-tcp-udp-http.listeners.yaml | 17 ++++++++++++----- ...p-route-custom-backend-error.listeners.yaml | 2 +- ...ckend-multiple-backend-error.listeners.yaml | 2 +- .../http-route-custom-backend.listeners.yaml | 2 +- ...-route-custom-backends-mixed.listeners.yaml | 2 +- ...stom-backends-multiple-mixed.listeners.yaml | 2 +- .../http-route-extension-filter.listeners.yaml | 6 +++--- ...ute-extension-listener-error.listeners.yaml | 6 +++--- ...-route-extension-route-error.listeners.yaml | 2 +- ...te-extension-translate-error.listeners.yaml | 2 +- ...-extension-virtualhost-error.listeners.yaml | 2 +- .../extension-xds-ir/http-route.listeners.yaml | 2 +- .../listener-policy.listeners.yaml | 6 +++--- ...le-listeners-same-port-error.listeners.yaml | 18 +++++++++++++++--- .../out/xds-ir/accesslog-cel.listeners.yaml | 2 +- .../accesslog-endpoint-stats.listeners.yaml | 2 +- .../xds-ir/accesslog-formatters.listeners.yaml | 2 +- .../xds-ir/accesslog-multi-cel.listeners.yaml | 2 +- .../out/xds-ir/accesslog-types.listeners.yaml | 2 +- .../accesslog-with-format.listeners.yaml | 2 +- .../out/xds-ir/accesslog.listeners.yaml | 2 +- .../out/xds-ir/api-key-auth.listeners.yaml | 2 +- .../authorization-client-cidr.listeners.yaml | 2 +- .../authorization-http-header.listeners.yaml | 2 +- .../authorization-jwt-claim.listeners.yaml | 2 +- .../authorization-jwt-scope.listeners.yaml | 2 +- ...rization-multiple-principals.listeners.yaml | 2 +- .../xds-ir/backend-buffer-limit.listeners.yaml | 4 ++-- .../out/xds-ir/backend-priority.listeners.yaml | 2 +- .../backend-tls-skip-verify.listeners.yaml | 2 +- .../basic-auth-username-header.listeners.yaml | 2 +- .../out/xds-ir/basic-auth.listeners.yaml | 2 +- .../out/xds-ir/btp-telemetry.listeners.yaml | 2 +- .../out/xds-ir/circuit-breaker.listeners.yaml | 2 +- .../xds-ir/client-buffer-limit.listeners.yaml | 4 ++-- .../xds-ir/client-ip-detection.listeners.yaml | 8 ++++---- .../client-stream-idle-timeout.listeners.yaml | 4 ++-- .../out/xds-ir/client-timeout.listeners.yaml | 4 ++-- .../out/xds-ir/compression.listeners.yaml | 2 +- .../cors-from-httpcorsfilter.listeners.yaml | 2 +- .../testdata/out/xds-ir/cors.listeners.yaml | 2 +- ...ial-injection-backend-filter.listeners.yaml | 2 +- .../xds-ir/credential-injection.listeners.yaml | 2 +- .../xds-ir/custom-filter-order.listeners.yaml | 2 +- .../out/xds-ir/custom-response.listeners.yaml | 2 +- .../xds-ir/dns-lookup-family.listeners.yaml | 2 +- .../out/xds-ir/ext-auth-backend.listeners.yaml | 2 +- .../out/xds-ir/ext-auth-body.listeners.yaml | 2 +- .../ext-auth-recomputation.listeners.yaml | 2 +- .../out/xds-ir/ext-auth.listeners.yaml | 2 +- ...t-proc-with-traffic-settings.listeners.yaml | 2 +- .../out/xds-ir/ext-proc.listeners.yaml | 2 +- .../out/xds-ir/fault-injection.listeners.yaml | 2 +- ...ders-with-disable-request-id.listeners.yaml | 4 ++-- ...ers-with-generate-request-id.listeners.yaml | 4 ++-- ...serve-or-generate-request-id.listeners.yaml | 4 ++-- ...ers-with-preserve-request-id.listeners.yaml | 4 ++-- ...ders-with-underscores-action.listeners.yaml | 8 ++++---- .../out/xds-ir/health-check.listeners.yaml | 2 +- .../xds-ir/http-connect-proxy.listeners.yaml | 2 +- .../http-connect-terminate.listeners.yaml | 2 +- .../http-early-header-mutation.listeners.yaml | 4 ++-- .../xds-ir/http-endpoint-stats.listeners.yaml | 2 +- .../xds-ir/http-health-check.listeners.yaml | 2 +- ...ttp-preserve-client-protocol.listeners.yaml | 2 +- .../http-req-resp-sizes-stats.listeners.yaml | 2 +- .../http-route-direct-response.listeners.yaml | 2 +- .../http-route-dns-cluster.listeners.yaml | 2 +- .../http-route-dynamic-resolver.listeners.yaml | 2 +- .../xds-ir/http-route-mirror.listeners.yaml | 2 +- ...ttp-route-mirrors-percentage.listeners.yaml | 2 +- .../http-route-multiple-matches.listeners.yaml | 2 +- ...-multiple-mirrors-percentage.listeners.yaml | 2 +- .../http-route-multiple-mirrors.listeners.yaml | 2 +- .../http-route-partial-invalid.listeners.yaml | 2 +- .../xds-ir/http-route-redirect.listeners.yaml | 2 +- .../out/xds-ir/http-route-regex.listeners.yaml | 2 +- .../http-route-request-headers.listeners.yaml | 2 +- ...p-route-response-add-headers.listeners.yaml | 2 +- ...-response-add-remove-headers.listeners.yaml | 2 +- ...oute-response-remove-headers.listeners.yaml | 2 +- ...rewrite-root-path-url-prefix.listeners.yaml | 2 +- ...sufixx-with-slash-url-prefix.listeners.yaml | 2 +- ...p-route-rewrite-url-fullpath.listeners.yaml | 2 +- .../http-route-rewrite-url-host.listeners.yaml | 2 +- ...ttp-route-rewrite-url-prefix.listeners.yaml | 2 +- ...http-route-rewrite-url-regex.listeners.yaml | 2 +- ...tp-route-session-persistence.listeners.yaml | 2 +- .../xds-ir/http-route-stat-name.listeners.yaml | 2 +- .../xds-ir/http-route-timeout.listeners.yaml | 2 +- ...oute-weighted-backend-uds-ip.listeners.yaml | 2 +- ...eighted-backend-with-filters.listeners.yaml | 2 +- .../http-route-weighted-backend.listeners.yaml | 2 +- ...ute-weighted-invalid-backend.listeners.yaml | 2 +- .../http-route-with-clientcert.listeners.yaml | 2 +- .../http-route-with-metadata.listeners.yaml | 2 +- ...e-with-tls-system-truststore.listeners.yaml | 2 +- ...ith-tlsbundle-multiple-certs.listeners.yaml | 4 ++-- .../http-route-with-tlsbundle.listeners.yaml | 2 +- ...al-routing-weighted-clusters.listeners.yaml | 2 +- .../http-route-zonal-routing.listeners.yaml | 2 +- .../out/xds-ir/http-route.listeners.yaml | 2 +- .../xds-ir/http-upgrade-spdy.listeners.yaml | 2 +- .../http-upgrade-websocket-spdy.listeners.yaml | 2 +- .../xds-ir/http1-preserve-case.listeners.yaml | 4 ++-- .../out/xds-ir/http1-trailers.listeners.yaml | 2 +- .../testdata/out/xds-ir/http10.listeners.yaml | 2 +- .../out/xds-ir/http2-mixed.listeners.yaml | 2 +- .../out/xds-ir/http2-route.listeners.yaml | 2 +- .../testdata/out/xds-ir/http2.listeners.yaml | 2 +- .../testdata/out/xds-ir/http3.listeners.yaml | 2 +- .../jsonpatch-missing-resource.listeners.yaml | 2 +- ...patch-with-jsonpath.envoypatchpolicies.yaml | 6 +++--- .../jsonpatch-with-jsonpath.listeners.yaml | 14 +------------- .../xds-ir/jsonpatch.envoypatchpolicies.yaml | 6 +++--- .../out/xds-ir/jsonpatch.listeners.yaml | 14 +------------- .../xds-ir/jwt-custom-extractor.listeners.yaml | 2 +- ...t-multi-route-multi-provider.listeners.yaml | 2 +- ...-multi-route-single-provider.listeners.yaml | 2 +- .../out/xds-ir/jwt-optional.listeners.yaml | 2 +- .../out/xds-ir/jwt-ratelimit.listeners.yaml | 2 +- ...wt-single-route-single-match.listeners.yaml | 2 +- .../jwt-with-backend-tls-retry.listeners.yaml | 2 +- .../listener-connection-limit.listeners.yaml | 8 ++++---- ...tener-overlapping-tls-config.listeners.yaml | 4 ++-- .../listener-proxy-protocol.listeners.yaml | 4 ++-- .../listener-tcp-keepalive.listeners.yaml | 8 ++++---- .../listener-tcp-without-route.listeners.yaml | 2 +- .../out/xds-ir/load-balancer.listeners.yaml | 2 +- .../local-ratelimit-distinct.listeners.yaml | 2 +- .../out/xds-ir/local-ratelimit.listeners.yaml | 2 +- .../testdata/out/xds-ir/lua.listeners.yaml | 2 +- .../max-conn-per-socket-event.listeners.yaml | 6 +++--- .../xds-ir/metrics-virtual-host.listeners.yaml | 2 +- .../xds-ir/mixed-tls-jwt-authn.listeners.yaml | 2 +- ...-port-with-different-filters.listeners.yaml | 2 +- ...multiple-listeners-same-port.listeners.yaml | 2 +- ...e-simple-tcp-route-same-port.listeners.yaml | 2 +- ...certificate-with-custom-data.listeners.yaml | 10 +++++----- ...s-forward-client-certificate.listeners.yaml | 10 +++++----- ...-client-certificate-disabled.listeners.yaml | 4 ++-- .../out/xds-ir/mutual-tls-san.listeners.yaml | 4 ++-- .../out/xds-ir/mutual-tls.listeners.yaml | 4 ++-- ...idc-and-jwt-with-passthrough.listeners.yaml | 2 +- ...idc-backend-cluster-provider.listeners.yaml | 2 +- .../testdata/out/xds-ir/oidc.listeners.yaml | 2 +- .../out/xds-ir/panic-threshold.listeners.yaml | 2 +- .../out/xds-ir/path-settings.listeners.yaml | 2 +- .../proxy-protocol-upstream.listeners.yaml | 2 +- .../ratelimit-custom-domain.listeners.yaml | 2 +- .../ratelimit-disable-headers.listeners.yaml | 2 +- .../ratelimit-endpoint-stats.listeners.yaml | 2 +- .../ratelimit-global-shared.listeners.yaml | 2 +- .../ratelimit-headers-and-cidr.listeners.yaml | 2 +- ...atelimit-multi-global-shared.listeners.yaml | 2 +- .../xds-ir/ratelimit-sourceip.listeners.yaml | 2 +- .../out/xds-ir/ratelimit.listeners.yaml | 2 +- .../out/xds-ir/request-buffer.listeners.yaml | 4 ++-- .../retry-partial-invalid.listeners.yaml | 2 +- .../testdata/out/xds-ir/retry.listeners.yaml | 2 +- ...typolicy-with-oidc-jwt-authz.listeners.yaml | 2 +- .../out/xds-ir/simple-tls.listeners.yaml | 2 +- .../suppress-envoy-headers.listeners.yaml | 2 +- .../xds-ir/tcp-endpoint-stats.listeners.yaml | 2 +- .../tcp-listener-ipfamily.listeners.yaml | 2 +- .../tcp-req-resp-sizes-stats.listeners.yaml | 2 +- .../xds-ir/tcp-route-complex.listeners.yaml | 2 +- .../out/xds-ir/tcp-route-simple.listeners.yaml | 2 +- .../tcp-route-tls-terminate.listeners.yaml | 2 +- .../tcp-route-weighted-backend.listeners.yaml | 2 +- .../tcp-route-with-no-routes.listeners.yaml | 2 +- .../testdata/out/xds-ir/timeout.listeners.yaml | 2 +- .../tls-route-passthrough.listeners.yaml | 4 ++-- ...s-with-ciphers-versions-alpn.listeners.yaml | 4 ++-- .../xds-ir/tracing-datadog-uds.listeners.yaml | 2 +- .../out/xds-ir/tracing-datadog.listeners.yaml | 2 +- .../tracing-endpoint-stats.listeners.yaml | 2 +- .../out/xds-ir/tracing-zipkin.listeners.yaml | 2 +- .../testdata/out/xds-ir/tracing.listeners.yaml | 2 +- .../upstream-tcpkeepalive.listeners.yaml | 2 +- .../testdata/out/xds-ir/wasm.listeners.yaml | 2 +- internal/xds/translator/translator.go | 4 ++-- 198 files changed, 299 insertions(+), 299 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 31b11eb1af..5c3f46144b 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1126,7 +1126,7 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1238,7 +1238,7 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/grpc + name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1322,7 +1322,7 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tcp + name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1413,7 +1413,7 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tls-passthrough + name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: listener: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index b592bd3e6a..fa2c0ceb98 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -978,7 +978,7 @@ "name": "default/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "name": "default/eg/http", + "name": "0.0.0.0-10080", "perConnectionBufferLimitBytes": 32768 } } @@ -1130,7 +1130,7 @@ "name": "default/eg/grpc" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "name": "default/eg/grpc", + "name": "0.0.0.0-8080", "perConnectionBufferLimitBytes": 32768 } } @@ -1242,7 +1242,7 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, - "name": "default/eg/tcp", + "name": "0.0.0.0-1234", "perConnectionBufferLimitBytes": 32768 } } @@ -1367,7 +1367,7 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, - "name": "default/eg/tls-passthrough", + "name": "0.0.0.0-8443", "perConnectionBufferLimitBytes": 32768 } } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 0ce878805f..22b5da8cd6 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -579,7 +579,7 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -691,7 +691,7 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/grpc + name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -775,7 +775,7 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tcp + name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -866,7 +866,7 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tls-passthrough + name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: listener: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index c0fa7da7c8..4f259d6657 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -143,7 +143,7 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -255,7 +255,7 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/grpc + name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -339,7 +339,7 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tcp + name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -430,7 +430,7 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: default/eg/tls-passthrough + name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: listener: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index c696b07001..edd18f2aaa 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -689,7 +689,7 @@ "name": "envoy-gateway-system/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "name": "envoy-gateway-system/eg/http", + "name": "0.0.0.0-10080", "perConnectionBufferLimitBytes": 32768 } } diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 7c62e33666..36c5d73239 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -417,7 +417,7 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway-system/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index 6eeb127d70..edc285e19d 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -163,5 +163,5 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway-system/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 0553585ed2..1ddf08e97c 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -352,7 +352,7 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway-system/eg/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: diff --git a/internal/xds/translator/extensionserver_test.go b/internal/xds/translator/extensionserver_test.go index e266dd7a1d..1b09446828 100644 --- a/internal/xds/translator/extensionserver_test.go +++ b/internal/xds/translator/extensionserver_test.go @@ -180,11 +180,11 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * // Only make the change when the listener's name matches the expected testdata // This prevents us from having to update every single testfile.out switch req.Listener.Name { - case "extension-post-xdslistener-hook-error": + case "0.0.0.0-10181": // "extension-post-xdslistener-hook-error" return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("extension post xds listener hook error") - case "extension-listener": + case "0.0.0.0-10182": // "extension-listener" // Setup a new Listener to avoid operating directly on the passed in pointer for better test coverage that the // Listener we are returning gets used properly modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) @@ -192,7 +192,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "policyextension-listener": + case "0.0.0.0-10183": // "policyextension-listener" if len(req.PostListenerContext.ExtensionResources) == 0 { return nil, fmt.Errorf("expected a policy in the ext array") } @@ -219,7 +219,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "envoy-gateway/gateway-1/http1": + case "0.0.0.0-10184": // "envoy-gateway/gateway-1/http1" if len(req.PostListenerContext.ExtensionResources) != 1 { return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, @@ -231,7 +231,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "envoy-gateway/gateway-1/tcp1": + case "0.0.0.0-10185": // "envoy-gateway/gateway-1/tcp1" return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("should not be called for this listener, test 'extensionpolicy-tcp-and-http' should merge tcp and http gateways to one listener") @@ -247,7 +247,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "first-listener-error": + case "::-10186": // "first-listener-error" modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) modifiedListener.StatPrefix = req.Listener.Name return &pb.PostHTTPListenerModifyResponse{ diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index b896f31990..8caa94717a 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" @@ -185,7 +186,7 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin // buildXdsTCPListener creates a xds Listener resource // TODO: Improve function parameters func buildXdsTCPListener( - name, address string, + address string, port uint32, ipFamily *egv1a1.IPFamily, keepalive *ir.TCPKeepalive, @@ -200,7 +201,7 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: name, + Name: tcpListenerName(address, port), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -226,6 +227,10 @@ func buildXdsTCPListener( return listener, nil } +func tcpListenerName(address string, port uint32) string { + return fmt.Sprintf("%s-%d", address, port) +} + func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value { if connection != nil && connection.BufferLimitBytes != nil { return wrapperspb.UInt32(*connection.BufferLimitBytes) diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 71c96518f7..9d67b3b051 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -34,7 +34,7 @@ http: path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true - port: 10080 + port: 10184 routes: - name: "http-route" hostname: "*" @@ -75,7 +75,7 @@ tcp: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 - port: 10080 + port: 10185 routes: - destination: name: "tcp-route-dest" diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml index 32f55ec5d7..ddb254402c 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml @@ -1,7 +1,7 @@ http: - name: "extension-listener" address: "0.0.0.0" - port: 10080 + port: 10182 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index fd4879a735..b59702edfe 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -1,7 +1,7 @@ http: - name: "extension-post-xdslistener-hook-error" address: "0.0.0.0" - port: 10080 + port: 10181 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml index 6f462ba015..e62300a3d6 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml @@ -34,4 +34,4 @@ http: path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true - port: 10081 + port: 10183 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 6052a301e3..95cfcfaeca 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -1,7 +1,7 @@ http: - name: "first-listener-error" address: "::" - port: 10080 + port: 10186 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index 70ae0f1071..aac36ba88a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "add" path: "/this/path/never/existed" diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index 146bc9f121..b7d2fe0356 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10080 + portValue: 10184 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,20 +27,27 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-1/http1 serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10080 + statPrefix: http-10184 useRemoteAddress: true name: envoy-gateway/gateway-1/http1 + maxConnectionsToAcceptPerSocketEvent: 1 + name: 0.0.0.0-10184 + perConnectionBufferLimitBytes: 32768 + statPrefix: 0.0.0.0-10184 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10185 filterChains: - filters: - name: envoy.filters.network.tcp_proxy typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tcp-route-dest - statPrefix: tcp-10080 + statPrefix: tcp-10185 maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http1 + name: 0.0.0.0-10185 perConnectionBufferLimitBytes: 32768 - statPrefix: envoy-gateway/gateway-1/http1 - address: socketAddress: address: 0.0.0.0 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml index 67ce52cb2b..6532d3d297 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: custom-backend-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml index c0c5aab4ad..9ac385326e 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: multiple-custom-backends-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml index 67ce52cb2b..6532d3d297 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: custom-backend-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml index c0c5aab4ad..9ac385326e 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: multiple-custom-backends-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml index c0c5aab4ad..9ac385326e 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: multiple-custom-backends-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index 7deec13dbb..90391f4af1 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10080 + portValue: 10182 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,10 +27,10 @@ resourceApiVersion: V3 routeConfigName: extension-listener serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10080 + statPrefix: http-10182 useRemoteAddress: true name: extension-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: extension-listener + name: 0.0.0.0-10182 perConnectionBufferLimitBytes: 32768 statPrefix: mock-extension-inserted-prefix diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml index f9ce671f37..3c6dc61867 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10080 + portValue: 10181 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,9 +27,9 @@ resourceApiVersion: V3 routeConfigName: extension-post-xdslistener-hook-error serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10080 + statPrefix: http-10181 useRemoteAddress: true name: extension-post-xdslistener-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - name: extension-post-xdslistener-hook-error + name: 0.0.0.0-10181 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml index a5bc288824..e0d087e20f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml index 877c7b5140..4b5bbd55aa 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: extension-post-xdstranslate-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - name: extension-post-xdstranslate-hook-error + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml index cb8f77fd5e..9fd5fc493b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: extension-post-xdsvirtualhost-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - name: extension-post-xdsvirtualhost-hook-error + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index a5bc288824..e0d087e20f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index 8f78e66fc6..f4d63babbc 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10081 + portValue: 10183 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,10 +27,10 @@ resourceApiVersion: V3 routeConfigName: policyextension-listener serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10081 + statPrefix: http-10183 useRemoteAddress: true name: policyextension-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: policyextension-listener + name: 0.0.0.0-10183 perConnectionBufferLimitBytes: 32768 statPrefix: from-the-policy diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml index b55f7c0187..19c1b42762 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: '::' - portValue: 10080 + portValue: 10186 filterChains: - filterChainMatch: serverNames: @@ -30,7 +30,7 @@ resourceApiVersion: V3 routeConfigName: first-listener-error serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10080 + statPrefix: https-10186 useRemoteAddress: true name: first-listener-error transportSocket: @@ -48,6 +48,18 @@ 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: ::-10186 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: '::' + portValue: 10080 + filterChains: - filterChainMatch: serverNames: - foo.net @@ -98,5 +110,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener-error + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index b2e7c7b796..da61101e84 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -180,5 +180,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index 9f4b791fbb..6592672c66 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -141,5 +141,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index 02a4d47e52..ada78bc5bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -197,5 +197,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index 69b8942922..2cc1b29c6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -216,5 +216,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index 58471e8de1..7c6cbd8ea8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -345,5 +345,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml index 95daf288e1..24504550f0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml @@ -175,5 +175,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 562b6a1be5..2b0b141e87 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -175,5 +175,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml index 2ed9678583..22f8da7bcb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml @@ -44,5 +44,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml index 0501674cf7..62ee459695 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml index 0501674cf7..62ee459695 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml index 261038728f..ed95629812 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml @@ -75,5 +75,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml index 261038728f..ed95629812 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml @@ -75,5 +75,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml index 0501674cf7..62ee459695 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index 09c320b7f3..be15c99138 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -46,7 +46,7 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 1500 - address: socketAddress: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml index 7f609a90d1..6bd9da7068 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml @@ -45,5 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml index 102acc609b..7dde79b5f7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml @@ -45,5 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index df9365142e..939931a2dd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -43,5 +43,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index 6f2229df69..0b467be3fc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 1500 - address: socketAddress: @@ -46,5 +46,5 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 1500 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index 0a81c11e30..60663e27be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -35,7 +35,7 @@ useRemoteAddress: false name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -74,7 +74,7 @@ useRemoteAddress: false name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -115,7 +115,7 @@ useRemoteAddress: false name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-8083 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -161,5 +161,5 @@ useRemoteAddress: false name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-8084 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml index ce18164fe2..f52cbdb62d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml @@ -34,7 +34,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -50,5 +50,5 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index 4ec0aeddf6..633401150e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -33,7 +33,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -49,5 +49,5 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml index e0bba0b836..7eb5e1e78c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml @@ -47,5 +47,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml index 6a7b66b8be..8cd66c06c5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index 6a7b66b8be..8cd66c06c5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml index 7a127ec768..08b4905f3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml @@ -59,5 +59,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml index 14804eca76..cb97e398b8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml @@ -126,5 +126,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml index 79224eb3d4..cc7d25327d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml @@ -167,5 +167,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml index 27c418f60e..d2f89648c2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml @@ -177,5 +177,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml index 7700a8986c..604d20ade1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml @@ -66,5 +66,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml index 50c1b91ee9..6afc39096a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml @@ -68,5 +68,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml index 2cd9c22f99..09e3f3479d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml @@ -67,5 +67,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index d4b0d94c49..ee68ea5da9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -66,5 +66,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml index 7f609a90d1..6bd9da7068 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml @@ -45,5 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml index 2b19425f13..424e5bb126 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml @@ -136,5 +136,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 578b85950b..9a29544b49 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml index b28018159a..a5fa2c8bc2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml @@ -30,7 +30,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -63,5 +63,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml index 2da2dbb0b0..423878c1de 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml @@ -30,7 +30,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -63,5 +63,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml index 7b5d0e785e..224837fa2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -64,5 +64,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml index 1cbee6b41e..670b548cb9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -64,5 +64,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml index 3c5a4ce9de..a60897b15b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml @@ -29,7 +29,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -61,7 +61,7 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-8082 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -94,7 +94,7 @@ useRemoteAddress: true name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-8083 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -127,5 +127,5 @@ useRemoteAddress: true name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-8084 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml index 5f3b4cd635..043f1d5afe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml @@ -37,7 +37,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -104,5 +104,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml index a88611caf1..ec9d83eee2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: listener-enable-endpoint-stats maxConnectionsToAcceptPerSocketEvent: 1 - name: listener-enable-endpoint-stats + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml index 2208eb5ee2..f876351fcc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml @@ -39,5 +39,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml index 89d3361c24..01a15eb59a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: listener-enable-req-resp-sizes-stats maxConnectionsToAcceptPerSocketEvent: 1 - name: listener-enable-req-resp-sizes-stats + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml index f869509943..54ef3705dd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml @@ -67,5 +67,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index a5bc288824..e0d087e20f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml index 26dedfa4ee..f60a902f8d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml @@ -75,5 +75,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index 86036a19d5..248377a004 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-btls/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml index a5bc288824..e0d087e20f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index 86036a19d5..248377a004 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-btls/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index 59e6ae249f..4e130879d5 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-btls/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -66,5 +66,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls-2/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-btls-2/http + name: 0.0.0.0-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index 86036a19d5..248377a004 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-btls/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml index 5c7db41545..64f9bddc41 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml @@ -29,5 +29,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml index 5c7db41545..64f9bddc41 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml @@ -29,5 +29,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml index 4d0fe90c54..a94bb52284 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index 22947a5cce..f1f6fd4d66 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -37,7 +37,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -79,5 +79,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index a7721414c8..3683d00d05 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -33,5 +33,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index f8f81a1f1b..d828b8b0e0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -34,5 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml index 368dab5a9b..3240f89889 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml index b2e4d2fb20..ea8a008a69 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml @@ -39,5 +39,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index 368dab5a9b..3240f89889 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index 80d7bc1b38..ea8016839a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -101,5 +101,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/tls + name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml index 9508dd3e7b..3c50dbfbe7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml @@ -9,8 +9,8 @@ namespace: default conditions: - lastTransitionTime: null - message: Patches have been successfully applied. - reason: Programmed - status: "True" + message: 'Unable to find xds resources: type.googleapis.com/envoy.config.listener.v3.Listener/first-listener,type.googleapis.com/envoy.config.listener.v3.Listener/first-listener' + reason: ResourceNotFound + status: "False" type: Programmed controllerName: "" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index cebf87c73f..9d1d10cb7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -14,17 +14,6 @@ initialStreamWindowSize: 65536 maxConcurrentStreams: 100 httpFilters: - - name: envoy.filters.http.ratelimit - typedConfig: - '@type': type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit - domain: eg-ratelimit - failureModeDeny: true - rateLimitService: - grpcService: - envoyGrpc: - clusterName: rate-limit-cluster - transportApiVersion: V3 - timeout: 1s - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -32,7 +21,6 @@ mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT - preserveExternalRequestId: true rds: configSource: ads: {} @@ -62,5 +50,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml index 9508dd3e7b..3c50dbfbe7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml @@ -9,8 +9,8 @@ namespace: default conditions: - lastTransitionTime: null - message: Patches have been successfully applied. - reason: Programmed - status: "True" + message: 'Unable to find xds resources: type.googleapis.com/envoy.config.listener.v3.Listener/first-listener,type.googleapis.com/envoy.config.listener.v3.Listener/first-listener' + reason: ResourceNotFound + status: "False" type: Programmed controllerName: "" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index cebf87c73f..9d1d10cb7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -14,17 +14,6 @@ initialStreamWindowSize: 65536 maxConcurrentStreams: 100 httpFilters: - - name: envoy.filters.http.ratelimit - typedConfig: - '@type': type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit - domain: eg-ratelimit - failureModeDeny: true - rateLimitService: - grpcService: - envoyGrpc: - clusterName: rate-limit-cluster - transportApiVersion: V3 - timeout: 1s - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -32,7 +21,6 @@ mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT - preserveExternalRequestId: true rds: configSource: ads: {} @@ -62,5 +50,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index 2385014f06..349d190b93 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -61,5 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index 97c317be07..47c923d4ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -127,5 +127,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index cb66d4dcf1..92cbd1f30d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -97,5 +97,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml index 051a776b32..d2f1157fd1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml @@ -64,5 +64,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index a4d81f0e11..d3b1591200 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -64,5 +64,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index 15f6b00844..754023cbc1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -54,5 +54,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml index 672ec20c19..2269c77a71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml @@ -63,5 +63,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 7cd7ecbd04..cf1ca1b922 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -71,7 +71,7 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -97,7 +97,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-10082 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -117,5 +117,5 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-10083 perConnectionBufferLimitBytes: 32768 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..d65411e404 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 @@ -96,7 +96,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/https-1 + name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -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: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index f166c8abef..fbdbdd5c33 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -60,7 +60,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -79,5 +79,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 93842bc5ce..02d0ccd317 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -71,7 +71,7 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -109,7 +109,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-10082 perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -128,7 +128,7 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-10083 perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml index 7e8d627484..6c8837df10 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml @@ -22,7 +22,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/tls-1 + name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 50000000 socketOptions: - description: socket option to enable tcp keep alive diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml index ee98980e3e..144a579cc4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml @@ -36,5 +36,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index ee98980e3e..144a579cc4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -36,5 +36,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml index d7d641dd2d..9ed099d006 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml @@ -52,5 +52,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index 05a995136e..70126db37f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -31,7 +31,7 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 2 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -45,7 +45,7 @@ cluster: max-accept-disabled statPrefix: tcp-10081 name: max-accept-disabled - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -60,5 +60,5 @@ statPrefix: tcp-10082 name: max-accept-default maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-10082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml index 31e76f774a..e210fafbc4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml @@ -46,5 +46,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index 8b0b416a06..d838d51f12 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -164,5 +164,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: default/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index bd7e033cf5..290f763a94 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -146,5 +146,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml index d4b4e1d6f4..8694fec93f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml @@ -39,5 +39,5 @@ statPrefix: tcp-10080 name: tcp-route-simple-4 maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-simple + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml index 7b0252b6c7..bb76814039 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml @@ -56,7 +56,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10001 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -117,7 +117,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10002 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -180,7 +180,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-10003 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -245,7 +245,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-10004 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -312,5 +312,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: fifth-listener + name: ::-10005 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml index fcb1f4dd3e..4c20105a9f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml @@ -56,7 +56,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10001 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -117,7 +117,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10002 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -178,7 +178,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: third-listener + name: ::-10003 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -239,7 +239,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: fourth-listener + name: ::-10004 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -300,5 +300,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: fifth-listener + name: ::-10005 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index 47b5e2f00d..8f5917dbaf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -56,7 +56,7 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -89,5 +89,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml index 6ca9e6eb7e..f96f852583 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml @@ -79,7 +79,7 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -135,5 +135,5 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index 3b1c6edfe4..a0ba631b1e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -56,7 +56,7 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -89,5 +89,5 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml index 8f1c1028d5..c40cf6d678 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml @@ -158,5 +158,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml index 4e20904646..2c108ed840 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml @@ -80,5 +80,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index 496d62dc62..c8b5314d98 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -141,5 +141,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index a25791ea52..36bad63fe6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -30,5 +30,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index 5848912b9c..0b40235c9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -41,5 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index d7dc5d1295..287c0b1342 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -40,5 +40,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index 5848912b9c..0b40235c9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -41,5 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml index 8576ebeb03..9458a894d9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml @@ -61,5 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml index 5848912b9c..0b40235c9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml @@ -41,5 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml index 8576ebeb03..9458a894d9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml @@ -61,5 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index 5848912b9c..0b40235c9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -41,5 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index 5848912b9c..0b40235c9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -41,5 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml index 1b5504bd87..37dd4d0d95 100644 --- a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml @@ -36,7 +36,7 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -76,5 +76,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-2/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-2/http + name: 0.0.0.0-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml index 61573e5b44..3ac88c2eb6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml @@ -103,5 +103,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 6f069367c6..9d1d10cb7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -50,5 +50,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index 26f3b45110..adb03e71d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -56,5 +56,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml index c8e9cafa63..65102adc96 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml @@ -10,5 +10,5 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-route-enable-endpoint-stats + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml index a4a42c3230..61b2c9f539 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml @@ -12,5 +12,5 @@ statPrefix: tcp-8082 name: tcp-route-dual maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-dual + name: 0.0.0.0-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml index df212ab00f..65102adc96 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml @@ -10,5 +10,5 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-route-enable-req-resp-sizes-stats + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml index 5f3b38aadb..954e07c726 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml @@ -20,5 +20,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-complex + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml index 41d498e6d0..f6abc637a5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml @@ -11,5 +11,5 @@ statPrefix: tcp-10080 name: tcp-route-simple maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-simple + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml index 4671321855..b9a9aa16d2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml @@ -50,5 +50,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tls-listener-terminate + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml index f16165dde4..40546ed758 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml @@ -20,5 +20,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-weighted-backend + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml index 68b0133abe..ac3c0fb1df 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml @@ -11,5 +11,5 @@ statPrefix: tcp-10080 name: EmptyCluster maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-listener-with-no-routes + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml index ddd54fbbc2..fe19c1d1b4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml @@ -18,7 +18,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tls-passthrough-foo + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -40,5 +40,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tls-passthrough-bar + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index 05c4b3c664..fdffbb6d52 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -76,7 +76,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -125,5 +125,5 @@ tlsMinimumProtocolVersion: TLSv1_0 disableStatefulSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml index f5d891adb1..f90c31967f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml @@ -57,5 +57,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index f5d891adb1..f90c31967f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -57,5 +57,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index c685e2ac55..5c9b76f630 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -59,5 +59,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml index 362f098ff2..4c7d877925 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml @@ -60,5 +60,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index b7497f7924..85dc84a8c3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -60,5 +60,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index 5dd5e46e3c..419f986368 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -31,5 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: first-listener + name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index 35a1d5fdee..417abea9ab 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -113,5 +113,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/http + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 0b3dbe724e..d59ead6df9 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -291,7 +291,7 @@ 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.Address, httpListener.Port, httpListener.IPFamily, httpListener.TCPKeepalive, httpListener.Connection, accessLog); err != nil { errs = errors.Join(errs, err) continue @@ -689,7 +689,7 @@ func (t *Translator) processTCPListenerXdsTranslation( 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.Address, tcpListener.Port, tcpListener.IPFamily, tcpListener.TCPKeepalive, tcpListener.Connection, accesslog); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) From b5ebedfdab9d6587a9383e3ba4716450d57fb092 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Thu, 17 Jul 2025 09:58:01 +0000 Subject: [PATCH 02/44] rename udp listener using its address and port Signed-off-by: Huabing (Robin) Zhao --- .../translate/out/default-resources.all.yaml | 2 +- .../translate/out/from-gateway-api-to-xds.all.json | 2 +- .../translate/out/from-gateway-api-to-xds.all.yaml | 2 +- .../out/from-gateway-api-to-xds.listener.yaml | 2 +- internal/xds/translator/extensionserver_test.go | 14 +++++++------- internal/xds/translator/listener.go | 6 +++--- .../extensionpolicy-tcp-udp-http.listeners.yaml | 4 ++-- .../out/xds-ir/backend-buffer-limit.listeners.yaml | 2 +- .../out/xds-ir/udp-endpoint-stats.listeners.yaml | 2 +- .../xds-ir/udp-req-resp-sizes-stats.listeners.yaml | 2 +- .../xds-ir/udp-route-no-endpoints.listeners.yaml | 2 +- .../xds-ir/udp-route-with-no-routes.listeners.yaml | 2 +- .../testdata/out/xds-ir/udp-route.listeners.yaml | 2 +- test/e2e/testdata/envoy-patch-policy.yaml | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 5c3f46144b..92f83d908a 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1501,7 +1501,7 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: default/eg/udp + name: 0.0.0.0-1234 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index fa2c0ceb98..0ba56d0fda 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -1484,7 +1484,7 @@ } } ], - "name": "default/eg/udp" + "name": "0.0.0.0-1234" } } } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 22b5da8cd6..d9dbb13f4c 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -954,7 +954,7 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: default/eg/udp + name: 0.0.0.0-1234 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index 4f259d6657..e147067487 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -518,4 +518,4 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: default/eg/udp + name: 0.0.0.0-1234 diff --git a/internal/xds/translator/extensionserver_test.go b/internal/xds/translator/extensionserver_test.go index 1b09446828..8dcbcf6744 100644 --- a/internal/xds/translator/extensionserver_test.go +++ b/internal/xds/translator/extensionserver_test.go @@ -180,11 +180,11 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * // Only make the change when the listener's name matches the expected testdata // This prevents us from having to update every single testfile.out switch req.Listener.Name { - case "0.0.0.0-10181": // "extension-post-xdslistener-hook-error" + case "0.0.0.0-10181": // "extension-post-xdslistener-hook-error" return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("extension post xds listener hook error") - case "0.0.0.0-10182": // "extension-listener" + case "0.0.0.0-10182": // "extension-listener" // Setup a new Listener to avoid operating directly on the passed in pointer for better test coverage that the // Listener we are returning gets used properly modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) @@ -192,7 +192,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10183": // "policyextension-listener" + case "0.0.0.0-10183": // "policyextension-listener" if len(req.PostListenerContext.ExtensionResources) == 0 { return nil, fmt.Errorf("expected a policy in the ext array") } @@ -219,7 +219,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10184": // "envoy-gateway/gateway-1/http1" + case "0.0.0.0-10184": // "envoy-gateway/gateway-1/http1" if len(req.PostListenerContext.ExtensionResources) != 1 { return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, @@ -231,11 +231,11 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10185": // "envoy-gateway/gateway-1/tcp1" + case "0.0.0.0-10185": // "envoy-gateway/gateway-1/tcp1" return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("should not be called for this listener, test 'extensionpolicy-tcp-and-http' should merge tcp and http gateways to one listener") - case "envoy-gateway/gateway-1/udp1": + case "0.0.0.0-10162": if len(req.PostListenerContext.ExtensionResources) != 1 { return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, @@ -247,7 +247,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "::-10186": // "first-listener-error" + case "::-10186": // "first-listener-error" modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) modifiedListener.StatPrefix = req.Listener.Name return &pb.PostHTTPListenerModifyResponse{ diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 8caa94717a..83d17ae8b1 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -201,7 +201,7 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: tcpListenerName(address, port), + Name: xdsListenerName(address, port), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -227,7 +227,7 @@ func buildXdsTCPListener( return listener, nil } -func tcpListenerName(address string, port uint32) string { +func xdsListenerName(address string, port uint32) string { return fmt.Sprintf("%s-%d", address, port) } @@ -972,7 +972,7 @@ func buildXdsUDPListener(clusterName string, udpListener *ir.UDPListener, access return nil, err } xdsListener := &listenerv3.Listener{ - Name: udpListener.Name, + Name: xdsListenerName(udpListener.Address, udpListener.Port), AccessLog: al, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index b7d2fe0356..75769724c0 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -65,5 +65,5 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: envoy-gateway/gateway-1/udp1 - statPrefix: envoy-gateway/gateway-1/udp1 + name: 0.0.0.0-10162 + statPrefix: 0.0.0.0-10162 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index be15c99138..cf253c7b39 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -65,4 +65,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: udp-route + name: ::-10080 diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml index 2f969eb7e9..cd040a4bc7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: udp-route-enable-endpoint-stats + name: ::-10080 diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml index 3d1cb7b1c7..cd040a4bc7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: udp-route-enable-req-resp-sizes-stats + name: ::-10080 diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml index 5edcecc248..36c4e88e2a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/udproute-1/rule/-1 statPrefix: service - name: udp-route + name: 0.0.0.0-10162 diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml index ce76497d0c..fd8e3bd4a2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: EmptyCluster statPrefix: service - name: udp-route-with-no-routes + name: ::-10080 diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml index cfcd4df467..cd040a4bc7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: udp-route + name: ::-10080 diff --git a/test/e2e/testdata/envoy-patch-policy.yaml b/test/e2e/testdata/envoy-patch-policy.yaml index ede3800d45..2c00d5f4c6 100644 --- a/test/e2e/testdata/envoy-patch-policy.yaml +++ b/test/e2e/testdata/envoy-patch-policy.yaml @@ -29,7 +29,7 @@ spec: type: JSONPatch jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "gateway-conformance-infra/same-namespace/http" + name: "0.0.0.0-80" operation: op: add path: "/default_filter_chain/filters/0/typed_config/local_reply_config" From 0cd2b1eb630436dfb916a1c0fccbabf775e72d11 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 01:26:52 +0000 Subject: [PATCH 03/44] fix e2e Signed-off-by: Huabing (Robin) Zhao --- test/e2e/tests/envoy_patch_policy.go | 45 ++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/test/e2e/tests/envoy_patch_policy.go b/test/e2e/tests/envoy_patch_policy.go index 2c93872841..c9cb3f8e0f 100644 --- a/test/e2e/tests/envoy_patch_policy.go +++ b/test/e2e/tests/envoy_patch_policy.go @@ -8,12 +8,25 @@ package tests import ( + "context" + "fmt" "testing" + "time" + "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/wait" + "sigs.k8s.io/controller-runtime/pkg/client" + gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/conformance/utils/http" "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api/conformance/utils/suite" + "sigs.k8s.io/gateway-api/conformance/utils/tlog" + + egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" + "github.com/envoyproxy/gateway/internal/gatewayapi" + "github.com/envoyproxy/gateway/internal/gatewayapi/resource" ) func init() { @@ -30,6 +43,15 @@ var EnvoyPatchPolicyTest = suite.ConformanceTest{ 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) + + ancestorRef := gwapiv1a2.ParentReference{ + Group: gatewayapi.GroupPtr(gwapiv1.GroupName), + Kind: gatewayapi.KindPtr(resource.KindGateway), + Namespace: gatewayapi.NamespacePtr(gwNN.Namespace), + Name: gwapiv1.ObjectName(gwNN.Name), + } + envoyPatchPolicyMustBeAccepted(t, suite.Client, types.NamespacedName{Name: "custom-response-patch-policy", Namespace: ns}, suite.ControllerName, ancestorRef) + OkResp := http.ExpectedResponse{ Request: http.Request{ Path: "/foo", @@ -58,3 +80,26 @@ var EnvoyPatchPolicyTest = suite.ConformanceTest{ }) }, } + +// envoyPatchPolicyMustBeAccepted waits for the specified EnvoyPatchPolicy to be accepted. +func envoyPatchPolicyMustBeAccepted(t *testing.T, client client.Client, policyName types.NamespacedName, controllerName string, ancestorRef gwapiv1a2.ParentReference) { + t.Helper() + + waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 60*time.Second, true, func(ctx context.Context) (bool, error) { + policy := &egv1a1.EnvoyPatchPolicy{} + err := client.Get(ctx, policyName, policy) + if err != nil { + return false, fmt.Errorf("error fetching EnvoyPatchPolicy: %w", err) + } + + if policyAcceptedByAncestor(policy.Status.Ancestors, controllerName, ancestorRef) { + tlog.Logf(t, "EnvoyPatchPolicy has been accepted: %v", policy) + return true, nil + } + + tlog.Logf(t, "EnvoyPatchPolicy not yet accepted: %v", policy) + return false, nil + }) + + require.NoErrorf(t, waitErr, "error waiting for EnvoyPatchPolicy to be accepted") +} From 67ca839efbaf5f5781e48381b692f8d5e2c38dfa Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 03:07:10 +0000 Subject: [PATCH 04/44] add metadata to listener Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/jsonpatch.go | 5 +- internal/xds/translator/listener.go | 8 ++- internal/xds/translator/metadata.go | 14 ++++- .../extensionpolicy-tcp-udp-http.yaml | 15 +++++ .../http-route-custom-backend-error.yaml | 7 ++- ...xtensionpolicy-tcp-udp-http.listeners.yaml | 24 ++++++++ .../extensionpolicy-tcp-udp-http.routes.yaml | 8 +++ ...-route-custom-backend-error.listeners.yaml | 12 +++- ...ttp-route-custom-backend-error.routes.yaml | 12 +++- ...kend-multiple-backend-error.listeners.yaml | 4 ++ .../http-route-custom-backend.listeners.yaml | 4 ++ ...route-custom-backends-mixed.listeners.yaml | 4 ++ ...tom-backends-multiple-mixed.listeners.yaml | 4 ++ ...http-route-extension-filter.listeners.yaml | 4 ++ ...te-extension-listener-error.listeners.yaml | 4 ++ ...route-extension-route-error.listeners.yaml | 4 ++ ...e-extension-translate-error.listeners.yaml | 4 ++ ...extension-virtualhost-error.listeners.yaml | 4 ++ .../http-route.listeners.yaml | 4 ++ .../listener-policy.listeners.yaml | 4 ++ ...e-listeners-same-port-error.listeners.yaml | 8 +++ .../out/xds-ir/accesslog-cel.listeners.yaml | 4 ++ .../accesslog-endpoint-stats.listeners.yaml | 4 ++ .../accesslog-formatters.listeners.yaml | 4 ++ .../xds-ir/accesslog-multi-cel.listeners.yaml | 4 ++ .../out/xds-ir/accesslog-types.listeners.yaml | 8 +++ .../accesslog-with-format.listeners.yaml | 4 ++ .../out/xds-ir/accesslog.listeners.yaml | 4 ++ .../out/xds-ir/api-key-auth.listeners.yaml | 4 ++ .../authorization-client-cidr.listeners.yaml | 4 ++ .../authorization-http-header.listeners.yaml | 4 ++ .../authorization-jwt-claim.listeners.yaml | 8 +++ .../authorization-jwt-scope.listeners.yaml | 8 +++ ...ization-multiple-principals.listeners.yaml | 4 ++ .../backend-buffer-limit.listeners.yaml | 8 +++ .../xds-ir/backend-priority.listeners.yaml | 8 +++ .../backend-tls-skip-verify.listeners.yaml | 4 ++ .../basic-auth-username-header.listeners.yaml | 4 ++ .../out/xds-ir/basic-auth.listeners.yaml | 4 ++ .../out/xds-ir/btp-telemetry.listeners.yaml | 8 +++ .../out/xds-ir/circuit-breaker.listeners.yaml | 4 ++ .../xds-ir/client-buffer-limit.listeners.yaml | 8 +++ .../xds-ir/client-ip-detection.listeners.yaml | 16 ++++++ .../client-stream-idle-timeout.listeners.yaml | 8 +++ .../out/xds-ir/client-timeout.listeners.yaml | 8 +++ .../out/xds-ir/compression.listeners.yaml | 8 +++ .../cors-from-httpcorsfilter.listeners.yaml | 4 ++ .../testdata/out/xds-ir/cors.listeners.yaml | 4 ++ ...al-injection-backend-filter.listeners.yaml | 8 +++ .../credential-injection.listeners.yaml | 8 +++ .../xds-ir/custom-filter-order.listeners.yaml | 4 ++ .../out/xds-ir/custom-response.listeners.yaml | 8 +++ .../xds-ir/dns-lookup-family.listeners.yaml | 8 +++ .../xds-ir/ext-auth-backend.listeners.yaml | 4 ++ .../out/xds-ir/ext-auth-body.listeners.yaml | 4 ++ .../ext-auth-recomputation.listeners.yaml | 4 ++ .../out/xds-ir/ext-auth.listeners.yaml | 4 ++ ...-proc-with-traffic-settings.listeners.yaml | 8 +++ .../out/xds-ir/ext-proc.listeners.yaml | 4 ++ .../out/xds-ir/fault-injection.listeners.yaml | 4 ++ ...ers-with-disable-request-id.listeners.yaml | 8 +++ ...rs-with-generate-request-id.listeners.yaml | 8 +++ ...erve-or-generate-request-id.listeners.yaml | 8 +++ ...rs-with-preserve-request-id.listeners.yaml | 8 +++ ...ers-with-underscores-action.listeners.yaml | 16 ++++++ .../out/xds-ir/health-check.listeners.yaml | 4 ++ .../xds-ir/http-connect-proxy.listeners.yaml | 8 +++ .../http-connect-terminate.listeners.yaml | 8 +++ .../http-early-header-mutation.listeners.yaml | 8 +++ .../xds-ir/http-endpoint-stats.listeners.yaml | 4 ++ .../xds-ir/http-health-check.listeners.yaml | 4 ++ ...tp-preserve-client-protocol.listeners.yaml | 4 ++ .../http-req-resp-sizes-stats.listeners.yaml | 4 ++ .../http-route-direct-response.listeners.yaml | 4 ++ .../http-route-dns-cluster.listeners.yaml | 4 ++ ...http-route-dynamic-resolver.listeners.yaml | 8 +++ .../xds-ir/http-route-mirror.listeners.yaml | 4 ++ ...tp-route-mirrors-percentage.listeners.yaml | 4 ++ ...http-route-multiple-matches.listeners.yaml | 4 ++ ...multiple-mirrors-percentage.listeners.yaml | 4 ++ ...http-route-multiple-mirrors.listeners.yaml | 4 ++ .../http-route-partial-invalid.listeners.yaml | 4 ++ .../xds-ir/http-route-redirect.listeners.yaml | 4 ++ .../xds-ir/http-route-regex.listeners.yaml | 4 ++ .../http-route-request-headers.listeners.yaml | 4 ++ ...-route-response-add-headers.listeners.yaml | 4 ++ ...response-add-remove-headers.listeners.yaml | 4 ++ ...ute-response-remove-headers.listeners.yaml | 4 ++ ...ewrite-root-path-url-prefix.listeners.yaml | 4 ++ ...ufixx-with-slash-url-prefix.listeners.yaml | 4 ++ ...-route-rewrite-url-fullpath.listeners.yaml | 4 ++ ...http-route-rewrite-url-host.listeners.yaml | 4 ++ ...tp-route-rewrite-url-prefix.listeners.yaml | 4 ++ ...ttp-route-rewrite-url-regex.listeners.yaml | 4 ++ ...p-route-session-persistence.listeners.yaml | 4 ++ .../http-route-stat-name.listeners.yaml | 4 ++ .../xds-ir/http-route-timeout.listeners.yaml | 4 ++ ...ute-weighted-backend-uds-ip.listeners.yaml | 4 ++ ...ighted-backend-with-filters.listeners.yaml | 4 ++ ...http-route-weighted-backend.listeners.yaml | 4 ++ ...te-weighted-invalid-backend.listeners.yaml | 4 ++ .../http-route-with-clientcert.listeners.yaml | 4 ++ .../http-route-with-metadata.listeners.yaml | 10 ++++ ...-with-tls-system-truststore.listeners.yaml | 4 ++ ...th-tlsbundle-multiple-certs.listeners.yaml | 8 +++ .../http-route-with-tlsbundle.listeners.yaml | 4 ++ ...l-routing-weighted-clusters.listeners.yaml | 4 ++ .../http-route-zonal-routing.listeners.yaml | 4 ++ .../out/xds-ir/http-route.listeners.yaml | 4 ++ .../xds-ir/http-upgrade-spdy.listeners.yaml | 8 +++ ...http-upgrade-websocket-spdy.listeners.yaml | 8 +++ .../xds-ir/http1-preserve-case.listeners.yaml | 8 +++ .../out/xds-ir/http1-trailers.listeners.yaml | 4 ++ .../testdata/out/xds-ir/http10.listeners.yaml | 4 ++ .../out/xds-ir/http2-mixed.listeners.yaml | 4 ++ .../out/xds-ir/http2-route.listeners.yaml | 4 ++ .../testdata/out/xds-ir/http2.listeners.yaml | 4 ++ .../testdata/out/xds-ir/http3.listeners.yaml | 10 +++- .../jsonpatch-missing-resource.listeners.yaml | 4 ++ .../jsonpatch-with-jsonpath.listeners.yaml | 4 ++ .../out/xds-ir/jsonpatch.listeners.yaml | 4 ++ .../jwt-custom-extractor.listeners.yaml | 4 ++ ...-multi-route-multi-provider.listeners.yaml | 4 ++ ...multi-route-single-provider.listeners.yaml | 4 ++ .../out/xds-ir/jwt-optional.listeners.yaml | 4 ++ .../out/xds-ir/jwt-ratelimit.listeners.yaml | 4 ++ ...t-single-route-single-match.listeners.yaml | 4 ++ .../jwt-with-backend-tls-retry.listeners.yaml | 8 +++ .../listener-connection-limit.listeners.yaml | 16 ++++++ ...ener-overlapping-tls-config.listeners.yaml | 20 +++++++ .../listener-proxy-protocol.listeners.yaml | 8 +++ .../listener-tcp-keepalive.listeners.yaml | 16 ++++++ .../listener-tcp-without-route.listeners.yaml | 4 ++ .../out/xds-ir/load-balancer.listeners.yaml | 4 ++ .../local-ratelimit-distinct.listeners.yaml | 4 ++ .../out/xds-ir/local-ratelimit.listeners.yaml | 4 ++ .../testdata/out/xds-ir/lua.listeners.yaml | 4 ++ .../max-conn-per-socket-event.listeners.yaml | 12 ++++ .../metrics-virtual-host.listeners.yaml | 4 ++ .../xds-ir/mixed-tls-jwt-authn.listeners.yaml | 4 ++ ...port-with-different-filters.listeners.yaml | 10 +++- ...ultiple-listeners-same-port.listeners.yaml | 4 ++ ...-simple-tcp-route-same-port.listeners.yaml | 4 ++ ...ertificate-with-custom-data.listeners.yaml | 20 +++++++ ...-forward-client-certificate.listeners.yaml | 20 +++++++ ...client-certificate-disabled.listeners.yaml | 8 +++ .../out/xds-ir/mutual-tls-san.listeners.yaml | 8 +++ .../out/xds-ir/mutual-tls.listeners.yaml | 8 +++ ...dc-and-jwt-with-passthrough.listeners.yaml | 4 ++ ...dc-backend-cluster-provider.listeners.yaml | 4 ++ .../testdata/out/xds-ir/oidc.listeners.yaml | 4 ++ .../out/xds-ir/panic-threshold.listeners.yaml | 4 ++ .../out/xds-ir/path-settings.listeners.yaml | 4 ++ .../proxy-protocol-upstream.listeners.yaml | 4 ++ .../ratelimit-custom-domain.listeners.yaml | 4 ++ .../ratelimit-disable-headers.listeners.yaml | 4 ++ .../ratelimit-endpoint-stats.listeners.yaml | 4 ++ .../ratelimit-global-shared.listeners.yaml | 4 ++ .../ratelimit-headers-and-cidr.listeners.yaml | 4 ++ ...telimit-multi-global-shared.listeners.yaml | 4 ++ .../xds-ir/ratelimit-sourceip.listeners.yaml | 4 ++ .../out/xds-ir/ratelimit.listeners.yaml | 4 ++ .../out/xds-ir/request-buffer.listeners.yaml | 16 ++++++ .../retry-partial-invalid.listeners.yaml | 4 ++ .../testdata/out/xds-ir/retry.listeners.yaml | 4 ++ ...ypolicy-with-oidc-jwt-authz.listeners.yaml | 8 +++ .../out/xds-ir/simple-tls.listeners.yaml | 4 ++ .../suppress-envoy-headers.listeners.yaml | 4 ++ .../xds-ir/tcp-endpoint-stats.listeners.yaml | 4 ++ .../tcp-listener-ipfamily.listeners.yaml | 4 ++ .../tcp-req-resp-sizes-stats.listeners.yaml | 4 ++ .../xds-ir/tcp-route-complex.listeners.yaml | 4 ++ .../xds-ir/tcp-route-simple.listeners.yaml | 4 ++ .../tcp-route-tls-terminate.listeners.yaml | 4 ++ .../tcp-route-weighted-backend.listeners.yaml | 4 ++ .../tcp-route-with-no-routes.listeners.yaml | 4 ++ .../out/xds-ir/timeout.listeners.yaml | 4 ++ .../tls-route-passthrough.listeners.yaml | 8 +++ ...-with-ciphers-versions-alpn.listeners.yaml | 8 +++ .../xds-ir/tracing-datadog-uds.listeners.yaml | 4 ++ .../out/xds-ir/tracing-datadog.listeners.yaml | 4 ++ .../tracing-endpoint-stats.listeners.yaml | 4 ++ .../out/xds-ir/tracing-zipkin.listeners.yaml | 4 ++ .../out/xds-ir/tracing.listeners.yaml | 4 ++ .../upstream-tcpkeepalive.listeners.yaml | 4 ++ .../testdata/out/xds-ir/wasm.listeners.yaml | 4 ++ internal/xds/translator/translator.go | 56 +++++++++++++++++-- 187 files changed, 1130 insertions(+), 17 deletions(-) diff --git a/internal/xds/translator/jsonpatch.go b/internal/xds/translator/jsonpatch.go index c8b2a7141a..fd2031748c 100644 --- a/internal/xds/translator/jsonpatch.go +++ b/internal/xds/translator/jsonpatch.go @@ -11,6 +11,7 @@ import ( "strings" clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" + corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" @@ -157,8 +158,8 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []* // Find the resource to patch and convert it to JSON switch p.Type { - case resourcev3.ListenerType: - if listener = findXdsListener(tCtx, p.Name); listener == nil { + case resourcev3.ListenerType: // TODO(huabing): add support for QUIC listeners + if listener = findXdsListener(tCtx, p.Name, corev3.SocketAddress_TCP); listener == nil { tn := typedName{p.Type, p.Name} notFoundResources = append(notFoundResources, tn.String()) continue diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 83d17ae8b1..8b07e09b18 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -231,6 +231,10 @@ func xdsListenerName(address string, port uint32) string { return fmt.Sprintf("%s-%d", address, port) } +func quicXDSListenerName(tcpListenerName string) string { + return fmt.Sprintf("%s-quic", tcpListenerName) +} + func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value { if connection != nil && connection.BufferLimitBytes != nil { return wrapperspb.UInt32(*connection.BufferLimitBytes) @@ -249,13 +253,13 @@ 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 buildXdsQuicListener(address string, port uint32, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { return nil, err } xdsListener := &listenerv3.Listener{ - Name: name + "-quic", + Name: quicXDSListenerName(xdsListenerName(address, port)), AccessLog: log, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ diff --git a/internal/xds/translator/metadata.go b/internal/xds/translator/metadata.go index 6ee726c258..e5b10d56cb 100644 --- a/internal/xds/translator/metadata.go +++ b/internal/xds/translator/metadata.go @@ -27,8 +27,20 @@ func buildXdsMetadata(metadata *ir.ResourceMetadata) *corev3.Metadata { return nil } + return buildXdsMetadataFromMultiple([]*ir.ResourceMetadata{metadata}) +} + +func buildXdsMetadataFromMultiple(metadata []*ir.ResourceMetadata) *corev3.Metadata { + if metadata == nil { + return nil + } + resourcesList := &structpb.ListValue{} - resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(metadata)) + for _, md := range metadata { + if md != nil { + resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(md)) + } + } return &corev3.Metadata{ FilterMetadata: map[string]*structpb.Struct{ diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 9d67b3b051..8e7bb76e79 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -30,6 +30,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: envoy-gateway/gateway-1/http1 path: escapedSlashesAction: UnescapeAndRedirect @@ -75,6 +80,11 @@ tcp: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp1 port: 10185 routes: - destination: @@ -123,4 +133,9 @@ udp: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/udp1 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: udp1 port: 10162 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 9c41eeb558..9ff60654c1 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -1,5 +1,10 @@ http: -- name: "custom-backend-listener" +- name: envoy-gateway/gateway-1/http1 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 address: "0.0.0.0" port: 10080 hostnames: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index 75769724c0..5bc36284ec 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -31,6 +31,14 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http1 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: 0.0.0.0-10184 perConnectionBufferLimitBytes: 32768 statPrefix: 0.0.0.0-10184 @@ -46,6 +54,14 @@ cluster: tcp-route-dest statPrefix: tcp-10185 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp1 name: 0.0.0.0-10185 perConnectionBufferLimitBytes: 32768 - address: @@ -65,5 +81,13 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: udp1 name: 0.0.0.0-10162 statPrefix: 0.0.0.0-10162 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml index bfcb22e483..da5e848bd8 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: envoy-gateway/gateway-1/http1/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml index 6532d3d297..9ddb28a054 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml @@ -25,11 +25,19 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: custom-backend-listener + routeConfigName: envoy-gateway/gateway-1/http1 serverHeaderTransformation: PASS_THROUGH statPrefix: http-10080 useRemoteAddress: true - name: custom-backend-listener + name: envoy-gateway/gateway-1/http1 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml index 5fd4a3a946..08f701b7f5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml @@ -1,9 +1,17 @@ - ignorePortInHostMatching: true - name: custom-backend-listener + name: envoy-gateway/gateway-1/http1 virtualHosts: - domains: - '*' - name: custom-backend-listener/* + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: envoy-gateway/gateway-1/http1/* routes: - match: prefix: / diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml index 9ac385326e..1ddf87f1b2 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml index 6532d3d297..a90422964f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml index 9ac385326e..1ddf87f1b2 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml index 9ac385326e..1ddf87f1b2 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index 90391f4af1..01bd99020f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: extension-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10182 perConnectionBufferLimitBytes: 32768 statPrefix: mock-extension-inserted-prefix diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml index 3c6dc61867..4f8507f88b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: extension-post-xdslistener-hook-error maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10181 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml index e0d087e20f..655ccc701a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml index 4b5bbd55aa..d22885132d 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: extension-post-xdstranslate-hook-error maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml index 9fd5fc493b..4ddacf5469 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: extension-post-xdsvirtualhost-hook-error maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index e0d087e20f..655ccc701a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index f4d63babbc..3ec0739fd5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: policyextension-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10183 perConnectionBufferLimitBytes: 32768 statPrefix: from-the-policy diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml index 19c1b42762..837660976c 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml @@ -53,6 +53,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10186 perConnectionBufferLimitBytes: 32768 - address: @@ -110,5 +114,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index da61101e84..72c79a65f9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -180,5 +180,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index 6592672c66..cfd3f5b0f5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -141,5 +141,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index ada78bc5bb..c83344d35f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -197,5 +197,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index 2cc1b29c6c..e2f2abfb7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -216,5 +216,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index 7c6cbd8ea8..e3e81e72a7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -345,5 +345,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml index 24504550f0..03140bc509 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml @@ -175,5 +175,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 2b0b141e87..539a808987 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -175,5 +175,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml index 22f8da7bcb..b279ba13a9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml @@ -44,5 +44,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml index 62ee459695..9772330b85 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml index 62ee459695..9772330b85 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml index ed95629812..b8af59e7cf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml @@ -75,5 +75,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml index ed95629812..b8af59e7cf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml @@ -75,5 +75,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml index 62ee459695..9772330b85 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index cf253c7b39..42cef74c0d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -46,6 +50,10 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 1500 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml index 6bd9da7068..0ea45ba7ba 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml @@ -45,5 +45,13 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml index 7dde79b5f7..0a70cb9958 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml @@ -45,5 +45,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index 939931a2dd..f2c503dd0a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -43,5 +43,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index 0b467be3fc..b3cd4f6874 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 1500 - address: @@ -46,5 +50,9 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 1500 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index 60663e27be..00aa966a2a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -35,6 +35,10 @@ useRemoteAddress: false name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -74,6 +78,10 @@ useRemoteAddress: false name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 - address: @@ -115,6 +123,10 @@ useRemoteAddress: false name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8083 perConnectionBufferLimitBytes: 32768 - address: @@ -161,5 +173,9 @@ useRemoteAddress: false name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8084 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml index f52cbdb62d..3c9904b849 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml @@ -34,6 +34,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -50,5 +54,9 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index 633401150e..21169af78b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -33,6 +33,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -49,5 +53,9 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml index 7eb5e1e78c..5f5dce604b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml @@ -47,5 +47,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml index 8cd66c06c5..bebd9b30b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index 8cd66c06c5..bebd9b30b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml index 08b4905f3c..e964b6fff1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml @@ -59,5 +59,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml index cb97e398b8..23ec5c14f9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml @@ -126,5 +126,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml index cc7d25327d..e7942f0c4f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml @@ -167,5 +167,13 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml index d2f89648c2..8fbfadea6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml @@ -177,5 +177,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml index 604d20ade1..56795cd16f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml @@ -66,5 +66,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml index 6afc39096a..6ae4a19589 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml @@ -68,5 +68,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml index 09e3f3479d..96c818a069 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml @@ -67,5 +67,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index ee68ea5da9..b3a5c65b6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -66,5 +66,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml index 6bd9da7068..0ea45ba7ba 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml @@ -45,5 +45,13 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml index 424e5bb126..9877c138c1 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml @@ -136,5 +136,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 9a29544b49..66b90b6cbc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml index a5fa2c8bc2..898cc94e18 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml @@ -30,6 +30,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -63,5 +67,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml index 423878c1de..fd5528236e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml @@ -30,6 +30,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -63,5 +67,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml index 224837fa2f..827bf6a690 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -64,5 +68,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml index 670b548cb9..a724ef015d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -64,5 +68,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml index a60897b15b..5626de61dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml @@ -29,6 +29,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8081 perConnectionBufferLimitBytes: 32768 - address: @@ -61,6 +65,10 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8082 perConnectionBufferLimitBytes: 32768 - address: @@ -94,6 +102,10 @@ useRemoteAddress: true name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8083 perConnectionBufferLimitBytes: 32768 - address: @@ -127,5 +139,9 @@ useRemoteAddress: true name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-8084 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml index 043f1d5afe..fd1f478e94 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml @@ -37,6 +37,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -104,5 +108,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml index ec9d83eee2..a2cd986d42 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: listener-enable-endpoint-stats maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml index f876351fcc..f0fadb6d93 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml @@ -39,5 +39,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml index a94bb52284..047172ae64 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml index 01a15eb59a..0a9a92697e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: listener-enable-req-resp-sizes-stats maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml index 54ef3705dd..fcba195d70 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml @@ -67,5 +67,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index e0d087e20f..655ccc701a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml index f60a902f8d..2aed6ee5de 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml @@ -75,5 +75,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index 248377a004..8570efd50f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml index e0d087e20f..cf31237e71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml @@ -31,5 +31,15 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - annotations: + foo: bar + kind: Gateway + name: first-gateway + namespace: first-gateway + sectionName: first-listener name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index 248377a004..8570efd50f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index 4e130879d5..3c0ba38ba9 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -66,5 +70,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls-2/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index 248377a004..8570efd50f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml index 64f9bddc41..6b214fbe9e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml @@ -29,5 +29,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml index 64f9bddc41..6b214fbe9e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml @@ -29,5 +29,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml index a94bb52284..8c84313ad9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml @@ -31,5 +31,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index f1f6fd4d66..d8eb928381 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -37,6 +37,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -79,5 +83,9 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index 3683d00d05..c00fa8188c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -33,5 +33,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index d828b8b0e0..63bc76ac0e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -34,5 +34,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml index 3240f89889..87f47463d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml index ea8a008a69..80f1b6982a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml @@ -39,5 +39,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index 3240f89889..87f47463d5 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index ea8016839a..c342ee473b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -49,7 +49,11 @@ resourceApiVersion: V3 disableStatefulSessionResumption: true disableStatelessSessionResumption: true - name: envoy-gateway/gateway-1/tls-quic + metadata: + filterMetadata: + envoy-gateway: + resources: [] + name: 0.0.0.0-10443-quic udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} @@ -101,5 +105,9 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index 9d1d10cb7d..3a759d085d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -50,5 +50,9 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index 9d1d10cb7d..3a759d085d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -50,5 +50,9 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index 349d190b93..154c63fa5e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -61,5 +61,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index 47c923d4ac..7f256db765 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -127,5 +127,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index 92cbd1f30d..f59ea7c3be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -97,5 +97,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml index d2f1157fd1..43de60e1b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml @@ -64,5 +64,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index d3b1591200..a16adbc0ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -64,5 +64,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index 754023cbc1..560f733683 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -54,5 +54,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml index 2269c77a71..4c2da89f76 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml @@ -63,5 +63,13 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index cf1ca1b922..5b69d79a54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -71,6 +75,10 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 - address: @@ -97,6 +105,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10082 perConnectionBufferLimitBytes: 32768 - address: @@ -117,5 +129,9 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10083 perConnectionBufferLimitBytes: 32768 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 d65411e404..0aec56ea06 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 @@ -96,6 +96,18 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https-2 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https-1 name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 32768 - address: @@ -152,5 +164,13 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https-1 name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index fbdbdd5c33..d42d1bed64 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -60,6 +60,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -79,5 +83,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 02d0ccd317..3eecc111b8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 socketOptions: @@ -71,6 +75,10 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 socketOptions: @@ -109,6 +117,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10082 perConnectionBufferLimitBytes: 32768 socketOptions: @@ -128,6 +140,10 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10083 perConnectionBufferLimitBytes: 32768 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml index 6c8837df10..c6a4b40483 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml @@ -22,6 +22,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 50000000 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml index 144a579cc4..84c743fddb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml @@ -36,5 +36,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index 144a579cc4..84c743fddb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -36,5 +36,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml index 9ed099d006..ca1bb46ee0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml @@ -52,5 +52,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index 70126db37f..eecd30da20 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -31,6 +31,10 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 2 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -45,6 +49,10 @@ cluster: max-accept-disabled statPrefix: tcp-10081 name: max-accept-disabled + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 - address: @@ -60,5 +68,9 @@ statPrefix: tcp-10082 name: max-accept-default maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml index e210fafbc4..4a2b86673e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml @@ -46,5 +46,9 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index d838d51f12..381b3934aa 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -59,7 +59,11 @@ useRemoteAddress: true name: default/gateway-1/http drainType: MODIFY_ONLY - name: default/gateway-1/http-quic + metadata: + filterMetadata: + envoy-gateway: + resources: [] + name: 0.0.0.0-10080-quic udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} @@ -164,5 +168,9 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 290f763a94..11bbfe1fcd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -146,5 +146,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml index 8694fec93f..2c5859d9b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml @@ -39,5 +39,9 @@ statPrefix: tcp-10080 name: tcp-route-simple-4 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml index bb76814039..7de7cdee6d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml @@ -56,6 +56,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10001 perConnectionBufferLimitBytes: 32768 - address: @@ -117,6 +121,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10002 perConnectionBufferLimitBytes: 32768 - address: @@ -180,6 +188,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10003 perConnectionBufferLimitBytes: 32768 - address: @@ -245,6 +257,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10004 perConnectionBufferLimitBytes: 32768 - address: @@ -312,5 +328,9 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10005 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml index 4c20105a9f..339973779a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml @@ -56,6 +56,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10001 perConnectionBufferLimitBytes: 32768 - address: @@ -117,6 +121,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10002 perConnectionBufferLimitBytes: 32768 - address: @@ -178,6 +186,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10003 perConnectionBufferLimitBytes: 32768 - address: @@ -239,6 +251,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10004 perConnectionBufferLimitBytes: 32768 - address: @@ -300,5 +316,9 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10005 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index 8f5917dbaf..6128d2608f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -56,6 +56,10 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -89,5 +93,9 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml index f96f852583..7cda3c1121 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml @@ -79,6 +79,10 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -135,5 +139,9 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index a0ba631b1e..72853cbfd2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -56,6 +56,10 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -89,5 +93,9 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml index c40cf6d678..2b025aa1f8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml @@ -158,5 +158,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml index 2c108ed840..047619c21d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml @@ -80,5 +80,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index c8b5314d98..e1791c5216 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -141,5 +141,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index 36bad63fe6..f4bc9e1e32 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -30,5 +30,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index 0b40235c9c..5c495dbb7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -41,5 +41,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index 287c0b1342..6a0c475b79 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -40,5 +40,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index 0b40235c9c..5c495dbb7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -41,5 +41,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml index 9458a894d9..410e93c7f0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml @@ -61,5 +61,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml index 0b40235c9c..5c495dbb7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml @@ -41,5 +41,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml index 9458a894d9..410e93c7f0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml @@ -61,5 +61,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index 0b40235c9c..5c495dbb7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -41,5 +41,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index 0b40235c9c..5c495dbb7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -41,5 +41,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml index 37dd4d0d95..c878be7ba9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml @@ -36,6 +36,14 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -76,5 +84,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-2/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-2 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml index 3ac88c2eb6..6864000d56 100644 --- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml @@ -103,5 +103,13 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 9d1d10cb7d..3a759d085d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -50,5 +50,9 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index adb03e71d7..4f66784841 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -56,5 +56,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml index 65102adc96..bed4da84ca 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml @@ -10,5 +10,9 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml index 61b2c9f539..6d00c584ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml @@ -12,5 +12,9 @@ statPrefix: tcp-8082 name: tcp-route-dual maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-8082 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml index 65102adc96..bed4da84ca 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml @@ -10,5 +10,9 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml index 954e07c726..9e76f74b1d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml @@ -20,5 +20,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml index f6abc637a5..da9dba7626 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml @@ -11,5 +11,9 @@ statPrefix: tcp-10080 name: tcp-route-simple maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml index b9a9aa16d2..8fe64fc260 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml @@ -50,5 +50,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml index 40546ed758..0f8bcd4ebf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml @@ -20,5 +20,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml index ac3c0fb1df..09b7f1538f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml @@ -11,5 +11,9 @@ statPrefix: tcp-10080 name: EmptyCluster maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml index fe19c1d1b4..48afdbb661 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml @@ -18,6 +18,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -40,5 +44,9 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index fdffbb6d52..1612e240ed 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -76,6 +76,10 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 - address: @@ -125,5 +129,9 @@ tlsMinimumProtocolVersion: TLSv1_0 disableStatefulSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10081 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml index f90c31967f..bd913b4fa9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml @@ -57,5 +57,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index f90c31967f..bd913b4fa9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -57,5 +57,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index 5c9b76f630..4f343cd31c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -59,5 +59,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml index 4c7d877925..d66e049501 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml @@ -60,5 +60,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index 85dc84a8c3..731def6422 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -60,5 +60,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index 419f986368..96dd7cf3b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -31,5 +31,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: ::-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index 417abea9ab..d59fb1fc72 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -113,5 +113,9 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index d59ead6df9..2d79e754ba 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -254,7 +254,10 @@ func (t *Translator) processHTTPListenerXdsTranslation( ) error { // The XDS translation is done in a best-effort manner, so we collect all // errors and return them at the end. - var errs error + var ( + ownerGatewayListeners = map[string]sets.Set[*ir.ResourceMetadata]{} // The set of Gateway HTTPListeners that own the xDS Listener + errs error + ) for _, httpListener := range httpListeners { var ( http3Enabled = httpListener.HTTP3 != nil // Whether HTTP3 is enabled @@ -277,7 +280,7 @@ 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, + if quicXDSListener, err = buildXdsQuicListener(httpListener.Address, httpListener.Port, httpListener.IPFamily, accessLog); err != nil { errs = errors.Join(errs, err) continue @@ -287,6 +290,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( errs = errors.Join(errs, err) continue } + ownerGatewayListeners[quicXDSListener.Name] = sets.New[*ir.ResourceMetadata]() } // Create a new TCP listener for HTTP1/HTTP2 traffic. @@ -301,6 +305,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( errs = errors.Join(errs, err) continue } + ownerGatewayListeners[tcpXDSListener.Name] = sets.New[*ir.ResourceMetadata]() // We need to add an HCM to the newly created listener. addHCM = true @@ -373,6 +378,16 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } + // Collect the metadata for the HTTPListener. + if _, ok := ownerGatewayListeners[tcpXDSListener.Name]; ok { + ownerGatewayListeners[tcpXDSListener.Name].Insert(httpListener.Metadata) + } + if http3Enabled { + if _, ok := ownerGatewayListeners[quicXDSListener.Name]; ok { + ownerGatewayListeners[quicXDSListener.Name].Insert(httpListener.Metadata) + } + } + // Add the secrets referenced by the listener's TLS configuration to the // resource version table. // 1:1 between IR TLSListenerConfig and xDS Secret @@ -434,6 +449,17 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } + // Add the owner Gateway Listeners to the xDS listeners' metadata. + for listenerName, ownerGatewayListeners := range ownerGatewayListeners { + xdsListener := findXdsListener(tCtx, listenerName, corev3.SocketAddress_TCP) + if xdsListener != nil { + xdsListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) + } + quicXDSListener := findXdsListener(tCtx, quicXDSListenerName(listenerName), corev3.SocketAddress_UDP) + if quicXDSListener != nil { + quicXDSListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) + } + } return errs } @@ -683,7 +709,10 @@ func (t *Translator) processTCPListenerXdsTranslation( ) error { // 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 + var ( + ownerGatewayListeners = map[string]sets.Set[*ir.ResourceMetadata]{} // The set of Gateway Listeners that own the xDS Listener + 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) @@ -701,6 +730,13 @@ func (t *Translator) processTCPListenerXdsTranslation( errs = errors.Join(errs, err) continue } + + ownerGatewayListeners[xdsListener.Name] = sets.New[*ir.ResourceMetadata]() + } + + // Collect the owner Gateway Listeners for the xDS Listener. + if _, ok := ownerGatewayListeners[xdsListener.Name]; ok { + ownerGatewayListeners[xdsListener.Name].Insert(tcpListener.Metadata) } // Add the proxy protocol filter if needed @@ -766,6 +802,15 @@ func (t *Translator) processTCPListenerXdsTranslation( } } } + + // Add the owner Gateway Listeners to the xDS listeners' metadata. + for listenerName, ownerGatewayListeners := range ownerGatewayListeners { + xdsListener := findXdsListener(tCtx, listenerName, corev3.SocketAddress_TCP) + if xdsListener != nil { + xdsListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) + } + } + return errs } @@ -819,6 +864,7 @@ func processUDPListenerXdsTranslation( errs = errors.Join(errs, err) continue } + xdsListener.Metadata = buildXdsMetadata(udpListener.Metadata) } return errs } @@ -844,14 +890,14 @@ func findXdsListenerByHostPort(tCtx *types.ResourceVersionTable, address string, } // findXdsListener finds a xds listener with the same name and returns nil if there is no match. -func findXdsListener(tCtx *types.ResourceVersionTable, name string) *listenerv3.Listener { +func findXdsListener(tCtx *types.ResourceVersionTable, name string, protocol corev3.SocketAddress_Protocol) *listenerv3.Listener { if tCtx == nil || tCtx.XdsResources == nil || tCtx.XdsResources[resourcev3.ListenerType] == nil { return nil } for _, r := range tCtx.XdsResources[resourcev3.ListenerType] { listener := r.(*listenerv3.Listener) - if listener.Name == name { + if listener.Name == name && listener.GetAddress().GetSocketAddress().Protocol == protocol { return listener } } From 4f039428ba26d9913e8d8075821f7344533cc423 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 03:25:42 +0000 Subject: [PATCH 05/44] fix e2e Signed-off-by: Huabing (Robin) Zhao --- test/e2e/testdata/envoy-patch-policy.yaml | 2 +- test/e2e/tests/envoy_patch_policy.go | 45 ----------------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/test/e2e/testdata/envoy-patch-policy.yaml b/test/e2e/testdata/envoy-patch-policy.yaml index 2c00d5f4c6..c8a4319e34 100644 --- a/test/e2e/testdata/envoy-patch-policy.yaml +++ b/test/e2e/testdata/envoy-patch-policy.yaml @@ -29,7 +29,7 @@ spec: type: JSONPatch jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "0.0.0.0-80" + name: "0.0.0.0-10080" operation: op: add path: "/default_filter_chain/filters/0/typed_config/local_reply_config" diff --git a/test/e2e/tests/envoy_patch_policy.go b/test/e2e/tests/envoy_patch_policy.go index c9cb3f8e0f..2c93872841 100644 --- a/test/e2e/tests/envoy_patch_policy.go +++ b/test/e2e/tests/envoy_patch_policy.go @@ -8,25 +8,12 @@ package tests import ( - "context" - "fmt" "testing" - "time" - "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/wait" - "sigs.k8s.io/controller-runtime/pkg/client" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/conformance/utils/http" "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api/conformance/utils/suite" - "sigs.k8s.io/gateway-api/conformance/utils/tlog" - - egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" - "github.com/envoyproxy/gateway/internal/gatewayapi" - "github.com/envoyproxy/gateway/internal/gatewayapi/resource" ) func init() { @@ -43,15 +30,6 @@ var EnvoyPatchPolicyTest = suite.ConformanceTest{ 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) - - ancestorRef := gwapiv1a2.ParentReference{ - Group: gatewayapi.GroupPtr(gwapiv1.GroupName), - Kind: gatewayapi.KindPtr(resource.KindGateway), - Namespace: gatewayapi.NamespacePtr(gwNN.Namespace), - Name: gwapiv1.ObjectName(gwNN.Name), - } - envoyPatchPolicyMustBeAccepted(t, suite.Client, types.NamespacedName{Name: "custom-response-patch-policy", Namespace: ns}, suite.ControllerName, ancestorRef) - OkResp := http.ExpectedResponse{ Request: http.Request{ Path: "/foo", @@ -80,26 +58,3 @@ var EnvoyPatchPolicyTest = suite.ConformanceTest{ }) }, } - -// envoyPatchPolicyMustBeAccepted waits for the specified EnvoyPatchPolicy to be accepted. -func envoyPatchPolicyMustBeAccepted(t *testing.T, client client.Client, policyName types.NamespacedName, controllerName string, ancestorRef gwapiv1a2.ParentReference) { - t.Helper() - - waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 60*time.Second, true, func(ctx context.Context) (bool, error) { - policy := &egv1a1.EnvoyPatchPolicy{} - err := client.Get(ctx, policyName, policy) - if err != nil { - return false, fmt.Errorf("error fetching EnvoyPatchPolicy: %w", err) - } - - if policyAcceptedByAncestor(policy.Status.Ancestors, controllerName, ancestorRef) { - tlog.Logf(t, "EnvoyPatchPolicy has been accepted: %v", policy) - return true, nil - } - - tlog.Logf(t, "EnvoyPatchPolicy not yet accepted: %v", policy) - return false, nil - }) - - require.NoErrorf(t, waitErr, "error waiting for EnvoyPatchPolicy to be accepted") -} From d893f924e79b16f8178e1fca9069e592d500eb1a Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 03:38:37 +0000 Subject: [PATCH 06/44] fix test Signed-off-by: Huabing (Robin) Zhao --- .../testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml | 8 ++++---- .../jsonpatch-with-jsonpath.envoypatchpolicies.yaml | 2 +- .../xds-ir/jsonpatch-with-jsonpath.listeners.yaml | 12 ++++++++++++ .../out/xds-ir/jsonpatch-with-jsonpath.routes.yaml | 6 +----- .../listener-overlapping-tls-config.listeners.yaml | 4 ++-- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index edaffc2247..db1be4c1c8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -10,14 +10,14 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: first-listener + name: "::-10080" operation: op: "add" jsonPath: "$.filter_chains[0].filters[0].typed_config" path: "/preserve_external_request_id" value: true - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "add" jsonPath: "filter_chains[0].filters[0].typed_config.http_filters[0]" @@ -34,7 +34,7 @@ envoyPatchPolicies: cluster_name: rate-limit-cluster transport_api_version: V3 - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration" - name: "first-listener" + name: "::-10080" operation: op: "add" jsonPath: "virtual_hosts[0]" @@ -43,7 +43,7 @@ envoyPatchPolicies: - actions: - remote_address: {} - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration" - name: "first-listener" + name: "::-10080" operation: op: "replace" jsonPath: "..routes[?(@.name=='second-route')].route.upgrade_configs" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml index 3c50dbfbe7..2747f79997 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml @@ -9,7 +9,7 @@ namespace: default conditions: - lastTransitionTime: null - message: 'Unable to find xds resources: type.googleapis.com/envoy.config.listener.v3.Listener/first-listener,type.googleapis.com/envoy.config.listener.v3.Listener/first-listener' + message: 'Unable to find xds resources: type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080,type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080' reason: ResourceNotFound status: "False" type: Programmed diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index 3a759d085d..bc6182f71d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -14,6 +14,17 @@ initialStreamWindowSize: 65536 maxConcurrentStreams: 100 httpFilters: + - name: envoy.filters.http.ratelimit + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit + domain: eg-ratelimit + failureModeDeny: true + rateLimitService: + grpcService: + envoyGrpc: + clusterName: rate-limit-cluster + transportApiVersion: V3 + timeout: 1s - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -21,6 +32,7 @@ mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + preserveExternalRequestId: true rds: configSource: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml index a7273c7a1b..1151564d8d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml @@ -4,9 +4,6 @@ - domains: - '*' name: first-listener/* - rateLimits: - - actions: - - remoteAddress: {} routes: - match: headers: @@ -32,5 +29,4 @@ route: cluster: second-route-dest upgradeConfigs: - - connectConfig: {} - upgradeType: CONNECT + - upgradeType: websocket 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 0aec56ea06..73f42de8b8 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 @@ -103,11 +103,11 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-2 + sectionName: https-1 - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-1 + sectionName: https-2 name: 0.0.0.0-10443 perConnectionBufferLimitBytes: 32768 - address: From 729ddd1528142dcf4d98526a03757113105e389d Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 03:40:25 +0000 Subject: [PATCH 07/44] fix test Signed-off-by: Huabing (Robin) Zhao --- .../testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml | 4 ++-- .../xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml | 6 +++--- .../testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index db1be4c1c8..214197c142 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -34,7 +34,7 @@ envoyPatchPolicies: cluster_name: rate-limit-cluster transport_api_version: V3 - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration" - name: "::-10080" + name: "first-listener" operation: op: "add" jsonPath: "virtual_hosts[0]" @@ -43,7 +43,7 @@ envoyPatchPolicies: - actions: - remote_address: {} - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration" - name: "::-10080" + name: "first-listener" operation: op: "replace" jsonPath: "..routes[?(@.name=='second-route')].route.upgrade_configs" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml index 2747f79997..9508dd3e7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml @@ -9,8 +9,8 @@ namespace: default conditions: - lastTransitionTime: null - message: 'Unable to find xds resources: type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080,type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080' - reason: ResourceNotFound - status: "False" + message: Patches have been successfully applied. + reason: Programmed + status: "True" type: Programmed controllerName: "" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml index 1151564d8d..a7273c7a1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml @@ -4,6 +4,9 @@ - domains: - '*' name: first-listener/* + rateLimits: + - actions: + - remoteAddress: {} routes: - match: headers: @@ -29,4 +32,5 @@ route: cluster: second-route-dest upgradeConfigs: - - upgradeType: websocket + - connectConfig: {} + upgradeType: CONNECT From 7febe3c6eeb5561d423e1f96b2f34714f97c671e Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 18 Jul 2025 03:46:50 +0000 Subject: [PATCH 08/44] fix test Signed-off-by: Huabing (Robin) Zhao --- .../translate/out/default-resources.all.yaml | 24 +++++++++++ .../out/from-gateway-api-to-xds.all.json | 42 +++++++++++++++++++ .../out/from-gateway-api-to-xds.all.yaml | 24 +++++++++++ .../out/from-gateway-api-to-xds.listener.yaml | 24 +++++++++++ ...-single-route-single-match-to-xds.all.json | 14 +++++++ ...-single-route-single-match-to-xds.all.yaml | 8 ++++ ...le-route-single-match-to-xds.listener.yaml | 8 ++++ .../out/no-service-cluster-ip.all.yaml | 8 ++++ .../jsonpatch-add-op-without-value.yaml | 2 +- .../in/xds-ir/jsonpatch-invalid-listener.yaml | 2 +- .../testdata/in/xds-ir/jsonpatch-invalid.yaml | 2 +- .../xds-ir/jsonpatch-move-op-with-value.yaml | 4 +- .../testdata/in/xds-ir/jsonpatch.yaml | 4 +- ...-translate-listeners-routes.listeners.yaml | 13 ++++-- .../xds-ir/jsonpatch.envoypatchpolicies.yaml | 6 +-- .../out/xds-ir/jsonpatch.listeners.yaml | 12 ++++++ 16 files changed, 184 insertions(+), 13 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 92f83d908a..82c3e739b1 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1126,6 +1126,14 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -1238,6 +1246,14 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: grpc name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -1322,6 +1338,10 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: @@ -1413,6 +1433,10 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index 0ba56d0fda..b60cc612b8 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -978,6 +978,20 @@ "name": "default/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, + "metadata": { + "filterMetadata": { + "envoy-gateway": { + "resources": [ + { + "kind": "Gateway", + "name": "eg", + "namespace": "default", + "sectionName": "http" + } + ] + } + } + }, "name": "0.0.0.0-10080", "perConnectionBufferLimitBytes": 32768 } @@ -1130,6 +1144,20 @@ "name": "default/eg/grpc" }, "maxConnectionsToAcceptPerSocketEvent": 1, + "metadata": { + "filterMetadata": { + "envoy-gateway": { + "resources": [ + { + "kind": "Gateway", + "name": "eg", + "namespace": "default", + "sectionName": "grpc" + } + ] + } + } + }, "name": "0.0.0.0-8080", "perConnectionBufferLimitBytes": 32768 } @@ -1242,6 +1270,13 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, + "metadata": { + "filterMetadata": { + "envoy-gateway": { + "resources": [] + } + } + }, "name": "0.0.0.0-1234", "perConnectionBufferLimitBytes": 32768 } @@ -1367,6 +1402,13 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, + "metadata": { + "filterMetadata": { + "envoy-gateway": { + "resources": [] + } + } + }, "name": "0.0.0.0-8443", "perConnectionBufferLimitBytes": 32768 } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index d9dbb13f4c..55dcfbf240 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -579,6 +579,14 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -691,6 +699,14 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: grpc name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -775,6 +791,10 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: @@ -866,6 +886,10 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index e147067487..3e58816550 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -143,6 +143,14 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -255,6 +263,14 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: default + sectionName: grpc name: 0.0.0.0-8080 perConnectionBufferLimitBytes: 32768 - activeState: @@ -339,6 +355,10 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-1234 perConnectionBufferLimitBytes: 32768 - activeState: @@ -430,6 +450,10 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: 0.0.0.0-8443 perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index edd18f2aaa..efb40fa4f0 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -689,6 +689,20 @@ "name": "envoy-gateway-system/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, + "metadata": { + "filterMetadata": { + "envoy-gateway": { + "resources": [ + { + "kind": "Gateway", + "name": "eg", + "namespace": "envoy-gateway-system", + "sectionName": "http" + } + ] + } + } + }, "name": "0.0.0.0-10080", "perConnectionBufferLimitBytes": 32768 } diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 36c5d73239..9de8bd765d 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -417,6 +417,14 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: envoy-gateway-system + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index edc285e19d..3ae113686d 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -163,5 +163,13 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: envoy-gateway-system + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 1ddf08e97c..9d9b026b47 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -352,6 +352,14 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: eg + namespace: envoy-gateway-system + sectionName: http name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index 67387a93db..9dce01cc0d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml index 6099f5daba..df458ecf48 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml @@ -1,6 +1,6 @@ jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "0.0.0.0-10080" operation: op: "add" path: "/default_filter_chain/filters/0/typed_config/http_filters/0" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml index ef60319193..1cb8fe14a8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml @@ -4,7 +4,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "0.0.0.0-10080" operation: op: "add" path: "/default_filter_chain/filters/0/typed_config/http_filters/0" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index e4210c7f0d..27bd894bfb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" @@ -27,7 +27,7 @@ envoyPatchPolicies: cluster_name: rate-limit-cluster transport_api_version: V3 - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "remove" from: "/filter_chains/0/filters/0/typed_config/http_filters/0" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index ab4aa88959..92e7c2cabd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -10,13 +10,13 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: first-listener + name: "::-10080" operation: op: add path: "/filter_chains/0/filters/0/typed_config/preserve_external_request_id" value: true - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "first-listener" + name: "::-10080" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml index b9ec83b9e3..5edabf06db 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml @@ -31,9 +31,12 @@ useRemoteAddress: true name: test-listener-modify maxConnectionsToAcceptPerSocketEvent: 1 - name: test-listener-modify + metadata: + filterMetadata: + envoy-gateway: + resources: [] + name: 0.0.0.0-10080 perConnectionBufferLimitBytes: 32768 - statPrefix: extension-modified-listener - address: socketAddress: address: 0.0.0.0 @@ -67,7 +70,11 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - name: second-listener + metadata: + filterMetadata: + envoy-gateway: + resources: [] + name: 0.0.0.0-10081 perConnectionBufferLimitBytes: 32768 - name: extension-injected-listener statPrefix: extension-injected diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml index 3c50dbfbe7..9508dd3e7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml @@ -9,8 +9,8 @@ namespace: default conditions: - lastTransitionTime: null - message: 'Unable to find xds resources: type.googleapis.com/envoy.config.listener.v3.Listener/first-listener,type.googleapis.com/envoy.config.listener.v3.Listener/first-listener' - reason: ResourceNotFound - status: "False" + message: Patches have been successfully applied. + reason: Programmed + status: "True" type: Programmed controllerName: "" diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index 3a759d085d..bc6182f71d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -14,6 +14,17 @@ initialStreamWindowSize: 65536 maxConcurrentStreams: 100 httpFilters: + - name: envoy.filters.http.ratelimit + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit + domain: eg-ratelimit + failureModeDeny: true + rateLimitService: + grpcService: + envoyGrpc: + clusterName: rate-limit-cluster + transportApiVersion: V3 + timeout: 1s - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -21,6 +32,7 @@ mergeSlashes: true normalizePath: true pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + preserveExternalRequestId: true rds: configSource: ads: {} From 70004c41d29ddc498516e8738e2f9c38dbfd5e35 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Mon, 21 Jul 2025 02:58:27 +0000 Subject: [PATCH 09/44] add feature flag for listener name Signed-off-by: Huabing (Robin) Zhao --- .github/workflows/build_and_test.yaml | 12 ++++ api/v1alpha1/envoygateway_helpers.go | 26 ++++++++ api/v1alpha1/envoygateway_types.go | 21 +++++++ api/v1alpha1/zz_generated.deepcopy.go | 30 +++++++++ .../translate/out/default-resources.all.yaml | 10 +-- .../out/from-gateway-api-to-xds.all.json | 10 +-- .../out/from-gateway-api-to-xds.all.yaml | 10 +-- .../out/from-gateway-api-to-xds.listener.yaml | 10 +-- ...-single-route-single-match-to-xds.all.json | 2 +- ...-single-route-single-match-to-xds.all.yaml | 2 +- ...le-route-single-match-to-xds.listener.yaml | 2 +- .../out/no-service-cluster-ip.all.yaml | 2 +- .../xds/translator/extensionserver_test.go | 14 ++--- internal/xds/translator/jsonpatch.go | 2 +- internal/xds/translator/listener.go | 32 +++++++--- internal/xds/translator/runner/runner.go | 1 + .../extensionpolicy-tcp-udp-http.yaml | 19 +----- .../http-route-custom-backend-error.yaml | 17 +++-- ...custom-backend-multiple-backend-error.yaml | 10 +++ .../http-route-custom-backend.yaml | 10 +++ .../http-route-custom-backends-mixed.yaml | 5 ++ ...-route-custom-backends-multiple-mixed.yaml | 5 ++ .../http-route-extension-filter.yaml | 7 ++- .../http-route-extension-listener-error.yaml | 12 +++- .../http-route-extension-route-error.yaml | 5 ++ .../http-route-extension-translate-error.yaml | 10 +++ ...ttp-route-extension-virtualhost-error.yaml | 10 +++ .../in/extension-xds-ir/http-route.yaml | 10 +++ .../in/extension-xds-ir/listener-policy.yaml | 2 +- .../multiple-listeners-same-port-error.yaml | 2 +- .../post-translate-listeners-routes.yaml | 12 ++++ .../in/ratelimit-config/distinct-match.yaml | 5 ++ .../distinct-remote-address-match.yaml | 5 ++ .../empty-header-matches.yaml | 5 ++ .../global-shared-distinct-match.yaml | 5 ++ ...lobal-shared-multiple-shared-policies.yaml | 5 ++ .../header-and-cidr-matches.yaml | 5 ++ .../masked-remote-address-match.yaml | 5 ++ .../in/ratelimit-config/multiple-domains.yaml | 10 +++ ...multiple-global-shared-distinct-match.yaml | 10 +++ .../multiple-listeners-distinct-match.yaml | 10 +++ ...-listeners-same-shared-distinct-match.yaml | 10 +++ ...tiple-listeners-shared-distinct-match.yaml | 10 +++ ...d-remote-address-match-with-same-cidr.yaml | 5 ++ .../in/ratelimit-config/multiple-matches.yaml | 5 ++ .../in/ratelimit-config/multiple-routes.yaml | 5 ++ .../in/ratelimit-config/multiple-rules.yaml | 5 ++ .../multiple-shared-and-unshared.yaml | 5 ++ .../multiple-shared-ratelimit-rules.yaml | 5 ++ .../in/ratelimit-config/value-match.yaml | 5 ++ .../testdata/in/xds-ir/accesslog-cel.yaml | 5 ++ .../in/xds-ir/accesslog-endpoint-stats.yaml | 5 ++ .../in/xds-ir/accesslog-formatters.yaml | 5 ++ .../testdata/in/xds-ir/accesslog-invalid.yaml | 5 ++ .../in/xds-ir/accesslog-multi-cel.yaml | 5 ++ .../in/xds-ir/accesslog-with-format.yaml | 5 ++ .../in/xds-ir/accesslog-without-format.yaml | 5 ++ .../testdata/in/xds-ir/accesslog.yaml | 5 ++ .../testdata/in/xds-ir/api-key-auth.yaml | 5 ++ .../in/xds-ir/authorization-client-cidr.yaml | 5 ++ .../in/xds-ir/authorization-http-header.yaml | 5 ++ .../authorization-multiple-principals.yaml | 5 ++ .../in/xds-ir/backend-buffer-limit.yaml | 5 ++ .../in/xds-ir/backend-tls-skip-verify.yaml | 5 ++ .../in/xds-ir/basic-auth-username-header.yaml | 5 ++ .../testdata/in/xds-ir/basic-auth.yaml | 5 ++ .../testdata/in/xds-ir/circuit-breaker.yaml | 5 ++ .../in/xds-ir/client-buffer-limit.yaml | 5 ++ .../in/xds-ir/client-ip-detection.yaml | 20 ++++++ .../in/xds-ir/client-stream-idle-timeout.yaml | 10 +++ .../testdata/in/xds-ir/client-timeout.yaml | 10 +++ .../in/xds-ir/cors-from-httpcorsfilter.yaml | 5 ++ .../translator/testdata/in/xds-ir/cors.yaml | 5 ++ .../in/xds-ir/custom-filter-order.yaml | 5 ++ .../testdata/in/xds-ir/ext-auth-backend.yaml | 5 ++ .../testdata/in/xds-ir/ext-auth-body.yaml | 5 ++ .../in/xds-ir/ext-auth-recomputation.yaml | 5 ++ .../testdata/in/xds-ir/ext-auth.yaml | 5 ++ .../testdata/in/xds-ir/ext-proc.yaml | 5 ++ .../testdata/in/xds-ir/fault-injection.yaml | 5 ++ .../headers-with-disable-request-id.yaml | 11 +++- .../headers-with-generate-request-id.yaml | 11 +++- ...-with-preserve-or-generate-request-id.yaml | 11 +++- .../headers-with-preserve-request-id.yaml | 11 +++- .../headers-with-underscores-action.yaml | 21 ++++++- .../testdata/in/xds-ir/health-check.yaml | 5 ++ .../in/xds-ir/http-early-header-mutation.yaml | 10 +++ .../in/xds-ir/http-endpoint-stats.yaml | 5 ++ .../testdata/in/xds-ir/http-health-check.yaml | 5 ++ .../xds-ir/http-preserve-client-protocol.yaml | 5 ++ .../in/xds-ir/http-req-resp-sizes-stats.yaml | 5 ++ .../in/xds-ir/http-route-direct-response.yaml | 5 ++ .../in/xds-ir/http-route-dns-cluster.yaml | 5 ++ .../in/xds-ir/http-route-invalid.yaml | 5 ++ .../testdata/in/xds-ir/http-route-mirror.yaml | 5 ++ .../xds-ir/http-route-mirrors-percentage.yaml | 5 ++ .../xds-ir/http-route-multiple-matches.yaml | 5 ++ ...ttp-route-multiple-mirrors-percentage.yaml | 5 ++ .../xds-ir/http-route-multiple-mirrors.yaml | 5 ++ .../in/xds-ir/http-route-partial-invalid.yaml | 5 ++ .../in/xds-ir/http-route-redirect.yaml | 5 ++ .../testdata/in/xds-ir/http-route-regex.yaml | 5 ++ .../in/xds-ir/http-route-request-headers.yaml | 5 ++ .../http-route-response-add-headers.yaml | 5 ++ ...ttp-route-response-add-remove-headers.yaml | 5 ++ .../http-route-response-remove-headers.yaml | 5 ++ ...tp-route-rewrite-root-path-url-prefix.yaml | 5 ++ ...-rewrite-sufixx-with-slash-url-prefix.yaml | 5 ++ .../http-route-rewrite-url-fullpath.yaml | 5 ++ .../xds-ir/http-route-rewrite-url-host.yaml | 5 ++ .../xds-ir/http-route-rewrite-url-prefix.yaml | 5 ++ .../xds-ir/http-route-rewrite-url-regex.yaml | 5 ++ .../http-route-session-persistence.yaml | 5 ++ .../in/xds-ir/http-route-stat-name.yaml | 5 ++ .../in/xds-ir/http-route-timeout.yaml | 5 ++ .../http-route-weighted-backend-uds-ip.yaml | 5 ++ .../xds-ir/http-route-weighted-backend.yaml | 5 ++ .../http-route-weighted-invalid-backend.yaml | 5 ++ ...route-zonal-routing-weighted-clusters.yaml | 5 ++ .../in/xds-ir/http-route-zonal-routing.yaml | 5 ++ .../testdata/in/xds-ir/http-route.yaml | 5 ++ .../in/xds-ir/http1-preserve-case.yaml | 10 +++ .../testdata/in/xds-ir/http1-trailers.yaml | 5 ++ .../testdata/in/xds-ir/http2-route.yaml | 5 ++ .../jsonpatch-add-op-empty-jsonpath.yaml | 5 ++ .../jsonpatch-add-op-without-value.yaml | 7 ++- .../in/xds-ir/jsonpatch-invalid-listener.yaml | 7 ++- .../in/xds-ir/jsonpatch-invalid-patch.yaml | 7 ++- .../testdata/in/xds-ir/jsonpatch-invalid.yaml | 7 ++- .../in/xds-ir/jsonpatch-missing-resource.yaml | 5 ++ .../xds-ir/jsonpatch-move-op-with-value.yaml | 9 ++- .../jsonpatch-with-jsonpath-invalid.yaml | 5 ++ .../in/xds-ir/jsonpatch-with-jsonpath.yaml | 9 ++- .../testdata/in/xds-ir/jsonpatch.yaml | 9 ++- .../in/xds-ir/jwt-custom-extractor.yaml | 5 ++ .../jwt-multi-route-multi-provider.yaml | 5 ++ .../jwt-multi-route-single-provider.yaml | 5 ++ .../testdata/in/xds-ir/jwt-optional.yaml | 5 ++ .../testdata/in/xds-ir/jwt-ratelimit.yaml | 5 ++ .../xds-ir/jwt-single-route-single-match.yaml | 5 ++ .../testdata/in/xds-ir/load-balancer.yaml | 5 ++ .../in/xds-ir/local-ratelimit-distinct.yaml | 5 ++ .../testdata/in/xds-ir/local-ratelimit.yaml | 5 ++ .../in/xds-ir/metrics-virtual-host.yaml | 5 ++ .../in/xds-ir/mixed-tls-jwt-authn.yaml | 5 ++ ...d-client-certificate-with-custom-data.yaml | 25 ++++++++ ...mutual-tls-forward-client-certificate.yaml | 25 ++++++++ ...-required-client-certificate-disabled.yaml | 5 ++ .../testdata/in/xds-ir/mutual-tls-san.yaml | 5 ++ .../testdata/in/xds-ir/mutual-tls.yaml | 5 ++ .../xds-ir/oidc-backend-cluster-provider.yaml | 5 ++ .../translator/testdata/in/xds-ir/oidc.yaml | 5 ++ .../testdata/in/xds-ir/panic-threshold.yaml | 5 ++ .../testdata/in/xds-ir/path-settings.yaml | 5 ++ .../in/xds-ir/proxy-protocol-upstream.yaml | 5 ++ .../in/xds-ir/ratelimit-custom-domain.yaml | 5 ++ .../in/xds-ir/ratelimit-headers-and-cidr.yaml | 5 ++ .../in/xds-ir/ratelimit-sourceip.yaml | 5 ++ .../testdata/in/xds-ir/ratelimit.yaml | 5 ++ .../in/xds-ir/retry-partial-invalid.yaml | 5 ++ .../translator/testdata/in/xds-ir/retry.yaml | 5 ++ .../testdata/in/xds-ir/simple-tls.yaml | 5 ++ .../testdata/in/xds-ir/timeout.yaml | 5 ++ .../testdata/in/xds-ir/tracing-zipkin.yaml | 10 +++ .../testdata/in/xds-ir/tracing.yaml | 5 ++ .../in/xds-ir/upstream-tcpkeepalive.yaml | 5 ++ ...xtensionpolicy-tcp-udp-http.listeners.yaml | 43 +++---------- .../extensionpolicy-tcp-udp-http.routes.yaml | 8 --- ...-route-custom-backend-error.listeners.yaml | 8 +-- ...ttp-route-custom-backend-error.routes.yaml | 6 +- ...kend-multiple-backend-error.listeners.yaml | 8 ++- ...backend-multiple-backend-error.routes.yaml | 8 +++ .../http-route-custom-backend.listeners.yaml | 8 ++- .../http-route-custom-backend.routes.yaml | 8 +++ ...route-custom-backends-mixed.listeners.yaml | 8 ++- ...tp-route-custom-backends-mixed.routes.yaml | 8 +++ ...tom-backends-multiple-mixed.listeners.yaml | 8 ++- ...custom-backends-multiple-mixed.routes.yaml | 8 +++ ...http-route-extension-filter.listeners.yaml | 12 ++-- .../http-route-extension-filter.routes.yaml | 8 +++ ...te-extension-listener-error.listeners.yaml | 12 ++-- ...route-extension-listener-error.routes.yaml | 8 +++ ...route-extension-route-error.listeners.yaml | 8 ++- ...tp-route-extension-route-error.routes.yaml | 8 +++ ...e-extension-translate-error.listeners.yaml | 8 ++- ...oute-extension-translate-error.routes.yaml | 8 +++ ...extension-virtualhost-error.listeners.yaml | 8 ++- ...te-extension-virtualhost-error.routes.yaml | 8 +++ .../http-route.listeners.yaml | 8 ++- .../extension-xds-ir/http-route.routes.yaml | 8 +++ .../listener-policy.listeners.yaml | 6 +- ...e-listeners-same-port-error.listeners.yaml | 22 +------ ...-translate-listeners-routes.listeners.yaml | 17 +++-- ...ost-translate-listeners-routes.routes.yaml | 16 +++++ .../out/xds-ir/accesslog-cel.listeners.yaml | 8 ++- .../out/xds-ir/accesslog-cel.routes.yaml | 8 +++ .../accesslog-endpoint-stats.listeners.yaml | 8 ++- .../accesslog-endpoint-stats.routes.yaml | 8 +++ .../accesslog-formatters.listeners.yaml | 8 ++- .../xds-ir/accesslog-formatters.routes.yaml | 8 +++ .../xds-ir/accesslog-multi-cel.listeners.yaml | 8 ++- .../xds-ir/accesslog-multi-cel.routes.yaml | 8 +++ .../out/xds-ir/accesslog-types.listeners.yaml | 2 +- .../accesslog-with-format.listeners.yaml | 8 ++- .../xds-ir/accesslog-with-format.routes.yaml | 8 +++ .../out/xds-ir/accesslog.listeners.yaml | 8 ++- .../testdata/out/xds-ir/accesslog.routes.yaml | 8 +++ .../out/xds-ir/api-key-auth.listeners.yaml | 8 ++- .../out/xds-ir/api-key-auth.routes.yaml | 16 +++++ .../authorization-client-cidr.listeners.yaml | 8 ++- .../authorization-client-cidr.routes.yaml | 8 +++ .../authorization-http-header.listeners.yaml | 8 ++- .../authorization-http-header.routes.yaml | 8 +++ .../authorization-jwt-claim.listeners.yaml | 2 +- .../authorization-jwt-scope.listeners.yaml | 2 +- ...ization-multiple-principals.listeners.yaml | 8 ++- ...horization-multiple-principals.routes.yaml | 8 +++ .../backend-buffer-limit.listeners.yaml | 12 ++-- .../xds-ir/backend-buffer-limit.routes.yaml | 8 +++ .../xds-ir/backend-priority.listeners.yaml | 2 +- .../backend-tls-skip-verify.listeners.yaml | 8 ++- .../backend-tls-skip-verify.routes.yaml | 8 +++ .../basic-auth-username-header.listeners.yaml | 8 ++- .../basic-auth-username-header.routes.yaml | 16 +++++ .../out/xds-ir/basic-auth.listeners.yaml | 8 ++- .../out/xds-ir/basic-auth.routes.yaml | 16 +++++ .../out/xds-ir/btp-telemetry.listeners.yaml | 2 +- .../out/xds-ir/circuit-breaker.listeners.yaml | 8 ++- .../out/xds-ir/circuit-breaker.routes.yaml | 8 +++ .../xds-ir/client-buffer-limit.listeners.yaml | 10 ++- .../xds-ir/client-buffer-limit.routes.yaml | 8 +++ .../xds-ir/client-ip-detection.listeners.yaml | 32 +++++++--- .../xds-ir/client-ip-detection.routes.yaml | 32 ++++++++++ .../client-stream-idle-timeout.listeners.yaml | 16 +++-- .../client-stream-idle-timeout.routes.yaml | 8 +++ .../out/xds-ir/client-timeout.listeners.yaml | 16 +++-- .../out/xds-ir/client-timeout.routes.yaml | 8 +++ .../out/xds-ir/compression.listeners.yaml | 2 +- .../cors-from-httpcorsfilter.listeners.yaml | 8 ++- .../cors-from-httpcorsfilter.routes.yaml | 8 +++ .../testdata/out/xds-ir/cors.listeners.yaml | 8 ++- .../testdata/out/xds-ir/cors.routes.yaml | 8 +++ ...al-injection-backend-filter.listeners.yaml | 2 +- .../credential-injection.listeners.yaml | 2 +- .../xds-ir/custom-filter-order.listeners.yaml | 8 ++- .../xds-ir/custom-filter-order.routes.yaml | 8 +++ .../out/xds-ir/custom-response.listeners.yaml | 2 +- .../xds-ir/dns-lookup-family.listeners.yaml | 2 +- .../xds-ir/ext-auth-backend.listeners.yaml | 8 ++- .../out/xds-ir/ext-auth-backend.routes.yaml | 16 +++++ .../out/xds-ir/ext-auth-body.listeners.yaml | 8 ++- .../out/xds-ir/ext-auth-body.routes.yaml | 16 +++++ .../ext-auth-recomputation.listeners.yaml | 8 ++- .../xds-ir/ext-auth-recomputation.routes.yaml | 16 +++++ .../out/xds-ir/ext-auth.listeners.yaml | 8 ++- .../testdata/out/xds-ir/ext-auth.routes.yaml | 16 +++++ ...-proc-with-traffic-settings.listeners.yaml | 2 +- .../out/xds-ir/ext-proc.listeners.yaml | 8 ++- .../testdata/out/xds-ir/ext-proc.routes.yaml | 16 +++++ .../out/xds-ir/fault-injection.listeners.yaml | 8 ++- .../out/xds-ir/fault-injection.routes.yaml | 8 +++ ...ers-with-disable-request-id.listeners.yaml | 16 +++-- ...eaders-with-disable-request-id.routes.yaml | 16 +++++ ...rs-with-generate-request-id.listeners.yaml | 16 +++-- ...aders-with-generate-request-id.routes.yaml | 16 +++++ ...erve-or-generate-request-id.listeners.yaml | 16 +++-- ...reserve-or-generate-request-id.routes.yaml | 16 +++++ ...rs-with-preserve-request-id.listeners.yaml | 16 +++-- ...aders-with-preserve-request-id.routes.yaml | 16 +++++ ...ers-with-underscores-action.listeners.yaml | 32 +++++++--- ...eaders-with-underscores-action.routes.yaml | 32 ++++++++++ .../out/xds-ir/health-check.listeners.yaml | 8 ++- .../out/xds-ir/health-check.routes.yaml | 8 +++ .../xds-ir/http-connect-proxy.listeners.yaml | 2 +- .../http-connect-terminate.listeners.yaml | 2 +- .../http-early-header-mutation.listeners.yaml | 16 +++-- .../http-early-header-mutation.routes.yaml | 16 +++++ .../xds-ir/http-endpoint-stats.listeners.yaml | 8 ++- .../xds-ir/http-endpoint-stats.routes.yaml | 8 +++ .../xds-ir/http-health-check.listeners.yaml | 8 ++- .../out/xds-ir/http-health-check.routes.yaml | 8 +++ ...tp-preserve-client-protocol.listeners.yaml | 8 ++- .../http-preserve-client-protocol.routes.yaml | 8 +++ .../http-req-resp-sizes-stats.listeners.yaml | 8 ++- .../http-req-resp-sizes-stats.routes.yaml | 8 +++ .../http-route-direct-response.listeners.yaml | 8 ++- .../http-route-direct-response.routes.yaml | 8 +++ .../http-route-dns-cluster.listeners.yaml | 8 ++- .../xds-ir/http-route-dns-cluster.routes.yaml | 8 +++ ...http-route-dynamic-resolver.listeners.yaml | 2 +- .../xds-ir/http-route-mirror.listeners.yaml | 8 ++- .../out/xds-ir/http-route-mirror.routes.yaml | 8 +++ ...tp-route-mirrors-percentage.listeners.yaml | 8 ++- .../http-route-mirrors-percentage.routes.yaml | 8 +++ ...http-route-multiple-matches.listeners.yaml | 8 ++- .../http-route-multiple-matches.routes.yaml | 40 ++++++++++++ ...multiple-mirrors-percentage.listeners.yaml | 8 ++- ...te-multiple-mirrors-percentage.routes.yaml | 8 +++ ...http-route-multiple-mirrors.listeners.yaml | 8 ++- .../http-route-multiple-mirrors.routes.yaml | 8 +++ .../http-route-partial-invalid.listeners.yaml | 8 ++- .../http-route-partial-invalid.routes.yaml | 8 +++ .../xds-ir/http-route-redirect.listeners.yaml | 8 ++- .../xds-ir/http-route-redirect.routes.yaml | 8 +++ .../xds-ir/http-route-regex.listeners.yaml | 8 ++- .../out/xds-ir/http-route-regex.routes.yaml | 8 +++ .../http-route-request-headers.listeners.yaml | 8 ++- .../http-route-request-headers.routes.yaml | 8 +++ ...-route-response-add-headers.listeners.yaml | 8 ++- ...ttp-route-response-add-headers.routes.yaml | 8 +++ ...response-add-remove-headers.listeners.yaml | 8 ++- ...te-response-add-remove-headers.routes.yaml | 8 +++ ...ute-response-remove-headers.listeners.yaml | 8 ++- ...-route-response-remove-headers.routes.yaml | 8 +++ ...ewrite-root-path-url-prefix.listeners.yaml | 8 ++- ...e-rewrite-root-path-url-prefix.routes.yaml | 8 +++ ...ufixx-with-slash-url-prefix.listeners.yaml | 8 ++- ...e-sufixx-with-slash-url-prefix.routes.yaml | 8 +++ ...-route-rewrite-url-fullpath.listeners.yaml | 8 ++- ...ttp-route-rewrite-url-fullpath.routes.yaml | 8 +++ ...http-route-rewrite-url-host.listeners.yaml | 8 ++- .../http-route-rewrite-url-host.routes.yaml | 8 +++ ...tp-route-rewrite-url-prefix.listeners.yaml | 8 ++- .../http-route-rewrite-url-prefix.routes.yaml | 8 +++ ...ttp-route-rewrite-url-regex.listeners.yaml | 8 ++- .../http-route-rewrite-url-regex.routes.yaml | 8 +++ ...p-route-session-persistence.listeners.yaml | 8 ++- ...http-route-session-persistence.routes.yaml | 8 +++ .../http-route-stat-name.listeners.yaml | 8 ++- .../xds-ir/http-route-stat-name.routes.yaml | 8 +++ .../xds-ir/http-route-timeout.listeners.yaml | 8 ++- .../out/xds-ir/http-route-timeout.routes.yaml | 8 +++ ...ute-weighted-backend-uds-ip.listeners.yaml | 8 ++- ...-route-weighted-backend-uds-ip.routes.yaml | 8 +++ ...ighted-backend-with-filters.listeners.yaml | 2 +- ...http-route-weighted-backend.listeners.yaml | 8 ++- .../http-route-weighted-backend.routes.yaml | 8 +++ ...te-weighted-invalid-backend.listeners.yaml | 8 ++- ...route-weighted-invalid-backend.routes.yaml | 8 +++ .../http-route-with-clientcert.listeners.yaml | 2 +- .../http-route-with-metadata.listeners.yaml | 2 +- ...-with-tls-system-truststore.listeners.yaml | 2 +- ...th-tlsbundle-multiple-certs.listeners.yaml | 4 +- .../http-route-with-tlsbundle.listeners.yaml | 2 +- ...l-routing-weighted-clusters.listeners.yaml | 8 ++- ...onal-routing-weighted-clusters.routes.yaml | 8 +++ .../http-route-zonal-routing.listeners.yaml | 8 ++- .../http-route-zonal-routing.routes.yaml | 8 +++ .../out/xds-ir/http-route.listeners.yaml | 8 ++- .../out/xds-ir/http-route.routes.yaml | 8 +++ .../xds-ir/http-upgrade-spdy.listeners.yaml | 2 +- ...http-upgrade-websocket-spdy.listeners.yaml | 2 +- .../xds-ir/http1-preserve-case.listeners.yaml | 16 +++-- .../xds-ir/http1-preserve-case.routes.yaml | 16 +++++ .../out/xds-ir/http1-trailers.listeners.yaml | 8 ++- .../out/xds-ir/http1-trailers.routes.yaml | 8 +++ .../testdata/out/xds-ir/http10.listeners.yaml | 2 +- .../out/xds-ir/http2-mixed.listeners.yaml | 2 +- .../out/xds-ir/http2-route.listeners.yaml | 8 ++- .../out/xds-ir/http2-route.routes.yaml | 8 +++ .../testdata/out/xds-ir/http2.listeners.yaml | 2 +- .../testdata/out/xds-ir/http3.listeners.yaml | 4 +- .../jsonpatch-missing-resource.listeners.yaml | 8 ++- .../jsonpatch-missing-resource.routes.yaml | 8 +++ .../jsonpatch-with-jsonpath.listeners.yaml | 8 ++- .../jsonpatch-with-jsonpath.routes.yaml | 8 +++ .../out/xds-ir/jsonpatch.listeners.yaml | 8 ++- .../testdata/out/xds-ir/jsonpatch.routes.yaml | 8 +++ .../jwt-custom-extractor.listeners.yaml | 8 ++- .../xds-ir/jwt-custom-extractor.routes.yaml | 8 +++ ...-multi-route-multi-provider.listeners.yaml | 8 ++- ...jwt-multi-route-multi-provider.routes.yaml | 8 +++ ...multi-route-single-provider.listeners.yaml | 8 ++- ...wt-multi-route-single-provider.routes.yaml | 8 +++ .../out/xds-ir/jwt-optional.listeners.yaml | 8 ++- .../out/xds-ir/jwt-optional.routes.yaml | 8 +++ .../out/xds-ir/jwt-ratelimit.listeners.yaml | 8 ++- .../out/xds-ir/jwt-ratelimit.routes.yaml | 8 +++ ...t-single-route-single-match.listeners.yaml | 8 ++- .../jwt-single-route-single-match.routes.yaml | 8 +++ .../jwt-with-backend-tls-retry.listeners.yaml | 2 +- .../listener-connection-limit.listeners.yaml | 8 +-- ...ener-overlapping-tls-config.listeners.yaml | 16 +---- .../listener-proxy-protocol.listeners.yaml | 4 +- .../listener-tcp-keepalive.listeners.yaml | 8 +-- .../listener-tcp-without-route.listeners.yaml | 2 +- .../out/xds-ir/load-balancer.listeners.yaml | 8 ++- .../out/xds-ir/load-balancer.routes.yaml | 8 +++ .../local-ratelimit-distinct.listeners.yaml | 8 ++- .../local-ratelimit-distinct.routes.yaml | 8 +++ .../out/xds-ir/local-ratelimit.listeners.yaml | 8 ++- .../out/xds-ir/local-ratelimit.routes.yaml | 8 +++ .../testdata/out/xds-ir/lua.listeners.yaml | 2 +- .../max-conn-per-socket-event.listeners.yaml | 6 +- .../metrics-virtual-host.listeners.yaml | 8 ++- .../xds-ir/metrics-virtual-host.routes.yaml | 8 +++ .../xds-ir/mixed-tls-jwt-authn.listeners.yaml | 8 ++- .../xds-ir/mixed-tls-jwt-authn.routes.yaml | 8 +++ ...port-with-different-filters.listeners.yaml | 4 +- ...ultiple-listeners-same-port.listeners.yaml | 2 +- ...-simple-tcp-route-same-port.listeners.yaml | 2 +- ...ertificate-with-custom-data.listeners.yaml | 40 +++++++++--- ...t-certificate-with-custom-data.routes.yaml | 40 ++++++++++++ ...-forward-client-certificate.listeners.yaml | 40 +++++++++--- ...tls-forward-client-certificate.routes.yaml | 40 ++++++++++++ ...client-certificate-disabled.listeners.yaml | 10 ++- ...ed-client-certificate-disabled.routes.yaml | 8 +++ .../out/xds-ir/mutual-tls-san.listeners.yaml | 10 ++- .../out/xds-ir/mutual-tls-san.routes.yaml | 8 +++ .../out/xds-ir/mutual-tls.listeners.yaml | 10 ++- .../out/xds-ir/mutual-tls.routes.yaml | 8 +++ ...dc-and-jwt-with-passthrough.listeners.yaml | 2 +- ...dc-backend-cluster-provider.listeners.yaml | 8 ++- .../oidc-backend-cluster-provider.routes.yaml | 8 +++ .../testdata/out/xds-ir/oidc.listeners.yaml | 8 ++- .../testdata/out/xds-ir/oidc.routes.yaml | 8 +++ .../out/xds-ir/panic-threshold.listeners.yaml | 8 ++- .../out/xds-ir/panic-threshold.routes.yaml | 8 +++ .../out/xds-ir/path-settings.listeners.yaml | 8 ++- .../out/xds-ir/path-settings.routes.yaml | 8 +++ .../proxy-protocol-upstream.listeners.yaml | 8 ++- .../proxy-protocol-upstream.routes.yaml | 8 +++ .../ratelimit-custom-domain.listeners.yaml | 8 ++- .../ratelimit-custom-domain.routes.yaml | 8 +++ .../ratelimit-disable-headers.listeners.yaml | 2 +- .../ratelimit-endpoint-stats.listeners.yaml | 2 +- .../ratelimit-global-shared.listeners.yaml | 2 +- .../ratelimit-headers-and-cidr.listeners.yaml | 8 ++- .../ratelimit-headers-and-cidr.routes.yaml | 8 +++ ...telimit-multi-global-shared.listeners.yaml | 2 +- .../xds-ir/ratelimit-sourceip.listeners.yaml | 8 ++- .../out/xds-ir/ratelimit-sourceip.routes.yaml | 8 +++ .../out/xds-ir/ratelimit.listeners.yaml | 8 ++- .../testdata/out/xds-ir/ratelimit.routes.yaml | 8 +++ .../out/xds-ir/request-buffer.listeners.yaml | 4 +- .../retry-partial-invalid.listeners.yaml | 8 ++- .../xds-ir/retry-partial-invalid.routes.yaml | 24 +++++++ .../testdata/out/xds-ir/retry.listeners.yaml | 8 ++- .../testdata/out/xds-ir/retry.routes.yaml | 16 +++++ ...ypolicy-with-oidc-jwt-authz.listeners.yaml | 2 +- .../out/xds-ir/simple-tls.listeners.yaml | 8 ++- .../out/xds-ir/simple-tls.routes.yaml | 8 +++ .../suppress-envoy-headers.listeners.yaml | 2 +- .../xds-ir/tcp-endpoint-stats.listeners.yaml | 2 +- .../tcp-listener-ipfamily.listeners.yaml | 2 +- .../tcp-req-resp-sizes-stats.listeners.yaml | 2 +- .../xds-ir/tcp-route-complex.listeners.yaml | 2 +- .../xds-ir/tcp-route-simple.listeners.yaml | 2 +- .../tcp-route-tls-terminate.listeners.yaml | 2 +- .../tcp-route-weighted-backend.listeners.yaml | 2 +- .../tcp-route-with-no-routes.listeners.yaml | 2 +- .../out/xds-ir/timeout.listeners.yaml | 8 ++- .../testdata/out/xds-ir/timeout.routes.yaml | 8 +++ .../tls-route-passthrough.listeners.yaml | 4 +- ...-with-ciphers-versions-alpn.listeners.yaml | 4 +- .../xds-ir/tracing-datadog-uds.listeners.yaml | 2 +- .../out/xds-ir/tracing-datadog.listeners.yaml | 2 +- .../tracing-endpoint-stats.listeners.yaml | 2 +- .../out/xds-ir/tracing-zipkin.listeners.yaml | 8 ++- .../out/xds-ir/tracing-zipkin.routes.yaml | 8 +++ .../out/xds-ir/tracing.listeners.yaml | 8 ++- .../testdata/out/xds-ir/tracing.routes.yaml | 8 +++ .../xds-ir/udp-endpoint-stats.listeners.yaml | 2 +- .../udp-req-resp-sizes-stats.listeners.yaml | 2 +- .../udp-route-no-endpoints.listeners.yaml | 2 +- .../udp-route-with-no-routes.listeners.yaml | 2 +- .../out/xds-ir/udp-route.listeners.yaml | 2 +- .../upstream-tcpkeepalive.listeners.yaml | 8 ++- .../xds-ir/upstream-tcpkeepalive.routes.yaml | 8 +++ .../testdata/out/xds-ir/wasm.listeners.yaml | 2 +- internal/xds/translator/translator.go | 24 ++++--- site/content/en/latest/api/extension_types.md | 35 +++++++++++ .../address-as-listener-name.yaml | 24 +++++++ .../config/helm/address-as-listener-name.yaml | 5 ++ test/e2e/e2e_test.go | 15 +++++ .../e2e/testdata/envoy-patch-policy-ipv4.yaml | 47 ++++++++++++++ .../e2e/testdata/envoy-patch-policy-ipv6.yaml | 47 ++++++++++++++ test/e2e/testdata/envoy-patch-policy.yaml | 2 +- test/e2e/tests/envoy_patch_policy.go | 62 ++++++++++--------- test/e2e/tests/envoy_patch_policy_ipv4.go | 29 +++++++++ test/e2e/tests/envoy_patch_policy_ipv6.go | 29 +++++++++ test/e2e/tests/utils.go | 5 ++ 482 files changed, 3541 insertions(+), 575 deletions(-) create mode 100644 test/config/envoy-gateaway-config/address-as-listener-name.yaml create mode 100644 test/config/helm/address-as-listener-name.yaml create mode 100644 test/e2e/testdata/envoy-patch-policy-ipv4.yaml create mode 100644 test/e2e/testdata/envoy-patch-policy-ipv6.yaml create mode 100644 test/e2e/tests/envoy_patch_policy_ipv4.go create mode 100644 test/e2e/tests/envoy_patch_policy_ipv6.go diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 6c9debaca5..6c93d8a8b7 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -102,6 +102,12 @@ 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: address-as-listener-name + - version: v1.32.5 + ipFamily: ipv6 + profile: address-as-listener-name steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps @@ -149,6 +155,12 @@ 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: address-as-listener-name + - version: v1.32.5 + ipFamily: ipv6 + profile: address-as-listener-name 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..d52741d4fe 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 } +// featureFlags are the default feature flags for Envoy Gateway. +var featureFlags = map[FeatureFlag]bool{ + FeatureUseAddressAsListenerName: false, +} + +// IsFeatureEnabled checks if a feature is enabled in the EnvoyGateway configuration. +func (f *FeatureFlags) IsFeatureEnabled(feature FeatureFlag) bool { + if f != nil { + for _, disable := range f.Disabled { + if disable == feature { + return false + } + } + for _, enable := range f.Enabled { + if enable == feature { + return true + } + } + } + + if enabled, found := featureFlags[feature]; found { + return enabled + } + 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 6d6caa68e4..aef5d3999e 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -93,6 +93,27 @@ type EnvoyGatewaySpec struct { // // +optional ExtensionAPIs *ExtensionAPISettings `json:"extensionApis,omitempty"` + + // FeatureFlags defines the feature flags for Envoy Gateway. + // Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. + FeatureFlags *FeatureFlags `json:"featureFlags,omitempty"` +} + +// FeatureFlag defines a feature flag for Envoy Gateway. +type FeatureFlag string + +const ( + // FeatureUseAddressAsListenerName indicates that the listener name should be derived from the address and port. + FeatureUseAddressAsListenerName FeatureFlag = "UseAddressAsListenerName" +) + +// FeatureFlags provide a mechanism to gate breaking changes or experimental features in new Envoy Gateway releases. +// Each flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource. +// The names of these flags will be included in the release notes alongside an explanation of the change. +// Please note that these flags are temporary and will be removed in future releases once the features are stable. +type FeatureFlags struct { + Enabled []FeatureFlag `json:"enabled,omitempty"` + Disabled []FeatureFlag `json:"disabled,omitempty"` } type KubernetesClient struct { diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index a539367614..21c2979518 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -2107,6 +2107,11 @@ func (in *EnvoyGatewaySpec) DeepCopyInto(out *EnvoyGatewaySpec) { *out = new(ExtensionAPISettings) **out = **in } + if in.FeatureFlags != nil { + in, out := &in.FeatureFlags, &out.FeatureFlags + *out = new(FeatureFlags) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyGatewaySpec. @@ -2902,6 +2907,31 @@ func (in *FaultInjectionDelay) DeepCopy() *FaultInjectionDelay { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlags) DeepCopyInto(out *FeatureFlags) { + *out = *in + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = make([]FeatureFlag, len(*in)) + copy(*out, *in) + } + if in.Disabled != nil { + in, out := &in.Disabled, &out.Disabled + *out = make([]FeatureFlag, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlags. +func (in *FeatureFlags) DeepCopy() *FeatureFlags { + if in == nil { + return nil + } + out := new(FeatureFlags) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FileEnvoyProxyAccessLog) DeepCopyInto(out *FileEnvoyProxyAccessLog) { *out = *in diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 82c3e739b1..68894c3bf2 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1134,7 +1134,7 @@ xds: name: eg namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1254,7 +1254,7 @@ xds: name: eg namespace: default sectionName: grpc - name: 0.0.0.0-8080 + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1342,7 +1342,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-1234 + name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1437,7 +1437,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-8443 + name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -1525,7 +1525,7 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: 0.0.0.0-1234 + name: default/eg/udp - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index b60cc612b8..5e2ca2f431 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -992,7 +992,7 @@ } } }, - "name": "0.0.0.0-10080", + "name": "default/eg/http", "perConnectionBufferLimitBytes": 32768 } } @@ -1158,7 +1158,7 @@ } } }, - "name": "0.0.0.0-8080", + "name": "default/eg/grpc", "perConnectionBufferLimitBytes": 32768 } } @@ -1277,7 +1277,7 @@ } } }, - "name": "0.0.0.0-1234", + "name": "default/eg/tcp", "perConnectionBufferLimitBytes": 32768 } } @@ -1409,7 +1409,7 @@ } } }, - "name": "0.0.0.0-8443", + "name": "default/eg/tls-passthrough", "perConnectionBufferLimitBytes": 32768 } } @@ -1526,7 +1526,7 @@ } } ], - "name": "0.0.0.0-1234" + "name": "default/eg/udp" } } } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 55dcfbf240..22ffd13141 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -587,7 +587,7 @@ xds: name: eg namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -707,7 +707,7 @@ xds: name: eg namespace: default sectionName: grpc - name: 0.0.0.0-8080 + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -795,7 +795,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-1234 + name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -890,7 +890,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-8443 + name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -978,7 +978,7 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: 0.0.0.0-1234 + name: default/eg/udp - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index 3e58816550..1e6f58f967 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -151,7 +151,7 @@ xds: name: eg namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -271,7 +271,7 @@ xds: name: eg namespace: default sectionName: grpc - name: 0.0.0.0-8080 + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -359,7 +359,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-1234 + name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -454,7 +454,7 @@ xds: filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-8443 + name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -542,4 +542,4 @@ xds: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/backend/rule/-1 statPrefix: service - name: 0.0.0.0-1234 + name: default/eg/udp diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index efb40fa4f0..30b2cc1b00 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -703,7 +703,7 @@ } } }, - "name": "0.0.0.0-10080", + "name": "envoy-gateway-system/eg/http", "perConnectionBufferLimitBytes": 32768 } } diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 9de8bd765d..7f5cc4d314 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -425,7 +425,7 @@ xds: name: eg namespace: envoy-gateway-system sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index 3ae113686d..9e33881f16 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -171,5 +171,5 @@ xds: name: eg namespace: envoy-gateway-system sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 9d9b026b47..f9ad0b261b 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -360,7 +360,7 @@ xds: name: eg namespace: envoy-gateway-system sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: diff --git a/internal/xds/translator/extensionserver_test.go b/internal/xds/translator/extensionserver_test.go index 8dcbcf6744..e266dd7a1d 100644 --- a/internal/xds/translator/extensionserver_test.go +++ b/internal/xds/translator/extensionserver_test.go @@ -180,11 +180,11 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * // Only make the change when the listener's name matches the expected testdata // This prevents us from having to update every single testfile.out switch req.Listener.Name { - case "0.0.0.0-10181": // "extension-post-xdslistener-hook-error" + case "extension-post-xdslistener-hook-error": return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("extension post xds listener hook error") - case "0.0.0.0-10182": // "extension-listener" + case "extension-listener": // Setup a new Listener to avoid operating directly on the passed in pointer for better test coverage that the // Listener we are returning gets used properly modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) @@ -192,7 +192,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10183": // "policyextension-listener" + case "policyextension-listener": if len(req.PostListenerContext.ExtensionResources) == 0 { return nil, fmt.Errorf("expected a policy in the ext array") } @@ -219,7 +219,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10184": // "envoy-gateway/gateway-1/http1" + case "envoy-gateway/gateway-1/http1": if len(req.PostListenerContext.ExtensionResources) != 1 { return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, @@ -231,11 +231,11 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "0.0.0.0-10185": // "envoy-gateway/gateway-1/tcp1" + case "envoy-gateway/gateway-1/tcp1": return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, }, fmt.Errorf("should not be called for this listener, test 'extensionpolicy-tcp-and-http' should merge tcp and http gateways to one listener") - case "0.0.0.0-10162": + case "envoy-gateway/gateway-1/udp1": if len(req.PostListenerContext.ExtensionResources) != 1 { return &pb.PostHTTPListenerModifyResponse{ Listener: req.Listener, @@ -247,7 +247,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req * return &pb.PostHTTPListenerModifyResponse{ Listener: modifiedListener, }, nil - case "::-10186": // "first-listener-error" + case "first-listener-error": modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener) modifiedListener.StatPrefix = req.Listener.Name return &pb.PostHTTPListenerModifyResponse{ diff --git a/internal/xds/translator/jsonpatch.go b/internal/xds/translator/jsonpatch.go index fd2031748c..06e9119c25 100644 --- a/internal/xds/translator/jsonpatch.go +++ b/internal/xds/translator/jsonpatch.go @@ -158,7 +158,7 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []* // Find the resource to patch and convert it to JSON switch p.Type { - case resourcev3.ListenerType: // TODO(huabing): add support for QUIC listeners + case resourcev3.ListenerType: if listener = findXdsListener(tCtx, p.Name, corev3.SocketAddress_TCP); listener == nil { tn := typedName{p.Type, p.Name} notFoundResources = append(notFoundResources, tn.String()) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 8b07e09b18..ffad3628ae 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -186,12 +186,14 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin // buildXdsTCPListener creates a xds Listener resource // TODO: Improve function parameters func buildXdsTCPListener( + name string, address string, port uint32, ipFamily *egv1a1.IPFamily, keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, + featureFlags *egv1a1.FeatureFlags, ) (*listenerv3.Listener, error) { socketOptions := buildTCPSocketOptions(keepalive) al, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) @@ -201,7 +203,7 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: xdsListenerName(address, port), + Name: xdsListenerName(name, address, port, featureFlags), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -227,8 +229,12 @@ func buildXdsTCPListener( return listener, nil } -func xdsListenerName(address string, port uint32) string { - return fmt.Sprintf("%s-%d", address, port) +func xdsListenerName(name, address string, port uint32, featureFlags *egv1a1.FeatureFlags) string { + if featureFlags.IsFeatureEnabled(egv1a1.FeatureUseAddressAsListenerName) { + return fmt.Sprintf("%s-%d", address, port) + } + + return name } func quicXDSListenerName(tcpListenerName string) string { @@ -253,13 +259,20 @@ func buildMaxAcceptPerSocketEvent(connection *ir.ClientConnection) *wrapperspb.U } // buildXdsQuicListener creates a xds Listener resource for quic -func buildXdsQuicListener(address string, port uint32, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog) (*listenerv3.Listener, error) { +func buildXdsQuicListener( + name string, + address string, + port uint32, + ipFamily *egv1a1.IPFamily, + accesslog *ir.AccessLog, + featureFlags *egv1a1.FeatureFlags, +) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { return nil, err } xdsListener := &listenerv3.Listener{ - Name: quicXDSListenerName(xdsListenerName(address, port)), + Name: quicXDSListenerName(xdsListenerName(name, address, port, featureFlags)), AccessLog: log, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ @@ -932,7 +945,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, + featureFlags *egv1a1.FeatureFlags, +) (*listenerv3.Listener, error) { if udpListener == nil { return nil, errors.New("udp listener is nil") } @@ -976,7 +994,7 @@ func buildXdsUDPListener(clusterName string, udpListener *ir.UDPListener, access return nil, err } xdsListener := &listenerv3.Listener{ - Name: xdsListenerName(udpListener.Address, udpListener.Port), + Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, featureFlags), 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 8453d59a72..e7ceaebf9f 100644 --- a/internal/xds/translator/runner/runner.go +++ b/internal/xds/translator/runner/runner.go @@ -69,6 +69,7 @@ func (r *Runner) subscribeAndTranslate(sub <-chan watchable.Snapshot[string, *ir t := &translator.Translator{ ControllerNamespace: r.ControllerNamespace, FilterOrder: val.FilterOrder, + FeatureFlag: r.EnvoyGateway.FeatureFlags, Logger: r.Logger, } diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 8e7bb76e79..71c96518f7 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -30,16 +30,11 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: envoy-gateway/gateway-1/http1 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true - port: 10184 + port: 10080 routes: - name: "http-route" hostname: "*" @@ -80,12 +75,7 @@ tcp: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp1 - port: 10185 + port: 10080 routes: - destination: name: "tcp-route-dest" @@ -133,9 +123,4 @@ udp: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/udp1 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: udp1 port: 10162 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 9ff60654c1..4d5ab54f42 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -1,14 +1,19 @@ http: -- name: envoy-gateway/gateway-1/http1 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 +- name: "custom-backend-listener" address: "0.0.0.0" port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml index 7c15856f51..29d3eb233d 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml index bdd872f07e..3504a39e95 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml index f99460ae7d..aaf3026e77 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml index ffa50b77ff..f5e357591f 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml index ddb254402c..2c700de333 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml @@ -1,9 +1,14 @@ http: - name: "extension-listener" address: "0.0.0.0" - port: 10182 + port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index b59702edfe..25ce5fdac3 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -1,9 +1,19 @@ http: - name: "extension-post-xdslistener-hook-error" address: "0.0.0.0" - port: 10181 + port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml index 2ac532e6c8..ec8a3b8958 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index 8f84f92d48..44b3ffd97e 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml index 20b82f0c4f..dacd3324e3 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index 4aa6680eb5..065fe42023 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml index e62300a3d6..6f462ba015 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml @@ -34,4 +34,4 @@ http: path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true - port: 10183 + port: 10081 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 95cfcfaeca..6052a301e3 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -1,7 +1,7 @@ http: - name: "first-listener-error" address: "::" - port: 10186 + port: 10080 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml index 4bd256117f..6f7e1e7be7 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -24,6 +29,13 @@ http: port: 10081 hostnames: - "example.com" + hostnames: + - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml index 7a9a6b0d18..ffc5288f58 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml index 1ab9355d9f..f336ff2441 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml index 390285f565..ba754317d3 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml index 50929cd847..6023079da6 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml index a3271bb665..4ef021a6ab 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml index 65df64720d..a18569f26d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml index 501c3b49d2..2a3082a428 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml index 87f60a62bb..723835d2e7 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml index 54e33e635a..df8da21cc4 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml @@ -4,6 +4,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml index ccc36f04aa..5bb4837816 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -33,6 +38,11 @@ http: port: 10081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml index b37bc3220a..5c5da5d05b 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -34,6 +39,11 @@ http: port: 10081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml index 9d45930773..4d729cbb10 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -34,6 +39,11 @@ http: port: 10081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml index fae7230914..28ca21ca03 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml index 2da0e13a50..c21b7dcf10 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml index 909b2388ef..eecc3fcb21 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml index 351dcf2fae..c3929f7e11 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml index e70a5ecd8d..8bae05f4a9 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml index 77fc67e7a3..0cd5887d1d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml index 2e0dcf9664..ac6f7a1a88 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml index 5a22eccfd8..13cd6e658e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml @@ -41,6 +41,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml index 17760201da..8430249f05 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml @@ -37,6 +37,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml index 4f9893c566..e142de8922 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml @@ -45,6 +45,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml index 7749fe3c4f..b7fbe35731 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml @@ -31,6 +31,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml index 989390b135..c935d6704d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml @@ -45,6 +45,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml index 915517dc73..7ded29cb84 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml @@ -53,6 +53,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml index 75a28bf769..428ad7481f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml @@ -50,6 +50,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index 7b27237294..a1b0e995ed 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -60,6 +60,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml index 30c51a35d2..ccb220f899 100644 --- a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml @@ -3,6 +3,11 @@ http: hostnames: - "*" isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml index 168884de1c..605fd279f5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml index ff997db5a4..053844ae00 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml index 8a8edbc2bb..58e0cafc0d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml index 08841b060c..881cf303de 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml index fc74c38f36..1a185f2110 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml index 81ab698e95..f138e5d538 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml index b4871881be..e43d39d52b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml index f47bea642c..93624d2e30 100644 --- a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml index 2c4c5b9cc0..fd5d524940 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml index ed56258c69..a95ddf3cd0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -22,6 +27,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -41,6 +51,11 @@ http: port: 8083 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 routes: - name: "third-route" hostname: "*" @@ -60,6 +75,11 @@ http: port: 8084 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 routes: - name: "fourth-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml index a118f22bdf..ef79ae9935 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -26,6 +31,11 @@ tcp: - name: "second-listener" address: "::" port: 10081 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp routes: - name: "second-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml index 41dec4d635..46999a4b00 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -25,6 +30,11 @@ tcp: - name: "second-listener" address: "::" port: 10081 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp routes: - name: "second-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml index 3dc98ab340..23d0fd30a9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/cors.yaml b/internal/xds/translator/testdata/in/xds-ir/cors.yaml index 90445b5670..cbf924e528 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml index 4971328e8c..1ebc6d6640 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml @@ -8,6 +8,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml index dfda65a471..6350a10e5d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml index 8b703a27b7..f506a1f42f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml index 370840868b..2ff1ba423f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml index 5c7705ad7b..070f50a51a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml index bc4b11ed09..bc783deef2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml index ae7cae975c..825740f001 100644 --- a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml @@ -7,6 +7,11 @@ http: escapedSlashesAction: UnescapeAndRedirect hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml index 68f5faebc9..ccf59f343b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -21,6 +26,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -31,4 +41,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/headers-with-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml index ac67c405b4..cdd7e65c02 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -21,6 +26,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -31,4 +41,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/headers-with-preserve-or-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml index b72f9722a1..bd4d1b1815 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -21,6 +26,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -31,4 +41,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/headers-with-preserve-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-request-id.yaml index 37920bb009..25ecefb8bc 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 @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -21,6 +26,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -31,4 +41,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/headers-with-underscores-action.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml index 80758f9f05..74b8c88df8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml @@ -4,6 +4,11 @@ http: port: 8081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -19,6 +24,11 @@ http: port: 8082 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -36,6 +46,11 @@ http: port: 8083 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 routes: - name: "third-route" hostname: "*" @@ -53,6 +68,11 @@ http: port: 8084 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 routes: - name: "fourth-route" hostname: "*" @@ -65,4 +85,3 @@ http: name: "fourth-route-dest/backend/0" headers: withUnderscoresAction: DropHeader - diff --git a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml index 1435becff8..0a55d37e4f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml @@ -1,6 +1,11 @@ http: - name: "first-listener" address: "::" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml index 0906e5db7f..f3aae14849 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 http1: preserveHeaderCase: true path: @@ -24,6 +29,11 @@ http: port: 10081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 headers: earlyAddRequestHeaders: - name: "some-header" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml index 02170f2132..4d51aca4b4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml @@ -7,6 +7,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml index fc58a4b2fd..5034c24453 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml index b9384c5e00..4fb3098ea0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml index 32dcbd0fe4..25832d9d74 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml @@ -7,6 +7,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index b0267f90b2..7dc0880828 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml index 78c42285fc..72c229c445 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml index 42184d4047..da894ccaa9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index b658e9289c..200b616648 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml index edcee4300b..33194f50ec 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml index c74747efdd..c4aa621f0c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml index e1259346dc..949a00be79 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml index f0b6743e99..340bc5f164 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml index 9d61197726..34613e2edf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index 7307a9ee4d..1bb0a4a9e5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml index a6a525ac30..d4fa262916 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index 2690f79154..0796e89c6d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index c03ff7e929..02cb4865cc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index d406821ca9..6bb4429411 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index ad555d3afe..ad45258451 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml index 2e58e873c3..4e44b8e4f7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml index 09f46bd726..51991863cb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 59ca0c2a8f..adbe53e1fa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index 197ec51e50..1603e5b341 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect 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 bfc60512e2..be99a598c7 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 @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect 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 bf4c3214de..fc8cb7a925 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 @@ -5,6 +5,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml index 09cde40926..dea176191f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml index d09a10b3c5..7b553442df 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml index b95b72c5a0..9ac1bff36c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml index f94ada950b..1645b6caf1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index ed7289dabf..e5a269757e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index 3f60f94e16..fc8bc8d29f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml index fb9c0c6fc1..0414b055f6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml index 37d103aed2..d1c5a3206a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index 5f0b477767..84fbec6218 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml index 23c4a65a20..e23ef3780a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 http1: preserveHeaderCase: true path: @@ -24,6 +29,11 @@ http: port: 10081 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 http1: preserveHeaderCase: true enableTrailers: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml index 138bc40ec1..063d4bd2da 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http http1: enableTrailers: true path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index 8f14a91d5e..81ee39491b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http isHTTP2: true path: mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml index 1402be2ca3..22f90d3ae9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml @@ -32,6 +32,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index 9dce01cc0d..1eaabf13e7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" @@ -37,6 +37,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml index df458ecf48..280ae0ca64 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml @@ -1,6 +1,6 @@ jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "0.0.0.0-10080" + name: "first-listener" operation: op: "add" path: "/default_filter_chain/filters/0/typed_config/http_filters/0" @@ -56,6 +56,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index aac36ba88a..52b42c3672 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "add" path: "/this/path/never/existed" @@ -32,6 +32,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml index 1cb8fe14a8..962440496c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml @@ -4,7 +4,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "0.0.0.0-10080" + name: "first-listener" operation: op: "add" path: "/default_filter_chain/filters/0/typed_config/http_filters/0" @@ -60,6 +60,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml index 3f78c3da14..05aa3f92b4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml @@ -32,6 +32,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index 27bd894bfb..b742612868 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -10,7 +10,7 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" @@ -27,7 +27,7 @@ envoyPatchPolicies: cluster_name: rate-limit-cluster transport_api_version: V3 - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "remove" from: "/filter_chains/0/filters/0/typed_config/http_filters/0" @@ -40,6 +40,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml index 7b47597073..6d8e298d01 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml @@ -21,6 +21,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index 214197c142..2fe7617f4d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -10,14 +10,14 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: first-listener operation: op: "add" jsonPath: "$.filter_chains[0].filters[0].typed_config" path: "/preserve_external_request_id" value: true - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "add" jsonPath: "filter_chains[0].filters[0].typed_config.http_filters[0]" @@ -124,6 +124,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index 92e7c2cabd..a449000db9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -10,13 +10,13 @@ envoyPatchPolicies: namespace: "default" jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: first-listener operation: op: add path: "/filter_chains/0/filters/0/typed_config/preserve_external_request_id" value: true - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "::-10080" + name: "first-listener" operation: op: "add" path: "/filter_chains/0/filters/0/typed_config/http_filters/0" @@ -113,6 +113,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml index 66fc43f92c..65cba64a60 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml index f2ebba7af4..6d42c4a662 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml index 4944995ad2..554918acdb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml index 18baee23cf..2ad10fa327 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml index b84df0fb04..38286abf78 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml index efa91fec85..13ea83a458 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index b7b9c6690c..0a7b2a028b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml index aece519682..7e9cb503ff 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml index e549de5041..49d803e4c6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml index 39d4ed300c..c775baebbc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml @@ -7,6 +7,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml index ad30c19bb3..7857c29889 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml index a138304010..b68991b315 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml @@ -4,6 +4,11 @@ http: port: 10001 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -41,6 +46,11 @@ http: port: 10002 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -79,6 +89,11 @@ http: port: 10003 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -118,6 +133,11 @@ http: port: 10004 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -159,6 +179,11 @@ http: port: 10005 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml index cf93007b97..97151eea0f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml @@ -4,6 +4,11 @@ http: port: 10001 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -41,6 +46,11 @@ http: port: 10002 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -78,6 +88,11 @@ http: port: 10003 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -115,6 +130,11 @@ http: port: 10004 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -152,6 +172,11 @@ http: port: 10005 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http5 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml index 492b84f1df..06c5612bac 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml index 81f750353f..dca5f04d07 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml index eecd3be065..7876c928af 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml index 90e63cadea..a891619ecb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml index 0c3c60fd5f..ed624aff35 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml index 566dcccb86..43aa19500b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml @@ -7,6 +7,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml index d989ec6f2e..db169f2742 100644 --- a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: false escapedSlashesAction: UnescapeAndForward diff --git a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml index 9ea98e19fd..05c09f1096 100644 --- a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index f38eeed1d6..6fb63483c2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml index 066a1d01ca..6c04cc0884 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index cc27f74e38..f59fb03dad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -10,6 +10,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index 9467167760..e01a5504f0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml index 557d750867..5f1f8972da 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/retry.yaml b/internal/xds/translator/testdata/in/xds-ir/retry.yaml index 5ca639cb6e..0739320fa5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index a584ad0a71..0c3ac84db8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml index 6e1c3fdc08..7f9ae7f764 100644 --- a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index 2db97e2646..b9bb95bdec 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -40,6 +40,16 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml index c0196ca747..e03c6b0bb9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml @@ -58,6 +58,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml index e73618c41f..3e5c7c47ab 100644 --- a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index 5bc36284ec..cf314b3ab9 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10184 + portValue: 10080 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,43 +27,24 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-1/http1 serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10184 + statPrefix: http-10080 useRemoteAddress: true name: envoy-gateway/gateway-1/http1 - maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 - name: 0.0.0.0-10184 - perConnectionBufferLimitBytes: 32768 - statPrefix: 0.0.0.0-10184 -- address: - socketAddress: - address: 0.0.0.0 - portValue: 10185 filterChains: - filters: - name: envoy.filters.network.tcp_proxy typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tcp-route-dest - statPrefix: tcp-10185 + statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 metadata: filterMetadata: envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp1 - name: 0.0.0.0-10185 + resources: [] + name: envoy-gateway/gateway-1/http1 perConnectionBufferLimitBytes: 32768 + statPrefix: envoy-gateway/gateway-1/http1 - address: socketAddress: address: 0.0.0.0 @@ -81,13 +62,5 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: udp1 - name: 0.0.0.0-10162 - statPrefix: 0.0.0.0-10162 + name: envoy-gateway/gateway-1/udp1 + statPrefix: envoy-gateway/gateway-1/udp1 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml index da5e848bd8..bfcb22e483 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: envoy-gateway/gateway-1/http1/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml index 9ddb28a054..61a2ca94f5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml @@ -25,11 +25,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/http1 + routeConfigName: custom-backend-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http-10080 useRemoteAddress: true - name: envoy-gateway/gateway-1/http1 + name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 metadata: filterMetadata: @@ -38,6 +38,6 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http1 - name: 0.0.0.0-10080 + sectionName: http + name: custom-backend-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml index 08f701b7f5..ac6f0aa3db 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml @@ -1,5 +1,5 @@ - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/http1 + name: custom-backend-listener virtualHosts: - domains: - '*' @@ -10,8 +10,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http1 - name: envoy-gateway/gateway-1/http1/* + sectionName: http + name: custom-backend-listener/* routes: - match: prefix: / diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml index 1ddf87f1b2..d11bfa0ef6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml index a1f19ab447..93fb40da11 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml index a90422964f..61a2ca94f5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: custom-backend-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml index 5fd4a3a946..ac6f0aa3db 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: custom-backend-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml index 1ddf87f1b2..d11bfa0ef6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml index 842d4e6251..42b5c43335 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml index 1ddf87f1b2..d11bfa0ef6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml index a1f19ab447..93fb40da11 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index 01bd99020f..883acd408a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10182 + portValue: 10080 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,14 +27,18 @@ resourceApiVersion: V3 routeConfigName: extension-listener serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10182 + statPrefix: http-10080 useRemoteAddress: true name: extension-listener maxConnectionsToAcceptPerSocketEvent: 1 metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10182 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: extension-listener perConnectionBufferLimitBytes: 32768 statPrefix: mock-extension-inserted-prefix diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml index b259daf0c7..19ef021fc5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: extension-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml index 4f8507f88b..f10e377561 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10181 + portValue: 10080 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,13 +27,17 @@ resourceApiVersion: V3 routeConfigName: extension-post-xdslistener-hook-error serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10181 + statPrefix: http-10080 useRemoteAddress: true name: extension-post-xdslistener-hook-error maxConnectionsToAcceptPerSocketEvent: 1 metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10181 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: extension-post-xdslistener-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml index 3010873c90..1e9f398992 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: extension-post-xdslistener-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml index 655ccc701a..a2cbde782a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml index 4f3f33059b..9f5d950177 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml index d22885132d..a082e609d2 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: extension-post-xdstranslate-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml index 489bb7edc8..813f94ed29 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: extension-post-xdstranslate-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml index 4ddacf5469..f21d448493 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: extension-post-xdsvirtualhost-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml index 5af870cc33..29ea16d95d 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: extension-post-xdsvirtualhost-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index 655ccc701a..a2cbde782a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml index 7030f6f4cd..510a31a1ae 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index 3ec0739fd5..5d6a499c95 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: 0.0.0.0 - portValue: 10183 + portValue: 10081 defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager @@ -27,7 +27,7 @@ resourceApiVersion: V3 routeConfigName: policyextension-listener serverHeaderTransformation: PASS_THROUGH - statPrefix: http-10183 + statPrefix: http-10081 useRemoteAddress: true name: policyextension-listener maxConnectionsToAcceptPerSocketEvent: 1 @@ -35,6 +35,6 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10183 + name: policyextension-listener perConnectionBufferLimitBytes: 32768 statPrefix: from-the-policy diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml index 837660976c..289d2d8680 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml @@ -1,7 +1,7 @@ - address: socketAddress: address: '::' - portValue: 10186 + portValue: 10080 filterChains: - filterChainMatch: serverNames: @@ -30,7 +30,7 @@ resourceApiVersion: V3 routeConfigName: first-listener-error serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10186 + statPrefix: https-10080 useRemoteAddress: true name: first-listener-error transportSocket: @@ -48,22 +48,6 @@ 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 - metadata: - filterMetadata: - envoy-gateway: - resources: [] - name: ::-10186 - perConnectionBufferLimitBytes: 32768 -- address: - socketAddress: - address: '::' - portValue: 10080 - filterChains: - filterChainMatch: serverNames: - foo.net @@ -118,5 +102,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml index 5edabf06db..b57535b09f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml @@ -34,9 +34,14 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: test-listener-modify perConnectionBufferLimitBytes: 32768 + statPrefix: extension-modified-listener - address: socketAddress: address: 0.0.0.0 @@ -73,8 +78,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 - name: extension-injected-listener statPrefix: extension-injected diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml index 1461a5960f..84c4b0e37c 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: test-listener-modify/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index 72c79a65f9..2b5f5e8b40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -183,6 +183,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index cfd3f5b0f5..406570e386 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -144,6 +144,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index c83344d35f..cb389c3cd1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -200,6 +200,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index e2f2abfb7d..003a91e046 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -219,6 +219,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index e3e81e72a7..5bc6484861 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -353,5 +353,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml index 03140bc509..e8feae980b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml @@ -178,6 +178,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 539a808987..4a0400f990 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -178,6 +178,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml index b279ba13a9..fa468e61bf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml @@ -47,6 +47,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml index 46a5169776..b687a31f31 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -42,6 +50,14 @@ - query: X-API-KEY-2 - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml index 9772330b85..9f6c395778 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml index 141d60a15d..a0daa77b7c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml index 9772330b85..9f6c395778 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml index 7f2a8ca271..14f65db3b5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml index b8af59e7cf..998f503038 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml @@ -83,5 +83,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml index b8af59e7cf..998f503038 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml @@ -83,5 +83,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml index 9772330b85..9f6c395778 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml index 2d1b96cfc0..ee164a2136 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index 42cef74c0d..95c546d126 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -34,8 +34,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -54,7 +58,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 1500 - address: socketAddress: @@ -73,4 +77,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: ::-10080 + name: udp-route diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml index 0ea45ba7ba..41a1c3abc8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml @@ -53,5 +53,5 @@ name: gateway-1 namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml index 0a70cb9958..3125c0d721 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml @@ -48,6 +48,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml index 114de4cb02..1873924c8c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -31,6 +39,14 @@ inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index f2c503dd0a..de5f228cfe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -46,6 +46,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml index 114de4cb02..1873924c8c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -31,6 +39,14 @@ inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: default + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index b3cd4f6874..404f6ce0bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -34,8 +34,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 1500 - address: socketAddress: @@ -54,5 +58,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 1500 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index 00aa966a2a..c135718c7f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -38,8 +38,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -81,8 +85,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -126,8 +134,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8083 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 + name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -176,6 +188,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8084 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 + name: fourth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml index a0e9171307..2439ea7656 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: @@ -31,6 +47,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: third-listener/* routes: - match: @@ -45,6 +69,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 name: fourth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml index 3c9904b849..bce5f9671e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml @@ -37,8 +37,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -57,6 +61,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index 21169af78b..b66bc86070 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -36,8 +36,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -56,6 +60,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml index 5f5dce604b..90876bb592 100644 --- a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml @@ -55,5 +55,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml index bebd9b30b6..7aa827d5dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml index 243ea76808..b20a713c90 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index bebd9b30b6..7aa827d5dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml index 12c4fce777..6cbed7a277 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml index e964b6fff1..c9dbe4269e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml @@ -67,5 +67,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml index 23ec5c14f9..32508f7823 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml @@ -129,6 +129,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml index c6e9c1d93d..b1309f689a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - directResponse: diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml index e7942f0c4f..7ac2f81044 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml @@ -175,5 +175,5 @@ name: gateway-1 namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml index 8fbfadea6c..8045a41116 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml @@ -185,5 +185,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml index 56795cd16f..b17ce27bf6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml @@ -69,6 +69,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml index 08edfc3c40..e1e32f6ea5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -29,6 +37,14 @@ config: {} - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml index 6ae4a19589..c05d4d6254 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml @@ -71,6 +71,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml index 08edfc3c40..e1e32f6ea5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -29,6 +37,14 @@ config: {} - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml index 96c818a069..3cac84edf0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml @@ -70,6 +70,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml index 08edfc3c40..e1e32f6ea5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -29,6 +37,14 @@ config: {} - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index b3a5c65b6c..1c98dbdde4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -69,6 +69,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml index 08edfc3c40..e1e32f6ea5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -29,6 +37,14 @@ config: {} - domains: - www.bar.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml index 0ea45ba7ba..41a1c3abc8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml @@ -53,5 +53,5 @@ name: gateway-1 namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml index 9877c138c1..4ee88ac992 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml @@ -139,6 +139,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml index 8cef38ab6a..fa132dfb6c 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/gateway_envoyproxy_io routes: - match: @@ -32,6 +40,14 @@ config: {} - domains: - "" + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/ routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 66b90b6cbc..81582834d8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml index 1f093f5a0c..4fe2bdc611 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml index 898cc94e18..15dc3de0b5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml @@ -33,8 +33,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -70,6 +74,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml index fd5528236e..b67a194e7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml @@ -33,8 +33,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -70,6 +74,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml index 827bf6a690..d1659b964b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml @@ -34,8 +34,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -71,6 +75,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml index a724ef015d..67cc7dd569 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml @@ -34,8 +34,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -71,6 +75,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml index 5626de61dc..a3d9094277 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml @@ -32,8 +32,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -68,8 +72,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8082 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -105,8 +113,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8083 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 + name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -142,6 +154,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-8084 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 + name: fourth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml index a0e9171307..2439ea7656 100755 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: @@ -31,6 +47,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: third-listener/* routes: - match: @@ -45,6 +69,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 name: fourth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml index 2f5c4977b2..b35345d0b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml index fd1f478e94..07175f790e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml @@ -40,8 +40,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -111,6 +115,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml index a2cd986d42..1d746951be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: listener-enable-endpoint-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml index 5f0482832e..b997c3fae7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: listener-enable-endpoint-stats/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml index f0fadb6d93..0875a501d8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml @@ -42,6 +42,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml index 7030f6f4cd..510a31a1ae 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml index 047172ae64..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml index 19e1921fb1..96a26cb24a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml index 0a9a92697e..89e82d6f69 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: listener-enable-req-resp-sizes-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml index 63cbc84719..dcc3cafc83 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: listener-enable-req-resp-sizes-stats/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml index d4a7fa5ae2..8ff0df9396 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - directResponse: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml index c27e2ea577..e87533f522 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml index fcba195d70..1d2eb71e64 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml @@ -75,5 +75,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml index c5a187d2c2..c76b78eaf9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml index 9f74797a1e..ce0ff96d72 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index 655ccc701a..a2cbde782a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: 0.0.0.0-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml index 25584aa3a9..4877ec6522 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/example_com routes: - match: @@ -25,6 +33,14 @@ - upgradeType: websocket - domains: - example.net + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/example_net routes: - match: @@ -47,6 +63,14 @@ - upgradeType: websocket - domains: - '*.com' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/*_com routes: - match: @@ -58,6 +82,14 @@ - upgradeType: websocket - domains: - '*.net' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/*_net routes: - match: @@ -69,6 +101,14 @@ - upgradeType: websocket - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml index c84213bd2c..73d5db24ee 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml index 37b12b36de..0d16ab6edd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml index 61face5a3a..3111452d93 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml index 21d751bc5a..1157d5bc25 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml index 7bc7d162a8..0967aa5e0a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml index 1f2c6be405..bf7e60bb04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml index b2241a1181..548d5c9896 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml index b09594aecd..64e26caca2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml index 58a4e27209..f624be54bf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml index d5a0bd9899..e6317c46be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml index 84bc70f04b..56c51a3e76 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml index 7c049365a8..d0712d496c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml index a3e1e29e82..b1e31be584 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml index 84bc70f04b..56c51a3e76 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml index 20d4e99ef6..e976eff01c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - gateway.envoyproxy.io + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml index 2aed6ee5de..d305b6c79a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml @@ -78,6 +78,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml index c5450601be..8b365bb98c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml index 1c335ad621..be546233e9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index 96dd7cf3b0..2f5507f75e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml index 3186e1ccfb..44019f528c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index 8570efd50f..f0d7bc1523 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml index cf31237e71..dfae8da1b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml @@ -41,5 +41,5 @@ name: first-gateway namespace: first-gateway sectionName: first-listener - name: 0.0.0.0-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index 8570efd50f..f0d7bc1523 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index 3c0ba38ba9..bf9f47c74c 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -35,7 +35,7 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -74,5 +74,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10081 + name: envoy-gateway/gateway-btls-2/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index 8570efd50f..f0d7bc1523 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml index 6b214fbe9e..81b9ea5ab3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml @@ -32,6 +32,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml index d2d5e3aefd..43d4363d85 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml index 6b214fbe9e..81b9ea5ab3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml @@ -32,6 +32,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml index 7030f6f4cd..510a31a1ae 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml index 8c84313ad9..be40ad3cb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml @@ -39,5 +39,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index d8eb928381..8fea326eb5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -40,8 +40,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -86,6 +90,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10081 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index c00fa8188c..58005eba8a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -36,6 +36,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index 63bc76ac0e..54c3baf862 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -38,5 +38,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml index 87f47463d5..b98593fdb9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml index 80f1b6982a..43e88b26e4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml @@ -42,6 +42,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml index 4fdedfabf6..54603ea873 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index 87f47463d5..b98593fdb9 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -35,5 +35,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index c342ee473b..25ff8c6354 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -53,7 +53,7 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10443-quic + name: envoy-gateway/gateway-1/tls-quic udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} @@ -109,5 +109,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10443 + name: envoy-gateway/gateway-1/tls perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml index 4a412b3576..f5b17deb2b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index bc6182f71d..7954f39558 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -65,6 +65,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml index a7273c7a1b..04f637834f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* rateLimits: - actions: diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index bc6182f71d..7954f39558 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -65,6 +65,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml index 3f4a7333a6..19e35c5809 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* rateLimits: - actions: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index 154c63fa5e..5d1321ecce 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -64,6 +64,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml index 321ecc1ced..eaafb9560f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index 7f256db765..c927c01b35 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -130,6 +130,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml index 5cd81b5d47..7dad3190c6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index f59ea7c3be..8da7fd91c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -100,6 +100,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml index 7c52b6de16..0272558f8c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml index 43de60e1b1..ebc7ac35e8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml @@ -67,6 +67,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml index 321ecc1ced..eaafb9560f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index a16adbc0ac..b8e3aca1ed 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -67,6 +67,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml index 0e312fd928..bc4d096059 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index 560f733683..0f4a7d018c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -57,6 +57,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml index 321ecc1ced..eaafb9560f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml index 4c2da89f76..f14e70b86e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml @@ -71,5 +71,5 @@ name: gateway-1 namespace: default sectionName: http - name: 0.0.0.0-10080 + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 5b69d79a54..4794012329 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -35,7 +35,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -79,7 +79,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -109,7 +109,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10082 + name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -133,5 +133,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10083 + name: fourth-listener perConnectionBufferLimitBytes: 32768 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 73f42de8b8..e6e3f9c31b 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 @@ -104,11 +104,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: https-1 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: https-2 - name: 0.0.0.0-10443 + name: envoy-gateway/gateway-1/https-1 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -164,13 +160,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: https-1 - name: 0.0.0.0-8443 + name: envoy-gateway/gateway-1/https-1 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index d42d1bed64..c3af4958ab 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -64,7 +64,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -87,5 +87,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 3eecc111b8..e9e236e672 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -35,7 +35,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -79,7 +79,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -121,7 +121,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10082 + name: third-listener perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive @@ -144,7 +144,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10083 + name: fourth-listener perConnectionBufferLimitBytes: 32768 socketOptions: - description: socket option to enable tcp keep alive diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml index c6a4b40483..821a856027 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml @@ -26,7 +26,7 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10443 + name: envoy-gateway/gateway-1/tls-1 perConnectionBufferLimitBytes: 50000000 socketOptions: - description: socket option to enable tcp keep alive diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml index 07bf30df03..ffe2caf4ca 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml index 84c743fddb..b0cae1c6c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml @@ -39,6 +39,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml index 65cce8400e..efc36bfe04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index 84c743fddb..b0cae1c6c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -39,6 +39,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml index 7fd4979238..cca5650fdd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml index ca1bb46ee0..7f98942469 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml @@ -56,5 +56,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index eecd30da20..5fc7925048 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -35,7 +35,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -53,7 +53,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -72,5 +72,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10082 + name: third-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml index 41594a227d..62cf1f191c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml index 4a2b86673e..d847786d0b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml @@ -49,6 +49,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml index 75d30a0592..0f9569f0a4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index 381b3934aa..f7af69c28d 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -63,7 +63,7 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080-quic + name: default/gateway-1/http-quic udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} @@ -172,5 +172,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 11bbfe1fcd..9bfdb853f3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -150,5 +150,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml index 2c5859d9b2..1d11ebadd1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml @@ -43,5 +43,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-listener-simple perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml index 7de7cdee6d..709614dc5b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml @@ -59,8 +59,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10001 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -124,8 +128,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10002 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -191,8 +199,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10003 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -260,8 +272,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10004 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: fourth-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -331,6 +347,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10005 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: fifth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml index 952278bf43..9f2d5aff87 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: second-listener/* routes: - match: @@ -31,6 +47,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: third-listener/* routes: - match: @@ -45,6 +69,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: fourth-listener/* routes: - match: @@ -59,6 +91,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: fifth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml index 339973779a..dd11d5a2a8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml @@ -59,8 +59,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10001 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -124,8 +128,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10002 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: second-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -189,8 +197,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10003 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 + name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -254,8 +266,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10004 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 + name: fourth-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -319,6 +335,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10005 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http5 + name: fifth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml index 952278bf43..5db726893c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: @@ -31,6 +47,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: third-listener/* routes: - match: @@ -45,6 +69,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http4 name: fourth-listener/* routes: - match: @@ -59,6 +91,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http5 name: fifth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index 6128d2608f..85c59ab944 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -59,8 +59,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -97,5 +101,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml index 7cda3c1121..3c70e48e43 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml @@ -82,8 +82,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -143,5 +147,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml index 9e64eb8111..0c534ba06b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - "" + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/ routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index 72853cbfd2..e0bfa41b92 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -59,8 +59,12 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -97,5 +101,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml index 2b025aa1f8..ad14b70cff 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml @@ -162,5 +162,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml index 047619c21d..86adeb7288 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml @@ -83,6 +83,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml index b17df86476..5e3d03debf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index e1791c5216..9c26830866 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -144,6 +144,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml index 2170a16d13..8bf16b46cb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml index 2f5c4977b2..b35345d0b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index f4bc9e1e32..57110ebb4b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -33,6 +33,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index 5c495dbb7b..57eff757d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -44,6 +44,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml index 479c2cd143..ce70a4ba6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index 6a0c475b79..f1da38a58c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -44,5 +44,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index 5c495dbb7b..b27b32d6dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -45,5 +45,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml index 410e93c7f0..472cf92202 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml @@ -65,5 +65,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml index 5c495dbb7b..57eff757d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml @@ -44,6 +44,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml index 459d975a9b..eebbab3429 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml index 410e93c7f0..472cf92202 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml @@ -65,5 +65,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index 5c495dbb7b..57eff757d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -44,6 +44,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml index a82f9d5c45..d856fae5c3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index 5c495dbb7b..57eff757d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -44,6 +44,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml index ee127d9994..30ce0cd18d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml index c878be7ba9..3448386e4d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml @@ -44,7 +44,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -92,5 +92,5 @@ name: gateway-2 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10081 + name: envoy-gateway/gateway-2/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml index f2cacab526..f91cf8e574 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: @@ -29,6 +37,14 @@ - upgradeType: websocket - domains: - foo + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/foo routes: - match: @@ -50,4 +66,12 @@ - upgradeType: websocket - domains: - bar + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/bar diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml index d07883d92c..7b9034df38 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: @@ -26,6 +34,14 @@ - upgradeType: websocket - domains: - foo + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/foo routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml index 6864000d56..c89b24ad99 100644 --- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml @@ -111,5 +111,5 @@ name: gateway-1 namespace: envoy-gateway sectionName: http - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 3a759d085d..924679c0ae 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -53,6 +53,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index 4f66784841..a2eebf2fa2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -60,5 +60,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml index bed4da84ca..b06bad4b08 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml @@ -14,5 +14,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-route-enable-endpoint-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml index 6d00c584ac..e7bd62e275 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml @@ -16,5 +16,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-8082 + name: tcp-listener-dual perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml index bed4da84ca..35bf85f713 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml @@ -14,5 +14,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-route-enable-req-resp-sizes-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml index 9e76f74b1d..39df57fed5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml @@ -24,5 +24,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-listener-complex perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml index da9dba7626..e35d175de9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml @@ -15,5 +15,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-listener-simple perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml index 8fe64fc260..121735ff0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml @@ -54,5 +54,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tls-listener-terminate perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml index 0f8bcd4ebf..9d9b282811 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml @@ -24,5 +24,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-listener-weighted-backend perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml index 09b7f1538f..fe16088aac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml @@ -15,5 +15,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tcp-listener-with-no-routes perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml index 48afdbb661..ee6b4250c5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml @@ -22,7 +22,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: tls-passthrough-foo perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -48,5 +48,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: tls-passthrough-bar perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index 1612e240ed..d53ebde031 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -80,7 +80,7 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -133,5 +133,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10081 + name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml index bd913b4fa9..6d4c3d9250 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml @@ -61,5 +61,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index bd913b4fa9..6d4c3d9250 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -61,5 +61,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index 4f343cd31c..e80d5c9b17 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -63,5 +63,5 @@ filterMetadata: envoy-gateway: resources: [] - name: ::-10080 + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml index d66e049501..1c7572403a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml @@ -63,6 +63,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index 731def6422..e04426f4bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -63,6 +63,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml index cd040a4bc7..2f969eb7e9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: ::-10080 + name: udp-route-enable-endpoint-stats diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml index cd040a4bc7..3d1cb7b1c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: ::-10080 + name: udp-route-enable-req-resp-sizes-stats diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml index 36c4e88e2a..5edcecc248 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/udproute-1/rule/-1 statPrefix: service - name: 0.0.0.0-10162 + name: udp-route diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml index fd8e3bd4a2..ce76497d0c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route-with-no-routes.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: EmptyCluster statPrefix: service - name: ::-10080 + name: udp-route-with-no-routes diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml index cd040a4bc7..cfcd4df467 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml @@ -15,4 +15,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udp-route-dest statPrefix: service - name: ::-10080 + name: udp-route diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index 96dd7cf3b0..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] - name: ::-10080 + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index d59fb1fc72..43a5a51c45 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -117,5 +117,5 @@ filterMetadata: envoy-gateway: resources: [] - name: 0.0.0.0-10080 + name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 2d79e754ba..77eabb39b4 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -64,7 +64,11 @@ type Translator struct { // FilterOrder holds the custom order of the HTTP filters FilterOrder []egv1a1.FilterPosition - Logger logging.Logger + + // FeatureFlag holds the feature flags for the translator. + FeatureFlag *egv1a1.FeatureFlags + + Logger logging.Logger } type GlobalRateLimitSettings struct { @@ -113,7 +117,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) } @@ -280,8 +284,8 @@ 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.Address, - httpListener.Port, httpListener.IPFamily, accessLog); err != nil { + if quicXDSListener, err = buildXdsQuicListener(httpListener.Name, httpListener.Address, + httpListener.Port, httpListener.IPFamily, accessLog, t.FeatureFlag); err != nil { errs = errors.Join(errs, err) continue } @@ -295,8 +299,8 @@ func (t *Translator) processHTTPListenerXdsTranslation( // Create a new TCP listener for HTTP1/HTTP2 traffic. if tcpXDSListener, err = buildXdsTCPListener( - httpListener.Address, httpListener.Port, httpListener.IPFamily, - httpListener.TCPKeepalive, httpListener.Connection, accessLog); err != nil { + httpListener.Name, httpListener.Address, httpListener.Port, httpListener.IPFamily, + httpListener.TCPKeepalive, httpListener.Connection, accessLog, t.FeatureFlag); err != nil { errs = errors.Join(errs, err) continue } @@ -718,8 +722,8 @@ func (t *Translator) processTCPListenerXdsTranslation( xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port, corev3.SocketAddress_TCP) if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( - tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, - tcpListener.TCPKeepalive, tcpListener.Connection, accesslog); err != nil { + tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, + tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, t.FeatureFlag); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -814,7 +818,7 @@ func (t *Translator) processTCPListenerXdsTranslation( return errs } -func processUDPListenerXdsTranslation( +func (t *Translator) processUDPListenerXdsTranslation( tCtx *types.ResourceVersionTable, udpListeners []*ir.UDPListener, accesslog *ir.AccessLog, @@ -853,7 +857,7 @@ func processUDPListenerXdsTranslation( } } - xdsListener, err := buildXdsUDPListener(udpListener.Route.Destination.Name, udpListener, accesslog) + xdsListener, err := buildXdsUDPListener(udpListener.Route.Destination.Name, udpListener, accesslog, t.FeatureFlag) if err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index 79eab9ba04..767cdec23d 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -1219,6 +1219,7 @@ EnvoyGateway is the schema for the envoygateways API. | `rateLimit` | _[RateLimit](#ratelimit)_ | false | | RateLimit defines the configuration associated with the Rate Limit service
deployed by Envoy Gateway required to implement the Global Rate limiting
functionality. The specific rate limit service used here is the reference
implementation in Envoy. For more details visit https://github.com/envoyproxy/ratelimit.
This configuration is unneeded for "Local" rate limiting. | | `extensionManager` | _[ExtensionManager](#extensionmanager)_ | false | | ExtensionManager defines an extension manager to register for the Envoy Gateway Control Plane. | | `extensionApis` | _[ExtensionAPISettings](#extensionapisettings)_ | false | | ExtensionAPIs defines the settings related to specific Gateway API Extensions
implemented by Envoy Gateway | +| `featureFlags` | _[FeatureFlags](#featureflags)_ | true | | FeatureFlags defines the feature flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. | #### EnvoyGatewayAdmin @@ -1478,6 +1479,7 @@ _Appears in:_ | `rateLimit` | _[RateLimit](#ratelimit)_ | false | | RateLimit defines the configuration associated with the Rate Limit service
deployed by Envoy Gateway required to implement the Global Rate limiting
functionality. The specific rate limit service used here is the reference
implementation in Envoy. For more details visit https://github.com/envoyproxy/ratelimit.
This configuration is unneeded for "Local" rate limiting. | | `extensionManager` | _[ExtensionManager](#extensionmanager)_ | false | | ExtensionManager defines an extension manager to register for the Envoy Gateway Control Plane. | | `extensionApis` | _[ExtensionAPISettings](#extensionapisettings)_ | false | | ExtensionAPIs defines the settings related to specific Gateway API Extensions
implemented by Envoy Gateway | +| `featureFlags` | _[FeatureFlags](#featureflags)_ | true | | FeatureFlags defines the feature flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. | #### EnvoyGatewayTelemetry @@ -1962,6 +1964,39 @@ _Appears in:_ | `percentage` | _float_ | false | 100 | Percentage specifies the percentage of requests to be delayed. Default 100%, if set 0, no requests will be delayed. Accuracy to 0.0001%. | +#### FeatureFlag + +_Underlying type:_ _string_ + +FeatureFlag defines a feature flag for Envoy Gateway. + +_Appears in:_ +- [FeatureFlags](#featureflags) + +| Value | Description | +| ----- | ----------- | +| `UseAddressAsListenerName` | FeatureUseAddressAsListenerName indicates that the listener name should be derived from the address and port.
| + + +#### FeatureFlags + + + +FeatureFlags provide a mechanism to gate breaking changes or experimental features in new Envoy Gateway releases. +Each flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource. +The names of these flags will be included in the release notes alongside an explanation of the change. +Please note that these flags are temporary and will be removed in future releases once the features are stable. + +_Appears in:_ +- [EnvoyGateway](#envoygateway) +- [EnvoyGatewaySpec](#envoygatewayspec) + +| Field | Type | Required | Default | Description | +| --- | --- | --- | --- | --- | +| `enabled` | _[FeatureFlag](#featureflag) array_ | true | | | +| `disabled` | _[FeatureFlag](#featureflag) array_ | true | | | + + #### FileEnvoyProxyAccessLog diff --git a/test/config/envoy-gateaway-config/address-as-listener-name.yaml b/test/config/envoy-gateaway-config/address-as-listener-name.yaml new file mode 100644 index 0000000000..85fc83e2cc --- /dev/null +++ b/test/config/envoy-gateaway-config/address-as-listener-name.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 + featureFlags: + enabled: + - UseAddressAsListenerName diff --git a/test/config/helm/address-as-listener-name.yaml b/test/config/helm/address-as-listener-name.yaml new file mode 100644 index 0000000000..8a515ff9fa --- /dev/null +++ b/test/config/helm/address-as-listener-name.yaml @@ -0,0 +1,5 @@ +config: + envoyGateway: + featureFlags: + enabled: + - UseAddressAsListenerName diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index b46a6a5101..551d701f0f 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -71,6 +71,21 @@ func TestE2E(t *testing.T) { ) } + if tests.UseAddressAsListenerName() { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyTest.ShortName, + ) + if tests.IPFamily == "ipv6" { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyIPv4Test.ShortName, + ) + } else { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyIPv6Test.ShortName, + ) + } + } + cSuite, err := suite.NewConformanceTestSuite(suite.ConformanceOptions{ Client: c, RestConfig: cfg, diff --git a/test/e2e/testdata/envoy-patch-policy-ipv4.yaml b/test/e2e/testdata/envoy-patch-policy-ipv4.yaml new file mode 100644 index 0000000000..c8a4319e34 --- /dev/null +++ b/test/e2e/testdata/envoy-patch-policy-ipv4.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: "0.0.0.0-10080" + 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/testdata/envoy-patch-policy-ipv6.yaml b/test/e2e/testdata/envoy-patch-policy-ipv6.yaml new file mode 100644 index 0000000000..07b44b46f4 --- /dev/null +++ b/test/e2e/testdata/envoy-patch-policy-ipv6.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: "::-10080" + 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/testdata/envoy-patch-policy.yaml b/test/e2e/testdata/envoy-patch-policy.yaml index c8a4319e34..ede3800d45 100644 --- a/test/e2e/testdata/envoy-patch-policy.yaml +++ b/test/e2e/testdata/envoy-patch-policy.yaml @@ -29,7 +29,7 @@ spec: type: JSONPatch jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "0.0.0.0-10080" + name: "gateway-conformance-infra/same-namespace/http" operation: op: add path: "/default_filter_chain/filters/0/typed_config/local_reply_config" 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_ipv4.go b/test/e2e/tests/envoy_patch_policy_ipv4.go new file mode 100644 index 0000000000..744cdbe8f4 --- /dev/null +++ b/test/e2e/tests/envoy_patch_policy_ipv4.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, EnvoyPatchPolicyTest) +} + +var EnvoyPatchPolicyIPv4Test = suite.ConformanceTest{ + ShortName: "EnvoyPatchPolicyIPv4", + Description: "update xds using EnvoyPatchPolicy", + Manifests: []string{"testdata/envoy-patch-policy-ipv4.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/envoy_patch_policy_ipv6.go b/test/e2e/tests/envoy_patch_policy_ipv6.go new file mode 100644 index 0000000000..bf9ec2fd49 --- /dev/null +++ b/test/e2e/tests/envoy_patch_policy_ipv6.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, EnvoyPatchPolicyTest) +} + +var EnvoyPatchPolicyIPv6Test = suite.ConformanceTest{ + ShortName: "EnvoyPatchPolicyIPv6", + Description: "update xds using EnvoyPatchPolicy", + Manifests: []string{"testdata/envoy-patch-policy-ipv6.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 fbd5f075da..f6bf34d2e9 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -728,6 +728,11 @@ func IsGatewayNamespaceMode() bool { return DeployProfile == "gateway-namespace-mode" } +// TODO(zhaohuabing) remove this after the feature flag is removed. +func UseAddressAsListenerName() bool { + return DeployProfile == "address-as-listener-name" +} + func GetGatewayResourceNamespace() string { if IsGatewayNamespaceMode() { return "gateway-conformance-infra" From 20f9cb49e8e6626b341db86a7ac4f4ef8016f7b1 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Mon, 21 Jul 2025 09:09:09 +0000 Subject: [PATCH 10/44] remove metadata for tcp and udp listeners Signed-off-by: Huabing (Robin) Zhao --- .../translate/out/default-resources.all.yaml | 8 ------- .../out/from-gateway-api-to-xds.all.json | 14 ------------ .../out/from-gateway-api-to-xds.all.yaml | 8 ------- .../out/from-gateway-api-to-xds.listener.yaml | 8 ------- .../backend-buffer-limit.listeners.yaml | 4 ---- .../xds-ir/client-buffer-limit.listeners.yaml | 4 ---- .../client-stream-idle-timeout.listeners.yaml | 8 ------- .../out/xds-ir/client-timeout.listeners.yaml | 8 ------- .../listener-connection-limit.listeners.yaml | 8 ------- .../listener-proxy-protocol.listeners.yaml | 4 ---- .../listener-tcp-keepalive.listeners.yaml | 8 ------- .../listener-tcp-without-route.listeners.yaml | 4 ---- .../max-conn-per-socket-event.listeners.yaml | 8 ------- ...-simple-tcp-route-same-port.listeners.yaml | 4 ---- ...client-certificate-disabled.listeners.yaml | 4 ---- .../out/xds-ir/mutual-tls-san.listeners.yaml | 4 ---- .../out/xds-ir/mutual-tls.listeners.yaml | 4 ---- .../xds-ir/tcp-endpoint-stats.listeners.yaml | 4 ---- .../tcp-listener-ipfamily.listeners.yaml | 4 ---- .../tcp-req-resp-sizes-stats.listeners.yaml | 4 ---- .../xds-ir/tcp-route-complex.listeners.yaml | 4 ---- .../xds-ir/tcp-route-simple.listeners.yaml | 4 ---- .../tcp-route-tls-terminate.listeners.yaml | 4 ---- .../tcp-route-weighted-backend.listeners.yaml | 4 ---- .../tcp-route-with-no-routes.listeners.yaml | 4 ---- .../tls-route-passthrough.listeners.yaml | 8 ------- ...-with-ciphers-versions-alpn.listeners.yaml | 4 ---- internal/xds/translator/translator.go | 22 ++----------------- 28 files changed, 2 insertions(+), 174 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 68894c3bf2..20dd5f7504 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1338,10 +1338,6 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: @@ -1433,10 +1429,6 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index 5e2ca2f431..e2a682a41e 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -1270,13 +1270,6 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, - "metadata": { - "filterMetadata": { - "envoy-gateway": { - "resources": [] - } - } - }, "name": "default/eg/tcp", "perConnectionBufferLimitBytes": 32768 } @@ -1402,13 +1395,6 @@ } ], "maxConnectionsToAcceptPerSocketEvent": 1, - "metadata": { - "filterMetadata": { - "envoy-gateway": { - "resources": [] - } - } - }, "name": "default/eg/tls-passthrough", "perConnectionBufferLimitBytes": 32768 } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 22ffd13141..9802790356 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -791,10 +791,6 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: @@ -886,10 +882,6 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index 1e6f58f967..407c87e4e9 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -355,10 +355,6 @@ xds: statPrefix: tcp-1234 name: tcproute/default/backend maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tcp perConnectionBufferLimitBytes: 32768 - activeState: @@ -450,10 +446,6 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: default/eg/tls-passthrough perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index 95c546d126..a6c21a4436 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -54,10 +54,6 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 1500 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index 404f6ce0bb..69fb9cd577 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -54,9 +54,5 @@ statPrefix: tcp-10081 name: tcp-route-dest maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 1500 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml index bce5f9671e..fe79a425b9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml @@ -58,13 +58,5 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index b66bc86070..acb9e11cb7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -57,13 +57,5 @@ statPrefix: tcp-10081 name: second-route maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 4794012329..09ec5e7aa3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -105,10 +105,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: third-listener perConnectionBufferLimitBytes: 32768 - address: @@ -129,9 +125,5 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: fourth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index c3af4958ab..ea4e715dd0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -83,9 +83,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index e9e236e672..2a412ff585 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -117,10 +117,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: third-listener perConnectionBufferLimitBytes: 32768 socketOptions: @@ -140,10 +136,6 @@ cluster: tcp-route-dest statPrefix: tcp-10083 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: fourth-listener perConnectionBufferLimitBytes: 32768 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml index 821a856027..7e8d627484 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml @@ -22,10 +22,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: envoy-gateway/gateway-1/tls-1 perConnectionBufferLimitBytes: 50000000 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index 5fc7925048..954f78130b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -49,10 +49,6 @@ cluster: max-accept-disabled statPrefix: tcp-10081 name: max-accept-disabled - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 - address: @@ -68,9 +64,5 @@ statPrefix: tcp-10082 name: max-accept-default maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: third-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml index 1d11ebadd1..d4b4e1d6f4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml @@ -39,9 +39,5 @@ statPrefix: tcp-10080 name: tcp-route-simple-4 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-simple perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index 85c59ab944..fed3282676 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -97,9 +97,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml index 3c70e48e43..b85ec758e8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml @@ -143,9 +143,5 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index e0bfa41b92..1b504f4bc1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -97,9 +97,5 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml index b06bad4b08..c8e9cafa63 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml @@ -10,9 +10,5 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-route-enable-endpoint-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml index e7bd62e275..a4a42c3230 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml @@ -12,9 +12,5 @@ statPrefix: tcp-8082 name: tcp-route-dual maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-dual perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml index 35bf85f713..df212ab00f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml @@ -10,9 +10,5 @@ cluster: tcp-route-simple-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-route-enable-req-resp-sizes-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml index 39df57fed5..5f3b38aadb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml @@ -20,9 +20,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-complex perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml index e35d175de9..41d498e6d0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml @@ -11,9 +11,5 @@ statPrefix: tcp-10080 name: tcp-route-simple maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-simple perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml index 121735ff0f..4671321855 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml @@ -50,9 +50,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tls-listener-terminate perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml index 9d9b282811..f16165dde4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml @@ -20,9 +20,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-weighted-backend perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml index fe16088aac..68b0133abe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml @@ -11,9 +11,5 @@ statPrefix: tcp-10080 name: EmptyCluster maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tcp-listener-with-no-routes perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml index ee6b4250c5..ddd54fbbc2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml @@ -18,10 +18,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tls-passthrough-foo perConnectionBufferLimitBytes: 32768 - address: @@ -44,9 +40,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: tls-passthrough-bar perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index d53ebde031..ae81457f82 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -129,9 +129,5 @@ tlsMinimumProtocolVersion: TLSv1_0 disableStatefulSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 77eabb39b4..29458974cc 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -713,10 +713,8 @@ func (t *Translator) processTCPListenerXdsTranslation( ) error { // The XDS translation is done in a best-effort manner, so we collect all // errors and return them at the end. - var ( - ownerGatewayListeners = map[string]sets.Set[*ir.ResourceMetadata]{} // The set of Gateway Listeners that own the xDS Listener - errs, err error - ) + 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) @@ -734,13 +732,6 @@ func (t *Translator) processTCPListenerXdsTranslation( errs = errors.Join(errs, err) continue } - - ownerGatewayListeners[xdsListener.Name] = sets.New[*ir.ResourceMetadata]() - } - - // Collect the owner Gateway Listeners for the xDS Listener. - if _, ok := ownerGatewayListeners[xdsListener.Name]; ok { - ownerGatewayListeners[xdsListener.Name].Insert(tcpListener.Metadata) } // Add the proxy protocol filter if needed @@ -807,14 +798,6 @@ func (t *Translator) processTCPListenerXdsTranslation( } } - // Add the owner Gateway Listeners to the xDS listeners' metadata. - for listenerName, ownerGatewayListeners := range ownerGatewayListeners { - xdsListener := findXdsListener(tCtx, listenerName, corev3.SocketAddress_TCP) - if xdsListener != nil { - xdsListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) - } - } - return errs } @@ -868,7 +851,6 @@ func (t *Translator) processUDPListenerXdsTranslation( errs = errors.Join(errs, err) continue } - xdsListener.Metadata = buildXdsMetadata(udpListener.Metadata) } return errs } From 497cedca7e03a3b15aef1a90d129dd61bbeb3350 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Mon, 21 Jul 2025 09:16:02 +0000 Subject: [PATCH 11/44] fix int Signed-off-by: Huabing (Robin) Zhao --- .../extensionpolicy-tcp-udp-http.yaml | 5 +++++ .../http-route-custom-backend-error.yaml | 5 ----- ...te-custom-backend-multiple-backend-error.yaml | 5 ----- .../http-route-custom-backend.yaml | 5 ----- .../http-route-extension-listener-error.yaml | 5 ----- .../http-route-extension-translate-error.yaml | 6 +----- .../http-route-extension-virtualhost-error.yaml | 5 ----- .../testdata/in/extension-xds-ir/http-route.yaml | 5 ----- .../in/extension-xds-ir/listener-policy.yaml | 5 +++++ .../multiple-listeners-same-port-error.yaml | 10 ++++++++++ .../post-translate-listeners-routes.yaml | 2 -- .../in/ratelimit-config/multiple-domains.yaml | 5 ----- .../multiple-global-shared-distinct-match.yaml | 5 ----- ...http-route-weighted-backend-with-filters.yaml | 5 +++++ .../in/xds-ir/http-route-with-clientcert.yaml | 5 +++++ .../http-route-with-tls-system-truststore.yaml | 5 +++++ ...http-route-with-tlsbundle-multiple-certs.yaml | 10 ++++++++++ .../in/xds-ir/http-route-with-tlsbundle.yaml | 5 +++++ .../translator/testdata/in/xds-ir/http10.yaml | 5 +++++ .../testdata/in/xds-ir/http2-mixed.yaml | 5 +++++ .../xds/translator/testdata/in/xds-ir/http2.yaml | 5 +++++ .../xds/translator/testdata/in/xds-ir/http3.yaml | 5 +++++ .../in/xds-ir/listener-connection-limit.yaml | 10 ++++++++++ .../in/xds-ir/listener-proxy-protocol.yaml | 5 +++++ .../in/xds-ir/listener-tcp-keepalive.yaml | 10 ++++++++++ .../xds/translator/testdata/in/xds-ir/lua.yaml | 5 +++++ .../in/xds-ir/max-conn-per-socket-event.yaml | 5 +++++ ...steners-same-port-with-different-filters.yaml | 5 +++++ .../in/xds-ir/multiple-listeners-same-port.yaml | 5 +++++ .../in/xds-ir/oidc-and-jwt-with-passthrough.yaml | 5 +++++ .../in/xds-ir/ratelimit-disable-headers.yaml | 5 +++++ .../in/xds-ir/ratelimit-endpoint-stats.yaml | 5 +++++ .../in/xds-ir/ratelimit-global-shared.yaml | 5 +++++ .../in/xds-ir/ratelimit-multi-global-shared.yaml | 5 +++++ .../in/xds-ir/suppress-envoy-headers.yaml | 5 +++++ .../xds-ir/tls-with-ciphers-versions-alpn.yaml | 5 +++++ .../testdata/in/xds-ir/tracing-datadog-uds.yaml | 5 +++++ .../testdata/in/xds-ir/tracing-datadog.yaml | 5 +++++ .../in/xds-ir/tracing-endpoint-stats.yaml | 5 +++++ .../testdata/in/xds-ir/tracing-zipkin.yaml | 5 ----- .../xds/translator/testdata/in/xds-ir/wasm.yaml | 5 +++++ .../extensionpolicy-tcp-udp-http.listeners.yaml | 6 +++++- .../extensionpolicy-tcp-udp-http.routes.yaml | 8 ++++++++ .../listener-policy.listeners.yaml | 6 +++++- ...iple-listeners-same-port-error.listeners.yaml | 10 +++++++++- ...ultiple-listeners-same-port-error.routes.yaml | 16 ++++++++++++++++ ...-weighted-backend-with-filters.listeners.yaml | 6 +++++- ...ute-weighted-backend-with-filters.routes.yaml | 8 ++++++++ .../http-route-with-clientcert.listeners.yaml | 6 +++++- .../http-route-with-clientcert.routes.yaml | 8 ++++++++ ...ute-with-tls-system-truststore.listeners.yaml | 6 +++++- ...-route-with-tls-system-truststore.routes.yaml | 8 ++++++++ ...-with-tlsbundle-multiple-certs.listeners.yaml | 12 ++++++++++-- ...ute-with-tlsbundle-multiple-certs.routes.yaml | 16 ++++++++++++++++ .../http-route-with-tlsbundle.listeners.yaml | 6 +++++- .../xds-ir/http-route-with-tlsbundle.routes.yaml | 8 ++++++++ .../testdata/out/xds-ir/http10.listeners.yaml | 6 +++++- .../testdata/out/xds-ir/http10.routes.yaml | 8 ++++++++ .../out/xds-ir/http2-mixed.listeners.yaml | 6 +++++- .../testdata/out/xds-ir/http2-mixed.routes.yaml | 8 ++++++++ .../testdata/out/xds-ir/http2.listeners.yaml | 6 +++++- .../testdata/out/xds-ir/http2.routes.yaml | 8 ++++++++ .../testdata/out/xds-ir/http3.listeners.yaml | 12 ++++++++++-- .../testdata/out/xds-ir/http3.routes.yaml | 8 ++++++++ .../listener-connection-limit.listeners.yaml | 12 ++++++++++-- .../xds-ir/listener-connection-limit.routes.yaml | 16 ++++++++++++++++ .../listener-proxy-protocol.listeners.yaml | 6 +++++- .../xds-ir/listener-proxy-protocol.routes.yaml | 8 ++++++++ .../xds-ir/listener-tcp-keepalive.listeners.yaml | 12 ++++++++++-- .../xds-ir/listener-tcp-keepalive.routes.yaml | 16 ++++++++++++++++ .../testdata/out/xds-ir/lua.listeners.yaml | 6 +++++- .../testdata/out/xds-ir/lua.routes.yaml | 8 ++++++++ .../max-conn-per-socket-event.listeners.yaml | 6 +++++- .../xds-ir/max-conn-per-socket-event.routes.yaml | 8 ++++++++ ...me-port-with-different-filters.listeners.yaml | 12 ++++++++++-- ...-same-port-with-different-filters.routes.yaml | 8 ++++++++ .../multiple-listeners-same-port.listeners.yaml | 6 +++++- .../multiple-listeners-same-port.routes.yaml | 8 ++++++++ .../oidc-and-jwt-with-passthrough.listeners.yaml | 6 +++++- .../oidc-and-jwt-with-passthrough.routes.yaml | 8 ++++++++ .../ratelimit-disable-headers.listeners.yaml | 6 +++++- .../xds-ir/ratelimit-disable-headers.routes.yaml | 8 ++++++++ .../ratelimit-endpoint-stats.listeners.yaml | 6 +++++- .../xds-ir/ratelimit-endpoint-stats.routes.yaml | 8 ++++++++ .../ratelimit-global-shared.listeners.yaml | 6 +++++- .../xds-ir/ratelimit-global-shared.routes.yaml | 8 ++++++++ .../ratelimit-multi-global-shared.listeners.yaml | 6 +++++- .../ratelimit-multi-global-shared.routes.yaml | 8 ++++++++ .../xds-ir/suppress-envoy-headers.listeners.yaml | 6 +++++- .../xds-ir/suppress-envoy-headers.routes.yaml | 8 ++++++++ ...tls-with-ciphers-versions-alpn.listeners.yaml | 6 +++++- .../tls-with-ciphers-versions-alpn.routes.yaml | 8 ++++++++ .../xds-ir/tracing-datadog-uds.listeners.yaml | 6 +++++- .../out/xds-ir/tracing-datadog-uds.routes.yaml | 8 ++++++++ .../out/xds-ir/tracing-datadog.listeners.yaml | 6 +++++- .../out/xds-ir/tracing-datadog.routes.yaml | 8 ++++++++ .../xds-ir/tracing-endpoint-stats.listeners.yaml | 6 +++++- .../xds-ir/tracing-endpoint-stats.routes.yaml | 8 ++++++++ .../testdata/out/xds-ir/wasm.listeners.yaml | 6 +++++- .../testdata/out/xds-ir/wasm.routes.yaml | 8 ++++++++ 100 files changed, 614 insertions(+), 87 deletions(-) diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 71c96518f7..c69173c524 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -29,6 +29,11 @@ http: controllerName: gateway.envoyproxy.io/gatewayclass-controller hostnames: - '*' + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http isHTTP2: false name: envoy-gateway/gateway-1/http1 path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 4d5ab54f42..525e6fe3aa 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml index 29d3eb233d..f8ea27d5f9 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml index 3504a39e95..fa535cc853 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index 25ce5fdac3..195543e0bf 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index 44b3ffd97e..6da2a952ce 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -4,11 +4,7 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http + metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml index dacd3324e3..7d2bf1516d 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index 065fe42023..64c8a8d6cb 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml index 6f462ba015..b54fd8a4eb 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml @@ -30,6 +30,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: policyextension-listener path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 6052a301e3..854a1aa55d 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -32,6 +37,11 @@ http: port: 10080 hostnames: - "foo.net" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml index 6f7e1e7be7..5c548da73e 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml @@ -29,8 +29,6 @@ http: port: 10081 hostnames: - "example.com" - hostnames: - - "*" metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml index 723835d2e7..0b54b1b88a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml index df8da21cc4..5f782ece39 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml @@ -4,11 +4,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml index 531cf64d47..d5421b9113 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml @@ -3,6 +3,11 @@ http: address: "::" hostnames: - '*' + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml index 03e1021d1d..ec0efba6d1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml index 07d3e9e280..ed0334e667 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml index a180b23ab4..6630438c41 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect @@ -59,6 +64,11 @@ http: hostnames: - 'example.com' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: envoy-gateway/gateway-btls-2/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml index b0a453e792..9854745f5e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml @@ -3,6 +3,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http10.yaml b/internal/xds/translator/testdata/in/xds-ir/http10.yaml index 6c77f67760..4351655838 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http10.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http10.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml index 026b3d069f..0be54b870d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http2.yaml b/internal/xds/translator/testdata/in/xds-ir/http2.yaml index 27602c958f..1cf9371d80 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http3.yaml b/internal/xds/translator/testdata/in/xds-ir/http3.yaml index 15858a8136..8d068e383f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http3.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http3.yaml @@ -5,6 +5,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: envoy-gateway/gateway-1/tls port: 10443 path: diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml index 1e194fa32d..1124b66709 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 connection: {} path: mergeSlashes: true @@ -23,6 +28,11 @@ http: port: 10081 hostnames: - "foo.net" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 connection: limit: value: 5 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml index 41bbd6eadf..fa2213822b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml index 3d02ac1c88..465ddda627 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 tcpKeepalive: {} path: mergeSlashes: true @@ -23,6 +28,11 @@ http: port: 10081 hostnames: - "foo.net" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 tcpKeepalive: probes: 7 interval: 200 diff --git a/internal/xds/translator/testdata/in/xds-ir/lua.yaml b/internal/xds/translator/testdata/in/xds-ir/lua.yaml index 43d7ffa8fa..05ae59f82e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/lua.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/lua.yaml @@ -2,6 +2,11 @@ http: - address: 0.0.0.0 hostnames: - '*' + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http isHTTP2: false name: envoy-gateway/gateway-1/http path: diff --git a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml index aa57f63397..3006d3a2b7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml index 6eb19b1506..834a03920a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml @@ -7,6 +7,11 @@ http: hostnames: - 'www.foo.com' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http http3: quicPort: 443 path: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index ff32004cb9..2120ce23d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml index 4cddbaafd2..4563c0728e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - '*' + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml index b25e2bdd12..00f286ab7c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml @@ -9,6 +9,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml index e34623adeb..ef5754a734 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml @@ -11,6 +11,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml index af7c562775..e511bf832d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml @@ -11,6 +11,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml index 0c67264d02..3697ef453e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml @@ -11,6 +11,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml index a2519db08b..35f399d684 100644 --- a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml @@ -4,6 +4,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml index 5495901ae6..4be22a0828 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml @@ -7,6 +7,11 @@ http: port: 10080 hostnames: - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http tls: ciphers: - ECDHE-ECDSA-AES128-GCM-SHA256 diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml index 694c99fd27..0bec2ae261 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml @@ -35,6 +35,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml index c7c42d9bae..7cda6a2bdf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml @@ -34,6 +34,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml index 1a147187d2..32ca5963d2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml @@ -39,6 +39,11 @@ http: port: 10080 hostnames: - "*" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index b9bb95bdec..152b68dff4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -40,11 +40,6 @@ http: port: 10080 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml index 14bf92ba12..85f27ab434 100644 --- a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml @@ -8,6 +8,11 @@ http: hostnames: - '*' isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index cf314b3ab9..2a5dccb121 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -41,7 +41,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http1 perConnectionBufferLimitBytes: 32768 statPrefix: envoy-gateway/gateway-1/http1 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml index bfcb22e483..f56e826f62 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http1/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index 5d6a499c95..a277e74fdb 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -34,7 +34,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: policyextension-listener perConnectionBufferLimitBytes: 32768 statPrefix: from-the-policy diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml index 289d2d8680..8ef5fb4c4e 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml @@ -101,6 +101,14 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: first-listener-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml index 8aaa940169..013522d014 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener-error/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index 2f5507f75e..1914d47bc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml index 1e620fc92f..969f3b7088 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index f0d7bc1523..63cf321dec 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml index bd4f9cfe7e..2ba374c8e3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index f0d7bc1523..63cf321dec 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml index bd4f9cfe7e..2ba374c8e3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index bf9f47c74c..1f5814e8c2 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -34,7 +34,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 - address: @@ -73,6 +77,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: envoy-gateway/gateway-btls-2/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml index 1d716e5c21..03937b58f6 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: envoy-gateway/gateway-btls/http/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: envoy-gateway/gateway-btls-2/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index f0d7bc1523..63cf321dec 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml index bd4f9cfe7e..2ba374c8e3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index 54c3baf862..346ceb0855 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -37,6 +37,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml index b98593fdb9..c6e9bcc9fd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml index c3acb4088d..8101f91ddd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index b98593fdb9..c6e9bcc9fd 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -34,6 +34,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml index 0b5b4bee7b..053f35ea04 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index 25ff8c6354..2e71dec7ee 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -52,7 +52,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: envoy-gateway/gateway-1/tls-quic udpListenerConfig: downstreamSocketConfig: {} @@ -108,6 +112,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: envoy-gateway/gateway-1/tls perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml index f3e513cea4..e653a23d16 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http3 name: envoy-gateway/gateway-1/tls/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 09ec5e7aa3..7f7eca3552 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -34,7 +34,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -78,7 +82,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index ea4e715dd0..da40157f12 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -63,7 +63,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 2a412ff585..92d6ab33c1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -34,7 +34,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 socketOptions: @@ -78,7 +82,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml index ff93cfff36..7e698aa3b6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 name: first-listener/* routes: - match: @@ -17,6 +25,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml index 7f98942469..dd42add0a1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml @@ -55,6 +55,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml index 307616b16e..089594feda 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index 954f78130b..73d693a8f7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -34,7 +34,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index f7af69c28d..e4b6d308ef 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -62,7 +62,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http-quic udpListenerConfig: downstreamSocketConfig: {} @@ -171,6 +175,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml index 5ce26e0d75..16009949c4 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.foo.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 9bfdb853f3..32214d2b94 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -149,6 +149,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml index c94d2c09f7..81b7e73cd6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml index ad14b70cff..058330547e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml @@ -161,6 +161,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml index 532d7d5046..1284e00207 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index f1da38a58c..df34d8491e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -43,6 +43,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml index 479c2cd143..ce70a4ba6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index b27b32d6dc..57eff757d7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -44,6 +44,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml index 479c2cd143..ce70a4ba6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml index 472cf92202..94139b64d4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml @@ -64,6 +64,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml index 935fb21d8c..30b046f5d2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml index 472cf92202..94139b64d4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml @@ -64,6 +64,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml index 9ebf1dd631..5740077cbd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index a2eebf2fa2..0841202a42 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -59,6 +59,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index ae81457f82..95f3962e86 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -79,7 +79,11 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml index 0b5b4bee7b..053f35ea04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml index 6d4c3d9250..3d9a8e99b3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml @@ -60,6 +60,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index 6d4c3d9250..3d9a8e99b3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -60,6 +60,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index e80d5c9b17..aa34d999bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -62,6 +62,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml index ea343799ac..5a36f2271a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index 43a5a51c45..62d67da17f 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -116,6 +116,10 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml index 1e07a621d5..4f5b73b9ac 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml @@ -3,6 +3,14 @@ virtualHosts: - domains: - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: From 599687649231a41221747e3032e62a47d9c206c3 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Mon, 21 Jul 2025 09:57:14 +0000 Subject: [PATCH 12/44] release notes Signed-off-by: Huabing (Robin) Zhao --- release-notes/current.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 12155091cf..a467765e7d 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 address and port, instead of the Gateway name and section name. This change is gated by the `UseAddressAsListenerName` feature flag. This flag is disabled by default in v1.5, and it will be enabled in v1.6. # Updates addressing vulnerabilities, security flaws, or compliance requirements. security updates: | From 117a25fccbc67bb70603b63ef2df54d197996869 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 22 Jul 2025 03:08:54 +0000 Subject: [PATCH 13/44] update api Signed-off-by: Huabing (Robin) Zhao --- api/v1alpha1/envoygateway_helpers.go | 16 ++--- api/v1alpha1/envoygateway_types.go | 25 +++---- api/v1alpha1/zz_generated.deepcopy.go | 56 +++++++-------- internal/xds/translator/listener.go | 16 ++--- internal/xds/translator/runner/runner.go | 2 +- internal/xds/translator/translator.go | 15 ++-- release-notes/current.yaml | 2 +- site/content/en/latest/api/extension_types.md | 71 ++++++++++--------- .../address-as-listener-name.yaml | 2 +- .../config/helm/address-as-listener-name.yaml | 2 +- 10 files changed, 107 insertions(+), 100 deletions(-) diff --git a/api/v1alpha1/envoygateway_helpers.go b/api/v1alpha1/envoygateway_helpers.go index d52741d4fe..09232d0d6a 100644 --- a/api/v1alpha1/envoygateway_helpers.go +++ b/api/v1alpha1/envoygateway_helpers.go @@ -109,27 +109,27 @@ func (e *EnvoyGateway) GatewayNamespaceMode() bool { *e.Provider.Kubernetes.Deploy.Type == KubernetesDeployModeTypeGatewayNamespace } -// featureFlags are the default feature flags for Envoy Gateway. -var featureFlags = map[FeatureFlag]bool{ - FeatureUseAddressAsListenerName: false, +// runtimeFlags are the default runtime flags for Envoy Gateway. +var runtimeFlags = map[RuntimeFlag]bool{ + UseAddressAsListenerName: false, } -// IsFeatureEnabled checks if a feature is enabled in the EnvoyGateway configuration. -func (f *FeatureFlags) IsFeatureEnabled(feature FeatureFlag) bool { +// 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 == feature { + if disable == flag { return false } } for _, enable := range f.Enabled { - if enable == feature { + if enable == flag { return true } } } - if enabled, found := featureFlags[feature]; found { + if enabled, found := runtimeFlags[flag]; found { return enabled } return false diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index aef5d3999e..586b4f49bd 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -94,26 +94,27 @@ type EnvoyGatewaySpec struct { // +optional ExtensionAPIs *ExtensionAPISettings `json:"extensionApis,omitempty"` - // FeatureFlags defines the feature flags for Envoy Gateway. - // Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. - FeatureFlags *FeatureFlags `json:"featureFlags,omitempty"` + // RuntimeFlags defines the runtime flags for Envoy Gateway. + // Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the related features are stable. + RuntimeFlags *RuntimeFlags `json:"runtimeFlags,omitempty"` } -// FeatureFlag defines a feature flag for Envoy Gateway. -type FeatureFlag string +// 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. +type RuntimeFlag string const ( - // FeatureUseAddressAsListenerName indicates that the listener name should be derived from the address and port. - FeatureUseAddressAsListenerName FeatureFlag = "UseAddressAsListenerName" + // UseAddressAsListenerName indicates that the listener name should be derived from the address and port. + UseAddressAsListenerName RuntimeFlag = "UseAddressAsListenerName" ) -// FeatureFlags provide a mechanism to gate breaking changes or experimental features in new Envoy Gateway releases. +// RuntimeFlags provide a mechanism to guard breaking changes or risky experimental features in new Envoy Gateway releases. // Each flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource. // The names of these flags will be included in the release notes alongside an explanation of the change. -// Please note that these flags are temporary and will be removed in future releases once the features are stable. -type FeatureFlags struct { - Enabled []FeatureFlag `json:"enabled,omitempty"` - Disabled []FeatureFlag `json:"disabled,omitempty"` +// Please note that these flags are temporary and will be removed in future releases once the related features are stable. +type RuntimeFlags struct { + Enabled []RuntimeFlag `json:"enabled,omitempty"` + Disabled []RuntimeFlag `json:"disabled,omitempty"` } type KubernetesClient struct { diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 21c2979518..3aaab73fe3 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -2107,9 +2107,9 @@ func (in *EnvoyGatewaySpec) DeepCopyInto(out *EnvoyGatewaySpec) { *out = new(ExtensionAPISettings) **out = **in } - if in.FeatureFlags != nil { - in, out := &in.FeatureFlags, &out.FeatureFlags - *out = new(FeatureFlags) + if in.RuntimeFlags != nil { + in, out := &in.RuntimeFlags, &out.RuntimeFlags + *out = new(RuntimeFlags) (*in).DeepCopyInto(*out) } } @@ -2907,31 +2907,6 @@ func (in *FaultInjectionDelay) DeepCopy() *FaultInjectionDelay { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *FeatureFlags) DeepCopyInto(out *FeatureFlags) { - *out = *in - if in.Enabled != nil { - in, out := &in.Enabled, &out.Enabled - *out = make([]FeatureFlag, len(*in)) - copy(*out, *in) - } - if in.Disabled != nil { - in, out := &in.Disabled, &out.Disabled - *out = make([]FeatureFlag, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlags. -func (in *FeatureFlags) DeepCopy() *FeatureFlags { - if in == nil { - return nil - } - out := new(FeatureFlags) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FileEnvoyProxyAccessLog) DeepCopyInto(out *FileEnvoyProxyAccessLog) { *out = *in @@ -6052,6 +6027,31 @@ func (in *RouteTranslationConfig) DeepCopy() *RouteTranslationConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RuntimeFlags) DeepCopyInto(out *RuntimeFlags) { + *out = *in + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = make([]RuntimeFlag, len(*in)) + copy(*out, *in) + } + if in.Disabled != nil { + in, out := &in.Disabled, &out.Disabled + *out = make([]RuntimeFlag, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuntimeFlags. +func (in *RuntimeFlags) DeepCopy() *RuntimeFlags { + if in == nil { + return nil + } + out := new(RuntimeFlags) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SecretTranslationConfig) DeepCopyInto(out *SecretTranslationConfig) { *out = *in diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index ffad3628ae..361db67a49 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -193,7 +193,7 @@ func buildXdsTCPListener( keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, - featureFlags *egv1a1.FeatureFlags, + useAddressAsListenerName bool, ) (*listenerv3.Listener, error) { socketOptions := buildTCPSocketOptions(keepalive) al, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) @@ -203,7 +203,7 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: xdsListenerName(name, address, port, featureFlags), + Name: xdsListenerName(name, address, port, useAddressAsListenerName), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -229,8 +229,8 @@ func buildXdsTCPListener( return listener, nil } -func xdsListenerName(name, address string, port uint32, featureFlags *egv1a1.FeatureFlags) string { - if featureFlags.IsFeatureEnabled(egv1a1.FeatureUseAddressAsListenerName) { +func xdsListenerName(name, address string, port uint32, useAddressAsListenerName bool) string { + if useAddressAsListenerName { return fmt.Sprintf("%s-%d", address, port) } @@ -265,14 +265,14 @@ func buildXdsQuicListener( port uint32, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog, - featureFlags *egv1a1.FeatureFlags, + useAddressAsListenerName bool, ) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { return nil, err } xdsListener := &listenerv3.Listener{ - Name: quicXDSListenerName(xdsListenerName(name, address, port, featureFlags)), + Name: quicXDSListenerName(xdsListenerName(name, address, port, useAddressAsListenerName)), AccessLog: log, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ @@ -949,7 +949,7 @@ func buildXdsUDPListener( clusterName string, udpListener *ir.UDPListener, accesslog *ir.AccessLog, - featureFlags *egv1a1.FeatureFlags, + useAddressAsListenerName bool, ) (*listenerv3.Listener, error) { if udpListener == nil { return nil, errors.New("udp listener is nil") @@ -994,7 +994,7 @@ func buildXdsUDPListener( return nil, err } xdsListener := &listenerv3.Listener{ - Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, featureFlags), + Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, useAddressAsListenerName), 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 e7ceaebf9f..7ec3a4fe9e 100644 --- a/internal/xds/translator/runner/runner.go +++ b/internal/xds/translator/runner/runner.go @@ -69,7 +69,7 @@ func (r *Runner) subscribeAndTranslate(sub <-chan watchable.Snapshot[string, *ir t := &translator.Translator{ ControllerNamespace: r.ControllerNamespace, FilterOrder: val.FilterOrder, - FeatureFlag: r.EnvoyGateway.FeatureFlags, + FeatureFlag: r.EnvoyGateway.RuntimeFlags, Logger: r.Logger, } diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 29458974cc..3a21287618 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -66,7 +66,7 @@ type Translator struct { FilterOrder []egv1a1.FilterPosition // FeatureFlag holds the feature flags for the translator. - FeatureFlag *egv1a1.FeatureFlags + FeatureFlag *egv1a1.RuntimeFlags Logger logging.Logger } @@ -285,7 +285,8 @@ func (t *Translator) processHTTPListenerXdsTranslation( // 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, t.FeatureFlag); err != nil { + httpListener.Port, httpListener.IPFamily, accessLog, + t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -300,7 +301,8 @@ 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, t.FeatureFlag); err != nil { + httpListener.TCPKeepalive, httpListener.Connection, accessLog, + t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -721,7 +723,8 @@ func (t *Translator) processTCPListenerXdsTranslation( if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, - tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, t.FeatureFlag); err != nil { + tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, + t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -840,7 +843,9 @@ func (t *Translator) processUDPListenerXdsTranslation( } } - xdsListener, err := buildXdsUDPListener(udpListener.Route.Destination.Name, udpListener, accesslog, t.FeatureFlag) + xdsListener, err := buildXdsUDPListener( + udpListener.Route.Destination.Name, udpListener, accesslog, + t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)) if err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) diff --git a/release-notes/current.yaml b/release-notes/current.yaml index a467765e7d..648801fa76 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -4,7 +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 address and port, instead of the Gateway name and section name. This change is gated by the `UseAddressAsListenerName` feature flag. This flag is disabled by default in v1.5, and it will be enabled in v1.6. + The xDS listener name are now renamed based on its listening address and port, 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 `UseAddressAsListenerName` 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 767cdec23d..1c4f9fb7fc 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -1219,7 +1219,7 @@ EnvoyGateway is the schema for the envoygateways API. | `rateLimit` | _[RateLimit](#ratelimit)_ | false | | RateLimit defines the configuration associated with the Rate Limit service
deployed by Envoy Gateway required to implement the Global Rate limiting
functionality. The specific rate limit service used here is the reference
implementation in Envoy. For more details visit https://github.com/envoyproxy/ratelimit.
This configuration is unneeded for "Local" rate limiting. | | `extensionManager` | _[ExtensionManager](#extensionmanager)_ | false | | ExtensionManager defines an extension manager to register for the Envoy Gateway Control Plane. | | `extensionApis` | _[ExtensionAPISettings](#extensionapisettings)_ | false | | ExtensionAPIs defines the settings related to specific Gateway API Extensions
implemented by Envoy Gateway | -| `featureFlags` | _[FeatureFlags](#featureflags)_ | true | | FeatureFlags defines the feature flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. | +| `runtimeFlags` | _[RuntimeFlags](#runtimeflags)_ | true | | RuntimeFlags defines the runtime flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the related features are stable. | #### EnvoyGatewayAdmin @@ -1479,7 +1479,7 @@ _Appears in:_ | `rateLimit` | _[RateLimit](#ratelimit)_ | false | | RateLimit defines the configuration associated with the Rate Limit service
deployed by Envoy Gateway required to implement the Global Rate limiting
functionality. The specific rate limit service used here is the reference
implementation in Envoy. For more details visit https://github.com/envoyproxy/ratelimit.
This configuration is unneeded for "Local" rate limiting. | | `extensionManager` | _[ExtensionManager](#extensionmanager)_ | false | | ExtensionManager defines an extension manager to register for the Envoy Gateway Control Plane. | | `extensionApis` | _[ExtensionAPISettings](#extensionapisettings)_ | false | | ExtensionAPIs defines the settings related to specific Gateway API Extensions
implemented by Envoy Gateway | -| `featureFlags` | _[FeatureFlags](#featureflags)_ | true | | FeatureFlags defines the feature flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the features are stable. | +| `runtimeFlags` | _[RuntimeFlags](#runtimeflags)_ | true | | RuntimeFlags defines the runtime flags for Envoy Gateway.
Unlike ExtensionAPIs, these flags are temporary and will be removed in future releases once the related features are stable. | #### EnvoyGatewayTelemetry @@ -1964,39 +1964,6 @@ _Appears in:_ | `percentage` | _float_ | false | 100 | Percentage specifies the percentage of requests to be delayed. Default 100%, if set 0, no requests will be delayed. Accuracy to 0.0001%. | -#### FeatureFlag - -_Underlying type:_ _string_ - -FeatureFlag defines a feature flag for Envoy Gateway. - -_Appears in:_ -- [FeatureFlags](#featureflags) - -| Value | Description | -| ----- | ----------- | -| `UseAddressAsListenerName` | FeatureUseAddressAsListenerName indicates that the listener name should be derived from the address and port.
| - - -#### FeatureFlags - - - -FeatureFlags provide a mechanism to gate breaking changes or experimental features in new Envoy Gateway releases. -Each flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource. -The names of these flags will be included in the release notes alongside an explanation of the change. -Please note that these flags are temporary and will be removed in future releases once the features are stable. - -_Appears in:_ -- [EnvoyGateway](#envoygateway) -- [EnvoyGatewaySpec](#envoygatewayspec) - -| Field | Type | Required | Default | Description | -| --- | --- | --- | --- | --- | -| `enabled` | _[FeatureFlag](#featureflag) array_ | true | | | -| `disabled` | _[FeatureFlag](#featureflag) array_ | true | | | - - #### FileEnvoyProxyAccessLog @@ -4464,6 +4431,40 @@ _Appears in:_ | `Endpoint` | EndpointRoutingType is the RoutingType for Endpoint routing.
| +#### RuntimeFlag + +_Underlying type:_ _string_ + +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. + +_Appears in:_ +- [RuntimeFlags](#runtimeflags) + +| Value | Description | +| ----- | ----------- | +| `UseAddressAsListenerName` | UseAddressAsListenerName indicates that the listener name should be derived from the address and port.
| + + +#### RuntimeFlags + + + +RuntimeFlags provide a mechanism to guard breaking changes or risky experimental features in new Envoy Gateway releases. +Each flag may be enabled or disabled by default and can be toggled through the EnvoyGateway resource. +The names of these flags will be included in the release notes alongside an explanation of the change. +Please note that these flags are temporary and will be removed in future releases once the related features are stable. + +_Appears in:_ +- [EnvoyGateway](#envoygateway) +- [EnvoyGatewaySpec](#envoygatewayspec) + +| Field | Type | Required | Default | Description | +| --- | --- | --- | --- | --- | +| `enabled` | _[RuntimeFlag](#runtimeflag) array_ | true | | | +| `disabled` | _[RuntimeFlag](#runtimeflag) array_ | true | | | + + #### SecretTranslationConfig diff --git a/test/config/envoy-gateaway-config/address-as-listener-name.yaml b/test/config/envoy-gateaway-config/address-as-listener-name.yaml index 85fc83e2cc..4f863046c5 100644 --- a/test/config/envoy-gateaway-config/address-as-listener-name.yaml +++ b/test/config/envoy-gateaway-config/address-as-listener-name.yaml @@ -19,6 +19,6 @@ data: type: Redis redis: url: redis.redis-system.svc.cluster.local:6379 - featureFlags: + runtimeFlags: enabled: - UseAddressAsListenerName diff --git a/test/config/helm/address-as-listener-name.yaml b/test/config/helm/address-as-listener-name.yaml index 8a515ff9fa..06240f6b05 100644 --- a/test/config/helm/address-as-listener-name.yaml +++ b/test/config/helm/address-as-listener-name.yaml @@ -1,5 +1,5 @@ config: envoyGateway: - featureFlags: + runtimeFlags: enabled: - UseAddressAsListenerName From 786dae73d08e5e62d697676a3c8d2b46dbe10ad4 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 23 Jul 2025 01:30:51 +0000 Subject: [PATCH 14/44] add validation Signed-off-by: Huabing (Robin) Zhao --- api/v1alpha1/envoygateway_types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index 586b4f49bd..b849126eb2 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -101,6 +101,8 @@ 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=UseAddressAsListenerName type RuntimeFlag string const ( From 372c87c0f89bcb2ac279c245a3a9aeb5ca2c78d1 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 23 Jul 2025 07:12:35 +0000 Subject: [PATCH 15/44] add protocol prefix to listener name Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/jsonpatch.go | 3 +- internal/xds/translator/listener.go | 22 +- internal/xds/translator/runner/runner.go | 2 +- .../in/xds-ir/address-as-listener-name.yaml | 214 ++++++++++++ .../address-as-listener-name.clusters.yaml | 203 +++++++++++ .../address-as-listener-name.endpoints.yaml | 122 +++++++ .../address-as-listener-name.listeners.yaml | 318 ++++++++++++++++++ .../address-as-listener-name.routes.yaml | 70 ++++ .../address-as-listener-name.secrets.yaml | 18 + ...port-with-different-filters.listeners.yaml | 86 ++--- internal/xds/translator/translator.go | 35 +- internal/xds/translator/translator_test.go | 9 +- .../e2e/testdata/envoy-patch-policy-ipv4.yaml | 2 +- 13 files changed, 1026 insertions(+), 78 deletions(-) create mode 100644 internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.clusters.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.endpoints.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml diff --git a/internal/xds/translator/jsonpatch.go b/internal/xds/translator/jsonpatch.go index 06e9119c25..c8b2a7141a 100644 --- a/internal/xds/translator/jsonpatch.go +++ b/internal/xds/translator/jsonpatch.go @@ -11,7 +11,6 @@ import ( "strings" clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" - corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" @@ -159,7 +158,7 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []* // Find the resource to patch and convert it to JSON switch p.Type { case resourcev3.ListenerType: - if listener = findXdsListener(tCtx, p.Name, corev3.SocketAddress_TCP); listener == nil { + if listener = findXdsListener(tCtx, p.Name); listener == nil { tn := typedName{p.Type, p.Name} notFoundResources = append(notFoundResources, tn.String()) continue diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 361db67a49..06c0f5320b 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -203,7 +203,7 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: xdsListenerName(name, address, port, useAddressAsListenerName), + Name: xdsListenerName(name, address, port, ir.TCPProtocolType, useAddressAsListenerName), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -229,18 +229,18 @@ func buildXdsTCPListener( return listener, nil } -func xdsListenerName(name, address string, port uint32, useAddressAsListenerName bool) string { +func xdsListenerName(name, address string, port uint32, protocol ir.ProtocolType, useAddressAsListenerName bool) string { if useAddressAsListenerName { - return fmt.Sprintf("%s-%d", address, port) + protocolType := "tcp" + if protocol == ir.UDPProtocolType { + protocolType = "udp" + } + return fmt.Sprintf("%s-%s-%d", protocolType, address, port) } return name } -func quicXDSListenerName(tcpListenerName string) string { - return fmt.Sprintf("%s-quic", tcpListenerName) -} - func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value { if connection != nil && connection.BufferLimitBytes != nil { return wrapperspb.UInt32(*connection.BufferLimitBytes) @@ -271,8 +271,12 @@ func buildXdsQuicListener( if err != nil { return nil, err } + listenerName := name + "-quic" + if useAddressAsListenerName { + listenerName = xdsListenerName(name, address, port, ir.UDPProtocolType, true) + } xdsListener := &listenerv3.Listener{ - Name: quicXDSListenerName(xdsListenerName(name, address, port, useAddressAsListenerName)), + Name: listenerName, AccessLog: log, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ @@ -994,7 +998,7 @@ func buildXdsUDPListener( return nil, err } xdsListener := &listenerv3.Listener{ - Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, useAddressAsListenerName), + Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, ir.UDPProtocolType, useAddressAsListenerName), 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 b2b4820804..c3e33c1969 100644 --- a/internal/xds/translator/runner/runner.go +++ b/internal/xds/translator/runner/runner.go @@ -71,7 +71,7 @@ func (r *Runner) subscribeAndTranslate(sub <-chan watchable.Snapshot[string, *ir t := &translator.Translator{ ControllerNamespace: r.ControllerNamespace, FilterOrder: val.FilterOrder, - FeatureFlag: r.EnvoyGateway.RuntimeFlags, + RuntimeFlags: r.EnvoyGateway.RuntimeFlags, Logger: r.Logger, } diff --git a/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml new file mode 100644 index 0000000000..b9a890b1bb --- /dev/null +++ b/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml @@ -0,0 +1,214 @@ +http: +- name: "envoy-gateway/gateway-1/http" + address: 0.0.0.0 + port: 10080 + hostnames: + - "foo.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + 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: "*" + 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/http-ipv6" + address: "::" + port: 10080 + hostnames: + - "foo.net" + path: + mergeSlashes: true + escapedSlashesAction: UnescapeAndRedirect + tls: + alpnProtocols: + - h2 + - http/1.1 + certificates: + - name: second-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: "*" + 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/https-http3 + address: 0.0.0.0 + hostnames: + - '*' + http3: + quicPort: 443 + isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https + path: + escapedSlashesAction: UnescapeAndRedirect + mergeSlashes: true + port: 10443 + 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 + metadata: + kind: HTTPRoute + name: httproute-1 + namespace: default + 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 + 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: + metadata: + kind: TLSRoute + name: tlsroute-2 + namespace: default + 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 + 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 + 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/address-as-listener-name.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.clusters.yaml new file mode 100644 index 0000000000..61aad0cfc5 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.clusters.yaml @@ -0,0 +1,203 @@ +- 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: {} + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: TLSRoute + name: tlsroute-2 + namespace: default + 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/address-as-listener-name.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.endpoints.yaml new file mode 100644 index 0000000000..1cf72f0db4 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.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/address-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml new file mode 100644 index 0000000000..e7cb10f1fd --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml @@ -0,0 +1,318 @@ +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10080 + 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/http + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10080 + useRemoteAddress: true + name: envoy-gateway/gateway-1/http + 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 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: tcp-0.0.0.0-10080 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: '::' + portValue: 10080 + filterChains: + - filterChainMatch: + serverNames: + - foo.net + 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/http-ipv6 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10080 + useRemoteAddress: true + name: envoy-gateway/gateway-1/http-ipv6 + 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: second-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 + metadata: + filterMetadata: + envoy-gateway: + resources: [] + name: tcp-::-10080 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10443 + 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-1/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/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 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https + name: udp-0.0.0.0-10443 + udpListenerConfig: + downstreamSocketConfig: {} + quicOptions: {} +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10443 + 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-1/https-http3 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10443 + useRemoteAddress: true + name: envoy-gateway/gateway-1/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 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https + name: tcp-0.0.0.0-10443 + 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-0.0.0.0-10090 + 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-0.0.0.0-10091 + 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-0.0.0.0-10090 diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml new file mode 100644 index 0000000000..54b84ecd65 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml @@ -0,0 +1,70 @@ +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http + virtualHosts: + - domains: + - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http/* + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http-ipv6 + virtualHosts: + - domains: + - '*' + name: envoy-gateway/gateway-1/http-ipv6/* + routes: + - match: + prefix: / + name: second-route + route: + cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https-http3 + virtualHosts: + - domains: + - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https + name: envoy-gateway/gateway-1/https-http3/* + routes: + - match: + prefix: / + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0/match/0/* + responseHeadersToAdd: + - append: true + header: + key: alt-svc + value: h3=":443"; ma=86400 + route: + cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml new file mode 100644 index 0000000000..9c04d11e7a --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml @@ -0,0 +1,18 @@ +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= +- name: second-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/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index e4b6d308ef..920688ca94 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -42,6 +42,49 @@ '@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth users: inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= + - disabled: true + name: envoy.filters.http.oauth2/securitypolicy/default/policy-for-gateway-2 + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.oauth2.v3.OAuth2 + config: + authScopes: + - openid + - email + - profile + authType: BASIC_AUTH + authorizationEndpoint: https://oauth.foo.com/oauth2/v2/auth + credentials: + clientId: client.oauth.foo.com + cookieNames: + bearerToken: AccessToken-5F93C2E4 + idToken: IdToken-5F93C2E4 + oauthExpires: OauthExpires-5F93C2E4 + oauthHmac: OauthHMAC-5F93C2E4 + oauthNonce: OauthNonce-5F93C2E4 + refreshToken: RefreshToken-5F93C2E4 + hmacSecret: + name: oauth2/hmac_secret/securitypolicy/default/policy-for-gateway-2 + sdsConfig: + ads: {} + resourceApiVersion: V3 + tokenSecret: + name: oauth2/client_secret/securitypolicy/default/policy-for-gateway-2 + sdsConfig: + ads: {} + resourceApiVersion: V3 + preserveAuthorizationHeader: true + redirectPathMatcher: + path: + exact: /foo/oauth2/callback + redirectUri: https://www.example.com/foo/oauth2/callback + signoutPath: + path: + exact: /foo/logout + tokenEndpoint: + cluster: oauth_foo_com_443 + timeout: 10s + uri: https://oauth.foo.com/token + useRefreshToken: false - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -112,49 +155,6 @@ '@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth users: inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= - - disabled: true - name: envoy.filters.http.oauth2/securitypolicy/default/policy-for-gateway-2 - typedConfig: - '@type': type.googleapis.com/envoy.extensions.filters.http.oauth2.v3.OAuth2 - config: - authScopes: - - openid - - email - - profile - authType: BASIC_AUTH - authorizationEndpoint: https://oauth.foo.com/oauth2/v2/auth - credentials: - clientId: client.oauth.foo.com - cookieNames: - bearerToken: AccessToken-5F93C2E4 - idToken: IdToken-5F93C2E4 - oauthExpires: OauthExpires-5F93C2E4 - oauthHmac: OauthHMAC-5F93C2E4 - oauthNonce: OauthNonce-5F93C2E4 - refreshToken: RefreshToken-5F93C2E4 - hmacSecret: - name: oauth2/hmac_secret/securitypolicy/default/policy-for-gateway-2 - sdsConfig: - ads: {} - resourceApiVersion: V3 - tokenSecret: - name: oauth2/client_secret/securitypolicy/default/policy-for-gateway-2 - sdsConfig: - ads: {} - resourceApiVersion: V3 - preserveAuthorizationHeader: true - redirectPathMatcher: - path: - exact: /foo/oauth2/callback - redirectUri: https://www.example.com/foo/oauth2/callback - signoutPath: - path: - exact: /foo/logout - tokenEndpoint: - cluster: oauth_foo_com_443 - timeout: 10s - uri: https://oauth.foo.com/token - useRefreshToken: false - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 3a21287618..3a2b2374cb 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -65,8 +65,8 @@ type Translator struct { // FilterOrder holds the custom order of the HTTP filters FilterOrder []egv1a1.FilterPosition - // FeatureFlag holds the feature flags for the translator. - FeatureFlag *egv1a1.RuntimeFlags + // RuntimeFlag holds the feature flags for the translator. + RuntimeFlags *egv1a1.RuntimeFlags Logger logging.Logger } @@ -275,7 +275,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( ) // Search for an existing TCP listener on the same address + port combination. - tcpXDSListener = findXdsListenerByHostPort(tCtx, httpListener.Address, httpListener.Port, corev3.SocketAddress_TCP) + tcpXDSListener = findXdsListenerByHostPort(tCtx, httpListener.Address, httpListener.Port) xdsListenerOnSameAddressPortExists = tcpXDSListener != nil tlsEnabled = httpListener.TLS != nil @@ -286,7 +286,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( if http3Enabled { if quicXDSListener, err = buildXdsQuicListener(httpListener.Name, httpListener.Address, httpListener.Port, httpListener.IPFamily, accessLog, - t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -302,7 +302,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( if tcpXDSListener, err = buildXdsTCPListener( httpListener.Name, httpListener.Address, httpListener.Port, httpListener.IPFamily, httpListener.TCPKeepalive, httpListener.Connection, accessLog, - t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -457,14 +457,10 @@ func (t *Translator) processHTTPListenerXdsTranslation( // Add the owner Gateway Listeners to the xDS listeners' metadata. for listenerName, ownerGatewayListeners := range ownerGatewayListeners { - xdsListener := findXdsListener(tCtx, listenerName, corev3.SocketAddress_TCP) + xdsListener := findXdsListener(tCtx, listenerName) if xdsListener != nil { xdsListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) } - quicXDSListener := findXdsListener(tCtx, quicXDSListenerName(listenerName), corev3.SocketAddress_UDP) - if quicXDSListener != nil { - quicXDSListener.Metadata = buildXdsMetadataFromMultiple(ownerGatewayListeners.UnsortedList()) - } } return errs } @@ -719,12 +715,12 @@ func (t *Translator) processTCPListenerXdsTranslation( 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) + xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port) if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, - t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -845,7 +841,7 @@ func (t *Translator) processUDPListenerXdsTranslation( xdsListener, err := buildXdsUDPListener( udpListener.Route.Destination.Name, udpListener, accesslog, - t.FeatureFlag.IsEnabled(egv1a1.UseAddressAsListenerName)) + t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)) if err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) @@ -860,10 +856,8 @@ func (t *Translator) processUDPListenerXdsTranslation( return errs } -// findXdsListenerByHostPort finds a xds listener with the same address, port and protocol, and returns nil if there is no match. -func findXdsListenerByHostPort(tCtx *types.ResourceVersionTable, address string, port uint32, - protocol corev3.SocketAddress_Protocol, -) *listenerv3.Listener { +// findXdsListenerByHostPort finds a xds listener with the same address and port, and returns nil if there is no match. +func findXdsListenerByHostPort(tCtx *types.ResourceVersionTable, address string, port uint32) *listenerv3.Listener { if tCtx == nil || tCtx.XdsResources == nil || tCtx.XdsResources[resourcev3.ListenerType] == nil { return nil } @@ -871,8 +865,7 @@ func findXdsListenerByHostPort(tCtx *types.ResourceVersionTable, address string, for _, r := range tCtx.XdsResources[resourcev3.ListenerType] { listener := r.(*listenerv3.Listener) addr := listener.GetAddress() - if addr.GetSocketAddress().GetPortValue() == port && addr.GetSocketAddress().Address == address && addr. - GetSocketAddress().Protocol == protocol { + if addr.GetSocketAddress().GetPortValue() == port && addr.GetSocketAddress().Address == address { return listener } } @@ -881,14 +874,14 @@ func findXdsListenerByHostPort(tCtx *types.ResourceVersionTable, address string, } // findXdsListener finds a xds listener with the same name and returns nil if there is no match. -func findXdsListener(tCtx *types.ResourceVersionTable, name string, protocol corev3.SocketAddress_Protocol) *listenerv3.Listener { +func findXdsListener(tCtx *types.ResourceVersionTable, name string) *listenerv3.Listener { if tCtx == nil || tCtx.XdsResources == nil || tCtx.XdsResources[resourcev3.ListenerType] == nil { return nil } for _, r := range tCtx.XdsResources[resourcev3.ListenerType] { listener := r.(*listenerv3.Listener) - if listener.Name == name && listener.GetAddress().GetSocketAddress().Protocol == protocol { + if listener.Name == name { return listener } } diff --git a/internal/xds/translator/translator_test.go b/internal/xds/translator/translator_test.go index 130fb086fd..7b001647de 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", }, + "address-as-listener-name": { + runtimeFlags: &egv1a1.RuntimeFlags{ + Enabled: []egv1a1.RuntimeFlag{egv1a1.UseAddressAsListenerName}, + }, + }, } 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/test/e2e/testdata/envoy-patch-policy-ipv4.yaml b/test/e2e/testdata/envoy-patch-policy-ipv4.yaml index c8a4319e34..ca5e2f6672 100644 --- a/test/e2e/testdata/envoy-patch-policy-ipv4.yaml +++ b/test/e2e/testdata/envoy-patch-policy-ipv4.yaml @@ -29,7 +29,7 @@ spec: type: JSONPatch jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "0.0.0.0-10080" + name: "tcp-0.0.0.0-10080" operation: op: add path: "/default_filter_chain/filters/0/typed_config/local_reply_config" From dbc25f57ebc0f755caf351549ab9a0d119f6b0a9 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 25 Jul 2025 03:28:04 +0000 Subject: [PATCH 16/44] rename listener using protocol and port Signed-off-by: Huabing (Robin) Zhao --- api/v1alpha1/envoygateway_helpers.go | 2 +- api/v1alpha1/envoygateway_types.go | 6 +- internal/gatewayapi/listener.go | 27 ++++---- .../testdata/accesslog-als-backend.out.yaml | 1 + .../testdata/accesslog-als-grpc.out.yaml | 1 + .../gatewayapi/testdata/accesslog.out.yaml | 1 + .../backend-invalid-feature-disabled.out.yaml | 1 + .../backend-with-endpoint-zones.out.yaml | 1 + .../testdata/backend-with-fallback.out.yaml | 1 + .../testdata/backend-with-hostname.out.yaml | 1 + .../backend-with-skip-tls-verify.out.yaml | 1 + .../backendtlspolicy-across-ns.out.yaml | 1 + ...ndtlspolicy-ca-clustertrustbundle.out.yaml | 1 + .../backendtlspolicy-ca-only-secret.out.yaml | 1 + .../backendtlspolicy-ca-only.out.yaml | 1 + ...ndtlspolicy-default-ns-targetrefs.out.yaml | 2 + .../backendtlspolicy-default-ns.out.yaml | 1 + .../backendtlspolicy-invalid-ca.out.yaml | 1 + ...backendtlspolicy-multiple-targets.out.yaml | 1 + ...endtlspolicy-serviceimport-target.out.yaml | 1 + ...olicy-status-conditions-truncated.out.yaml | 18 ++++++ .../backendtlspolicy-subjectaltnames.out.yaml | 1 + ...ackendtlspolicy-system-truststore.out.yaml | 1 + ...y-buffer-limit-out-of-range-error.out.yaml | 2 + ...y-buffer-limit-with-invalid-value.out.yaml | 2 + ...backendtrafficpolicy-buffer-limit.out.yaml | 2 + .../backendtrafficpolicy-compression.out.yaml | 1 + ...ackendtrafficpolicy-connect-proxy.out.yaml | 1 + ...ndtrafficpolicy-connect-terminate.out.yaml | 1 + ...ndtrafficpolicy-dns-lookup-family.out.yaml | 1 + ...ndtrafficpolicy-http-upgrade-spdy.out.yaml | 1 + ...fficpolicy-http-upgrade-websocket.out.yaml | 1 + ...endtrafficpolicy-override-replace.out.yaml | 1 + ...ckendtrafficpolicy-request-buffer.out.yaml | 2 + ...olicy-status-conditions-truncated.out.yaml | 18 ++++++ ...ndtrafficpolicy-status-conditions.out.yaml | 4 ++ ...fficpolicy-status-fault-injection.out.yaml | 2 + ...-strategic-merge-global-ratelimit.out.yaml | 2 + ...y-strategic-merge-local-ratelimit.out.yaml | 2 + ...policy-strategic-merge-only-gw-rl.out.yaml | 2 + ...strategic-merge-only-httproute-rl.out.yaml | 2 + ...trategic-merge-with-multi-parents.out.yaml | 2 + ...kendtrafficpolicy-strategic-merge.out.yaml | 1 + .../backendtrafficpolicy-tracing.out.yaml | 1 + ...trafficpolicy-use-client-protocol.out.yaml | 1 + ...policy-with-circuitbreakers-error.out.yaml | 2 + ...rafficpolicy-with-circuitbreakers.out.yaml | 2 + ...ndtrafficpolicy-with-dns-settings.out.yaml | 2 + ...endtrafficpolicy-with-healthcheck.out.yaml | 2 + .../backendtrafficpolicy-with-http2.out.yaml | 2 + ...fficpolicy-with-httproute-timeout.out.yaml | 1 + ...nvalid-consistent-hash-table-size.out.yaml | 1 + ...ndtrafficpolicy-with-loadbalancer.out.yaml | 2 + ...telimit-default-route-level-limit.out.yaml | 1 + ...cal-ratelimit-distinct-match-type.out.yaml | 1 + ...ocal-ratelimit-invalid-limit-unit.out.yaml | 1 + ...valid-multiple-route-level-limits.out.yaml | 1 + ...rafficpolicy-with-local-ratelimit.out.yaml | 1 + ...rafficpolicy-with-panic-threshold.out.yaml | 2 + ...dtrafficpolicy-with-proxyprotocol.out.yaml | 2 + ...ratelimit-invalid-distinct-invert.out.yaml | 1 + ...licy-with-ratelimit-invalid-regex.out.yaml | 1 + ...ckendtrafficpolicy-with-ratelimit.out.yaml | 2 + ...esponse-override-invalid-valueref.out.yaml | 2 + ...fficpolicy-with-response-override.out.yaml | 2 + ...backendtrafficpolicy-with-retries.out.yaml | 2 + ...olicy-with-same-prefix-httproutes.out.yaml | 1 + ...afficpolicy-with-shared-ratelimit.out.yaml | 2 + ...cp-udp-listeners-apply-on-gateway.out.yaml | 2 + ...-tcp-udp-listeners-apply-on-route.out.yaml | 2 + ...ndtrafficpolicy-with-tcpkeepalive.out.yaml | 2 + ...dtrafficpolicy-with-timeout-error.out.yaml | 1 + ...ficpolicy-with-timeout-targetrefs.out.yaml | 2 + ...backendtrafficpolicy-with-timeout.out.yaml | 2 + ...cy-buffer-limit-with-format-error.out.yaml | 2 + ...fer-limit-with-out-of-range-error.out.yaml | 2 + .../clienttrafficpolicy-buffer-limit.out.yaml | 2 + ...trafficpolicy-client-ip-detection.out.yaml | 4 ++ ...fficpolicy-connection-limit-error.out.yaml | 2 + ...enttrafficpolicy-connection-limit.out.yaml | 2 + ...nttrafficpolicy-for-tcp-listeners.out.yaml | 2 + ...clienttrafficpolicy-headers-error.out.yaml | 1 + .../clienttrafficpolicy-headers.out.yaml | 2 + ...nttrafficpolicy-http-health-check.out.yaml | 1 + .../clienttrafficpolicy-http10.out.yaml | 5 ++ .../clienttrafficpolicy-http2.out.yaml | 2 + .../clienttrafficpolicy-http3.out.yaml | 1 + ...ficpolicy-idle-timeout-with-error.out.yaml | 1 + .../clienttrafficpolicy-idle-timeout.out.yaml | 2 + ...enttrafficpolicy-invalid-settings.out.yaml | 12 ++++ ...icpolicy-mtls-client-verification.out.yaml | 5 ++ ...ficpolicy-mtls-clustertrustbundle.out.yaml | 6 ++ ...s-forward-client-cert-custom-data.out.yaml | 6 ++ ...icpolicy-mtls-forward-client-cert.out.yaml | 6 ++ .../clienttrafficpolicy-mtls.out.yaml | 3 + ...clienttrafficpolicy-path-settings.out.yaml | 2 + ...cy-preserve-case-multiple-targets.out.yaml | 3 + ...clienttrafficpolicy-preserve-case.out.yaml | 2 + ...clienttrafficpolicy-proxyprotocol.out.yaml | 2 + ...enttrafficpolicy-ratelimitheaders.out.yaml | 2 + ...olicy-status-conditions-truncated.out.yaml | 18 ++++++ ...nttrafficpolicy-status-conditions.out.yaml | 5 ++ ...trafficpolicy-stream-idle-timeout.out.yaml | 2 + ...clienttrafficpolicy-tcp-keepalive.out.yaml | 2 + ...ttrafficpolicy-timeout-with-error.out.yaml | 1 + .../clienttrafficpolicy-timeout.out.yaml | 2 + .../clienttrafficpolicy-tls-settings.out.yaml | 4 ++ .../clienttrafficpolicy-trailers.out.yaml | 2 + .../testdata/conflicting-policies.out.yaml | 2 + .../testdata/custom-filter-order.out.yaml | 1 + .../testdata/disable-accesslog.out.yaml | 1 + ...ensionpolicy-invalid-cross-ns-ref.out.yaml | 1 + ...yextensionpolicy-override-replace.out.yaml | 1 + ...olicy-status-conditions-truncated.out.yaml | 18 ++++++ ...extensionpolicy-status-conditions.out.yaml | 4 ++ ...-extproc-invalid-no-matching-port.out.yaml | 1 + ...licy-with-extproc-invalid-no-port.out.yaml | 1 + ...xtproc-invalid-no-reference-grant.out.yaml | 1 + ...y-with-extproc-invalid-no-service.out.yaml | 1 + ...ith-extproc-with-backendtlspolicy.out.yaml | 1 + ...th-extproc-with-mixed-backendrefs.out.yaml | 1 + ...extproc-with-multiple-backendrefs.out.yaml | 1 + ...ith-extproc-with-traffic-features.out.yaml | 1 + ...h-invalid-lua-validation-disabled.out.yaml | 1 + ...ith-invalid-lua-validation-syntax.out.yaml | 1 + ...yextensionpolicy-with-invalid-lua.out.yaml | 1 + ...xtensionpolicy-with-lua-configmap.out.yaml | 1 + .../envoyextensionpolicy-with-lua.out.yaml | 1 + ...xtensionpolicy-with-wasm-env-vars.out.yaml | 1 + ...y-with-wasm-invalid-configuration.out.yaml | 3 + ...ensionpolicy-with-wasm-targetrefs.out.yaml | 1 + .../envoyextensionpolicy-with-wasm.out.yaml | 1 + .../envoypatchpolicy-cross-ns-target.out.yaml | 1 + ...chpolicy-invalid-feature-disabled.out.yaml | 1 + ...nvalid-target-kind-merge-gateways.out.yaml | 1 + ...oypatchpolicy-invalid-target-kind.out.yaml | 1 + ...ypatchpolicy-valid-merge-gateways.out.yaml | 1 + .../testdata/envoypatchpolicy-valid.out.yaml | 1 + .../envoyproxy-accesslog-als-json.out.yaml | 1 + ...oyproxy-accesslog-backend-invalid.out.yaml | 1 + .../envoyproxy-accesslog-backend.out.yaml | 1 + ...yproxy-accesslog-cel-with-invalid.out.yaml | 1 + .../envoyproxy-accesslog-cel.out.yaml | 1 + ...oxy-accesslog-file-json-no-format.out.yaml | 1 + .../envoyproxy-accesslog-file-json.out.yaml | 1 + .../envoyproxy-accesslog-types.out.yaml | 1 + ...voyproxy-accesslog-with-bad-sinks.out.yaml | 1 + ...envoyproxy-accesslog-with-traffic.out.yaml | 1 + ...voyproxy-accesslog-without-format.out.yaml | 1 + .../testdata/envoyproxy-accesslog.out.yaml | 1 + ...roxy-endpoint-routing-for-gateway.out.yaml | 1 + .../envoyproxy-endpoint-routing.out.yaml | 1 + ...envoyproxy-metric-backend-invalid.out.yaml | 1 + .../envoyproxy-metric-backend.out.yaml | 1 + ...envoyproxy-metric-enabled-backend.out.yaml | 1 + .../envoyproxy-preserve-route-order.out.yaml | 1 + .../envoyproxy-priority-backend.out.yaml | 1 + ...proxy-service-routing-for-gateway.out.yaml | 1 + .../envoyproxy-service-routing.out.yaml | 1 + ...nvoyproxy-tls-settings-invalid-ns.out.yaml | 2 + .../envoyproxy-tls-settings-invalid.out.yaml | 2 + .../testdata/envoyproxy-tls-settings.out.yaml | 2 + ...nvoyproxy-tracing-backend-invalid.out.yaml | 1 + .../envoyproxy-tracing-backend-uds.out.yaml | 1 + .../envoyproxy-tracing-backend.out.yaml | 1 + .../testdata/envoyproxy-valid.out.yaml | 1 + .../envoyproxy-with-statname.out.yaml | 1 + .../extensionpolicy-tcp-listener.out.yaml | 2 + .../extensionpolicy-udp-listener.out.yaml | 2 + ...tensionpolicy-with-invalid-target.out.yaml | 2 + ...ionpolicy-with-valid-target-array.out.yaml | 2 + ...extensionpolicy-with-valid-target.out.yaml | 2 + ...custom-backend-invalid-apiversion.out.yaml | 1 + ...with-custom-backend-invalid-group.out.yaml | 1 + ...route-with-custom-backend-invalid.out.yaml | 1 + ...ith-custom-backend-mixed-multiple.out.yaml | 1 + ...tproute-with-custom-backend-mixed.out.yaml | 1 + ...oute-with-custom-backend-multiple.out.yaml | 1 + .../httproute-with-custom-backend.out.yaml | 1 + ...ith-non-matching-extension-filter.out.yaml | 1 + ...with-unsupported-extension-filter.out.yaml | 1 + ...route-with-valid-extension-filter.out.yaml | 1 + ...-namespace-with-allowed-httproute.out.yaml | 1 + ...mespace-with-disallowed-httproute.out.yaml | 1 + ...stener-with-hostname-intersection.out.yaml | 2 + .../testdata/gateway-infrastructure.out.yaml | 1 + ...ay-namespace-mode-infra-httproute.out.yaml | 3 + ...way-with-addresses-with-ipaddress.out.yaml | 1 + ...with-infrastructure-parametersref.out.yaml | 1 + ...ture-parametersref-does-not-exist.out.yaml | 1 + ...astructure-parametersref-fallback.out.yaml | 1 + ...route-with-mismatch-port-protocol.out.yaml | 1 + ...h-tcproute-with-multiple-backends.out.yaml | 1 + ...with-tcproute-with-multiple-rules.out.yaml | 1 + ...her-namespace-allowed-by-refgrant.out.yaml | 1 + ...ith-tls-terminate-and-passthrough.out.yaml | 2 + ...route-with-mismatch-port-protocol.out.yaml | 1 + ...h-udproute-with-multiple-backends.out.yaml | 1 + ...with-udproute-with-multiple-rules.out.yaml | 1 + ...-listener-with-unmatched-tcproute.out.yaml | 1 + ...-listener-with-unmatched-udproute.out.yaml | 1 + ...ith-same-algorithm-different-fqdn.out.yaml | 1 + ...-valid-multiple-tls-configuration.out.yaml | 1 + ...ener-with-valid-tls-configuration.out.yaml | 1 + ...-listeners-with-overlapping-certs.out.yaml | 3 + ...stnames-and-certs-merged-gateways.out.yaml | 2 + ...h-overlapping-hostnames-and-certs.out.yaml | 2 + ...lapping-hostnames-merged-gateways.out.yaml | 3 + ...teners-with-overlapping-hostnames.out.yaml | 3 + ...with-preexisting-status-condition.out.yaml | 1 + ...-listener-with-multiple-tcproutes.out.yaml | 1 + ...-listener-with-multiple-udproutes.out.yaml | 1 + ...teway-with-stale-status-condition.out.yaml | 1 + ...listeners-on-same-tcp-or-tls-port.out.yaml | 1 + ...th-two-listeners-on-same-udp-port.out.yaml | 1 + ...isteners-with-multiple-httproutes.out.yaml | 2 + ...-with-same-port-http-tcp-protocol.out.yaml | 2 + ...-with-same-port-http-udp-protocol.out.yaml | 2 + ...s-with-tcproutes-with-sectionname.out.yaml | 2 + ...ith-tcproutes-without-sectionname.out.yaml | 2 + ...s-with-udproutes-with-sectionname.out.yaml | 2 + ...ith-udproutes-without-sectionname.out.yaml | 2 + .../testdata/grpcroute-with-backend.out.yaml | 1 + .../grpcroute-with-empty-backends.out.yaml | 1 + .../grpcroute-with-header-match.out.yaml | 1 + ...ute-with-method-and-service-match.out.yaml | 1 + .../grpcroute-with-method-match.out.yaml | 1 + ...oute-with-request-header-modifier.out.yaml | 1 + .../grpcroute-with-service-match.out.yaml | 1 + ...dtrafficpolicy-with-timeout-error.out.yaml | 1 + ...backendtrafficpolicy-with-timeout.out.yaml | 2 + ...way-with-more-different-listeners.out.yaml | 8 +++ ...ng-to-gateway-with-more-listeners.out.yaml | 8 +++ ...wo-listeners-with-different-ports.out.yaml | 2 + ...ing-to-gateway-with-two-listeners.out.yaml | 2 + .../httproute-attaching-to-gateway.out.yaml | 1 + ...taching-to-listener-matching-port.out.yaml | 1 + ...ner-on-gateway-with-two-listeners.out.yaml | 2 + ...with-backend-and-core-backendrefs.out.yaml | 1 + ...end-backendref-mixed-address-type.out.yaml | 1 + ...-listener-with-backend-backendref.out.yaml | 1 + ...end-backendrefs-diff-address-type.out.yaml | 1 + ...end-backendrefs-same-address-type.out.yaml | 1 + ...ort-backendrefs-diff-address-type.out.yaml | 1 + ...ort-backendrefs-same-address-type.out.yaml | 1 + ...port-backendref-fqdn-address-type.out.yaml | 1 + ...ort-backendref-mixed-address-type.out.yaml | 1 + ...ner-with-serviceimport-backendref.out.yaml | 1 + .../httproute-attaching-to-listener.out.yaml | 1 + ...httproute-backend-request-timeout.out.yaml | 1 + ...r-by-creation-date-and-route-name.out.yaml | 1 + ...c-resolver-with-mutliple-backends.out.yaml | 1 + .../httproute-dynamic-resolver.out.yaml | 1 + ...ing-to-listener-non-matching-port.out.yaml | 1 + .../httproute-order-by-creation-date.out.yaml | 1 + .../httproute-request-timeout.out.yaml | 1 + .../testdata/httproute-retry.out.yaml | 2 + ...ith-empty-backends-and-no-filters.out.yaml | 1 + ...-multiple-backends-and-no-weights.out.yaml | 1 + ...ith-multiple-backends-and-weights.out.yaml | 1 + ...ervice-backends-and-app-protocols.out.yaml | 1 + ...-non-service-backends-and-weights.out.yaml | 1 + ...h-api-key-auth-duplicated-api-key.out.yaml | 1 + ...h-backendref-add-multiple-filters.out.yaml | 1 + ...her-namespace-allowed-by-refgrant.out.yaml | 1 + ...her-namespace-allowed-by-refgrant.out.yaml | 1 + .../httproute-with-cors-filter.out.yaml | 1 + ...tproute-with-credential-injection.out.yaml | 1 + .../httproute-with-direct-response.out.yaml | 1 + .../httproute-with-empty-matches.out.yaml | 1 + ...proute-with-enable-zone-discovery.out.yaml | 1 + ...er-duplicate-add-multiple-filters.out.yaml | 1 + ...with-header-filter-duplicate-adds.out.yaml | 1 + ...duplicate-remove-multiple-filters.out.yaml | 1 + ...h-header-filter-duplicate-removes.out.yaml | 1 + ...header-filter-empty-header-values.out.yaml | 1 + ...-with-header-filter-empty-headers.out.yaml | 1 + ...ader-filter-invalid-header-values.out.yaml | 1 + ...ith-header-filter-invalid-headers.out.yaml | 1 + ...ute-with-header-filter-no-headers.out.yaml | 1 + ...th-header-filter-no-valid-headers.out.yaml | 1 + ...tproute-with-header-filter-remove.out.yaml | 1 + ...ute-with-header-match-diff-number.out.yaml | 1 + ...route-with-header-match-diff-type.out.yaml | 1 + ...headless-service-endpoint-routing.out.yaml | 1 + ...-headless-service-service-routing.out.yaml | 1 + ...with-invalid-backend-ref-bad-port.out.yaml | 1 + ...invalid-backend-ref-invalid-group.out.yaml | 1 + ...-invalid-backend-ref-invalid-kind.out.yaml | 1 + ...id-backend-ref-invalid-mixed-kind.out.yaml | 1 + ...-with-invalid-backend-ref-no-port.out.yaml | 1 + ...lid-backend-ref-no-service.import.out.yaml | 1 + ...th-invalid-backend-ref-no-service.out.yaml | 1 + ...id-backend-ref-unsupported-filter.out.yaml | 1 + ...lid-backendref-in-other-namespace.out.yaml | 1 + .../httproute-with-invalid-regex.out.yaml | 2 + .../testdata/httproute-with-metadata.out.yaml | 1 + ...ute-with-mirror-filter-duplicates.out.yaml | 1 + ...route-with-mirror-filter-multiple.out.yaml | 1 + ...irror-filter-percentage-mirroring.out.yaml | 1 + ...ith-mirror-filter-service-no-port.out.yaml | 1 + ...h-mirror-filter-service-not-found.out.yaml | 1 + .../httproute-with-mirror-filter.out.yaml | 1 + ...oute-with-multi-gateways-notmatch.out.yaml | 2 + ...ith-multi-gateways-with-same-name.out.yaml | 2 + ...ltiple-gateways-from-different-ns.out.yaml | 2 + ...th-multiple-gateways-from-same-ns.out.yaml | 2 + ...route-with-multiple-invalid-rules.out.yaml | 1 + ...to-gateway-with-wildcard-hostname.out.yaml | 1 + ...oute-with-query-match-diff-number.out.yaml | 1 + ...proute-with-query-match-diff-type.out.yaml | 1 + ...ct-filter-full-path-replace-https.out.yaml | 1 + ...ute-with-redirect-filter-hostname.out.yaml | 1 + ...direct-filter-invalid-filter-type.out.yaml | 1 + ...th-redirect-filter-invalid-scheme.out.yaml | 1 + ...th-redirect-filter-invalid-status.out.yaml | 1 + ...ter-prefix-replace-with-port-http.out.yaml | 1 + ...-with-response-header-filter-adds.out.yaml | 1 + ...er-duplicate-add-multiple-filters.out.yaml | 1 + ...onse-header-filter-duplicate-adds.out.yaml | 1 + ...duplicate-remove-multiple-filters.out.yaml | 1 + ...e-header-filter-duplicate-removes.out.yaml | 1 + ...header-filter-empty-header-values.out.yaml | 1 + ...ponse-header-filter-empty-headers.out.yaml | 1 + ...ader-filter-invalid-header-values.out.yaml | 1 + ...nse-header-filter-invalid-headers.out.yaml | 1 + ...response-header-filter-no-headers.out.yaml | 1 + ...se-header-filter-no-valid-headers.out.yaml | 1 + ...ith-response-header-filter-remove.out.yaml | 1 + ...single-rule-with-exact-path-match.out.yaml | 1 + ...ingle-rule-with-http-method-match.out.yaml | 1 + ...h-single-rule-with-multiple-rules.out.yaml | 1 + ...h-prefix-and-exact-header-matches.out.yaml | 1 + ...e-invalid-backend-refs-no-service.out.yaml | 1 + ...to-gateway-with-wildcard-hostname.out.yaml | 1 + ...to-gateway-with-wildcard-hostname.out.yaml | 1 + ...ite-filter-full-path-replace-http.out.yaml | 1 + ...te-filter-hostname-prefix-replace.out.yaml | 1 + ...e-with-urlrewrite-filter-hostname.out.yaml | 1 + ...ewrite-filter-invalid-filter-type.out.yaml | 1 + ...rlrewrite-filter-invalid-hostname.out.yaml | 1 + ...e-filter-invalid-multiple-filters.out.yaml | 1 + ...lrewrite-filter-invalid-path-type.out.yaml | 1 + ...th-urlrewrite-filter-invalid-path.out.yaml | 1 + ...th-urlrewrite-filter-missing-path.out.yaml | 1 + ...ewrite-filter-prefix-replace-http.out.yaml | 1 + ...e-filter-regex-match-replace-http.out.yaml | 1 + ...ilter-regex-match-replace-invalid.out.yaml | 1 + ...rlrewrite-hostname-filter-invalid.out.yaml | 1 + ...e-with-urlrewrite-hostname-filter.out.yaml | 1 + ...ng-to-gateway-with-unset-hostname.out.yaml | 1 + .../httproutes-with-multiple-matches.out.yaml | 1 + .../merge-invalid-multiple-gateways.out.yaml | 2 + ...ays-multiple-listeners-same-ports.out.yaml | 4 ++ ...multiple-gateways-multiple-routes.out.yaml | 3 + .../merge-valid-multiple-gateways.out.yaml | 3 + .../merge-with-isolated-policies-2.out.yaml | 4 ++ .../merge-with-isolated-policies.out.yaml | 2 + ...curitypolicy-invalid-cross-ns-ref.out.yaml | 1 + ...-invalid-no-section-name-listener.out.yaml | 1 + ...nvalid-no-section-name-route-rule.out.yaml | 1 + .../securitypolicy-override-replace.out.yaml | 2 + ...licy-status-conditions-route-rule.out.yaml | 1 + ...olicy-status-conditions-truncated.out.yaml | 18 ++++++ .../securitypolicy-status-conditions.out.yaml | 3 + ...icy-with-authoriztion-client-cidr.out.yaml | 1 + ...-authoriztion-headers-and-methods.out.yaml | 1 + ...olicy-with-authoriztion-jwt-claim.out.yaml | 1 + .../securitypolicy-with-basic-auth.out.yaml | 1 + ...curitypolicy-with-cors-targetrefs.out.yaml | 3 + .../securitypolicy-with-cors.out.yaml | 3 + ...curitypolicy-with-extauth-backend.out.yaml | 1 + ...itypolicy-with-extauth-backendref.out.yaml | 1 + .../securitypolicy-with-extauth-body.out.yaml | 1 + ...-extauth-invalid-no-matching-port.out.yaml | 1 + ...licy-with-extauth-invalid-no-port.out.yaml | 1 + ...xtauth-invalid-no-reference-grant.out.yaml | 1 + ...y-with-extauth-invalid-no-service.out.yaml | 3 + ...uth-invalid-no-serviceimport-port.out.yaml | 1 + ...-extauth-invalid-no-serviceimport.out.yaml | 1 + ...policy-with-extauth-recomputation.out.yaml | 1 + ...policy-with-extauth-serviceimport.out.yaml | 1 + ...ith-extauth-with-backendtlspolicy.out.yaml | 1 + .../securitypolicy-with-extauth.out.yaml | 1 + ...ypolicy-with-jwt-and-invalid-oidc.out.yaml | 1 + ...itypolicy-with-jwt-backendcluster.out.yaml | 1 + ...ecuritypolicy-with-jwt-local-jwks.out.yaml | 1 + .../securitypolicy-with-jwt-optional.out.yaml | 2 + ...ritypolicy-with-jwt-serviceimport.out.yaml | 1 + ...cy-with-jwt-with-custom-extractor.out.yaml | 2 + .../testdata/securitypolicy-with-jwt.out.yaml | 2 + ...icy-with-oidc-and-jwt-passthrough.out.yaml | 1 + ...typolicy-with-oidc-backendcluster.out.yaml | 1 + ...with-oidc-custom-cookies-samesite.out.yaml | 1 + ...typolicy-with-oidc-custom-cookies.out.yaml | 1 + ...itypolicy-with-oidc-deny-redirect.out.yaml | 1 + ...typolicy-with-oidc-invalid-issuer.out.yaml | 1 + ...olicy-with-oidc-invalid-secretref.out.yaml | 3 + ...itypolicy-with-oidc-serviceimport.out.yaml | 1 + .../securitypolicy-with-oidc.out.yaml | 1 + ...teway-with-listener-tls-terminate.out.yaml | 2 + ...ultiple-backends-and-zero-weights.out.yaml | 1 + .../testdata/tcproute-with-backend.out.yaml | 1 + .../tlsroute-attaching-to-gateway.out.yaml | 1 + .../tlsroute-invalid-reference-grant.out.yaml | 1 + .../testdata/tlsroute-multiple.out.yaml | 1 + .../testdata/tlsroute-with-backend.out.yaml | 1 + ...her-namespace-allowed-by-refgrant.out.yaml | 1 + .../tlsroute-with-empty-hostname.out.yaml | 1 + ...oute-with-empty-listener-hostname.out.yaml | 1 + .../tracing-merged-multiple-routes.out.yaml | 3 + .../testdata/tracing-multiple-routes.out.yaml | 3 + .../tracing-sampling-fraction.out.yaml | 3 + ...ultiple-backends-and-zero-weights.out.yaml | 1 + .../testdata/udproute-with-backend.out.yaml | 1 + internal/ir/xds.go | 3 +- internal/xds/translator/listener.go | 63 +++++++++++-------- .../extensionpolicy-tcp-udp-http.yaml | 3 + .../http-route-custom-backend-error.yaml | 1 + ...custom-backend-multiple-backend-error.yaml | 1 + .../http-route-custom-backend.yaml | 1 + .../http-route-custom-backends-mixed.yaml | 1 + ...-route-custom-backends-multiple-mixed.yaml | 1 + .../http-route-extension-filter.yaml | 1 + .../http-route-extension-listener-error.yaml | 1 + .../http-route-extension-route-error.yaml | 1 + .../http-route-extension-translate-error.yaml | 1 + ...ttp-route-extension-virtualhost-error.yaml | 1 + .../in/extension-xds-ir/http-route.yaml | 1 + .../multiple-listeners-same-port-error.yaml | 2 + .../post-translate-listeners-routes.yaml | 1 + .../in/ratelimit-config/distinct-match.yaml | 1 + .../distinct-remote-address-match.yaml | 1 + .../empty-header-matches.yaml | 1 + .../global-shared-distinct-match.yaml | 1 + ...lobal-shared-multiple-shared-policies.yaml | 1 + .../header-and-cidr-matches.yaml | 1 + .../masked-remote-address-match.yaml | 1 + .../in/ratelimit-config/multiple-domains.yaml | 1 + ...multiple-global-shared-distinct-match.yaml | 1 + .../multiple-listeners-distinct-match.yaml | 2 + ...-listeners-same-shared-distinct-match.yaml | 1 + ...tiple-listeners-shared-distinct-match.yaml | 2 + ...d-remote-address-match-with-same-cidr.yaml | 1 + .../in/ratelimit-config/multiple-matches.yaml | 1 + .../in/ratelimit-config/multiple-routes.yaml | 1 + .../in/ratelimit-config/multiple-rules.yaml | 1 + .../multiple-shared-and-unshared.yaml | 1 + .../multiple-shared-ratelimit-rules.yaml | 1 + .../in/ratelimit-config/value-match.yaml | 1 + .../testdata/in/xds-ir/accesslog-cel.yaml | 1 + .../in/xds-ir/accesslog-endpoint-stats.yaml | 1 + .../in/xds-ir/accesslog-formatters.yaml | 1 + .../testdata/in/xds-ir/accesslog-invalid.yaml | 1 + .../in/xds-ir/accesslog-multi-cel.yaml | 1 + .../in/xds-ir/accesslog-with-format.yaml | 1 + .../in/xds-ir/accesslog-without-format.yaml | 1 + .../testdata/in/xds-ir/accesslog.yaml | 1 + .../in/xds-ir/address-as-listener-name.yaml | 6 ++ .../testdata/in/xds-ir/api-key-auth.yaml | 1 + .../in/xds-ir/authorization-client-cidr.yaml | 1 + .../in/xds-ir/authorization-http-header.yaml | 1 + .../in/xds-ir/authorization-jwt-claim.yaml | 1 + .../in/xds-ir/authorization-jwt-scope.yaml | 1 + .../authorization-multiple-principals.yaml | 1 + .../in/xds-ir/backend-buffer-limit.yaml | 3 + .../testdata/in/xds-ir/backend-priority.yaml | 1 + .../in/xds-ir/backend-tls-skip-verify.yaml | 1 + .../in/xds-ir/basic-auth-username-header.yaml | 1 + .../testdata/in/xds-ir/basic-auth.yaml | 1 + .../testdata/in/xds-ir/btp-telemetry.yaml | 1 + .../testdata/in/xds-ir/circuit-breaker.yaml | 1 + .../in/xds-ir/client-buffer-limit.yaml | 2 + .../in/xds-ir/client-stream-idle-timeout.yaml | 2 + .../testdata/in/xds-ir/client-timeout.yaml | 2 + .../testdata/in/xds-ir/compression.yaml | 1 + .../in/xds-ir/cors-from-httpcorsfilter.yaml | 1 + .../translator/testdata/in/xds-ir/cors.yaml | 1 + .../credential-injection-backend-filter.yaml | 1 + .../in/xds-ir/credential-injection.yaml | 1 + .../in/xds-ir/custom-filter-order.yaml | 1 + .../testdata/in/xds-ir/custom-response.yaml | 1 + .../testdata/in/xds-ir/dns-lookup-family.yaml | 1 + .../testdata/in/xds-ir/ext-auth-backend.yaml | 1 + .../testdata/in/xds-ir/ext-auth-body.yaml | 1 + .../in/xds-ir/ext-auth-recomputation.yaml | 1 + .../testdata/in/xds-ir/ext-auth.yaml | 1 + .../ext-proc-with-traffic-settings.yaml | 1 + .../testdata/in/xds-ir/ext-proc.yaml | 1 + .../testdata/in/xds-ir/fault-injection.yaml | 1 + .../testdata/in/xds-ir/health-check.yaml | 1 + .../in/xds-ir/http-connect-proxy.yaml | 1 + .../in/xds-ir/http-connect-terminate.yaml | 1 + .../in/xds-ir/http-early-header-mutation.yaml | 2 + .../in/xds-ir/http-endpoint-stats.yaml | 1 + .../testdata/in/xds-ir/http-health-check.yaml | 1 + .../xds-ir/http-preserve-client-protocol.yaml | 1 + .../in/xds-ir/http-req-resp-sizes-stats.yaml | 1 + .../in/xds-ir/http-route-direct-response.yaml | 1 + .../in/xds-ir/http-route-dns-cluster.yaml | 1 + .../xds-ir/http-route-dynamic-resolver.yaml | 1 + .../in/xds-ir/http-route-invalid.yaml | 1 + .../testdata/in/xds-ir/http-route-mirror.yaml | 1 + .../xds-ir/http-route-mirrors-percentage.yaml | 1 + .../xds-ir/http-route-multiple-matches.yaml | 1 + ...ttp-route-multiple-mirrors-percentage.yaml | 1 + .../xds-ir/http-route-multiple-mirrors.yaml | 1 + .../in/xds-ir/http-route-partial-invalid.yaml | 1 + .../in/xds-ir/http-route-redirect.yaml | 1 + .../testdata/in/xds-ir/http-route-regex.yaml | 1 + .../in/xds-ir/http-route-request-headers.yaml | 1 + .../http-route-response-add-headers.yaml | 1 + ...ttp-route-response-add-remove-headers.yaml | 1 + .../http-route-response-remove-headers.yaml | 1 + ...tp-route-rewrite-root-path-url-prefix.yaml | 1 + ...-rewrite-sufixx-with-slash-url-prefix.yaml | 1 + .../http-route-rewrite-url-fullpath.yaml | 1 + .../xds-ir/http-route-rewrite-url-host.yaml | 1 + .../xds-ir/http-route-rewrite-url-prefix.yaml | 2 +- .../xds-ir/http-route-rewrite-url-regex.yaml | 2 +- .../http-route-session-persistence.yaml | 1 + .../in/xds-ir/http-route-stat-name.yaml | 1 + .../in/xds-ir/http-route-timeout.yaml | 1 + .../http-route-weighted-backend-uds-ip.yaml | 1 + ...p-route-weighted-backend-with-filters.yaml | 1 + .../xds-ir/http-route-weighted-backend.yaml | 1 + .../http-route-weighted-invalid-backend.yaml | 1 + .../in/xds-ir/http-route-with-clientcert.yaml | 1 + .../in/xds-ir/http-route-with-metadata.yaml | 1 + ...http-route-with-tls-system-truststore.yaml | 1 + ...p-route-with-tlsbundle-multiple-certs.yaml | 2 + .../in/xds-ir/http-route-with-tlsbundle.yaml | 1 + ...route-zonal-routing-weighted-clusters.yaml | 1 + .../in/xds-ir/http-route-zonal-routing.yaml | 1 + .../testdata/in/xds-ir/http-route.yaml | 1 + .../testdata/in/xds-ir/http-upgrade-spdy.yaml | 1 + .../xds-ir/http-upgrade-websocket-spdy.yaml | 1 + .../in/xds-ir/http1-preserve-case.yaml | 2 + .../testdata/in/xds-ir/http1-trailers.yaml | 1 + .../translator/testdata/in/xds-ir/http10.yaml | 1 + .../testdata/in/xds-ir/http2-mixed.yaml | 1 + .../testdata/in/xds-ir/http2-route.yaml | 1 + .../translator/testdata/in/xds-ir/http2.yaml | 1 + .../translator/testdata/in/xds-ir/http3.yaml | 1 + .../jsonpatch-add-op-empty-jsonpath.yaml | 1 + .../jsonpatch-add-op-without-value.yaml | 1 + .../in/xds-ir/jsonpatch-invalid-listener.yaml | 1 + .../in/xds-ir/jsonpatch-invalid-patch.yaml | 1 + .../testdata/in/xds-ir/jsonpatch-invalid.yaml | 1 + .../in/xds-ir/jsonpatch-missing-resource.yaml | 1 + .../xds-ir/jsonpatch-move-op-with-value.yaml | 1 + .../jsonpatch-with-jsonpath-invalid.yaml | 1 + .../in/xds-ir/jsonpatch-with-jsonpath.yaml | 1 + .../testdata/in/xds-ir/jsonpatch.yaml | 1 + .../in/xds-ir/jwt-custom-extractor.yaml | 1 + .../jwt-multi-route-multi-provider.yaml | 1 + .../jwt-multi-route-single-provider.yaml | 1 + .../testdata/in/xds-ir/jwt-optional.yaml | 1 + .../testdata/in/xds-ir/jwt-ratelimit.yaml | 1 + .../xds-ir/jwt-single-route-single-match.yaml | 1 + .../in/xds-ir/jwt-with-backend-tls-retry.yaml | 1 + .../in/xds-ir/listener-connection-limit.yaml | 4 ++ .../listener-overlapping-tls-config.yaml | 2 + .../in/xds-ir/listener-proxy-protocol.yaml | 2 + .../in/xds-ir/listener-tcp-keepalive.yaml | 4 ++ .../in/xds-ir/listener-tcp-without-route.yaml | 1 + .../testdata/in/xds-ir/load-balancer.yaml | 1 + .../in/xds-ir/local-ratelimit-distinct.yaml | 1 + .../testdata/in/xds-ir/local-ratelimit.yaml | 1 + .../translator/testdata/in/xds-ir/lua.yaml | 1 + .../in/xds-ir/max-conn-per-socket-event.yaml | 3 + .../in/xds-ir/metrics-virtual-host.yaml | 1 + .../in/xds-ir/mixed-tls-jwt-authn.yaml | 1 + ...ners-same-port-with-different-filters.yaml | 2 + .../xds-ir/multiple-listeners-same-port.yaml | 6 ++ .../multiple-simple-tcp-route-same-port.yaml | 5 ++ ...d-client-certificate-with-custom-data.yaml | 5 ++ ...mutual-tls-forward-client-certificate.yaml | 5 ++ ...-required-client-certificate-disabled.yaml | 2 + .../testdata/in/xds-ir/mutual-tls-san.yaml | 2 + .../testdata/in/xds-ir/mutual-tls.yaml | 2 + .../xds-ir/oidc-and-jwt-with-passthrough.yaml | 1 + .../xds-ir/oidc-backend-cluster-provider.yaml | 1 + .../translator/testdata/in/xds-ir/oidc.yaml | 1 + .../testdata/in/xds-ir/panic-threshold.yaml | 1 + .../testdata/in/xds-ir/path-settings.yaml | 1 + .../in/xds-ir/proxy-protocol-upstream.yaml | 1 + .../in/xds-ir/ratelimit-custom-domain.yaml | 1 + .../in/xds-ir/ratelimit-disable-headers.yaml | 1 + .../in/xds-ir/ratelimit-endpoint-stats.yaml | 1 + .../in/xds-ir/ratelimit-global-shared.yaml | 1 + .../in/xds-ir/ratelimit-headers-and-cidr.yaml | 1 + .../xds-ir/ratelimit-multi-global-shared.yaml | 1 + .../in/xds-ir/ratelimit-sourceip.yaml | 1 + .../testdata/in/xds-ir/ratelimit.yaml | 1 + .../testdata/in/xds-ir/request-buffer.yaml | 2 + .../in/xds-ir/retry-partial-invalid.yaml | 1 + .../translator/testdata/in/xds-ir/retry.yaml | 1 + .../securitypolicy-with-oidc-jwt-authz.yaml | 1 + .../testdata/in/xds-ir/simple-tls.yaml | 1 + .../in/xds-ir/suppress-envoy-headers.yaml | 1 + .../in/xds-ir/tcp-endpoint-stats.yaml | 1 + .../in/xds-ir/tcp-req-resp-sizes-stats.yaml | 1 + .../testdata/in/xds-ir/tcp-route-complex.yaml | 1 + .../in/xds-ir/tcp-route-invalid-endpoint.yaml | 1 + .../testdata/in/xds-ir/tcp-route-invalid.yaml | 1 + .../testdata/in/xds-ir/tcp-route-simple.yaml | 1 + .../in/xds-ir/tcp-route-tls-terminate.yaml | 2 + .../in/xds-ir/tcp-route-weighted-backend.yaml | 1 + .../in/xds-ir/tcp-route-with-no-routes.yaml | 1 + .../testdata/in/xds-ir/timeout.yaml | 1 + .../in/xds-ir/tls-route-passthrough.yaml | 2 + .../tls-with-ciphers-versions-alpn.yaml | 2 + .../in/xds-ir/tracing-datadog-uds.yaml | 1 + .../testdata/in/xds-ir/tracing-datadog.yaml | 1 + .../in/xds-ir/tracing-endpoint-stats.yaml | 1 + .../testdata/in/xds-ir/tracing-invalid.yaml | 1 + .../xds-ir/tracing-unknown-provider-type.yaml | 1 + .../testdata/in/xds-ir/tracing-zipkin.yaml | 1 + .../testdata/in/xds-ir/tracing.yaml | 1 + .../in/xds-ir/udp-endpoint-stats.yaml | 1 + .../in/xds-ir/udp-req-resp-sizes-stats.yaml | 1 + .../testdata/in/xds-ir/udp-route-invalid.yaml | 1 + .../in/xds-ir/udp-route-no-endpoints.yaml | 1 + .../in/xds-ir/udp-route-with-no-routes.yaml | 1 + .../testdata/in/xds-ir/udp-route.yaml | 1 + .../in/xds-ir/upstream-tcpkeepalive.yaml | 1 + .../translator/testdata/in/xds-ir/wasm.yaml | 1 + .../address-as-listener-name.listeners.yaml | 40 +++++------- internal/xds/translator/translator.go | 29 +++++---- internal/xds/translator/translator_test.go | 2 +- release-notes/current.yaml | 2 +- site/content/en/latest/api/extension_types.md | 2 +- .../address-as-listener-name.yaml | 2 +- .../config/helm/address-as-listener-name.yaml | 2 +- test/e2e/e2e_test.go | 2 +- .../e2e/testdata/envoy-patch-policy-ipv4.yaml | 2 +- test/e2e/tests/utils.go | 2 +- 638 files changed, 1047 insertions(+), 89 deletions(-) diff --git a/api/v1alpha1/envoygateway_helpers.go b/api/v1alpha1/envoygateway_helpers.go index 09232d0d6a..a26507461b 100644 --- a/api/v1alpha1/envoygateway_helpers.go +++ b/api/v1alpha1/envoygateway_helpers.go @@ -111,7 +111,7 @@ func (e *EnvoyGateway) GatewayNamespaceMode() bool { // runtimeFlags are the default runtime flags for Envoy Gateway. var runtimeFlags = map[RuntimeFlag]bool{ - UseAddressAsListenerName: false, + UseProtocolPortAsListenerName: false, } // IsEnabled checks if a runtime flag is enabled in the EnvoyGateway configuration. diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index b849126eb2..610ec70b2e 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -102,12 +102,12 @@ 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=UseAddressAsListenerName +// +kubebuilder:validation:Enum=UseProtocolPortAsListenerName type RuntimeFlag string const ( - // UseAddressAsListenerName indicates that the listener name should be derived from the address and port. - UseAddressAsListenerName RuntimeFlag = "UseAddressAsListenerName" + // UseProtocolPortAsListenerName indicates that the listener name should be derived from the protocol and port. + UseProtocolPortAsListenerName RuntimeFlag = "UseProtocolPortAsListenerName" ) // RuntimeFlags provide a mechanism to guard breaking changes or risky experimental features in new Envoy Gateway releases. diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go index 6b087d7e8e..8c6084734b 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 1d655683d0..db577e3ccc 100644 --- a/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml +++ b/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml @@ -200,6 +200,7 @@ xdsIR: [%START_TIME%] "%REQ(:METHOD)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n 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 efe420cc8e..8e8a1f562c 100644 --- a/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml +++ b/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml @@ -102,6 +102,7 @@ xdsIR: type: HTTP 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 550830780f..eb72cdfb58 100644 --- a/internal/gatewayapi/testdata/accesslog.out.yaml +++ b/internal/gatewayapi/testdata/accesslog.out.yaml @@ -126,6 +126,7 @@ xdsIR: - path: /dev/stdout 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 91c33b5200..c378a30f44 100644 --- a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml @@ -158,6 +158,7 @@ xdsIR: - path: /dev/stdout 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 5ad240562e..a815486ef2 100644 --- a/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml @@ -144,6 +144,7 @@ xdsIR: - path: /dev/stdout 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 cf6beeb9ad..fbcb7dc19d 100644 --- a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml @@ -143,6 +143,7 @@ xdsIR: - path: /dev/stdout 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 de6179b098..843d197eab 100644 --- a/internal/gatewayapi/testdata/backend-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-hostname.out.yaml @@ -145,6 +145,7 @@ xdsIR: - path: /dev/stdout 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 e27e840eb2..6f74e8a789 100644 --- a/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml @@ -159,6 +159,7 @@ xdsIR: - path: /dev/stdout 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 3ef92d1f08..ecf4dc2d3e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml @@ -127,6 +127,7 @@ xdsIR: - path: /dev/stdout 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 231b693ff5..026faa8d73 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 225f41449a..8b2553632d 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 03a7fd0b0c..0a2f6b5b75 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 cf47473dda..e8ed92981f 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml @@ -275,6 +275,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -353,6 +354,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 c00a0389f8..3bff23ad02 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -232,6 +232,7 @@ xdsIR: - path: /dev/stdout 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 e5abcf72b2..fb334614aa 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -138,6 +138,7 @@ xdsIR: - path: /dev/stdout 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 f420579c9f..2d30d41220 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml @@ -179,6 +179,7 @@ xdsIR: - path: /dev/stdout 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 777965f8f6..6c0f98a630 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml @@ -145,6 +145,7 @@ xdsIR: - path: /dev/stdout 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 cb1160f86b..386c1ae941 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 @@ -2974,6 +2991,7 @@ xdsIR: - path: /dev/stdout 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 0471bdf09f..76bced2fe7 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml @@ -142,6 +142,7 @@ xdsIR: - path: /dev/stdout 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 b1fe3c44c3..4d33226ede 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout 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 48a6fe789b..33e16e135b 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 @@ -315,6 +316,7 @@ xdsIR: - path: /dev/stdout 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 70bc1add68..1aa9074020 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 @@ -315,6 +316,7 @@ xdsIR: - path: /dev/stdout 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 b388d8ddc1..8f1d4041fc 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 @@ -319,6 +320,7 @@ xdsIR: - path: /dev/stdout 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 045267de97..c2992bcef6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml @@ -135,6 +135,7 @@ xdsIR: - path: /dev/stdout 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 303e76cec0..3f56115c18 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout 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 37fd704b24..fa6677f5d2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml @@ -136,6 +136,7 @@ xdsIR: - path: /dev/stdout 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 c598de6872..11734309a9 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml @@ -380,6 +380,7 @@ xdsIR: path: /dev/stdout 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 b28929d6ea..23e5216cd7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout 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 df214b9750..88d70b3574 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml @@ -135,6 +135,7 @@ xdsIR: - path: /dev/stdout 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 be383014b5..3a24f7efb9 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -277,6 +277,7 @@ xdsIR: - path: /dev/stdout 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 b5029d8353..e51b636a53 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 @@ -315,6 +316,7 @@ xdsIR: - path: /dev/stdout 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 4858c51cc7..5b11571f9d 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 @@ -3312,6 +3329,7 @@ xdsIR: - path: /dev/stdout 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 e4f4fed697..8004a8816b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -534,6 +534,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -558,6 +559,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -614,6 +616,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -666,5 +669,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 c0abf0effe..81980f744b 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 @@ -396,6 +397,7 @@ xdsIR: - path: /dev/stdout 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 05ec4c39f0..0d5cfffc38 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 @@ -405,6 +406,7 @@ xdsIR: privateKey: '[redacted]' 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 f738bc2e2e..f9733e8aee 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 @@ -394,6 +395,7 @@ xdsIR: - path: /dev/stdout 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 aa1c8a7c6f..b1f893f60d 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 @@ -398,6 +399,7 @@ xdsIR: - path: /dev/stdout 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 8e373838e5..0e844eb93d 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 @@ -403,6 +404,7 @@ xdsIR: privateKey: '[redacted]' 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 340b6fc3d0..1f9269bc2f 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 @@ -348,6 +349,7 @@ xdsIR: - path: /dev/stdout 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 7ea51b707a..557a1f2f1b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml @@ -259,6 +259,7 @@ xdsIR: - path: /dev/stdout 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 dfa695646c..0ba7d384ca 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml @@ -152,6 +152,7 @@ xdsIR: - path: /dev/stdout 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 2f1a5f7adc..e9200adff3 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml @@ -132,6 +132,7 @@ xdsIR: - path: /dev/stdout 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 995c65225a..378f6559a0 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 @@ -372,6 +373,7 @@ xdsIR: - path: /dev/stdout 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 f96906fa1b..b8651eea13 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 @@ -319,6 +320,7 @@ xdsIR: - path: /dev/stdout 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 8a65d72148..5e85454943 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 @@ -385,6 +386,7 @@ xdsIR: - path: /dev/stdout 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 08c0122438..0642dd8a0d 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 @@ -902,6 +903,7 @@ xdsIR: - path: /dev/stdout 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 be1cf81063..48efcf341b 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 @@ -316,6 +317,7 @@ xdsIR: - path: /dev/stdout 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 ace5479bbc..3e0e506325 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml @@ -213,6 +213,7 @@ xdsIR: - path: /dev/stdout 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 b4ebed9fb1..b076798423 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 @@ -206,6 +206,7 @@ xdsIR: - path: /dev/stdout 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 a203cdb788..75d95a8d36 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 @@ -483,6 +484,7 @@ xdsIR: - path: /dev/stdout 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 f7cd9a449e..421b7d9ac5 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 @@ -155,6 +155,7 @@ xdsIR: - path: /dev/stdout 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 f3569071b3..762a598303 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 @@ -155,6 +155,7 @@ xdsIR: - path: /dev/stdout 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 eed4a47cae..f005c1b4ce 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 @@ -159,6 +159,7 @@ xdsIR: - path: /dev/stdout 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 ac24fe90ad..18088e82ac 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 @@ -162,6 +162,7 @@ xdsIR: - path: /dev/stdout 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 ffbf08f59b..49a918d611 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -158,6 +158,7 @@ xdsIR: - path: /dev/stdout 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 0796c24972..ad101e795f 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 @@ -381,6 +382,7 @@ xdsIR: - path: /dev/stdout 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 79cbdc8fc4..a5d14c389f 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 @@ -307,6 +308,7 @@ xdsIR: - path: /dev/stdout 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 b434227aaf..9668a830c3 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 @@ -140,6 +140,7 @@ xdsIR: - path: /dev/stdout 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 9d371c8393..cbc964577d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout 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 dac03a71a3..cbb57c8d17 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 @@ -364,6 +365,7 @@ xdsIR: privateKey: '[redacted]' 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 7f6ad9abd5..6821cfdb5a 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 @@ -355,6 +356,7 @@ xdsIR: - path: /dev/stdout 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 b60b4342be..fb578be868 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 @@ -524,6 +525,7 @@ xdsIR: - path: /dev/stdout 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 a3f97660f9..5945d64533 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 @@ -474,6 +475,7 @@ xdsIR: - path: /dev/stdout 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 811ecba92e..155b86b699 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -174,6 +174,7 @@ xdsIR: - path: /dev/stdout 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 c433276023..8c6555399b 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 @@ -366,6 +367,7 @@ xdsIR: privateKey: '[redacted]' 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 9e98f03241..60c9ce59c2 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 @@ -243,6 +243,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8089 name: default/tcp-gateway/bar port: 8089 routes: @@ -311,6 +312,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 c6074b303e..25007f19ca 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 @@ -316,6 +316,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8089 name: default/tcp-gateway/bar port: 8089 routes: @@ -384,6 +385,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 32ab0d1af2..41dab2e86d 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 @@ -313,6 +314,7 @@ xdsIR: - path: /dev/stdout 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 b76c76fd40..ece52e16df 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -132,6 +132,7 @@ xdsIR: - path: /dev/stdout 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 2b9a66db58..cdc90975ab 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 @@ -304,6 +305,7 @@ xdsIR: - path: /dev/stdout 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 64fe0b76e3..d668239226 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 @@ -324,6 +325,7 @@ xdsIR: - path: /dev/stdout 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 4a72f28057..56671d677d 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 @@ -164,6 +164,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -179,6 +180,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 5234f9f21d..0d2042ee79 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 @@ -165,6 +165,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -180,6 +181,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 1a068ce8a8..c734b19f53 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml @@ -171,6 +171,7 @@ xdsIR: - address: 0.0.0.0 connection: bufferLimit: 50000000 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -186,6 +187,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 c5f3736a3b..4cb7056c75 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml @@ -270,6 +270,7 @@ xdsIR: clientIPDetection: xForwardedFor: numTrustedHops: 2 + externalPort: 8081 hostnames: - '*' isHTTP2: false @@ -288,6 +289,7 @@ xdsIR: customHeader: failClosed: false name: x-client-ip-address + externalPort: 8082 hostnames: - '*' isHTTP2: false @@ -306,6 +308,7 @@ xdsIR: customHeader: failClosed: true name: x-client-ip-address + externalPort: 8083 hostnames: - '*' isHTTP2: false @@ -320,6 +323,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 4792808e1e..8e168ecf69 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml @@ -166,6 +166,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -180,6 +181,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 e36dc727f1..cd13738717 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml @@ -170,6 +170,7 @@ xdsIR: limit: closeDelay: 10s value: 3 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -185,6 +186,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 4345a30879..5a6c16d4ac 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml @@ -200,6 +200,7 @@ xdsIR: closeDelay: 10s value: 3 enableProxyProtocol: true + externalPort: 443 name: envoy-gateway/gateway-1/tls-1 port: 10443 routes: @@ -271,6 +272,7 @@ xdsIR: closeDelay: 10s value: 3 enableProxyProtocol: true + externalPort: 8080 name: envoy-gateway/gateway-1/tcp-1 port: 8080 routes: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml index 8dad31c9da..a959684d74 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml @@ -122,6 +122,7 @@ xdsIR: - path: /dev/stdout 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 9d76b964c0..77d7ff7acf 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml @@ -146,6 +146,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 headers: earlyAddRequestHeaders: - append: true @@ -175,6 +176,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 302860832b..07686b78c3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml @@ -94,6 +94,7 @@ xdsIR: - path: /dev/stdout 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 09ad2067aa..2b44fc5ceb 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml @@ -459,6 +459,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -475,6 +476,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - www.example.com http1: @@ -492,6 +494,7 @@ xdsIR: mergeSlashes: true port: 8080 - address: 0.0.0.0 + externalPort: 8081 hostnames: - '*' http1: {} @@ -507,6 +510,7 @@ xdsIR: mergeSlashes: true port: 8081 - address: 0.0.0.0 + externalPort: 8082 hostnames: - '*' http1: @@ -555,6 +559,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 ffb5eda2bc..fcf0b5134d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml @@ -168,6 +168,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http2: @@ -186,6 +187,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 55ba1580d6..b67fa1ca24 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -136,6 +136,7 @@ xdsIR: - path: /dev/stdout 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 1b4adb72eb..747263d0b3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml @@ -95,6 +95,7 @@ xdsIR: - path: /dev/stdout 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 8fd8b7e739..cd232dd934 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml @@ -133,6 +133,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -150,6 +151,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 dbc01780d0..1947219dcf 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: @@ -1062,6 +1070,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1088,6 +1097,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" - address: 0.0.0.0 + externalPort: 8080 headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -1112,6 +1122,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 8443 name: default/gateway-3/tcp-1 port: 8443 tls: @@ -1123,5 +1134,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 d7fd002afc..997d995627 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 @@ -573,6 +576,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -625,6 +629,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 571ba0bf20..325885fe63 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: @@ -745,6 +750,7 @@ xdsIR: - path: /dev/stdout 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 a08caec04f..19a2663524 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: @@ -749,6 +754,7 @@ xdsIR: - path: /dev/stdout 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 75aa4ac362..e25e51004d 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: @@ -730,6 +735,7 @@ xdsIR: - path: /dev/stdout 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 0bf546dc4c..7c6fb22f8d 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 @@ -290,6 +292,7 @@ xdsIR: - path: /dev/stdout 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 f0f25f8e1e..139ce9f40c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -145,6 +146,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 02d33decf5..ea93092ddd 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: @@ -234,6 +235,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -248,6 +250,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 cb238c66ae..1bfb1778d3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -148,6 +149,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8080 hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml index 5a33f4837e..7142eac825 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml @@ -132,6 +132,7 @@ xdsIR: http: - address: 0.0.0.0 enableProxyProtocol: true + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -146,6 +147,7 @@ xdsIR: mergeSlashes: true port: 10080 - 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 7870406536..30d4310c43 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 headers: disableRateLimitHeaders: true enableEnvoyHeaders: true @@ -149,6 +150,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 d16377f342..d6a7e5221c 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 @@ -2018,6 +2035,7 @@ xdsIR: - path: /dev/stdout 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 e4086f621f..6faf3415f7 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 @@ -595,6 +599,7 @@ xdsIR: - path: /dev/stdout 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 71ef791bd2..dc07a8b56d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -152,6 +153,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 829a19a83d..3072a4b0cb 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -166,6 +166,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -184,6 +185,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 550da47bc8..83d1f18d4c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml @@ -95,6 +95,7 @@ xdsIR: - path: /dev/stdout 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 c6b88230fc..5c72b2a635 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml @@ -133,6 +133,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -150,6 +151,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 50f18206e3..0b0eaa2ecf 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 @@ -424,6 +427,7 @@ xdsIR: - path: /dev/stdout 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 b93193ecd4..e56dddbb88 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml @@ -130,6 +130,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' http1: @@ -146,6 +147,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 dc4830c2b3..f0020b2c3a 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -270,6 +270,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.192.168.0.15.nip.io' isHTTP2: false @@ -314,6 +315,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 ecd3827acc..346fc0be55 100644 --- a/internal/gatewayapi/testdata/custom-filter-order.out.yaml +++ b/internal/gatewayapi/testdata/custom-filter-order.out.yaml @@ -235,6 +235,7 @@ xdsIR: privateKey: '[redacted]' 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 d27a6b0c9b..9c2740d61c 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -124,6 +124,7 @@ xdsIR: envoy-gateway/gateway-1: 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 76aac404e6..349e6a93b4 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml @@ -84,6 +84,7 @@ xdsIR: - path: /dev/stdout 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 aeef477a02..9f56c3e632 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml @@ -273,6 +273,7 @@ xdsIR: - path: /dev/stdout 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 cb62b14f17..3de4a627c1 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 @@ -3312,6 +3329,7 @@ xdsIR: - path: /dev/stdout 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 796677a806..1446edd7be 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml @@ -534,6 +534,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -558,6 +559,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -614,6 +616,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -666,5 +669,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 6e6c4b1430..921a87ee0d 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 @@ -135,6 +135,7 @@ xdsIR: - path: /dev/stdout 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 1045a3b315..05d8b8aea5 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 @@ -135,6 +135,7 @@ xdsIR: - path: /dev/stdout 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 25298d0d74..04f5078c7e 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 @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 4f76df5f3c..1ea97861e5 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 @@ -361,6 +361,7 @@ xdsIR: - path: /dev/stdout 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 d0b17187ee..df0ac59006 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml @@ -296,6 +296,7 @@ xdsIR: - path: /dev/stdout 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 2266c1df4a..87cdfb81d4 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 @@ -179,6 +179,7 @@ xdsIR: - path: /dev/stdout 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 ab9ba02fb5..fa0b2d3789 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 @@ -287,6 +287,7 @@ xdsIR: - path: /dev/stdout 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 bfa487328f..b6032fc677 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 @@ -314,6 +314,7 @@ xdsIR: - path: /dev/stdout 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 b73d1a359b..1649748192 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 @@ -152,6 +152,7 @@ xdsIR: - path: /dev/stdout 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 c9dc018783..49899d3d44 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 @@ -239,6 +239,7 @@ xdsIR: - path: /dev/stdout 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 065b52800c..c90326dbfd 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml @@ -228,6 +228,7 @@ xdsIR: - path: /dev/stdout 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 3e4cacd7f4..488fc46ec1 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml @@ -393,6 +393,7 @@ xdsIR: - path: /dev/stdout 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 cfbe145cd1..1b188b3887 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml @@ -214,6 +214,7 @@ xdsIR: - path: /dev/stdout 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 8190076e67..171effb5bb 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml @@ -249,6 +249,7 @@ xdsIR: privateKey: '[redacted]' 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 abc0d3fde1..98845e3907 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 @@ -934,6 +936,7 @@ xdsIR: - path: /dev/stdout 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 a682678855..e125afe767 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml @@ -217,6 +217,7 @@ xdsIR: privateKey: '[redacted]' 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 003991cc51..7433656003 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml @@ -251,6 +251,7 @@ xdsIR: privateKey: '[redacted]' 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 bcc920e1e5..29d7d52149 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -66,6 +66,7 @@ xdsIR: - path: /dev/stdout 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 7cf39316cf..800a5a2806 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml @@ -92,6 +92,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller 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 253f4350cf..b18a4365e6 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 @@ -94,6 +94,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller 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 428d54ae1b..c501e9688a 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -85,6 +85,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller 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 05fb4d576b..2a97aec4e5 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml @@ -121,6 +121,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller 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 bc9f47e444..121ffb7751 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -115,6 +115,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller 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 d903d96603..d3e5158dc5 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml @@ -207,6 +207,7 @@ xdsIR: type: 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 b4686d9514..2893d96db8 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml @@ -147,6 +147,7 @@ xdsIR: envoy-gateway/gateway-1: 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 4bcdc29f5d..1b97a1bfac 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml @@ -167,6 +167,7 @@ xdsIR: path: /dev/stdout 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 9bc128427d..b0842c124e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml @@ -148,6 +148,7 @@ xdsIR: envoy-gateway/gateway-1: 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 078d94a6ce..eefe812120 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml @@ -198,6 +198,7 @@ xdsIR: path: /dev/stdout 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 54d161e1be..0e1e5c24d3 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 @@ -133,6 +133,7 @@ xdsIR: - path: /dev/stdout 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 52a2dead69..2f11833685 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -139,6 +139,7 @@ xdsIR: path: /dev/stdout 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 a3f6cc0073..70eb276599 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml @@ -510,6 +510,7 @@ xdsIR: path: /dev/stdout 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 dc3d16f95a..a97ac63f58 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml @@ -133,6 +133,7 @@ xdsIR: accessLog: {} 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 e457ac11ee..39378fc46c 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml @@ -341,6 +341,7 @@ xdsIR: path: /dev/stdout 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 53e836c775..f041389c34 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml @@ -225,6 +225,7 @@ xdsIR: k8s.cluster.name: cluster-1 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 33e103ae05..61d124404a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -237,6 +237,7 @@ xdsIR: path: /dev/stdout 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 13ec7edfe8..c329f365fa 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 2b9c50ff16..265919620b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 2f6ab10cb7..a329bfcc80 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml @@ -140,6 +140,7 @@ xdsIR: - path: /dev/stdout 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 1a27fc8f2e..23128888f4 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml @@ -133,6 +133,7 @@ xdsIR: - path: /dev/stdout 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 e8f5188c58..62f990f4b3 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml @@ -136,6 +136,7 @@ xdsIR: - path: /dev/stdout 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 7d0e45dc46..34ca783910 100644 --- a/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml @@ -162,6 +162,7 @@ xdsIR: - path: /dev/stdout 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 a56756b74a..b63d562086 100644 --- a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml @@ -288,6 +288,7 @@ xdsIR: - path: /dev/stdout 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 32be3c8af1..b2004f735a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 8c319d51b4..16df4c8f3e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 de8d3d5078..5de6ea8cff 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml @@ -235,6 +235,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -270,6 +271,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 a2282a87db..2d81b18d44 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml @@ -234,6 +234,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -269,6 +270,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 feb49ffd1f..6c2cc7ff34 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml @@ -231,6 +231,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*' isHTTP2: false @@ -306,6 +307,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 d8356d1fc4..e6978f2fdf 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml @@ -140,6 +140,7 @@ xdsIR: - path: /dev/stdout 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 b797b32849..0eefe50549 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml @@ -181,6 +181,7 @@ xdsIR: - path: /dev/stdout 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 d305353ee3..42f01c0421 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml @@ -160,6 +160,7 @@ xdsIR: - path: /dev/stdout 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 53463abc6e..060e460a45 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -124,6 +124,7 @@ xdsIR: - path: /dev/stdout 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 916e118b86..b111945ba3 100644 --- a/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml @@ -170,6 +170,7 @@ xdsIR: - path: /dev/stdout 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 5d7432124f..70d989befe 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml @@ -237,6 +237,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 @@ -267,5 +268,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 63daf51565..5f0eba0966 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml @@ -237,6 +237,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 @@ -267,5 +268,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 6e989e9801..03278a421f 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml @@ -102,6 +102,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 81 hostnames: - '*' isHTTP2: false @@ -116,6 +117,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 76bdcfa24b..b08145c1f1 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 @@ -306,6 +307,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 b4abbe7abf..9ec096aea4 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml @@ -208,6 +208,7 @@ xdsIR: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller + externalPort: 81 hostnames: - '*' isHTTP2: false @@ -277,6 +278,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 c4a91292b6..670a4f66ce 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 @@ -116,6 +116,7 @@ xdsIR: - path: /dev/stdout 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 65f9e0aa3a..67cc2249e8 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 @@ -114,6 +114,7 @@ xdsIR: - path: /dev/stdout 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 0c9d44380b..6bf77ce94c 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 @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 605ff6b2ef..190b75dbcf 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 @@ -128,6 +128,7 @@ xdsIR: - path: /dev/stdout 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 eb0053db42..28e98d5dc9 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 @@ -120,6 +120,7 @@ xdsIR: - path: /dev/stdout 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 b782b65aa9..86d9dc19d1 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 @@ -124,6 +124,7 @@ xdsIR: - path: /dev/stdout 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 1484045d8e..26da7a1955 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml @@ -116,6 +116,7 @@ xdsIR: - path: /dev/stdout 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 cd0dc3b778..dae9b5c5b6 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 82d46ac99d..e2a15e0fb9 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 3417545754..41f420ebf6 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 721f986244..c5899357f9 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 @@ -101,6 +101,7 @@ xdsIR: - path: /dev/stdout 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 fb9b307ad5..09cfad56b5 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 @@ -101,6 +101,7 @@ xdsIR: - path: /dev/stdout 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 b2ec5319de..ac7ae803d2 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 @@ -177,6 +177,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -222,6 +223,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 2e0598bc0b..72ac412517 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -119,6 +119,7 @@ xdsIR: - path: /dev/stdout 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 3a22369ee3..2286070a47 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -76,5 +76,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 ed7c237730..1d3a72aeb4 100644 --- a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml @@ -128,6 +128,7 @@ xdsIR: - path: /dev/stdout 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 fdd2722631..47424d2346 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 @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 68ae922686..17a49607bb 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 @@ -128,6 +128,7 @@ xdsIR: - path: /dev/stdout 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 bb6f802021..e5d4c8f73c 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 @@ -101,6 +101,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 62252bd95c..fd0b96ef9d 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 @@ -105,6 +105,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 3fc8d6e19c..e2d536db07 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 @@ -101,5 +101,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 e8f046066a..933021fd27 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 @@ -108,6 +108,7 @@ xdsIR: - path: /dev/stdout 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 3c1aa5d0e7..fd528e329b 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 @@ -177,6 +177,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.bar.com isHTTP2: false @@ -233,6 +234,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 91fd896e39..74105be7af 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 @@ -101,6 +101,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 804b451671..bcd4ac26d3 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 @@ -105,6 +105,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 dd9fcb222e..47454ddb6a 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 @@ -101,5 +101,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 114cc9a4c6..cd8fbe2469 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 @@ -69,5 +69,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 11ba89124a..0d14d6b990 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 @@ -69,5 +69,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 a98dd69f8e..c20e0806c2 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 @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 a33bb1ee5b..977445f92c 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 @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 df9c76a472..7ae6381ea1 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 @@ -107,6 +107,7 @@ xdsIR: - path: /dev/stdout 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 9038771eaf..9c1af1a036 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 @@ -194,6 +194,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -246,6 +247,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - bar.example.com isHTTP2: false @@ -298,6 +300,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 88fafa6caa..8959d1028e 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 @@ -181,6 +181,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -233,6 +234,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 b18346c99c..b1a44de0c9 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 @@ -158,6 +158,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -210,6 +211,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 4fe6f825a7..ab0412f111 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 @@ -217,6 +217,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -269,6 +270,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -290,6 +292,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 6d1429b986..dbaee7fdc2 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 @@ -194,6 +194,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 443 hostnames: - foo.example.com isHTTP2: false @@ -246,6 +247,7 @@ xdsIR: privateKey: '[redacted]' tlsOverlaps: true - address: 0.0.0.0 + externalPort: 443 hostnames: - '*.example.com' isHTTP2: false @@ -298,6 +300,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 bdba15558e..5fd0324a71 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -101,6 +101,7 @@ xdsIR: - path: /dev/stdout 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 f923f33dbf..391d30d2d2 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 @@ -132,6 +132,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 4b45df0b5c..c128be4b8d 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 @@ -132,6 +132,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 5afe316dfd..37ebda1812 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -107,6 +107,7 @@ xdsIR: - path: /dev/stdout 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 cb96131918..8d9dcdd22d 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 @@ -125,6 +125,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 df0462c890..a7b10d502f 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 @@ -128,6 +128,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 001529fd6b..4b32c9c806 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 @@ -173,6 +173,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -246,6 +247,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 f7879b311a..ca0ce0f88f 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 @@ -168,6 +168,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -218,6 +219,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 428617eaa5..9e17833ad8 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 @@ -168,6 +168,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -218,6 +219,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 4f276d0b7a..b4c9057061 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 @@ -170,6 +170,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/tcp1 port: 10162 routes: @@ -193,6 +194,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 9296262fad..e4a8777346 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 @@ -166,6 +166,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 161 name: envoy-gateway/gateway-1/tcp1 port: 10161 routes: @@ -189,6 +190,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 01f5f010dc..d65b0fa658 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 @@ -170,6 +170,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 162 name: envoy-gateway/gateway-1/udp1 port: 10162 route: @@ -193,6 +194,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 34425404c9..6874c92825 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 @@ -166,6 +166,7 @@ xdsIR: port: 19003 udp: - address: 0.0.0.0 + externalPort: 161 name: envoy-gateway/gateway-1/udp1 port: 10161 route: @@ -189,6 +190,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 e4b50f6247..7e101b56cc 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml @@ -128,6 +128,7 @@ xdsIR: - path: /dev/stdout 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 8aa6b80792..85995d2f5a 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -101,6 +101,7 @@ xdsIR: - path: /dev/stdout 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 a607f42a69..7fc176852e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 ad2507a845..a5a1b776f6 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 298758479b..8674509063 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -107,6 +107,7 @@ xdsIR: - path: /dev/stdout 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 6c1c8fde5f..e42dd07b44 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 1a1e8e005d..176618d24e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -107,6 +107,7 @@ xdsIR: - path: /dev/stdout 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 11353b48c7..ba9acc0497 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 @@ -139,6 +139,7 @@ xdsIR: - path: /dev/stdout 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 fd74fe4fe1..e467399d5e 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 @@ -320,6 +321,7 @@ xdsIR: - path: /dev/stdout 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 63e951aa68..8a83b027e1 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 @@ -361,6 +361,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 81 hostnames: - foo.com isHTTP2: false @@ -405,6 +406,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 82 hostnames: - bar.com isHTTP2: false @@ -449,6 +451,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 83 hostnames: - foo1.com isHTTP2: false @@ -493,6 +496,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 84 hostnames: - bar1.com isHTTP2: false @@ -537,6 +541,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 85 hostnames: - foo2.com isHTTP2: false @@ -581,6 +586,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 86 hostnames: - bar2.com isHTTP2: false @@ -625,6 +631,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 87 hostnames: - foo3.com isHTTP2: false @@ -669,6 +676,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 d1415563c3..652bd37a09 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 @@ -312,6 +312,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -356,6 +357,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.com isHTTP2: false @@ -400,6 +402,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo1.com isHTTP2: false @@ -444,6 +447,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar1.com isHTTP2: false @@ -488,6 +492,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo2.com isHTTP2: false @@ -532,6 +537,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - bar2.com isHTTP2: false @@ -576,6 +582,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 80 hostnames: - foo3.com isHTTP2: false @@ -620,6 +627,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 252c5058e8..9459434b73 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 @@ -143,6 +143,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -187,6 +188,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 9802bb01d0..2f1fa418b1 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 @@ -132,6 +132,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -176,6 +177,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 edb8cf378b..b83537b12d 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -101,6 +101,7 @@ xdsIR: - path: /dev/stdout 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 2201dbec3e..e9819b9945 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 e7e9e2f33f..8107638953 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 @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.com isHTTP2: false @@ -148,6 +149,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 541452911c..0bfe063604 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 @@ -207,6 +207,7 @@ xdsIR: - path: /dev/stdout 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 2516e49c30..a0fb0f6ac6 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 @@ -264,6 +264,7 @@ xdsIR: - path: /dev/stdout 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 4731f586b5..c0cf8bf5a8 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 @@ -347,6 +347,7 @@ xdsIR: - path: /dev/stdout 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 bccfe8ee7c..eec8a7dc73 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 @@ -287,6 +287,7 @@ xdsIR: - path: /dev/stdout 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 8e4d199cce..20de7358e0 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 @@ -296,6 +296,7 @@ xdsIR: - path: /dev/stdout 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 19722b2552..86d6913e88 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 60764db3c5..fae4a4de3e 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 1f3ba7f381..aa10260427 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 cbf5ba2edc..93aea89ae7 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 @@ -106,6 +106,7 @@ xdsIR: - path: /dev/stdout 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 1f5513ade6..fde91df2ff 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 fbd90c2c6c..af35299798 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -103,6 +103,7 @@ xdsIR: - path: /dev/stdout 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 339b9e2030..59d6c8d988 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 b6b5eb715f..d7e37d2caa 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 @@ -337,6 +337,7 @@ xdsIR: - path: /dev/stdout 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 8eeb9fd598..96c16276d6 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 @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout 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 e2da694bf1..4721c374ea 100644 --- a/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml +++ b/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml @@ -179,6 +179,7 @@ xdsIR: - path: /dev/stdout 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 2c7ad1168d..22d635e3d5 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 @@ -104,6 +104,7 @@ xdsIR: - path: /dev/stdout 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 21d9d23244..0be91f657f 100644 --- a/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml +++ b/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml @@ -231,6 +231,7 @@ xdsIR: - path: /dev/stdout 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 93bd80dfe9..f7f419cc93 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 5497d156be..3144dd8176 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 @@ -271,6 +272,7 @@ xdsIR: - path: /dev/stdout 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 876b9922b6..0b49fc1d11 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 @@ -98,6 +98,7 @@ xdsIR: - path: /dev/stdout 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 be298bea23..bdefeb33bd 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 ba3bf49b78..780565e03c 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 @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 22d9b51958..fc5ea87eae 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 @@ -180,6 +180,7 @@ xdsIR: - path: /dev/stdout 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 4e7c011ae4..b76f41779e 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 @@ -178,6 +178,7 @@ xdsIR: - path: /dev/stdout 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 a904087298..d73d927af9 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 @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout 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 27774d383d..d959b446aa 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 @@ -134,6 +134,7 @@ xdsIR: - path: /dev/stdout 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 e489e0a369..796bebb85b 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 @@ -103,6 +103,7 @@ xdsIR: - path: /dev/stdout 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 fba9f215ab..7580ed5f40 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 f4bc617d03..a3db867a82 100644 --- a/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml @@ -172,6 +172,7 @@ xdsIR: - path: /dev/stdout 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 c7eb0a3066..a181cf7a78 100644 --- a/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml @@ -169,6 +169,7 @@ xdsIR: - path: /dev/stdout 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 1cb64e5c1e..4024af8190 100644 --- a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml @@ -199,6 +199,7 @@ xdsIR: - path: /dev/stdout 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 7b197cb3c3..dabff939fb 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -100,6 +100,7 @@ xdsIR: - path: /dev/stdout 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 726f586356..bcbbf431e0 100644 --- a/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml @@ -123,6 +123,7 @@ xdsIR: - path: /dev/stdout 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 6875858642..c19ec8e539 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 @@ -121,6 +121,7 @@ xdsIR: - path: /dev/stdout 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 7671dfc2db..2f2ff6a091 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 @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout 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 d28eef2ab4..7339387397 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 4296b3f03b..1383a175bd 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 50a1f2dc99..7df828c2da 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 @@ -116,6 +116,7 @@ xdsIR: - path: /dev/stdout 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 2a3130f6b1..e53d7fe7e4 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 930befc4ce..08acb75b65 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 89e2b726ff..e22b5b6393 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 @@ -211,6 +211,7 @@ xdsIR: - path: /dev/stdout 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 191f1013c8..cc3bc62995 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 8dc0255c37..a9df193bcd 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 75cc156c6b..7a0836d218 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 100bb38f85..adf5db8468 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 @@ -157,6 +157,7 @@ xdsIR: - path: /dev/stdout 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 15a4a8438c..f370749181 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 @@ -154,6 +154,7 @@ xdsIR: - path: /dev/stdout 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 7f9eabb8d9..62d88620f8 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 a34b879430..48d4dbf57f 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 @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 e1a3a8bd7b..cf0d41268f 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 @@ -103,6 +103,7 @@ xdsIR: - path: /dev/stdout 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 d203e5f48b..6ddb592b19 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 @@ -107,6 +107,7 @@ xdsIR: - path: /dev/stdout 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 ec6b3fd3f9..f476f83df0 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 @@ -104,6 +104,7 @@ xdsIR: - path: /dev/stdout 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 65acf7d743..04b454510b 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 @@ -126,6 +126,7 @@ xdsIR: - path: /dev/stdout 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 f17aa724c3..3de2b22b8b 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 @@ -102,6 +102,7 @@ xdsIR: - path: /dev/stdout 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 8dbd37e34d..2385d85810 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 6ba0272a48..1231b95193 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 @@ -103,6 +103,7 @@ xdsIR: - path: /dev/stdout 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 28f83a0c6d..b5fa024a64 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 @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 1458a2fe52..d2289a3225 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 @@ -104,6 +104,7 @@ xdsIR: - path: /dev/stdout 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 c1decd8f3d..3ac7032afc 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 @@ -186,6 +187,7 @@ xdsIR: - path: /dev/stdout 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 da9ffd2be0..d7ce3d9ace 100644 --- a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 d1478b62af..44f3a1555f 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -119,6 +119,7 @@ xdsIR: - path: /dev/stdout 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 245aa6e211..5321fe7b8f 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout 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 24e0d6e379..a5f121d9fa 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 @@ -123,6 +123,7 @@ xdsIR: - path: /dev/stdout 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 99feb8f195..1c6379c30f 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 5800254e9f..ceea5f3282 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 @@ -114,6 +114,7 @@ xdsIR: - path: /dev/stdout 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 caa6567158..ed249f6b7d 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 9ac76b9749..b87b8fc770 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 @@ -149,6 +150,7 @@ xdsIR: - path: /dev/stdout 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 596e8b9c85..d2b01152db 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 @@ -158,6 +158,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -212,6 +213,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 898582a1e2..11b050207e 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 @@ -249,6 +250,7 @@ xdsIR: - path: /dev/stdout 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 e16aaa1435..692f20519e 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 @@ -227,6 +228,7 @@ xdsIR: - path: /dev/stdout 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 3ad7d9d73d..0f803c715d 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml @@ -126,6 +126,7 @@ xdsIR: - path: /dev/stdout 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 e68ae4921b..5295529cf6 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 15e9a6b75d..41d82fa40e 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 @@ -157,6 +157,7 @@ xdsIR: - path: /dev/stdout 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 17edc41e8e..04ff91f811 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 @@ -154,6 +154,7 @@ xdsIR: - path: /dev/stdout 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 92f7dfaf36..8fe95096a5 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 @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 805aa7d1cc..175d43b166 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 47e0bd90b3..385e98fa50 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 8b38fe5c89..de449b890c 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 42378afa0d..1bc16eff72 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 @@ -108,6 +108,7 @@ xdsIR: - path: /dev/stdout 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 046f1f2ee6..5fa068dcc8 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 01d7268233..1104e1a331 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 @@ -127,6 +127,7 @@ xdsIR: - path: /dev/stdout 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 6eb052e838..b8f49fe2bf 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 @@ -121,6 +121,7 @@ xdsIR: - path: /dev/stdout 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 8fb5922cda..3e4ba4c68a 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 @@ -131,6 +131,7 @@ xdsIR: - path: /dev/stdout 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 d688c1f011..59a82aa2ff 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 cfbeeb9fdc..3a401ff1ac 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 b6e1dea538..ef607451be 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 @@ -116,6 +116,7 @@ xdsIR: - path: /dev/stdout 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 c1677e9bda..bd836891fe 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 7e0426cde8..82cf41de7f 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 @@ -117,6 +117,7 @@ xdsIR: - path: /dev/stdout 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 151a297ebf..bc1d848110 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 @@ -209,6 +209,7 @@ xdsIR: - path: /dev/stdout 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 28efd561e6..e73502e4bd 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 @@ -109,6 +109,7 @@ xdsIR: - path: /dev/stdout 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 f569f87c6c..e4269502e2 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 91432f6510..e5e284d1d1 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 75fcaae1d2..5496cad0f3 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 @@ -102,6 +102,7 @@ xdsIR: - path: /dev/stdout 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 f1c310a844..3d12f212b7 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 @@ -100,6 +100,7 @@ xdsIR: - path: /dev/stdout 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 8b838e5e17..35aa4db5a4 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 @@ -133,6 +133,7 @@ xdsIR: - path: /dev/stdout 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 72ca225c6b..c810edb482 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 @@ -106,6 +106,7 @@ xdsIR: - path: /dev/stdout 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 d4dd06ccc7..4891c1ec5c 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 @@ -108,6 +108,7 @@ xdsIR: - path: /dev/stdout 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 0bb3b69bb3..eebef91bb5 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 @@ -104,6 +104,7 @@ xdsIR: - path: /dev/stdout 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 3b35cbfa0f..67c73f3c70 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 @@ -105,6 +105,7 @@ xdsIR: - path: /dev/stdout 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 08bd878ed5..af57ecb629 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 00bb80c45e..28f3688352 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 957a27b3d0..8b3f687629 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 471931f229..bcf68d363d 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 @@ -110,6 +110,7 @@ xdsIR: - path: /dev/stdout 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 cb1975f1cf..9b6cba691f 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 @@ -116,6 +116,7 @@ xdsIR: - path: /dev/stdout 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 a94b54e97e..7f90f7d856 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 @@ -118,6 +118,7 @@ xdsIR: - path: /dev/stdout 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 5d41c1ae69..1ff2e78da3 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 @@ -114,6 +114,7 @@ xdsIR: - path: /dev/stdout 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 b0d45963dd..b3637ad49e 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 @@ -113,6 +113,7 @@ xdsIR: - path: /dev/stdout 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 7e7a412f7a..ff62721e88 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 @@ -111,6 +111,7 @@ xdsIR: - path: /dev/stdout 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 154b33514b..0b4c20b886 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 @@ -112,6 +112,7 @@ xdsIR: - path: /dev/stdout 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 ca3284339b..0b004cd4c6 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 @@ -250,6 +250,7 @@ xdsIR: - path: /dev/stdout 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 48fd34be74..0a9c5e6734 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 @@ -347,6 +347,7 @@ xdsIR: - path: /dev/stdout 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 1cc501df2e..60c88d6a5d 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 @@ -353,6 +353,7 @@ xdsIR: - path: /dev/stdout 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 d28bfb180d..a8db0507b0 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml @@ -254,6 +254,7 @@ xdsIR: - path: /dev/stdout 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 ae420d85a5..d88fe8e367 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 @@ -103,6 +103,7 @@ xdsIR: - path: /dev/stdout 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 786618f52f..44579fa699 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -288,6 +288,7 @@ xdsIR: - path: /dev/stdout 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 3b11346c63..2312a03502 100644 --- a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -161,5 +162,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 faf676e406..f5a381898e 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 @@ -177,6 +177,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -191,6 +192,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8888 hostnames: - company.com isHTTP2: false @@ -205,6 +207,7 @@ xdsIR: mergeSlashes: true port: 8888 - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -219,6 +222,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 875425aede..494535b5fc 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 @@ -228,6 +228,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -272,6 +273,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -286,6 +288,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 bce4deb322..0af305bcbe 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml @@ -150,6 +150,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -164,6 +165,7 @@ xdsIR: mergeSlashes: true port: 10080 - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -178,6 +180,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 4b28b5a0c1..ac0ffb8a4b 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -506,6 +506,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - bar.example.com isHTTP2: false @@ -574,6 +575,7 @@ xdsIR: http: requestReceivedTimeout: 5s - address: 0.0.0.0 + externalPort: 80 hostnames: - foo.example.com isHTTP2: false @@ -642,6 +644,7 @@ xdsIR: http: requestReceivedTimeout: 5s - address: 0.0.0.0 + externalPort: 81 hostnames: - bar.example.com isHTTP2: false @@ -702,6 +705,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 27dfa1d93f..5b5ddad077 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -298,6 +298,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false @@ -363,6 +364,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 14af4c95df..d6a5594b77 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml @@ -95,6 +95,7 @@ xdsIR: - path: /dev/stdout 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 3f896cfafc..42171a75c2 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 @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 e3bf8410d3..baf51728ea 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 @@ -137,6 +137,7 @@ xdsIR: - path: /dev/stdout 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 c5f3a8856b..45e2d2dcf4 100644 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -560,6 +560,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - listener-1.gateway-1.envoyproxy.io isHTTP2: false @@ -817,6 +818,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 9cb21fc6e2..c531318d96 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml @@ -241,6 +241,7 @@ xdsIR: - path: /dev/stdout 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 6811013796..7c21ed4a00 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 @@ -3312,6 +3329,7 @@ xdsIR: - path: /dev/stdout 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 c5eead5d0f..ac63d73a2f 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 @@ -470,6 +471,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: true @@ -511,5 +513,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 6a994b3898..4463cdae92 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml @@ -290,6 +290,7 @@ xdsIR: - path: /dev/stdout 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 9cf6b62c8f..9f8bcf837f 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 @@ -146,6 +146,7 @@ xdsIR: - path: /dev/stdout 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 bd493eaa9b..7c09873d3e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml @@ -159,6 +159,7 @@ xdsIR: - path: /dev/stdout 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 2d01613558..a5891b96e8 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -222,6 +222,7 @@ xdsIR: - path: /dev/stdout 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 b16eb74b52..5698278c25 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 @@ -449,6 +451,7 @@ xdsIR: - path: /dev/stdout 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 d9212c35ec..ae082fc84a 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 @@ -560,6 +562,7 @@ xdsIR: - path: /dev/stdout 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 f12b79a416..f0374703e7 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml @@ -368,6 +368,7 @@ xdsIR: - path: /dev/stdout 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 7e9840bcea..08f5698838 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml @@ -233,6 +233,7 @@ xdsIR: - path: /dev/stdout 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 dc34fb936b..0a127973fa 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml @@ -208,6 +208,7 @@ xdsIR: - path: /dev/stdout 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 77e21c3e5c..648a4e6430 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 @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout 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 e899d2fa5a..c3d287328c 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 @@ -141,6 +141,7 @@ xdsIR: - path: /dev/stdout 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 dba0b2bb25..39d029642b 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 @@ -142,6 +142,7 @@ xdsIR: - path: /dev/stdout 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 07b58402a4..e8d8fc8e94 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 @@ -742,6 +744,7 @@ xdsIR: - path: /dev/stdout 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 64765bd9b1..42e0248997 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 @@ -188,6 +188,7 @@ xdsIR: - path: /dev/stdout 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 628bd999f7..e18f7bb860 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 @@ -188,6 +188,7 @@ xdsIR: - path: /dev/stdout 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 586b306976..b666272955 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml @@ -207,6 +207,7 @@ xdsIR: - path: /dev/stdout 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 dbd453397e..6ba7d7e68b 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml @@ -231,6 +231,7 @@ xdsIR: - path: /dev/stdout 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 cb66e48331..e31ef45bed 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -288,6 +288,7 @@ xdsIR: - path: /dev/stdout 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 f6bf47856b..8657928210 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -227,6 +227,7 @@ xdsIR: - path: /dev/stdout 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 bedb450446..8d3b0246f8 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 @@ -239,6 +239,7 @@ xdsIR: - path: /dev/stdout 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 28e7226e19..7690709187 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml @@ -211,6 +211,7 @@ xdsIR: - path: /dev/stdout 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 0da37f13ae..0b054c2532 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml @@ -371,6 +371,7 @@ xdsIR: - path: /dev/stdout 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 9e9369b53b..81f4c521ed 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 @@ -361,6 +362,7 @@ xdsIR: - path: /dev/stdout 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 8fc6f3c665..6aa32ba970 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml @@ -193,6 +193,7 @@ xdsIR: - path: /dev/stdout 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 90ede9685e..db631445de 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 @@ -360,6 +361,7 @@ xdsIR: - path: /dev/stdout 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 50dea3e3e2..c75aea6d71 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 @@ -352,6 +353,7 @@ xdsIR: - path: /dev/stdout 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 3277912885..200445fbeb 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 @@ -150,6 +150,7 @@ xdsIR: - path: /dev/stdout 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 b2d10cce02..231793a19b 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml @@ -216,6 +216,7 @@ xdsIR: - path: /dev/stdout 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 2927b1a496..3e42f1fa28 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 @@ -147,6 +147,7 @@ xdsIR: - path: /dev/stdout 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 331ef0d3b8..7fbce21000 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml @@ -145,6 +145,7 @@ xdsIR: - path: /dev/stdout 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 61da8b5b97..c5ff177bfe 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml @@ -161,6 +161,7 @@ xdsIR: - path: /dev/stdout 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 c9904814d8..daece1750d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml @@ -102,6 +102,7 @@ xdsIR: - path: /dev/stdout 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 0ef0d672ac..abc7e7be89 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 @@ -342,6 +344,7 @@ xdsIR: - path: /dev/stdout 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 c265650be7..75fb3a1cb8 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml @@ -198,6 +198,7 @@ xdsIR: - path: /dev/stdout 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 6b8b0edf44..f92dd9d9d2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -243,6 +243,7 @@ xdsIR: - path: /dev/stdout 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 bfd29ea140..993be57305 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 @@ -176,6 +176,7 @@ xdsIR: port: 19003 tcp: - address: 0.0.0.0 + externalPort: 90 name: envoy-gateway/gateway-1/tls port: 10090 routes: @@ -212,6 +213,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 2e239629cf..61db6edc28 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 @@ -111,6 +111,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 8bd0812304..9bc5cf2a6c 100644 --- a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml @@ -121,6 +121,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 6e1cd5d486..c5dd3fe5c3 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -104,6 +104,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 49ceacd9e1..0d07e49d55 100644 --- a/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml @@ -107,5 +107,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 327f8be37e..0ed83fc917 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -138,6 +138,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 8814191b2d..0d0ca6310e 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml @@ -124,6 +124,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 3486bd59e2..74f08f5e72 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 @@ -105,6 +105,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 13ae2ef0e6..4050738efb 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -103,6 +103,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 9581eeaed5..aa74555cd2 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -105,6 +105,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 b307872bb3..49c4dbe17c 100644 --- a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml @@ -235,6 +235,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -279,6 +280,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -293,6 +295,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 805cbdb432..6a282f4323 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 @@ -340,6 +341,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -354,6 +356,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 5124564f80..0a3d16ff5a 100644 --- a/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml +++ b/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml @@ -237,6 +237,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -281,6 +282,7 @@ xdsIR: name: "" prefix: / - address: 0.0.0.0 + externalPort: 8888 hostnames: - '*' isHTTP2: false @@ -295,6 +297,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 f72ed4a8ab..3cf01140e7 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 @@ -111,6 +111,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 4921b911db..1e71cb7537 100644 --- a/internal/gatewayapi/testdata/udproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/udproute-with-backend.out.yaml @@ -121,6 +121,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 7d04ccee03..f97250c359 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 @@ -3186,7 +3188,6 @@ type ResourceMetadata struct { SectionName string `json:"sectionName,omitempty" yaml:"sectionName,omitempty"` } - // RequestBuffer holds the information for the Buffer filter // +k8s:deepcopy-gen=true type RequestBuffer struct { diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index b0947ea3fa..3ec9eaca80 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -186,14 +186,11 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin // buildXdsTCPListener creates a xds Listener resource // TODO: Improve function parameters func buildXdsTCPListener( - name string, - address string, - port uint32, - ipFamily *egv1a1.IPFamily, + listenerDetails ir.CoreListenerDetails, keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, - useAddressAsListenerName bool, + useProtocolPortAsListenerName bool, ) (*listenerv3.Listener, error) { socketOptions := buildTCPSocketOptions(keepalive) al, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) @@ -203,7 +200,9 @@ func buildXdsTCPListener( bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection) maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection) listener := &listenerv3.Listener{ - Name: xdsListenerName(name, address, port, corev3.SocketAddress_TCP, useAddressAsListenerName), + Name: xdsListenerName( + listenerDetails.Name, listenerDetails.ExternalPort, + corev3.SocketAddress_TCP, useProtocolPortAsListenerName), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -212,16 +211,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 } @@ -229,13 +228,13 @@ func buildXdsTCPListener( return listener, nil } -func xdsListenerName(name, address string, port uint32, protocol corev3.SocketAddress_Protocol, useAddressAsListenerName bool) string { - if useAddressAsListenerName { +func xdsListenerName(name string, externalPort uint32, protocol corev3.SocketAddress_Protocol, useProtocolPortAsListenerName bool) string { + if useProtocolPortAsListenerName { protocolType := "tcp" if protocol == corev3.SocketAddress_UDP { protocolType = "udp" } - return fmt.Sprintf("%s-%s-%d", protocolType, address, port) + return fmt.Sprintf("%s-%d", protocolType, externalPort) } return name @@ -260,20 +259,18 @@ func buildMaxAcceptPerSocketEvent(connection *ir.ClientConnection) *wrapperspb.U // buildXdsQuicListener creates a xds Listener resource for quic func buildXdsQuicListener( - name string, - address string, - port uint32, + listenerDetails ir.CoreListenerDetails, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog, - useAddressAsListenerName bool, + useProtocolPortAsListenerName bool, ) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { return nil, err } - listenerName := name + "-quic" - if useAddressAsListenerName { - listenerName = xdsListenerName(name, address, port, corev3.SocketAddress_UDP, true) + listenerName := listenerDetails.Name + "-quic" + if useProtocolPortAsListenerName { + listenerName = xdsListenerName(listenerDetails.Name, listenerDetails.ExternalPort, corev3.SocketAddress_UDP, true) } xdsListener := &listenerv3.Listener{ Name: listenerName, @@ -282,9 +279,9 @@ func buildXdsQuicListener( 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, }, }, }, @@ -316,8 +313,9 @@ func buildXdsQuicListener( // 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 { @@ -355,7 +353,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(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), }, }, HttpProtocolOptions: http1ProtocolOptions(irListener.HTTP1), @@ -452,7 +450,7 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: irListener.Name, + Name: filterChianName(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), } if irListener.TLS != nil { @@ -493,6 +491,17 @@ func (t *Translator) addHCMToXDSListener(xdsListener *listenerv3.Listener, irLis return nil } +func routeConfigName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { + if useProtocolPortAsListenerName { + return xdsListener.Name + } + return irListener.Name +} + +func filterChianName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { + return routeConfigName(xdsListener, irListener, useProtocolPortAsListenerName) +} + func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensionConfig { if headers == nil || (len(headers.EarlyAddRequestHeaders) == 0 && len(headers.EarlyRemoveRequestHeaders) == 0) { return nil @@ -953,7 +962,7 @@ func buildXdsUDPListener( clusterName string, udpListener *ir.UDPListener, accesslog *ir.AccessLog, - useAddressAsListenerName bool, + useProtocolPortAsListenerName bool, ) (*listenerv3.Listener, error) { if udpListener == nil { return nil, errors.New("udp listener is nil") @@ -998,7 +1007,7 @@ func buildXdsUDPListener( return nil, err } xdsListener := &listenerv3.Listener{ - Name: xdsListenerName(udpListener.Name, udpListener.Address, udpListener.Port, corev3.SocketAddress_UDP, useAddressAsListenerName), + Name: xdsListenerName(udpListener.Name, udpListener.ExternalPort, corev3.SocketAddress_UDP, useProtocolPortAsListenerName), AccessLog: al, Address: &corev3.Address{ Address: &corev3.Address_SocketAddress{ diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index c69173c524..0235711d48 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -40,6 +40,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: "http-route" hostname: "*" @@ -81,6 +82,7 @@ tcp: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 port: 10080 + externalPort: 80 routes: - destination: name: "tcp-route-dest" @@ -129,3 +131,4 @@ udp: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/udp1 port: 10162 + externalPort: 162 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 525e6fe3aa..542b88cfa9 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -2,6 +2,7 @@ http: - name: "custom-backend-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml index f8ea27d5f9..3c857d15ee 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml @@ -2,6 +2,7 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml index fa535cc853..21342f168c 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml @@ -2,6 +2,7 @@ http: - name: "custom-backend-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml index aaf3026e77..33fe90a5a0 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml @@ -2,6 +2,7 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml index f5e357591f..ef73ffdd57 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml @@ -2,6 +2,7 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml index 2c700de333..ca73724452 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml @@ -2,6 +2,7 @@ http: - name: "extension-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index 195543e0bf..cd23deb24b 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -2,6 +2,7 @@ http: - name: "extension-post-xdslistener-hook-error" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml index ec8a3b8958..44123a77a7 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index 6da2a952ce..660f5f5869 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -2,6 +2,7 @@ http: - name: "extension-post-xdstranslate-hook-error" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml index 7d2bf1516d..e7528f9baa 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml @@ -2,6 +2,7 @@ http: - name: "extension-post-xdsvirtualhost-hook-error" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index 64c8a8d6cb..14f7ea9d9b 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 854a1aa55d..5c983e5479 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener-error" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -35,6 +36,7 @@ http: - name: "second-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.net" metadata: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml index 5c548da73e..3b5e70f238 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml @@ -2,6 +2,7 @@ http: - name: "test-listener-modify" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml index ffc5288f58..a702470535 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml index f336ff2441..a685246f0f 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml index ba754317d3..8142047621 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml index 6023079da6..b23d06c3d2 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml index 4ef021a6ab..5c18fa7251 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml index a18569f26d..8c05f88d3c 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml index 2a3082a428..94ecdeea81 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml index 0b54b1b88a..a310be8a39 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml index 5f782ece39..2d0461944d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml index 5bb4837816..21e89bb0ac 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -36,6 +37,7 @@ http: - name: "second-listener" address: "0.0.0.0" port: 10081 + externalPort: 81 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml index 5c5da5d05b..a898961beb 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml index 4d729cbb10..2e20067c86 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -37,6 +38,7 @@ http: - name: "second-listener" address: "0.0.0.0" port: 10081 + externalPort: 81 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml index 28ca21ca03..c6252a6af4 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml index c21b7dcf10..f09ad1e8e5 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml index eecc3fcb21..819834c82f 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml index c3929f7e11..0bb9e6efcf 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml index 8bae05f4a9..b584378c0d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml index 0cd5887d1d..c7264c52b4 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml index ac6f7a1a88..162e4d9f44 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml index 13cd6e658e..7d695c9ca3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml @@ -39,6 +39,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml index 8430249f05..c93f047edc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml @@ -35,6 +35,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml index e142de8922..b8b8adcc1f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml @@ -43,6 +43,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml index b7fbe35731..5ad0fad7fc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml @@ -29,6 +29,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml index c935d6704d..68eda0d2d5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml @@ -43,6 +43,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml index 7ded29cb84..5e7ddb36f4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml @@ -51,6 +51,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml index 428ad7481f..7788c9f86c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml @@ -48,6 +48,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index a1b0e995ed..52ef810044 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -58,6 +58,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml index b9a890b1bb..bf4f19d6f2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml @@ -2,6 +2,7 @@ http: - name: "envoy-gateway/gateway-1/http" address: 0.0.0.0 port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -35,6 +36,7 @@ http: - name: "envoy-gateway/gateway-1/http-ipv6" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.net" path: @@ -76,6 +78,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10443 + externalPort: 443 routes: - destination: metadata: @@ -118,6 +121,7 @@ tcp: - name: "envoy-gateway/gateway-1/tls" address: 0.0.0.0 port: 10090 + externalPort: 90 routes: - destination: metadata: @@ -168,6 +172,7 @@ tcp: - name: envoy-gateway/gateway-1/tcp address: 0.0.0.0 port: 10091 + externalPort: 91 routes: - destination: metadata: @@ -192,6 +197,7 @@ udp: - name: envoy-gateway/gateway-1/udp address: 0.0.0.0 port: 10090 + externalPort: 90 route: destination: metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml index ccb220f899..68caefd30e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml index 605fd279f5..f3cf8a9a3f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-3/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml index 053844ae00..fcc6d75717 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml index 321ad85efa..05a840a9bf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml index 95ffc4a947..16debebac4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml index 58e0cafc0d..446e157fb7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml index 881cf303de..06d0596650 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -31,6 +32,7 @@ tcp: connection: bufferLimit: 1500 port: 10081 + externalPort: 81 routes: - name: "tcp-route-dest" destination: @@ -46,6 +48,7 @@ udp: - name: "udp-route" address: "::" port: 10080 + externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml index 31e142cd48..d62eb83d33 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml index 1a185f2110..0bedf30aa7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml index f138e5d538..b6019aa642 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml index e43d39d52b..0caa52298f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml b/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml index f9826c13bc..3cf1b35020 100644 --- a/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml index 93624d2e30..b755d67880 100644 --- a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml index fd5d524940..64aa99703e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -30,6 +31,7 @@ tcp: connection: bufferLimit: 1500 port: 10081 + externalPort: 81 routes: - name: "tcp-route-dest" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml index ef79ae9935..2ebc57b760 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -31,6 +32,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml index 46999a4b00..725b25b1bb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -30,6 +31,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/compression.yaml b/internal/xds/translator/testdata/in/xds-ir/compression.yaml index 6d271a0dd6..037af59ced 100644 --- a/internal/xds/translator/testdata/in/xds-ir/compression.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/compression.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml index 23d0fd30a9..2c9ddf983e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/cors.yaml b/internal/xds/translator/testdata/in/xds-ir/cors.yaml index cbf924e528..09a69e7bbe 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml b/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml index 1d8a4e7973..1ffbbb079a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/1 diff --git a/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml index 0edc17e02d..962ab7ab8e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - credentialInjection: name: httproutefilter/default/credential-injection-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml index 1ebc6d6640..2fc6043678 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml @@ -18,6 +18,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 1 diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml index 66a8bb601e..3d136475c6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml b/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml index 9fcd42b86e..89d862e75a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml @@ -36,6 +36,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml index 6350a10e5d..3f015a6402 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml index f506a1f42f..111c9c78da 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml index 2ff1ba423f..e71731e1cc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml index 070f50a51a..625b842e20 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml index 46635150dd..98c90b6244 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml index bc783deef2..6b03b92bcc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml index 825740f001..0d6c4821e6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml index 0a55d37e4f..a80656a6aa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml @@ -10,6 +10,7 @@ http: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect port: 10080 + externalPort: 80 hostnames: - "*" routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml index 94d9783d7c..ff2161c606 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml b/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml index 0c5298050a..e1e0fc217b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml index f3aae14849..46203b6962 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -27,6 +28,7 @@ http: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml index 4d51aca4b4..80ff9b8ecb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml @@ -5,6 +5,7 @@ http: - name: "listener-enable-endpoint-stats" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml index 5034c24453..e032863030 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml index 4fb3098ea0..6149dbb645 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml index 25832d9d74..911ca14f28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml @@ -5,6 +5,7 @@ http: - name: "listener-enable-req-resp-sizes-stats" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index 7dc0880828..38184a7ea6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml index 72c229c445..6d73b90b67 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml index b996416c43..d14db668da 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml index da894ccaa9..dd2d977506 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index 200b616648..c6c175e8a2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml index 33194f50ec..231d3890b5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml index c4aa621f0c..64bed5469b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml @@ -2,6 +2,7 @@ http: - name: first-listener address: 0.0.0.0 port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml index 949a00be79..97065054d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml index 340bc5f164..c1006f467c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml index 34613e2edf..241763e4a7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index 1bb0a4a9e5..a32f4bcf90 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml index d4fa262916..7d58563ead 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index 0796e89c6d..2638c98ccc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index 02cb4865cc..5e542434c9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index 6bb4429411..60d403d55c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index ad45258451..27e7cff586 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml index 4e44b8e4f7..38ed8d4ef1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml index 51991863cb..7a7179955f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 18b0e24660..98439f41cb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index 6d9037bb23..f503cecc5f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: 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 f549ef3ec3..e52c4db38f 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 @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -52,4 +53,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 72f6173925..0e02721301 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 @@ -3,6 +3,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -50,4 +51,3 @@ http: timeout: http: requestTimeout: 5s - diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml index dea176191f..34a3966f70 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml index 7b553442df..3ae4ef78d6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml index 9ac1bff36c..2d6cebcd17 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml index 1645b6caf1..3786468487 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml index d5421b9113..efde1c5c0b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml @@ -12,6 +12,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: "first-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index e5a269757e..bfda71583a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index fc8bc8d29f..1b1de2232e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml index ec0efba6d1..bd0edaaf44 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml index c0b2fce601..5733d8417f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml @@ -2,6 +2,7 @@ http: - name: first-listener address: 0.0.0.0 port: 10080 + externalPort: 80 metadata: groupVersion: "gateway.networking.k8s.io/v1" kind: "Gateway" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml index ed0334e667..4dbe6a4303 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml index 6630438c41..f1a4e6d04c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 0 @@ -74,6 +75,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 + externalPort: 81 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml index 9854745f5e..4aa35d02fe 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml index 0414b055f6..2bc7da89e5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml index d1c5a3206a..619a1a2d06 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index 84fbec6218..b66a0117d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml index caac615cf1..bf8419179b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml index 52b4a7696a..b3766449ce 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml index e23ef3780a..11a226b46e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -27,6 +28,7 @@ http: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml index 063d4bd2da..24fd58868f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http10.yaml b/internal/xds/translator/testdata/in/xds-ir/http10.yaml index 4351655838..a3984b5178 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http10.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http10.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml index 0be54b870d..d26376de23 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index 81ee39491b..f13a711a75 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2.yaml b/internal/xds/translator/testdata/in/xds-ir/http2.yaml index 1cf9371d80..1c809a4b49 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/http3.yaml b/internal/xds/translator/testdata/in/xds-ir/http3.yaml index 8d068e383f..1fd9b4f80f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http3.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http3.yaml @@ -12,6 +12,7 @@ http: sectionName: http3 name: envoy-gateway/gateway-1/tls port: 10443 + externalPort: 443 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml index 22f90d3ae9..2443d50061 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml @@ -30,6 +30,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index 1eaabf13e7..60781b1cff 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -35,6 +35,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml index 280ae0ca64..e47ee26ab3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml @@ -54,6 +54,7 @@ http: - name: "first-listener" address: "" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index 52b42c3672..236a7897a9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -30,6 +30,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml index 962440496c..c6ef82decc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml @@ -58,6 +58,7 @@ http: - name: "first-listener" address: "" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml index 05aa3f92b4..5dcf4ae737 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml @@ -30,6 +30,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index b742612868..4b9eb2e0cb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -38,6 +38,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml index 6d8e298d01..16470fd112 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml @@ -19,6 +19,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index 2fe7617f4d..0177f082e2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -122,6 +122,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index a449000db9..42fd9f7af0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -111,6 +111,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml index 65cba64a60..f442cd4a47 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml index 6d42c4a662..c13e6f69a0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml index 554918acdb..7284f86b53 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml index 2ad10fa327..7225c0c33b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml index 38286abf78..b12f07b21b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml index 13ea83a458..77fd8adeb7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml index f1ba24346d..7f8abbc596 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml index 1124b66709..9d5d0373f0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -26,6 +27,7 @@ http: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 hostnames: - "foo.net" metadata: @@ -53,6 +55,7 @@ tcp: - name: "third-listener" address: "::" port: 10082 + externalPort: 82 connection: limit: value: 3 @@ -75,6 +78,7 @@ tcp: value: 10 closeDelay: 3s port: 10083 + externalPort: 83 routes: - destination: name: "tcp-route-dest" 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..1c233668a8 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 @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10443 + externalPort: 443 routes: - destination: name: httproute/envoy-gateway/httproute-1/rule/0 @@ -56,6 +57,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10443 + externalPort: 443 routes: - destination: name: httproute/envoy-gateway/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml index fa2213822b..cef56b70e2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -40,6 +41,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 enableProxyProtocol: true routes: - name: "tcp-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml index 465ddda627..e05d35a2ec 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -26,6 +27,7 @@ http: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 hostnames: - "foo.net" metadata: @@ -54,6 +56,7 @@ tcp: - name: "third-listener" address: "::" port: 10082 + externalPort: 82 tcpKeepalive: {} routes: - tls: @@ -72,6 +75,7 @@ tcp: tcpKeepalive: probes: 10 port: 10083 + externalPort: 83 routes: - destination: name: "tcp-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml index cc24bfbdf0..eb0a52a13d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml @@ -8,6 +8,7 @@ tcp: enableProxyProtocol: true name: envoy-gateway/gateway-1/tls-1 port: 10443 + externalPort: 443 tcpKeepalive: idleTime: 1200 interval: 60 diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index 0a7b2a028b..f18d7ed24e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml index 7e9cb503ff..86f305dba2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml index 49d803e4c6..1664cfa819 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/lua.yaml b/internal/xds/translator/testdata/in/xds-ir/lua.yaml index 05ae59f82e..9206bf1488 100644 --- a/internal/xds/translator/testdata/in/xds-ir/lua.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/lua.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml index 3006d3a2b7..8253108e3e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -30,6 +31,7 @@ tcp: connection: maxAcceptPerSocketEvent: 0 port: 10081 + externalPort: 81 routes: - name: "max-accept-disabled" destination: @@ -42,6 +44,7 @@ tcp: - name: "third-listener" address: "::" port: 10082 + externalPort: 82 routes: - name: "max-accept-default" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml index c775baebbc..9b6bbe61d8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml @@ -5,6 +5,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml index 7857c29889..8227f14ed1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml index 834a03920a..0c2799fcbb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml @@ -18,6 +18,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com @@ -92,6 +93,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - name: httproute/default/httproute-3/rule/0/match/0/www_bar_com hostname: www.bar.com diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index 2120ce23d4..7170fee84e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -35,6 +36,7 @@ http: - name: "second-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.net" path: @@ -63,6 +65,7 @@ http: - name: "third-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "example.com" path: @@ -81,6 +84,7 @@ http: - name: "fourth-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "example.net" path: @@ -100,6 +104,7 @@ tcp: - name: "fifth-listener" address: "::" port: 10080 + externalPort: 80 routes: - name: "fifth-route" tls: @@ -116,6 +121,7 @@ tcp: - name: "sixth-listener" address: "::" port: 10080 + externalPort: 80 routes: - name: "sixth-route" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml index 4ce2211ce5..c337e5b58d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple" destination: @@ -16,6 +17,7 @@ tcp: - name: "tcp-listener-simple-1" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple-1" destination: @@ -30,6 +32,7 @@ tcp: - name: "tcp-listener-simple-2" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple-2" destination: @@ -44,6 +47,7 @@ tcp: - name: "tcp-listener-simple-3" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple-3" destination: @@ -58,6 +62,7 @@ tcp: - name: "tcp-listener-simple-4" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple-4" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml index b68991b315..c47ba92eeb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10001 + externalPort: 10001 hostnames: - "*" metadata: @@ -44,6 +45,7 @@ http: - name: "second-listener" address: "::" port: 10002 + externalPort: 10002 hostnames: - "*" metadata: @@ -87,6 +89,7 @@ http: - name: "third-listener" address: "::" port: 10003 + externalPort: 10003 hostnames: - "*" metadata: @@ -131,6 +134,7 @@ http: - name: "fourth-listener" address: "::" port: 10004 + externalPort: 10004 hostnames: - "*" metadata: @@ -177,6 +181,7 @@ http: - name: "fifth-listener" address: "::" port: 10005 + externalPort: 10005 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml index 97151eea0f..d06daef48e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10001 + externalPort: 10001 hostnames: - "*" metadata: @@ -44,6 +45,7 @@ http: - name: "second-listener" address: "::" port: 10002 + externalPort: 10002 hostnames: - "*" metadata: @@ -86,6 +88,7 @@ http: - name: "third-listener" address: "::" port: 10003 + externalPort: 10003 hostnames: - "*" metadata: @@ -128,6 +131,7 @@ http: - name: "fourth-listener" address: "::" port: 10004 + externalPort: 10004 hostnames: - "*" metadata: @@ -170,6 +174,7 @@ http: - name: "fifth-listener" address: "::" port: 10005 + externalPort: 10005 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml index 06c5612bac..b8a6decb2a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -43,6 +44,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 tls: certificates: - name: secret-3 diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml index dca5f04d07..4f23395f71 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -57,6 +58,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 tls: alpnProtocols: [] certificates: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml index 7876c928af..1aeec13177 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: @@ -43,6 +44,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 tls: certificates: - name: secret-3 diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml index 4563c0728e..3c26839bb3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml @@ -2,6 +2,7 @@ http: - name: envoy-gateway/gateway-1/http address: 0.0.0.0 port: 10080 + externalPort: 80 hostnames: - '*' metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml index a891619ecb..7fe0203fc8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml index ed624aff35..db15011f30 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml index 43aa19500b..278948a933 100644 --- a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml @@ -5,6 +5,7 @@ http: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml index db169f2742..cac77a7f99 100644 --- a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml index 05c09f1096..5f2e1736ac 100644 --- a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index 6fb63483c2..d4fc3dac02 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml index 00f286ab7c..4a7071a3d9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml index ef5754a734..7a86d58ecf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml @@ -9,6 +9,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml index e511bf832d..f566f8b447 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml @@ -9,6 +9,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml index 6c04cc0884..18b27e9b7e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml index 3697ef453e..eb7b629201 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml @@ -9,6 +9,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index f59fb03dad..3038bae945 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -8,6 +8,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index e01a5504f0..039ff55bc5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -7,6 +7,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml b/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml index 54b2ba2659..74b7a712b4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 @@ -52,6 +53,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 + externalPort: 81 routes: - destination: name: httproute/default/httproute-2/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml index 5f1f8972da..55fcc67f8b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/retry.yaml b/internal/xds/translator/testdata/in/xds-ir/retry.yaml index 0739320fa5..c529fff709 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml index f3e8399384..7b9867f3a1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml @@ -13,6 +13,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index 0c3ac84db8..b7a4b165ad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml index 35f399d684..e0d2291746 100644 --- a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml index 747b8d3d42..444c65070e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml @@ -5,6 +5,7 @@ tcp: - name: "tcp-route-enable-endpoint-stats" address: "::" port: 10080 + externalPort: 80 routes: - destination: name: "tcp-route-simple-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml index 8365c9706f..b4c419ec28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml @@ -5,6 +5,7 @@ tcp: - name: "tcp-route-enable-req-resp-sizes-stats" address: "::" port: 10080 + externalPort: 80 routes: - destination: name: "tcp-route-simple-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml index 62d4ffa1d2..c8cc0eb5fb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-complex" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-complex" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml index 80511b1289..55d23d6516 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml index d694b2c7e4..93b63da5ea 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-invalid" address: "" port: 10080 + externalPort: 80 routes: - name: "tcp-route-invalid" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml index da4cc242f3..bd9edfd78a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-simple" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml index e2723636a2..7f75d59d28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml @@ -2,6 +2,7 @@ tcp: - name: "tls-listener-terminate" address: "::" port: 10080 + externalPort: 80 routes: - name: "tls-route-terminate" tls: @@ -23,6 +24,7 @@ tcp: - name: "tls-terminate-hostname" address: "::" port: 10080 + externalPort: 80 tls: inspector: snis: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml index e54b06c8f9..599261a61d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml @@ -2,6 +2,7 @@ tcp: - name: "tcp-listener-weighted-backend" address: "::" port: 10080 + externalPort: 80 routes: - name: "tcp-route-weighted-backend" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml index dafca1cf20..9606fd053b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml @@ -2,3 +2,4 @@ tcp: - name: "tcp-listener-with-no-routes" address: "::" port: 10080 + externalPort: 80 diff --git a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml index 7f9ae7f764..c37cad34d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml index 4b294edad6..cac0dd0a5a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml @@ -2,6 +2,7 @@ tcp: - name: "tls-passthrough-foo" address: "::" port: 10080 + externalPort: 80 routes: - name: "tls-route-passthrough-foo" tls: @@ -20,6 +21,7 @@ tcp: - name: "tls-passthrough-bar" address: "::" port: 10081 + externalPort: 81 routes: - name: "tls-route-passthrough-bar" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml index 4be22a0828..9dd130a323 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml @@ -5,6 +5,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 hostnames: - "foo.com" metadata: @@ -59,6 +60,7 @@ tcp: - name: "second-listener" address: "::" port: 10081 + externalPort: 81 tls: ciphers: - ECDHE-ECDSA-AES128-GCM-SHA256 diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml index 0bec2ae261..b3f217a3a1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml @@ -33,6 +33,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml index 7cda6a2bdf..db34d693ba 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml @@ -32,6 +32,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml index 32ca5963d2..95cf2fe24a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml @@ -37,6 +37,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml index 00329fd9c3..0735df0698 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml @@ -24,6 +24,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml index 5d8e2e81d6..d2a8d06dc4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml @@ -33,6 +33,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index 152b68dff4..09b7758855 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -38,6 +38,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml index e03c6b0bb9..8e294f81d3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml @@ -56,6 +56,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml index 9516e43cce..2af4910547 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml @@ -5,6 +5,7 @@ udp: - name: "udp-route-enable-endpoint-stats" address: "::" port: 10080 + externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml index fe37c063f6..235ca0b530 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml @@ -5,6 +5,7 @@ udp: - name: "udp-route-enable-req-resp-sizes-stats" address: "::" port: 10080 + externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml index 94b3bdad06..b11964ef5b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml @@ -1,6 +1,7 @@ udp: - name: "udp-route" port: 10080 + externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml index c78d4436d6..7e9fb3e90a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml @@ -3,6 +3,7 @@ udp: - name: "udp-route" address: "0.0.0.0" port: 10162 + externalPort: 162 route: destination: metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml index fc6a647cba..e1410ebb37 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml @@ -2,3 +2,4 @@ udp: - name: "udp-route-with-no-routes" address: "::" port: 10080 + externalPort: 80 diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml index e7d5a5a412..f59b8b33db 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml @@ -2,6 +2,7 @@ udp: - name: "udp-route" address: "::" port: 10080 + externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml index 3e5c7c47ab..93bafa730f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml @@ -2,6 +2,7 @@ http: - name: "first-listener" address: "::" port: 10080 + externalPort: 80 hostnames: - "*" metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml index 85f27ab434..c791f43392 100644 --- a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml @@ -18,6 +18,7 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml index e7cb10f1fd..a86e7f509f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml @@ -28,11 +28,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/http + routeConfigName: tcp-80 serverHeaderTransformation: PASS_THROUGH statPrefix: https-10080 useRemoteAddress: true - name: envoy-gateway/gateway-1/http + name: tcp-80 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -56,12 +56,8 @@ metadata: filterMetadata: envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http - name: tcp-0.0.0.0-10080 + resources: [] + name: tcp-80 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -93,11 +89,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/http-ipv6 + routeConfigName: tcp-80 serverHeaderTransformation: PASS_THROUGH statPrefix: https-10080 useRemoteAddress: true - name: envoy-gateway/gateway-1/http-ipv6 + name: tcp-80 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -118,11 +114,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] - name: tcp-::-10080 + name: tcp-80 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -155,11 +147,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/https-http3 + routeConfigName: udp-443 serverHeaderTransformation: PASS_THROUGH statPrefix: https-10443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https-http3 + name: udp-443 transportSocket: name: envoy.transport_sockets.quic typedConfig: @@ -186,7 +178,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: https - name: udp-0.0.0.0-10443 + name: udp-443 udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} @@ -217,11 +209,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway/gateway-1/https-http3 + routeConfigName: tcp-443 serverHeaderTransformation: PASS_THROUGH statPrefix: https-10443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https-http3 + name: tcp-443 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -249,7 +241,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: https - name: tcp-0.0.0.0-10443 + name: tcp-443 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -281,7 +273,7 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-0.0.0.0-10090 + name: tcp-90 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -296,7 +288,7 @@ statPrefix: tcp-10091 name: tcproute/default/tcproute-1 maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-0.0.0.0-10091 + name: tcp-91 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -315,4 +307,4 @@ '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route cluster: udproute/default/udproute statPrefix: service - name: udp-0.0.0.0-10090 + name: udp-90 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 7bde5730d3..473ff9af81 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -286,9 +286,8 @@ 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, - t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + if quicXDSListener, err = buildXdsQuicListener(httpListener.CoreListenerDetails, httpListener.IPFamily, + accessLog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -302,9 +301,8 @@ 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, - t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + httpListener.CoreListenerDetails, httpListener.TCPKeepalive, httpListener.Connection, + accessLog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { errs = errors.Join(errs, err) continue } @@ -507,7 +505,8 @@ 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(xdsRouteCfg, httpListener, underscoredHostname, + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), Domains: []string{httpRoute.Hostname}, Metadata: buildXdsMetadata(httpListener.Metadata), } @@ -659,6 +658,15 @@ func (t *Translator) addRouteToRouteConfig( return errs } +func virtualHostName(xdsRouteCfg *routev3.RouteConfiguration, httpListener *ir.HTTPListener, + underscoredHostname string, useProtocolPortAsListenerName bool, +) string { + if useProtocolPortAsListenerName { + return fmt.Sprintf("%s/%s", xdsRouteCfg.Name, underscoredHostname) + } + return fmt.Sprintf("%s/%s", httpListener.Name, underscoredHostname) +} + func (t *Translator) addHTTPFiltersToHCM(filterChain *listenerv3.FilterChain, httpListener *ir.HTTPListener) error { var ( hcm *hcmv3.HttpConnectionManager @@ -734,9 +742,8 @@ func (t *Translator) processTCPListenerXdsTranslation( xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port) if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( - tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, - tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, - t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)); err != nil { + tcpListener.CoreListenerDetails, tcpListener.TCPKeepalive, tcpListener.Connection, + accesslog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -857,7 +864,7 @@ func (t *Translator) processUDPListenerXdsTranslation( xdsListener, err := buildXdsUDPListener( udpListener.Route.Destination.Name, udpListener, accesslog, - t.RuntimeFlags.IsEnabled(egv1a1.UseAddressAsListenerName)) + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)) 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 7b001647de..dd5bbb7d5d 100644 --- a/internal/xds/translator/translator_test.go +++ b/internal/xds/translator/translator_test.go @@ -137,7 +137,7 @@ func TestTranslateXds(t *testing.T) { }, "address-as-listener-name": { runtimeFlags: &egv1a1.RuntimeFlags{ - Enabled: []egv1a1.RuntimeFlag{egv1a1.UseAddressAsListenerName}, + Enabled: []egv1a1.RuntimeFlag{egv1a1.UseProtocolPortAsListenerName}, }, }, } diff --git a/release-notes/current.yaml b/release-notes/current.yaml index f36ba21b0e..7294ab8aba 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -4,7 +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 address and port, 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 `UseAddressAsListenerName` 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. + 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 `useProtocolPortAsListenerName` 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 b5ad578b92..d694069674 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -4444,7 +4444,7 @@ _Appears in:_ | Value | Description | | ----- | ----------- | -| `UseAddressAsListenerName` | UseAddressAsListenerName indicates that the listener name should be derived from the address and port.
| +| `UseProtocolPortAsListenerName` | UseProtocolPortAsListenerName indicates that the listener name should be derived from the protocol and port.
| #### RuntimeFlags diff --git a/test/config/envoy-gateaway-config/address-as-listener-name.yaml b/test/config/envoy-gateaway-config/address-as-listener-name.yaml index 4f863046c5..6a6b22d43e 100644 --- a/test/config/envoy-gateaway-config/address-as-listener-name.yaml +++ b/test/config/envoy-gateaway-config/address-as-listener-name.yaml @@ -21,4 +21,4 @@ data: url: redis.redis-system.svc.cluster.local:6379 runtimeFlags: enabled: - - UseAddressAsListenerName + - useProtocolPortAsListenerName diff --git a/test/config/helm/address-as-listener-name.yaml b/test/config/helm/address-as-listener-name.yaml index 06240f6b05..6a4befe170 100644 --- a/test/config/helm/address-as-listener-name.yaml +++ b/test/config/helm/address-as-listener-name.yaml @@ -2,4 +2,4 @@ config: envoyGateway: runtimeFlags: enabled: - - UseAddressAsListenerName + - useProtocolPortAsListenerName diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index be7b96afde..020b6a3d7b 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -71,7 +71,7 @@ func TestE2E(t *testing.T) { ) } - if tests.UseAddressAsListenerName() { + if tests.UseProtocolPortAsListenerName() { skipTests = append(skipTests, tests.EnvoyPatchPolicyTest.ShortName, ) diff --git a/test/e2e/testdata/envoy-patch-policy-ipv4.yaml b/test/e2e/testdata/envoy-patch-policy-ipv4.yaml index ca5e2f6672..f0ede72827 100644 --- a/test/e2e/testdata/envoy-patch-policy-ipv4.yaml +++ b/test/e2e/testdata/envoy-patch-policy-ipv4.yaml @@ -29,7 +29,7 @@ spec: type: JSONPatch jsonPatches: - type: "type.googleapis.com/envoy.config.listener.v3.Listener" - name: "tcp-0.0.0.0-10080" + name: "tcp-80" operation: op: add path: "/default_filter_chain/filters/0/typed_config/local_reply_config" diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go index 342d7cca1f..a282223232 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -735,7 +735,7 @@ func IsGatewayNamespaceMode() bool { } // TODO(zhaohuabing) remove this after the feature flag is removed. -func UseAddressAsListenerName() bool { +func UseProtocolPortAsListenerName() bool { return DeployProfile == "address-as-listener-name" } From 5863891af6f38f45bd9be5e54af0507feaaebe33 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 25 Jul 2025 04:58:04 +0000 Subject: [PATCH 17/44] rename tests Signed-off-by: Huabing (Robin) Zhao --- .github/workflows/build_and_test.yaml | 8 +- ...r-name.yaml => port-as-listener-name.yaml} | 64 +++++++++++++-- ...ml => port-as-listener-name.clusters.yaml} | 0 ...l => port-as-listener-name.endpoints.yaml} | 0 ...l => port-as-listener-name.listeners.yaml} | 77 +++++++++++++++++-- ...yaml => port-as-listener-name.routes.yaml} | 38 ++++++++- ...aml => port-as-listener-name.secrets.yaml} | 6 ++ internal/xds/translator/translator.go | 12 +-- internal/xds/translator/translator_test.go | 2 +- ...r-name.yaml => port-as-listener-name.yaml} | 0 test/e2e/tests/utils.go | 2 +- 11 files changed, 178 insertions(+), 31 deletions(-) rename internal/xds/translator/testdata/in/xds-ir/{address-as-listener-name.yaml => port-as-listener-name.yaml} (83%) rename internal/xds/translator/testdata/out/xds-ir/{address-as-listener-name.clusters.yaml => port-as-listener-name.clusters.yaml} (100%) rename internal/xds/translator/testdata/out/xds-ir/{address-as-listener-name.endpoints.yaml => port-as-listener-name.endpoints.yaml} (100%) rename internal/xds/translator/testdata/out/xds-ir/{address-as-listener-name.listeners.yaml => port-as-listener-name.listeners.yaml} (82%) rename internal/xds/translator/testdata/out/xds-ir/{address-as-listener-name.routes.yaml => port-as-listener-name.routes.yaml} (64%) rename internal/xds/translator/testdata/out/xds-ir/{address-as-listener-name.secrets.yaml => port-as-listener-name.secrets.yaml} (93%) rename test/config/envoy-gateaway-config/{address-as-listener-name.yaml => port-as-listener-name.yaml} (100%) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 6c93d8a8b7..3416fdf55d 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -104,10 +104,10 @@ jobs: profile: gateway-namespace-mode - version: v1.33.1 ipFamily: ipv4 - profile: address-as-listener-name + profile: port-as-listener-name - version: v1.32.5 ipFamily: ipv6 - profile: address-as-listener-name + profile: port-as-listener-name steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps @@ -157,10 +157,10 @@ jobs: profile: gateway-namespace-mode - version: v1.33.1 ipFamily: ipv4 - profile: address-as-listener-name + profile: port-as-listener-name - version: v1.32.5 ipFamily: ipv6 - profile: address-as-listener-name + profile: port-as-listener-name steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps diff --git a/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml similarity index 83% rename from internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml rename to internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml index bf4f19d6f2..367b91141e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/address-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml @@ -1,5 +1,5 @@ http: -- name: "envoy-gateway/gateway-1/http" +- name: "envoy-gateway/gateway-1/http1" address: 0.0.0.0 port: 10080 externalPort: 80 @@ -9,7 +9,7 @@ http: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -33,12 +33,51 @@ http: - host: "1.2.3.4" port: 50000 name: "first-route-dest/backend/0" -- name: "envoy-gateway/gateway-1/http-ipv6" - address: "::" +- name: "envoy-gateway/gateway-1/http2" + address: 0.0.0.0 port: 10080 externalPort: 80 hostnames: + - "bar.com" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + 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: "*" + 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/http-ipv6" + address: "::" + port: 10081 + externalPort: 81 + hostnames: - "foo.net" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http-ipv6 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -73,7 +112,7 @@ http: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https + sectionName: https-http3 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true @@ -122,6 +161,11 @@ tcp: address: 0.0.0.0 port: 10090 externalPort: 90 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tls routes: - destination: metadata: @@ -173,6 +217,11 @@ tcp: address: 0.0.0.0 port: 10091 externalPort: 91 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: tcp routes: - destination: metadata: @@ -198,6 +247,11 @@ udp: address: 0.0.0.0 port: 10090 externalPort: 90 + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: udp route: destination: metadata: diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml similarity index 100% rename from internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.clusters.yaml rename to internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.endpoints.yaml similarity index 100% rename from internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.endpoints.yaml rename to internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.endpoints.yaml diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml similarity index 82% rename from internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml rename to internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml index a86e7f509f..7d59eba996 100644 --- a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml @@ -48,6 +48,51 @@ 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: tcp-80 + serverHeaderTransformation: PASS_THROUGH + statPrefix: https-10080 + useRemoteAddress: true + name: tcp-80 + 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: @@ -56,13 +101,21 @@ metadata: filterMetadata: envoy-gateway: - resources: [] + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 name: tcp-80 perConnectionBufferLimitBytes: 32768 - address: socketAddress: address: '::' - portValue: 10080 + portValue: 10081 filterChains: - filterChainMatch: serverNames: @@ -89,11 +142,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: tcp-80 + routeConfigName: tcp-81 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10080 + statPrefix: https-10081 useRemoteAddress: true - name: tcp-80 + name: tcp-81 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -114,7 +167,15 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: tcp-80 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http-ipv6 + name: tcp-81 perConnectionBufferLimitBytes: 32768 - address: socketAddress: @@ -177,7 +238,7 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https + sectionName: https-http3 name: udp-443 udpListenerConfig: downstreamSocketConfig: {} @@ -240,7 +301,7 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https + sectionName: https-http3 name: tcp-443 perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml similarity index 64% rename from internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml rename to internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index 54b84ecd65..cdbef49e85 100644 --- a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -1,5 +1,5 @@ - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/http + name: envoy-gateway/gateway-1/http1 virtualHosts: - domains: - '*' @@ -10,8 +10,30 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http - name: envoy-gateway/gateway-1/http/* + sectionName: http1 + name: envoy-gateway/gateway-1/http1/* + routes: + - match: + prefix: / + name: first-route + route: + cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http2 + virtualHosts: + - domains: + - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: envoy-gateway/gateway-1/http2/* routes: - match: prefix: / @@ -25,6 +47,14 @@ virtualHosts: - domains: - '*' + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http-ipv6 name: envoy-gateway/gateway-1/http-ipv6/* routes: - match: @@ -46,7 +76,7 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https + sectionName: https-http3 name: envoy-gateway/gateway-1/https-http3/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml similarity index 93% rename from internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml rename to internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml index 9c04d11e7a..aecdc68016 100644 --- a/internal/xds/translator/testdata/out/xds-ir/address-as-listener-name.secrets.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml @@ -1,3 +1,9 @@ +- name: first-listener + tlsCertificate: + certificateChain: + inlineBytes: Y2VydC1kYXRh + privateKey: + inlineBytes: a2V5LWRhdGE= - name: first-listener tlsCertificate: certificateChain: diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 98fb36fb6b..055319574b 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -266,8 +266,8 @@ func (t *Translator) processHTTPListenerXdsTranslation( // The XDS translation is done in a best-effort manner, so we collect all // errors and return them at the end. var ( - ownerGatewayListeners = map[string]sets.Set[*ir.ResourceMetadata]{} // The set of Gateway HTTPListeners that own the xDS Listener - http3EnabledListeners = make(map[listenerKey]*ir.HTTP3Settings) // Map to track HTTP3 settings for listeners by address and port + ownerGatewayListeners = make(map[string]sets.Set[*ir.ResourceMetadata]) // The set of Gateway HTTPListeners that own the xDS Listener + http3EnabledListeners = make(map[listenerKey]*ir.HTTP3Settings) // Map to track HTTP3 settings for listeners by address and port errs error ) @@ -405,13 +405,9 @@ func (t *Translator) processHTTPListenerXdsTranslation( } // Collect the metadata for the HTTPListener. - if _, ok := ownerGatewayListeners[tcpXDSListener.Name]; ok { - ownerGatewayListeners[tcpXDSListener.Name].Insert(httpListener.Metadata) - } + ownerGatewayListeners[tcpXDSListener.Name].Insert(httpListener.Metadata) if http3Enabled { - if _, ok := ownerGatewayListeners[quicXDSListener.Name]; ok { - ownerGatewayListeners[quicXDSListener.Name].Insert(httpListener.Metadata) - } + ownerGatewayListeners[quicXDSListener.Name].Insert(httpListener.Metadata) } // Add the secrets referenced by the listener's TLS configuration to the diff --git a/internal/xds/translator/translator_test.go b/internal/xds/translator/translator_test.go index dd5bbb7d5d..05c72158c1 100644 --- a/internal/xds/translator/translator_test.go +++ b/internal/xds/translator/translator_test.go @@ -135,7 +135,7 @@ func TestTranslateXds(t *testing.T) { "tracing-unknown-provider-type": { errMsg: "unknown tracing provider type: AwesomeTelemetry", }, - "address-as-listener-name": { + "port-as-listener-name": { runtimeFlags: &egv1a1.RuntimeFlags{ Enabled: []egv1a1.RuntimeFlag{egv1a1.UseProtocolPortAsListenerName}, }, diff --git a/test/config/envoy-gateaway-config/address-as-listener-name.yaml b/test/config/envoy-gateaway-config/port-as-listener-name.yaml similarity index 100% rename from test/config/envoy-gateaway-config/address-as-listener-name.yaml rename to test/config/envoy-gateaway-config/port-as-listener-name.yaml diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go index a282223232..010945fbf4 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -736,7 +736,7 @@ func IsGatewayNamespaceMode() bool { // TODO(zhaohuabing) remove this after the feature flag is removed. func UseProtocolPortAsListenerName() bool { - return DeployProfile == "address-as-listener-name" + return DeployProfile == "port-as-listener-name" } func GetGatewayResourceNamespace() string { From 97577a602cba7772344c1ee73a2dfc691ef085cc Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 25 Jul 2025 07:19:22 +0000 Subject: [PATCH 18/44] add host suffix to filterChain name Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 53 +++++++++++++++---- .../xds/translator/server_names_match_test.go | 2 +- .../port-as-listener-name.listeners.yaml | 12 ++--- internal/xds/translator/translator.go | 8 ++- 4 files changed, 55 insertions(+), 20 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index ba876f032a..304359c0a7 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -450,7 +450,7 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: filterChianName(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), + Name: httpListenerFilterChainName(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), } if irListener.TLS != nil { @@ -474,7 +474,9 @@ func (t *Translator) addHCMToXDSListener( } } filterChain.TransportSocket = tSocket - if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil { + if err := addServerNamesMatch( + xdsListener, filterChain, irListener.Hostnames, + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { return err } @@ -498,10 +500,17 @@ func routeConfigName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListen return irListener.Name } -func filterChianName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { +func httpListenerFilterChainName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { return routeConfigName(xdsListener, irListener, useProtocolPortAsListenerName) } +func tcpListenerFilterChainName(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, useProtocolPortAsListenerName bool) string { + if useProtocolPortAsListenerName { + return xdsListener.Name + } + return irRoute.Name +} + func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensionConfig { if headers == nil || (len(headers.EarlyAddRequestHeaders) == 0 && len(headers.EarlyRemoveRequestHeaders) == 0) { return nil @@ -569,7 +578,9 @@ func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensi } } -func addServerNamesMatch(xdsListener *listenerv3.Listener, filterChain *listenerv3.FilterChain, hostnames []string) error { +func addServerNamesMatch( + xdsListener *listenerv3.Listener, filterChain *listenerv3.FilterChain, + hostnames []string, useProtocolPortAsListenerName bool) error { // Skip adding ServerNames match for: // 1. nil listeners // 2. UDP (QUIC) listeners used for HTTP3 @@ -586,6 +597,11 @@ func addServerNamesMatch(xdsListener *listenerv3.Listener, filterChain *listener ServerNames: hostnames, } + // Add hostname suffix to the filter chain name if useProtocolPortAsListenerName is false to avoid conflicts. + if useProtocolPortAsListenerName { + filterChain.Name = fmt.Sprintf("%s/%s", filterChain.Name, strings.ReplaceAll(strings.Join(hostnames, "-"), ".", "_")) + } + if err := addXdsTLSInspectorFilter(xdsListener); err != nil { return err } @@ -618,10 +634,9 @@ 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, -) error { +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") } @@ -676,12 +691,22 @@ func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute } filterChain := &listenerv3.FilterChain{ + Name: tcpListenerFilterChainName( + xdsListener, + irRoute, + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + ), Filters: filters, - Name: irRoute.Name, } if isTLSPassthrough { - if err := addServerNamesMatch(xdsListener, filterChain, irRoute.TLS.TLSInspectorConfig.SNIs); err != nil { + err := addServerNamesMatch( + xdsListener, + filterChain, + irRoute.TLS.TLSInspectorConfig.SNIs, + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + ) + if err != nil { return err } } @@ -691,7 +716,13 @@ func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute if cfg := irRoute.TLS.TLSInspectorConfig; cfg != nil { snis = cfg.SNIs } - if err := addServerNamesMatch(xdsListener, filterChain, snis); err != nil { + err := addServerNamesMatch( + xdsListener, + filterChain, + snis, + t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + ) + if err != nil { return err } tSocket, err := buildXdsDownstreamTLSSocket(irRoute.TLS.Terminate) diff --git a/internal/xds/translator/server_names_match_test.go b/internal/xds/translator/server_names_match_test.go index ce2f8b108b..5a4a661b28 100644 --- a/internal/xds/translator/server_names_match_test.go +++ b/internal/xds/translator/server_names_match_test.go @@ -97,7 +97,7 @@ func TestAddServerNamesMatch(t *testing.T) { t.Run(tt.name, func(t *testing.T) { filterChain := &listenerv3.FilterChain{} - err := addServerNamesMatch(tt.xdsListener, filterChain, tt.hostnames) + err := addServerNamesMatch(tt.xdsListener, filterChain, tt.hostnames, false) require.NoError(t, err) // Check if filter chain match was added diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml index 7d59eba996..e488e7e917 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml @@ -32,7 +32,7 @@ serverHeaderTransformation: PASS_THROUGH statPrefix: https-10080 useRemoteAddress: true - name: tcp-80 + name: tcp-80/foo_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -77,7 +77,7 @@ serverHeaderTransformation: PASS_THROUGH statPrefix: https-10080 useRemoteAddress: true - name: tcp-80 + name: tcp-80/bar_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -146,7 +146,7 @@ serverHeaderTransformation: PASS_THROUGH statPrefix: https-10081 useRemoteAddress: true - name: tcp-81 + name: tcp-81/foo_net transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -318,7 +318,7 @@ '@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 + name: tcp-90/foo_com - filterChainMatch: serverNames: - bar.com @@ -328,7 +328,7 @@ '@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 + name: tcp-90/bar_com listenerFilters: - name: envoy.filters.listener.tls_inspector typedConfig: @@ -347,7 +347,7 @@ '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tcproute/default/tcproute statPrefix: tcp-10091 - name: tcproute/default/tcproute-1 + name: tcp-91 maxConnectionsToAcceptPerSocketEvent: 1 name: tcp-91 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 055319574b..e5d0bbffa2 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -810,7 +810,9 @@ 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) } } @@ -830,7 +832,9 @@ 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) } } From 86145d32d82ca92c5f01fe6d9abffa8e0b794e2f Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 25 Jul 2025 09:41:51 +0000 Subject: [PATCH 19/44] fix test Signed-off-by: Huabing (Robin) Zhao --- api/v1alpha1/envoygateway_helpers.go | 8 ++-- internal/gatewayapi/translator_test.go | 13 +++-- internal/xds/translator/listener.go | 34 +++++++++----- internal/xds/translator/translator.go | 41 +++++++++++----- release-notes/current.yaml | 2 +- .../port-as-listener-name.yaml | 2 +- ...r-name.yaml => port-as-listener-name.yaml} | 2 +- test/e2e/e2e_test.go | 13 ++--- .../e2e/testdata/envoy-patch-policy-ipv6.yaml | 47 ------------------- ...y-use-protocol-port-as-listener-name.yaml} | 0 test/e2e/tests/envoy_patch_policy_ipv6.go | 29 ------------ ...go => envoy_patch_policy_listener_name.go} | 8 ++-- 12 files changed, 75 insertions(+), 124 deletions(-) rename test/config/helm/{address-as-listener-name.yaml => port-as-listener-name.yaml} (60%) delete mode 100644 test/e2e/testdata/envoy-patch-policy-ipv6.yaml rename test/e2e/testdata/{envoy-patch-policy-ipv4.yaml => envoy-patch-policy-use-protocol-port-as-listener-name.yaml} (100%) delete mode 100644 test/e2e/tests/envoy_patch_policy_ipv6.go rename test/e2e/tests/{envoy_patch_policy_ipv4.go => envoy_patch_policy_listener_name.go} (60%) diff --git a/api/v1alpha1/envoygateway_helpers.go b/api/v1alpha1/envoygateway_helpers.go index a26507461b..fd19935772 100644 --- a/api/v1alpha1/envoygateway_helpers.go +++ b/api/v1alpha1/envoygateway_helpers.go @@ -109,8 +109,8 @@ func (e *EnvoyGateway) GatewayNamespaceMode() bool { *e.Provider.Kubernetes.Deploy.Type == KubernetesDeployModeTypeGatewayNamespace } -// runtimeFlags are the default runtime flags for Envoy Gateway. -var runtimeFlags = map[RuntimeFlag]bool{ +// defaultRuntimeFlags are the default runtime flags for Envoy Gateway. +var defaultRuntimeFlags = map[RuntimeFlag]bool{ UseProtocolPortAsListenerName: false, } @@ -129,8 +129,8 @@ func (f *RuntimeFlags) IsEnabled(flag RuntimeFlag) bool { } } - if enabled, found := runtimeFlags[flag]; found { - return enabled + if defaultValue, found := defaultRuntimeFlags[flag]; found { + return defaultValue } return false } diff --git a/internal/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go index 982a65b6c0..96f4aa4bc4 100644 --- a/internal/gatewayapi/translator_test.go +++ b/internal/gatewayapi/translator_test.go @@ -47,10 +47,11 @@ func mustUnmarshal(t *testing.T, val []byte, out any) { func TestTranslate(t *testing.T) { testCasesConfig := []struct { - name string - EnvoyPatchPolicyEnabled bool - BackendEnabled bool - GatewayNamespaceMode bool + name string + EnvoyPatchPolicyEnabled bool + BackendEnabled bool + GatewayNamespaceMode bool + UseProtocolPortAsListenerName bool }{ { name: "envoypatchpolicy-invalid-feature-disabled", @@ -64,6 +65,10 @@ func TestTranslate(t *testing.T) { name: "gateway-namespace-mode-infra-httproute", GatewayNamespaceMode: true, }, + { + name: "protocol-port-as-listener-name", + UseProtocolPortAsListenerName: true, + }, } inputFiles, err := filepath.Glob(filepath.Join("testdata", "*.in.yaml")) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 304359c0a7..a551d6338d 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -314,8 +314,12 @@ func buildXdsQuicListener( // 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, + 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 { @@ -353,7 +357,7 @@ func (t *Translator) addHCMToXDSListener( Rds: &hcmv3.Rds{ ConfigSource: makeConfigSource(), // Configure route name to be found via RDS. - RouteConfigName: routeConfigName(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), + RouteConfigName: routeConfigName(xdsListener, irListener, t.useProtocolPortAsListenerName()), }, }, HttpProtocolOptions: http1ProtocolOptions(irListener.HTTP1), @@ -450,7 +454,7 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: httpListenerFilterChainName(xdsListener, irListener, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), + Name: httpListenerFilterChainName(xdsListener, irListener, t.useProtocolPortAsListenerName()), } if irListener.TLS != nil { @@ -474,9 +478,9 @@ func (t *Translator) addHCMToXDSListener( } } filterChain.TransportSocket = tSocket - if err := addServerNamesMatch( - xdsListener, filterChain, irListener.Hostnames, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { + + err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames, t.useProtocolPortAsListenerName()) + if err != nil { return err } @@ -579,8 +583,11 @@ func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensi } func addServerNamesMatch( - xdsListener *listenerv3.Listener, filterChain *listenerv3.FilterChain, - hostnames []string, useProtocolPortAsListenerName bool) error { + xdsListener *listenerv3.Listener, + filterChain *listenerv3.FilterChain, + hostnames []string, + useProtocolPortAsListenerName bool, +) error { // Skip adding ServerNames match for: // 1. nil listeners // 2. UDP (QUIC) listeners used for HTTP3 @@ -636,7 +643,8 @@ func findXdsHTTPRouteConfigName(xdsListener *listenerv3.Listener) string { func (t *Translator) addXdsTCPFilterChain( xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, clusterName string, - accesslog *ir.AccessLog, timeout *ir.ClientTimeout, connection *ir.ClientConnection) error { + accesslog *ir.AccessLog, timeout *ir.ClientTimeout, connection *ir.ClientConnection, +) error { if irRoute == nil { return errors.New("tcp listener is nil") } @@ -694,7 +702,7 @@ func (t *Translator) addXdsTCPFilterChain( Name: tcpListenerFilterChainName( xdsListener, irRoute, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + t.useProtocolPortAsListenerName(), ), Filters: filters, } @@ -704,7 +712,7 @@ func (t *Translator) addXdsTCPFilterChain( xdsListener, filterChain, irRoute.TLS.TLSInspectorConfig.SNIs, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + t.useProtocolPortAsListenerName(), ) if err != nil { return err @@ -720,7 +728,7 @@ func (t *Translator) addXdsTCPFilterChain( xdsListener, filterChain, snis, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName), + t.useProtocolPortAsListenerName(), ) if err != nil { return err diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index e5d0bbffa2..e3c984ca56 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -73,6 +73,13 @@ type Translator struct { Logger logging.Logger } +func (t *Translator) useProtocolPortAsListenerName() bool { + if t.RuntimeFlags == nil { + return false + } + return t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName) +} + type GlobalRateLimitSettings struct { // ServiceURL is the URL of the global // rate limit service. @@ -306,8 +313,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.CoreListenerDetails, httpListener.IPFamily, - accessLog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { + if quicXDSListener, err = buildXdsQuicListener( + httpListener.CoreListenerDetails, + httpListener.IPFamily, + accessLog, + t.useProtocolPortAsListenerName()); err != nil { errs = errors.Join(errs, err) continue } @@ -321,8 +331,11 @@ func (t *Translator) processHTTPListenerXdsTranslation( // Create a new TCP listener for HTTP1/HTTP2 traffic. if tcpXDSListener, err = buildXdsTCPListener( - httpListener.CoreListenerDetails, httpListener.TCPKeepalive, httpListener.Connection, - accessLog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { + httpListener.CoreListenerDetails, + httpListener.TCPKeepalive, + httpListener.Connection, + accessLog, + t.useProtocolPortAsListenerName()); err != nil { errs = errors.Join(errs, err) continue } @@ -522,7 +535,7 @@ func (t *Translator) addRouteToRouteConfig( // Allocate virtual host for this httpRoute. vHost = &routev3.VirtualHost{ Name: virtualHostName(xdsRouteCfg, httpListener, underscoredHostname, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)), + t.useProtocolPortAsListenerName()), Domains: []string{httpRoute.Hostname}, Metadata: buildXdsMetadata(httpListener.Metadata), } @@ -758,8 +771,11 @@ func (t *Translator) processTCPListenerXdsTranslation( xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port, corev3.SocketAddress_TCP) if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( - tcpListener.CoreListenerDetails, tcpListener.TCPKeepalive, tcpListener.Connection, - accesslog, t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)); err != nil { + tcpListener.CoreListenerDetails, + tcpListener.TCPKeepalive, + tcpListener.Connection, + accesslog, + t.useProtocolPortAsListenerName()); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue @@ -812,7 +828,7 @@ func (t *Translator) processTCPListenerXdsTranslation( } if err := t.addXdsTCPFilterChain( xdsListener, route, route.Destination.Name, accesslog, - tcpListener.Timeout,tcpListener.Connection); err != nil { + tcpListener.Timeout, tcpListener.Connection); err != nil { errs = errors.Join(errs, err) } } @@ -834,7 +850,7 @@ func (t *Translator) processTCPListenerXdsTranslation( } if err := t.addXdsTCPFilterChain( xdsListener, emptyRoute, emptyClusterName, accesslog, - tcpListener.Timeout, tcpListener.Connection,); err != nil { + tcpListener.Timeout, tcpListener.Connection); err != nil { errs = errors.Join(errs, err) } } @@ -883,8 +899,11 @@ func (t *Translator) processUDPListenerXdsTranslation( } xdsListener, err := buildXdsUDPListener( - udpListener.Route.Destination.Name, udpListener, accesslog, - t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName)) + udpListener.Route.Destination.Name, + udpListener, + accesslog, + t.useProtocolPortAsListenerName(), + ) if err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 7294ab8aba..4d271da480 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -4,7 +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 `useProtocolPortAsListenerName` 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. + 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 `UseProtocolPortAsListenerName` 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/test/config/envoy-gateaway-config/port-as-listener-name.yaml b/test/config/envoy-gateaway-config/port-as-listener-name.yaml index 6a6b22d43e..1ad6ec622d 100644 --- a/test/config/envoy-gateaway-config/port-as-listener-name.yaml +++ b/test/config/envoy-gateaway-config/port-as-listener-name.yaml @@ -21,4 +21,4 @@ data: url: redis.redis-system.svc.cluster.local:6379 runtimeFlags: enabled: - - useProtocolPortAsListenerName + - UseProtocolPortAsListenerName diff --git a/test/config/helm/address-as-listener-name.yaml b/test/config/helm/port-as-listener-name.yaml similarity index 60% rename from test/config/helm/address-as-listener-name.yaml rename to test/config/helm/port-as-listener-name.yaml index 6a4befe170..3d5ec4ac29 100644 --- a/test/config/helm/address-as-listener-name.yaml +++ b/test/config/helm/port-as-listener-name.yaml @@ -2,4 +2,4 @@ config: envoyGateway: runtimeFlags: enabled: - - useProtocolPortAsListenerName + - UseProtocolPortAsListenerName diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 020b6a3d7b..d0ad00cfb6 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -75,15 +75,10 @@ func TestE2E(t *testing.T) { skipTests = append(skipTests, tests.EnvoyPatchPolicyTest.ShortName, ) - if tests.IPFamily == "ipv6" { - skipTests = append(skipTests, - tests.EnvoyPatchPolicyIPv4Test.ShortName, - ) - } else { - skipTests = append(skipTests, - tests.EnvoyPatchPolicyIPv6Test.ShortName, - ) - } + } else { + skipTests = append(skipTests, + tests.EnvoyPatchPolicyUseProtocolPortAsListenerNameTest.ShortName, + ) } enabledFeatures := sets.New(features.SupportGateway) diff --git a/test/e2e/testdata/envoy-patch-policy-ipv6.yaml b/test/e2e/testdata/envoy-patch-policy-ipv6.yaml deleted file mode 100644 index 07b44b46f4..0000000000 --- a/test/e2e/testdata/envoy-patch-policy-ipv6.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -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: "::-10080" - 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/testdata/envoy-patch-policy-ipv4.yaml b/test/e2e/testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml similarity index 100% rename from test/e2e/testdata/envoy-patch-policy-ipv4.yaml rename to test/e2e/testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml diff --git a/test/e2e/tests/envoy_patch_policy_ipv6.go b/test/e2e/tests/envoy_patch_policy_ipv6.go deleted file mode 100644 index bf9ec2fd49..0000000000 --- a/test/e2e/tests/envoy_patch_policy_ipv6.go +++ /dev/null @@ -1,29 +0,0 @@ -// 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, EnvoyPatchPolicyTest) -} - -var EnvoyPatchPolicyIPv6Test = suite.ConformanceTest{ - ShortName: "EnvoyPatchPolicyIPv6", - Description: "update xds using EnvoyPatchPolicy", - Manifests: []string{"testdata/envoy-patch-policy-ipv6.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/envoy_patch_policy_ipv4.go b/test/e2e/tests/envoy_patch_policy_listener_name.go similarity index 60% rename from test/e2e/tests/envoy_patch_policy_ipv4.go rename to test/e2e/tests/envoy_patch_policy_listener_name.go index 744cdbe8f4..d36fbd3904 100644 --- a/test/e2e/tests/envoy_patch_policy_ipv4.go +++ b/test/e2e/tests/envoy_patch_policy_listener_name.go @@ -14,13 +14,13 @@ import ( ) func init() { - ConformanceTests = append(ConformanceTests, EnvoyPatchPolicyTest) + ConformanceTests = append(ConformanceTests, EnvoyPatchPolicyUseProtocolPortAsListenerNameTest) } -var EnvoyPatchPolicyIPv4Test = suite.ConformanceTest{ - ShortName: "EnvoyPatchPolicyIPv4", +var EnvoyPatchPolicyUseProtocolPortAsListenerNameTest = suite.ConformanceTest{ + ShortName: "EnvoyPatchPolicyUseProtocolPortAsListenerName", Description: "update xds using EnvoyPatchPolicy", - Manifests: []string{"testdata/envoy-patch-policy-ipv4.yaml"}, + Manifests: []string{"testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { t.Run("envoy patch policy", func(t *testing.T) { testEnvoyPatchPolicy(t, suite) From 5ca080c6cccc8040250b41987886afe9495ca2b6 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Fri, 25 Jul 2025 12:29:12 +0000 Subject: [PATCH 20/44] fix e2e Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 1 + .../out/xds-ir/port-as-listener-name.routes.yaml | 16 ++++++++-------- internal/xds/translator/translator.go | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index a551d6338d..b5bd38edc9 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -268,6 +268,7 @@ func buildXdsQuicListener( if err != nil { return nil, err } + // Keep the listener name compatible with the old naming scheme listenerName := listenerDetails.Name + "-quic" if useProtocolPortAsListenerName { listenerName = xdsListenerName(listenerDetails.Name, listenerDetails.ExternalPort, corev3.SocketAddress_UDP, true) diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index cdbef49e85..9edcec728e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -1,5 +1,5 @@ - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/http1 + name: tcp-80 virtualHosts: - domains: - '*' @@ -11,7 +11,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http1 - name: envoy-gateway/gateway-1/http1/* + name: tcp-80/* routes: - match: prefix: / @@ -21,7 +21,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/http2 + name: tcp-80 virtualHosts: - domains: - '*' @@ -33,7 +33,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http2 - name: envoy-gateway/gateway-1/http2/* + name: tcp-80/* routes: - match: prefix: / @@ -43,7 +43,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/http-ipv6 + name: tcp-81 virtualHosts: - domains: - '*' @@ -55,7 +55,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http-ipv6 - name: envoy-gateway/gateway-1/http-ipv6/* + name: tcp-81/* routes: - match: prefix: / @@ -65,7 +65,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/https-http3 + name: tcp-443 virtualHosts: - domains: - '*' @@ -77,7 +77,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: https-http3 - name: envoy-gateway/gateway-1/https-http3/* + name: tcp-443/* routes: - match: prefix: / diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index e3c984ca56..37dcec17bd 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -463,7 +463,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: httpListener.Name, + Name: routeConfigName(tcpXDSListener, httpListener, t.useProtocolPortAsListenerName()), } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { From fe945d43494e3fc37974a7e8fa499ac3c5c2131f Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 01:06:10 +0000 Subject: [PATCH 21/44] modify listener stat prefix Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index b5bd38edc9..247ad80e4c 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -341,7 +341,11 @@ func (t *Translator) addHCMToXDSListener( } // Append port to the statPrefix. - statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.Port))}, "-") + if t.useProtocolPortAsListenerName() { + statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.ExternalPort))}, "-") + } else { + statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.Port))}, "-") + } // Client IP detection useRemoteAddress := true From c01ee3d1f379bc91e79df3761f96b0f8526c3352 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 03:24:29 +0000 Subject: [PATCH 22/44] rename routeconfig Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 12 ++++---- .../port-as-listener-name.listeners.yaml | 30 +++++++++---------- .../xds-ir/port-as-listener-name.routes.yaml | 16 +++++----- internal/xds/translator/translator.go | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 247ad80e4c..126006872a 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -362,7 +362,7 @@ func (t *Translator) addHCMToXDSListener( Rds: &hcmv3.Rds{ ConfigSource: makeConfigSource(), // Configure route name to be found via RDS. - RouteConfigName: routeConfigName(xdsListener, irListener, t.useProtocolPortAsListenerName()), + RouteConfigName: routeConfigName(irListener, t.useProtocolPortAsListenerName()), }, }, HttpProtocolOptions: http1ProtocolOptions(irListener.HTTP1), @@ -459,7 +459,7 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: httpListenerFilterChainName(xdsListener, irListener, t.useProtocolPortAsListenerName()), + Name: httpListenerFilterChainName(irListener, t.useProtocolPortAsListenerName()), } if irListener.TLS != nil { @@ -502,15 +502,15 @@ func (t *Translator) addHCMToXDSListener( return nil } -func routeConfigName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { +func routeConfigName(irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { if useProtocolPortAsListenerName { - return xdsListener.Name + return strconv.Itoa(int(irListener.ExternalPort)) } return irListener.Name } -func httpListenerFilterChainName(xdsListener *listenerv3.Listener, irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { - return routeConfigName(xdsListener, irListener, useProtocolPortAsListenerName) +func httpListenerFilterChainName(irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { + return routeConfigName(irListener, useProtocolPortAsListenerName) } func tcpListenerFilterChainName(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, useProtocolPortAsListenerName bool) string { diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml index e488e7e917..15845def36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml @@ -28,11 +28,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: tcp-80 + routeConfigName: "80" serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10080 + statPrefix: https-80 useRemoteAddress: true - name: tcp-80/foo_com + name: 80/foo_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -73,11 +73,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: tcp-80 + routeConfigName: "80" serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10080 + statPrefix: https-80 useRemoteAddress: true - name: tcp-80/bar_com + name: 80/bar_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -142,11 +142,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: tcp-81 + routeConfigName: "81" serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10081 + statPrefix: https-81 useRemoteAddress: true - name: tcp-81/foo_net + name: 81/foo_net transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -208,11 +208,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: udp-443 + routeConfigName: "443" serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10443 + statPrefix: https-443 useRemoteAddress: true - name: udp-443 + name: "443" transportSocket: name: envoy.transport_sockets.quic typedConfig: @@ -270,11 +270,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: tcp-443 + routeConfigName: "443" serverHeaderTransformation: PASS_THROUGH - statPrefix: https-10443 + statPrefix: https-443 useRemoteAddress: true - name: tcp-443 + name: "443" transportSocket: name: envoy.transport_sockets.tls typedConfig: diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index 9edcec728e..a2da78973d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -1,5 +1,5 @@ - ignorePortInHostMatching: true - name: tcp-80 + name: "80" virtualHosts: - domains: - '*' @@ -11,7 +11,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http1 - name: tcp-80/* + name: 80/* routes: - match: prefix: / @@ -21,7 +21,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: tcp-80 + name: "80" virtualHosts: - domains: - '*' @@ -33,7 +33,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http2 - name: tcp-80/* + name: 80/* routes: - match: prefix: / @@ -43,7 +43,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: tcp-81 + name: "81" virtualHosts: - domains: - '*' @@ -55,7 +55,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http-ipv6 - name: tcp-81/* + name: 81/* routes: - match: prefix: / @@ -65,7 +65,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: tcp-443 + name: "443" virtualHosts: - domains: - '*' @@ -77,7 +77,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: https-http3 - name: tcp-443/* + name: 443/* routes: - match: prefix: / diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 37dcec17bd..492e79519a 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -463,7 +463,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: routeConfigName(tcpXDSListener, httpListener, t.useProtocolPortAsListenerName()), + Name: routeConfigName(httpListener, t.useProtocolPortAsListenerName()), } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { From 172fff27c16c488acb95f4505b60a117b1f878c1 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 03:54:02 +0000 Subject: [PATCH 23/44] fix e2e Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 20 +++++--------------- internal/xds/translator/translator.go | 25 ++++--------------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 126006872a..84a07da974 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -622,28 +622,18 @@ func addServerNamesMatch( return nil } -// findXdsHTTPRouteConfigName finds the name of the route config associated with the -// http connection manager within the default filter chain and returns an empty string if -// not found. -func findXdsHTTPRouteConfigName(xdsListener *listenerv3.Listener) string { +// hasHCMInDefaultFilterChain checks if the default filter chain of the xdsListener has a HTTP Connection Manager (HCM) filter. +func hasHCMInDefaultFilterChain(xdsListener *listenerv3.Listener) bool { if xdsListener == nil || xdsListener.DefaultFilterChain == nil || xdsListener.DefaultFilterChain.Filters == nil { - return "" + return false } for _, filter := range xdsListener.DefaultFilterChain.Filters { if filter.Name == wellknown.HTTPConnectionManager { - m := new(hcmv3.HttpConnectionManager) - if err := filter.GetTypedConfig().UnmarshalTo(m); err != nil { - return "" - } - rds := m.GetRds() - if rds == nil { - return "" - } - return rds.GetRouteConfigName() + return true } } - return "" + return false } func (t *Translator) addXdsTCPFilterChain( diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 492e79519a..b03cc885a2 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -359,26 +359,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. @@ -460,10 +441,12 @@ func (t *Translator) processHTTPListenerXdsTranslation( } // Create a route config if we have not found one yet + routeConfigName := routeConfigName(httpListener, t.useProtocolPortAsListenerName()) + xdsRouteCfg = findXdsRouteConfig(tCtx, routeConfigName) if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: routeConfigName(httpListener, t.useProtocolPortAsListenerName()), + Name: routeConfigName, } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { From ea805e60f45f7b178990c340a245283d8798bceb Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 05:06:47 +0000 Subject: [PATCH 24/44] fix gen Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 26 +++++++++- .../listener-overlapping-tls-config.yaml | 20 ++++---- ...tener-overlapping-tls-config.clusters.yaml | 48 +++++++++++++++++++ ...ener-overlapping-tls-config.endpoints.yaml | 24 ++++++++++ ...ener-overlapping-tls-config.listeners.yaml | 18 +++++-- ...istener-overlapping-tls-config.routes.yaml | 18 +++---- .../xds-ir/port-as-listener-name.routes.yaml | 3 -- internal/xds/translator/translator.go | 34 +++++++++---- 8 files changed, 156 insertions(+), 35 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 84a07da974..21aacb6edf 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -622,12 +622,34 @@ func addServerNamesMatch( return nil } -// hasHCMInDefaultFilterChain checks if the default filter chain of the xdsListener has a HTTP Connection Manager (HCM) filter. +// findXdsHTTPRouteConfigName finds the name of the route config associated with the +// http connection manager within the default filter chain and returns an empty string if +// not found. +func findXdsHTTPRouteConfigName(xdsListener *listenerv3.Listener) string { + if xdsListener == nil || xdsListener.DefaultFilterChain == nil || xdsListener.DefaultFilterChain.Filters == nil { + return "" + } + + for _, filter := range xdsListener.DefaultFilterChain.Filters { + if filter.Name == wellknown.HTTPConnectionManager { + m := new(hcmv3.HttpConnectionManager) + if err := filter.GetTypedConfig().UnmarshalTo(m); err != nil { + return "" + } + rds := m.GetRds() + if rds == nil { + return "" + } + return rds.GetRouteConfigName() + } + } + return "" +} + 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 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 1c233668a8..3cd9c0b900 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 @@ -60,22 +60,22 @@ http: externalPort: 443 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: "" @@ -95,30 +95,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/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 e6e3f9c31b..bc14dec8de 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 @@ -104,6 +104,10 @@ name: gateway-1 namespace: envoy-gateway sectionName: https-1 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https-2 name: envoy-gateway/gateway-1/https-1 perConnectionBufferLimitBytes: 32768 - address: @@ -136,11 +140,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: @@ -160,5 +164,13 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - name: envoy-gateway/gateway-1/https-1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: https-3 + 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/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index a2da78973d..39e77e97cd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -20,9 +20,6 @@ cluster: first-route-dest upgradeConfigs: - upgradeType: websocket -- ignorePortInHostMatching: true - name: "80" - virtualHosts: - domains: - '*' metadata: diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index b03cc885a2..c4b2e95315 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -290,10 +290,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 + routeConfig 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 @@ -440,13 +441,29 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } + // For backward compatibility, we firt 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". + if !t.useProtocolPortAsListenerName() { + routeConfig = 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 routeConfig == "" { + routeConfig = routeConfigName(httpListener, false) + } + } else { + // The new rout config is named after the xDS listener port, for example "80". + routeConfig = routeConfigName(httpListener, true) + } + // Create a route config if we have not found one yet - routeConfigName := routeConfigName(httpListener, t.useProtocolPortAsListenerName()) - xdsRouteCfg = findXdsRouteConfig(tCtx, routeConfigName) + xdsRouteCfg = findXdsRouteConfig(tCtx, routeConfig) if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: routeConfigName, + Name: routeConfig, } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { @@ -666,7 +683,8 @@ func (t *Translator) addRouteToRouteConfig( } } xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, vHostList...) - + // TODO(zhaohuabing) we need to sort the virtual hosts from the most specific to the least specific + // to ensure that the most specific virtual host is matched first. return errs } From 2cdc332d57cfcddc3045026cbe100b477c262e5e Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 06:22:16 +0000 Subject: [PATCH 25/44] fix gen Signed-off-by: Huabing (Robin) Zhao --- .../out/xds-ir/http-route-zonal-lb-routing.listeners.yaml | 4 ++++ internal/xds/translator/translator.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml index 5c7db41545..77683b5239 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml @@ -29,5 +29,9 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: [] name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 17ad0928ba..14a552a5e7 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -441,7 +441,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } - // For backward compatibility, we firt try to get the route config name from the xDS listener. + // 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. // From 6040211a18ab6efc0c06b61c9719705b4e19d36f Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 09:17:20 +0000 Subject: [PATCH 26/44] fix e2e Signed-off-by: Huabing (Robin) Zhao --- test/e2e/tests/connection_limit.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/e2e/tests/connection_limit.go b/test/e2e/tests/connection_limit.go index 15e316fec4..654f6bf138 100644 --- a/test/e2e/tests/connection_limit.go +++ b/test/e2e/tests/connection_limit.go @@ -85,6 +85,9 @@ var ConnectionLimitTest = suite.ConformanceTest{ } prefix := "http-10080" + if UseProtocolPortAsListenerName() { + prefix = "http-80" + } gtwName := "connection-limit-gateway" promQL := fmt.Sprintf(`envoy_connection_limit_limited_connections{envoy_connection_limit_prefix="%s",gateway_envoyproxy_io_owning_gateway_name="%s"}`, prefix, gtwName) From dcef7d1090ce71f22d3c375a2a4b2db37bf472d7 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sat, 26 Jul 2025 10:40:04 +0000 Subject: [PATCH 27/44] minor change Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 16 ++++++++------- internal/xds/translator/translator.go | 28 ++++++++++++++------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 21aacb6edf..51427f37a9 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -184,13 +184,11 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin } // buildXdsTCPListener creates a xds Listener resource -// TODO: Improve function parameters -func buildXdsTCPListener( +func (t *Translator) buildXdsTCPListener( listenerDetails ir.CoreListenerDetails, keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, - useProtocolPortAsListenerName bool, ) (*listenerv3.Listener, error) { socketOptions := buildTCPSocketOptions(keepalive) al, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) @@ -202,7 +200,7 @@ func buildXdsTCPListener( listener := &listenerv3.Listener{ Name: xdsListenerName( listenerDetails.Name, listenerDetails.ExternalPort, - corev3.SocketAddress_TCP, useProtocolPortAsListenerName), + corev3.SocketAddress_TCP, t.useProtocolPortAsListenerName()), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -228,6 +226,11 @@ func buildXdsTCPListener( return listener, nil } +// xdsListenerName returns the name of the xDS listener in two formats: +// 1. "tcp-80" if useProtocolPortAsListenerName is true. +// 2. "default/gateway-1/http" if useProtocolPortAsListenerName 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, useProtocolPortAsListenerName bool) string { if useProtocolPortAsListenerName { protocolType := "tcp" @@ -258,11 +261,10 @@ func buildMaxAcceptPerSocketEvent(connection *ir.ClientConnection) *wrapperspb.U } // buildXdsQuicListener creates a xds Listener resource for quic -func buildXdsQuicListener( +func (t *Translator) buildXdsQuicListener( listenerDetails ir.CoreListenerDetails, ipFamily *egv1a1.IPFamily, accesslog *ir.AccessLog, - useProtocolPortAsListenerName bool, ) (*listenerv3.Listener, error) { log, err := buildXdsAccessLog(accesslog, ir.ProxyAccessLogTypeListener) if err != nil { @@ -270,7 +272,7 @@ func buildXdsQuicListener( } // Keep the listener name compatible with the old naming scheme listenerName := listenerDetails.Name + "-quic" - if useProtocolPortAsListenerName { + if t.useProtocolPortAsListenerName() { listenerName = xdsListenerName(listenerDetails.Name, listenerDetails.ExternalPort, corev3.SocketAddress_UDP, true) } xdsListener := &listenerv3.Listener{ diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 14a552a5e7..0c7a7ea7dd 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -294,7 +294,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( 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 - routeConfig string + 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 @@ -303,6 +303,8 @@ 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) @@ -314,11 +316,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( + if quicXDSListener, err = t.buildXdsQuicListener( httpListener.CoreListenerDetails, httpListener.IPFamily, accessLog, - t.useProtocolPortAsListenerName()); err != nil { + ); err != nil { errs = errors.Join(errs, err) continue } @@ -331,12 +333,12 @@ func (t *Translator) processHTTPListenerXdsTranslation( } // Create a new TCP listener for HTTP1/HTTP2 traffic. - if tcpXDSListener, err = buildXdsTCPListener( + if tcpXDSListener, err = t.buildXdsTCPListener( httpListener.CoreListenerDetails, httpListener.TCPKeepalive, httpListener.Connection, accessLog, - t.useProtocolPortAsListenerName()); err != nil { + ); err != nil { errs = errors.Join(errs, err) continue } @@ -448,22 +450,22 @@ func (t *Translator) processHTTPListenerXdsTranslation( // 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". if !t.useProtocolPortAsListenerName() { - routeConfig = findXdsHTTPRouteConfigName(tcpXDSListener) + 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 routeConfig == "" { - routeConfig = routeConfigName(httpListener, false) + if routeCfgName == "" { + routeCfgName = routeConfigName(httpListener, false) } } else { // The new rout config is named after the xDS listener port, for example "80". - routeConfig = routeConfigName(httpListener, true) + routeCfgName = routeConfigName(httpListener, true) } // Create a route config if we have not found one yet - xdsRouteCfg = findXdsRouteConfig(tCtx, routeConfig) + xdsRouteCfg = findXdsRouteConfig(tCtx, routeCfgName) if xdsRouteCfg == nil { xdsRouteCfg = &routev3.RouteConfiguration{ IgnorePortInHostMatching: true, - Name: routeConfig, + Name: routeCfgName, } if err = tCtx.AddXdsResource(resourcev3.RouteType, xdsRouteCfg); err != nil { @@ -772,12 +774,12 @@ func (t *Translator) processTCPListenerXdsTranslation( // 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( + if xdsListener, err = t.buildXdsTCPListener( tcpListener.CoreListenerDetails, tcpListener.TCPKeepalive, tcpListener.Connection, accesslog, - t.useProtocolPortAsListenerName()); err != nil { + ); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) continue From 4cdaff641bb5f8717bfd80e1ffec8e16f56b6059 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Sun, 27 Jul 2025 00:32:37 +0000 Subject: [PATCH 28/44] remove duplicated virtual hosts in RouteConfig Signed-off-by: Huabing (Robin) Zhao --- .../in/xds-ir/port-as-listener-name.yaml | 10 ++++----- .../xds-ir/port-as-listener-name.routes.yaml | 12 +++++------ internal/xds/translator/translator.go | 21 ++++++++++++------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml index 367b91141e..52292c4ce5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml @@ -25,7 +25,7 @@ http: privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - name: "first-route" - hostname: "*" + hostname: "foo.com" destination: name: "first-route-dest" settings: @@ -58,15 +58,15 @@ http: # byte slice representation of "key-data" privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - - name: "first-route" - hostname: "*" + - name: "second-route" + hostname: "bar.com" destination: - name: "first-route-dest" + name: "second-route-dest" settings: - endpoints: - host: "1.2.3.4" port: 50000 - name: "first-route-dest/backend/0" + name: "second-route-dest/backend/0" - name: "envoy-gateway/gateway-1/http-ipv6" address: "::" port: 10081 diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index 39e77e97cd..ef6cb4a427 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -2,7 +2,7 @@ name: "80" virtualHosts: - domains: - - '*' + - foo.com metadata: filterMetadata: envoy-gateway: @@ -11,7 +11,7 @@ name: gateway-1 namespace: envoy-gateway sectionName: http1 - name: 80/* + name: 80/foo_com routes: - match: prefix: / @@ -21,7 +21,7 @@ upgradeConfigs: - upgradeType: websocket - domains: - - '*' + - bar.com metadata: filterMetadata: envoy-gateway: @@ -30,13 +30,13 @@ name: gateway-1 namespace: envoy-gateway sectionName: http2 - name: 80/* + name: 80/bar_com routes: - match: prefix: / - name: first-route + name: second-route route: - cluster: first-route-dest + cluster: second-route-dest upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 0c7a7ea7dd..c1a1d40ecd 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -520,12 +520,19 @@ func (t *Translator) addRouteToRouteConfig( http3Settings *ir.HTTP3Settings, ) error { var ( - vHosts = map[string]*routev3.VirtualHost{} // store virtual hosts by domain - vHostList []*routev3.VirtualHost // keep track of order by using a list as well as the map - errs error // the accumulated errors - err error + vHosts = map[string]*routev3.VirtualHost{} // store virtual hosts by domain + virtualHostsToAdd []*routev3.VirtualHost // newly created virtual hosts to be added to the route config + errs error // the accumulated errors + err error ) + // If the virtual host already exists, we can skip it. + for _, vHost := range xdsRouteCfg.VirtualHosts { + if vHost.Name == virtualHostName(xdsRouteCfg, httpListener, vHost.Domains[0], t.useProtocolPortAsListenerName()) { + vHosts[vHost.Domains[0]] = vHost + } + } + // Check if an extension is loaded that wants to modify xDS Routes after they have been generated for _, httpRoute := range httpListener.Routes { // 1:1 between IR HTTPRoute Hostname and xDS VirtualHost. @@ -561,7 +568,7 @@ func (t *Translator) addRouteToRouteConfig( } } vHosts[httpRoute.Hostname] = vHost - vHostList = append(vHostList, vHost) + virtualHostsToAdd = append(virtualHostsToAdd, vHost) } var xdsRoute *routev3.Route @@ -672,7 +679,7 @@ func (t *Translator) addRouteToRouteConfig( } } - for _, vHost := range vHostList { + for _, vHost := range virtualHostsToAdd { // Check if an extension want to modify the Virtual Host we just generated // If no extension exists (or it doesn't subscribe to this hook) then this is a quick no-op. if err = processExtensionPostVHostHook(vHost, t.ExtensionManager); err != nil { @@ -685,7 +692,7 @@ func (t *Translator) addRouteToRouteConfig( } } } - xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, vHostList...) + xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, virtualHostsToAdd...) // TODO(zhaohuabing) we need to sort the virtual hosts from the most specific to the least specific // to ensure that the most specific virtual host is matched first. return errs From 11249c8557285d24d3fb7092645f0731bfc73b07 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Mon, 28 Jul 2025 02:55:42 +0000 Subject: [PATCH 29/44] minor change Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/translator.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index c1a1d40ecd..9e8493f402 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -693,8 +693,6 @@ func (t *Translator) addRouteToRouteConfig( } } xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, virtualHostsToAdd...) - // TODO(zhaohuabing) we need to sort the virtual hosts from the most specific to the least specific - // to ensure that the most specific virtual host is matched first. return errs } From 14d865c809a6cbab1c569799ae3acff89422ffd8 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 01:37:25 +0000 Subject: [PATCH 30/44] split route config on different hosts for HTTPS listeners Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 8 +- .../in/xds-ir/port-as-listener-name.yaml | 80 +++++++----- .../port-as-listener-name.listeners.yaml | 122 ++++++++---------- .../xds-ir/port-as-listener-name.routes.yaml | 50 +++++-- .../xds-ir/port-as-listener-name.secrets.yaml | 6 - internal/xds/translator/translator.go | 9 +- 6 files changed, 145 insertions(+), 130 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 51427f37a9..aa36f283e6 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -505,9 +505,12 @@ func (t *Translator) addHCMToXDSListener( } func routeConfigName(irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { - if useProtocolPortAsListenerName { - return strconv.Itoa(int(irListener.ExternalPort)) + // If the ir Listener is HTTP, then the route is merged on the same port. + if useProtocolPortAsListenerName && irListener.TLS == nil { + return fmt.Sprintf("default-%d", irListener.ExternalPort) } + // If the ir Listener is HTTPS, then each Listener has its own route config because we build a separate + // filter chain for each SNI. return irListener.Name } @@ -599,6 +602,7 @@ func addServerNamesMatch( // 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) { diff --git a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml index 52292c4ce5..d395f1e4b9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml @@ -1,31 +1,21 @@ http: - name: "envoy-gateway/gateway-1/http1" - address: 0.0.0.0 + address: "::" port: 10080 externalPort: 80 hostnames: - - "foo.com" + - "foo.net" metadata: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http1 + sectionName: http-ipv6 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" + hostname: "foo.net" destination: name: "first-route-dest" settings: @@ -34,16 +24,40 @@ http: port: 50000 name: "first-route-dest/backend/0" - name: "envoy-gateway/gateway-1/http2" - address: 0.0.0.0 + address: "::" port: 10080 externalPort: 80 hostnames: - - "bar.com" + - "bar.net" metadata: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http2 + sectionName: http-ipv6 + 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" + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -58,26 +72,26 @@ http: # byte slice representation of "key-data" privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - - name: "second-route" - hostname: "bar.com" + - name: "first-route" + hostname: "foo.com" destination: - name: "second-route-dest" + name: "first-route-dest" settings: - endpoints: - host: "1.2.3.4" port: 50000 - name: "second-route-dest/backend/0" -- name: "envoy-gateway/gateway-1/http-ipv6" - address: "::" - port: 10081 - externalPort: 81 + name: "first-route-dest/backend/0" +- name: "envoy-gateway/gateway-1/https2" + address: 0.0.0.0 + port: 10443 + externalPort: 443 hostnames: - - "foo.net" + - "bar.com" metadata: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http-ipv6 + sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -86,14 +100,14 @@ http: - h2 - http/1.1 certificates: - - name: second-listener + - 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: "*" + hostname: "bar.com" destination: name: "second-route-dest" settings: @@ -101,7 +115,7 @@ http: - host: "1.2.3.4" port: 50000 name: "second-route-dest/backend/0" -- name: envoy-gateway/gateway-1/https-http3 +- name: envoy-gateway/gateway-2/https-http3 address: 0.0.0.0 hostnames: - '*' @@ -110,14 +124,14 @@ http: isHTTP2: false metadata: kind: Gateway - name: gateway-1 + name: gateway-2 namespace: envoy-gateway sectionName: https-http3 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true - port: 10443 - externalPort: 443 + port: 11443 + externalPort: 1443 routes: - destination: metadata: diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml index 15845def36..f6e94e8d57 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml @@ -1,11 +1,8 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' portValue: 10080 - filterChains: - - filterChainMatch: - serverNames: - - foo.com + defaultFilterChain: filters: - name: envoy.filters.network.http_connection_manager typedConfig: @@ -28,29 +25,34 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: "80" + routeConfigName: default-80 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-80 + statPrefix: http-80 useRemoteAddress: true - name: 80/foo_com - 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 + name: default-80 + maxConnectionsToAcceptPerSocketEvent: 1 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http-ipv6 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http-ipv6 + name: tcp-80 + perConnectionBufferLimitBytes: 32768 +- address: + socketAddress: + address: 0.0.0.0 + portValue: 10443 + filterChains: - filterChainMatch: serverNames: - - bar.com + - foo.com filters: - name: envoy.filters.network.http_connection_manager typedConfig: @@ -73,11 +75,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: "80" + routeConfigName: envoy-gateway/gateway-1/https1 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-80 + statPrefix: https-443 useRemoteAddress: true - name: 80/bar_com + name: envoy-gateway/gateway-1/https1/foo_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -93,33 +95,9 @@ 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 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 - name: tcp-80 - perConnectionBufferLimitBytes: 32768 -- address: - socketAddress: - address: '::' - portValue: 10081 - filterChains: - filterChainMatch: serverNames: - - foo.net + - bar.com filters: - name: envoy.filters.network.http_connection_manager typedConfig: @@ -142,11 +120,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: "81" + routeConfigName: envoy-gateway/gateway-1/https2 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-81 + statPrefix: https-443 useRemoteAddress: true - name: 81/foo_net + name: envoy-gateway/gateway-1/https2/bar_com transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -156,7 +134,7 @@ - h2 - http/1.1 tlsCertificateSdsSecretConfigs: - - name: second-listener + - name: first-listener sdsConfig: ads: {} resourceApiVersion: V3 @@ -174,13 +152,17 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http-ipv6 - name: tcp-81 + sectionName: http1 + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: tcp-443 perConnectionBufferLimitBytes: 32768 - address: socketAddress: address: 0.0.0.0 - portValue: 10443 + portValue: 11443 protocol: UDP drainType: MODIFY_ONLY filterChains: @@ -208,11 +190,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: "443" + routeConfigName: envoy-gateway/gateway-2/https-http3 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-443 + statPrefix: https-1443 useRemoteAddress: true - name: "443" + name: envoy-gateway/gateway-2/https-http3 transportSocket: name: envoy.transport_sockets.quic typedConfig: @@ -236,17 +218,17 @@ envoy-gateway: resources: - kind: Gateway - name: gateway-1 + name: gateway-2 namespace: envoy-gateway sectionName: https-http3 - name: udp-443 + name: udp-1443 udpListenerConfig: downstreamSocketConfig: {} quicOptions: {} - address: socketAddress: address: 0.0.0.0 - portValue: 10443 + portValue: 11443 filterChains: - filters: - name: envoy.filters.network.http_connection_manager @@ -270,11 +252,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: "443" + routeConfigName: envoy-gateway/gateway-2/https-http3 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-443 + statPrefix: https-1443 useRemoteAddress: true - name: "443" + name: envoy-gateway/gateway-2/https-http3 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -299,10 +281,10 @@ envoy-gateway: resources: - kind: Gateway - name: gateway-1 + name: gateway-2 namespace: envoy-gateway sectionName: https-http3 - name: tcp-443 + name: tcp-1443 perConnectionBufferLimitBytes: 32768 - address: socketAddress: diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index ef6cb4a427..6d98d2b52d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -1,8 +1,8 @@ - ignorePortInHostMatching: true - name: "80" + name: default-80 virtualHosts: - domains: - - foo.com + - foo.net metadata: filterMetadata: envoy-gateway: @@ -10,8 +10,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http1 - name: 80/foo_com + sectionName: http-ipv6 + name: foo_net routes: - match: prefix: / @@ -21,7 +21,7 @@ upgradeConfigs: - upgradeType: websocket - domains: - - bar.com + - bar.net metadata: filterMetadata: envoy-gateway: @@ -29,8 +29,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http2 - name: 80/bar_com + sectionName: http-ipv6 + name: bar_net routes: - match: prefix: / @@ -40,10 +40,10 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: "81" + name: envoy-gateway/gateway-1/https1 virtualHosts: - domains: - - '*' + - foo.com metadata: filterMetadata: envoy-gateway: @@ -51,8 +51,30 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: http-ipv6 - name: 81/* + sectionName: http1 + name: 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 + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http2 + name: bar_com routes: - match: prefix: / @@ -62,7 +84,7 @@ upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: "443" + name: envoy-gateway/gateway-2/https-http3 virtualHosts: - domains: - '*' @@ -71,10 +93,10 @@ envoy-gateway: resources: - kind: Gateway - name: gateway-1 + name: gateway-2 namespace: envoy-gateway sectionName: https-http3 - name: 443/* + name: '*' routes: - match: prefix: / diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml index aecdc68016..87209a295f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml @@ -10,12 +10,6 @@ inlineBytes: Y2VydC1kYXRh privateKey: inlineBytes: a2V5LWRhdGE= -- name: second-listener - tlsCertificate: - certificateChain: - inlineBytes: Y2VydC1kYXRh - privateKey: - inlineBytes: a2V5LWRhdGE= - name: envoy-gateway/tls-secret-1 tlsCertificate: certificateChain: diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 9e8493f402..24ea8dad5c 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -528,7 +528,7 @@ func (t *Translator) addRouteToRouteConfig( // If the virtual host already exists, we can skip it. for _, vHost := range xdsRouteCfg.VirtualHosts { - if vHost.Name == virtualHostName(xdsRouteCfg, httpListener, vHost.Domains[0], t.useProtocolPortAsListenerName()) { + if vHost.Name == virtualHostName(httpListener, vHost.Domains[0], t.useProtocolPortAsListenerName()) { vHosts[vHost.Domains[0]] = vHost } } @@ -543,8 +543,7 @@ func (t *Translator) addRouteToRouteConfig( underscoredHostname := strings.ReplaceAll(httpRoute.Hostname, ".", "_") // Allocate virtual host for this httpRoute. vHost = &routev3.VirtualHost{ - Name: virtualHostName(xdsRouteCfg, httpListener, underscoredHostname, - t.useProtocolPortAsListenerName()), + Name: virtualHostName(httpListener, underscoredHostname, t.useProtocolPortAsListenerName()), Domains: []string{httpRoute.Hostname}, Metadata: buildXdsMetadata(httpListener.Metadata), } @@ -696,11 +695,11 @@ func (t *Translator) addRouteToRouteConfig( return errs } -func virtualHostName(xdsRouteCfg *routev3.RouteConfiguration, httpListener *ir.HTTPListener, +func virtualHostName(httpListener *ir.HTTPListener, underscoredHostname string, useProtocolPortAsListenerName bool, ) string { if useProtocolPortAsListenerName { - return fmt.Sprintf("%s/%s", xdsRouteCfg.Name, underscoredHostname) + return underscoredHostname // Just use the hostname as it is unique inside the route config } return fmt.Sprintf("%s/%s", httpListener.Name, underscoredHostname) } From e7fc9400d006546911a6492433b5bf635a0fc602 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 03:01:29 +0000 Subject: [PATCH 31/44] remove listener metadata Signed-off-by: Huabing (Robin) Zhao --- .../translate/out/default-resources.all.yaml | 16 -------- .../out/from-gateway-api-to-xds.all.json | 28 ------------- .../out/from-gateway-api-to-xds.all.yaml | 16 -------- .../out/from-gateway-api-to-xds.listener.yaml | 16 -------- ...-single-route-single-match-to-xds.all.json | 14 ------- ...-single-route-single-match-to-xds.all.yaml | 8 ---- ...le-route-single-match-to-xds.listener.yaml | 8 ---- .../out/no-service-cluster-ip.all.yaml | 8 ---- ...xtensionpolicy-tcp-udp-http.listeners.yaml | 8 ---- ...-route-custom-backend-error.listeners.yaml | 8 ---- ...kend-multiple-backend-error.listeners.yaml | 8 ---- .../http-route-custom-backend.listeners.yaml | 8 ---- ...route-custom-backends-mixed.listeners.yaml | 8 ---- ...tom-backends-multiple-mixed.listeners.yaml | 8 ---- ...http-route-extension-filter.listeners.yaml | 8 ---- ...te-extension-listener-error.listeners.yaml | 8 ---- ...route-extension-route-error.listeners.yaml | 8 ---- ...e-extension-translate-error.listeners.yaml | 8 ---- ...extension-virtualhost-error.listeners.yaml | 8 ---- .../http-route.listeners.yaml | 8 ---- .../listener-policy.listeners.yaml | 8 ---- ...e-listeners-same-port-error.listeners.yaml | 12 ------ ...-translate-listeners-routes.listeners.yaml | 16 -------- .../out/xds-ir/accesslog-cel.listeners.yaml | 8 ---- .../accesslog-endpoint-stats.listeners.yaml | 8 ---- .../accesslog-formatters.listeners.yaml | 8 ---- .../xds-ir/accesslog-multi-cel.listeners.yaml | 8 ---- .../out/xds-ir/accesslog-types.listeners.yaml | 8 ---- .../accesslog-with-format.listeners.yaml | 8 ---- .../out/xds-ir/accesslog.listeners.yaml | 8 ---- .../out/xds-ir/api-key-auth.listeners.yaml | 8 ---- .../authorization-client-cidr.listeners.yaml | 8 ---- .../authorization-http-header.listeners.yaml | 8 ---- .../authorization-jwt-claim.listeners.yaml | 8 ---- .../authorization-jwt-scope.listeners.yaml | 8 ---- ...ization-multiple-principals.listeners.yaml | 8 ---- .../backend-buffer-limit.listeners.yaml | 8 ---- .../xds-ir/backend-priority.listeners.yaml | 8 ---- .../backend-tls-skip-verify.listeners.yaml | 8 ---- .../basic-auth-username-header.listeners.yaml | 8 ---- .../out/xds-ir/basic-auth.listeners.yaml | 8 ---- .../out/xds-ir/btp-telemetry.listeners.yaml | 8 ---- .../out/xds-ir/circuit-breaker.listeners.yaml | 8 ---- .../xds-ir/client-buffer-limit.listeners.yaml | 8 ---- .../xds-ir/client-ip-detection.listeners.yaml | 32 --------------- .../client-stream-idle-timeout.listeners.yaml | 8 ---- .../out/xds-ir/client-timeout.listeners.yaml | 8 ---- .../out/xds-ir/compression.listeners.yaml | 8 ---- .../cors-from-httpcorsfilter.listeners.yaml | 8 ---- .../testdata/out/xds-ir/cors.listeners.yaml | 8 ---- ...al-injection-backend-filter.listeners.yaml | 8 ---- .../credential-injection.listeners.yaml | 8 ---- .../xds-ir/custom-filter-order.listeners.yaml | 8 ---- .../out/xds-ir/custom-response.listeners.yaml | 8 ---- .../xds-ir/dns-lookup-family.listeners.yaml | 8 ---- .../xds-ir/ext-auth-backend.listeners.yaml | 8 ---- .../out/xds-ir/ext-auth-body.listeners.yaml | 8 ---- .../ext-auth-recomputation.listeners.yaml | 8 ---- .../out/xds-ir/ext-auth.listeners.yaml | 8 ---- ...-proc-with-traffic-settings.listeners.yaml | 8 ---- .../out/xds-ir/ext-proc.listeners.yaml | 8 ---- .../out/xds-ir/fault-injection.listeners.yaml | 8 ---- ...ers-with-disable-request-id.listeners.yaml | 16 -------- ...rs-with-generate-request-id.listeners.yaml | 16 -------- ...erve-or-generate-request-id.listeners.yaml | 16 -------- ...rs-with-preserve-request-id.listeners.yaml | 16 -------- ...ers-with-underscores-action.listeners.yaml | 32 --------------- .../out/xds-ir/health-check.listeners.yaml | 8 ---- .../xds-ir/http-connect-proxy.listeners.yaml | 8 ---- .../http-connect-terminate.listeners.yaml | 8 ---- .../http-early-header-mutation.listeners.yaml | 16 -------- .../xds-ir/http-endpoint-stats.listeners.yaml | 8 ---- .../xds-ir/http-health-check.listeners.yaml | 8 ---- ...tp-preserve-client-protocol.listeners.yaml | 8 ---- .../http-req-resp-sizes-stats.listeners.yaml | 8 ---- .../http-route-direct-response.listeners.yaml | 8 ---- .../http-route-dns-cluster.listeners.yaml | 8 ---- ...http-route-dynamic-resolver.listeners.yaml | 8 ---- .../xds-ir/http-route-mirror.listeners.yaml | 8 ---- ...tp-route-mirrors-percentage.listeners.yaml | 8 ---- ...http-route-multiple-matches.listeners.yaml | 8 ---- ...multiple-mirrors-percentage.listeners.yaml | 8 ---- ...http-route-multiple-mirrors.listeners.yaml | 8 ---- .../http-route-partial-invalid.listeners.yaml | 8 ---- .../xds-ir/http-route-redirect.listeners.yaml | 8 ---- .../xds-ir/http-route-regex.listeners.yaml | 8 ---- .../http-route-request-headers.listeners.yaml | 8 ---- ...-route-response-add-headers.listeners.yaml | 8 ---- ...response-add-remove-headers.listeners.yaml | 8 ---- ...ute-response-remove-headers.listeners.yaml | 8 ---- ...ewrite-root-path-url-prefix.listeners.yaml | 8 ---- ...ufixx-with-slash-url-prefix.listeners.yaml | 8 ---- ...-route-rewrite-url-fullpath.listeners.yaml | 8 ---- ...http-route-rewrite-url-host.listeners.yaml | 8 ---- ...tp-route-rewrite-url-prefix.listeners.yaml | 8 ---- ...ttp-route-rewrite-url-regex.listeners.yaml | 8 ---- ...p-route-session-persistence.listeners.yaml | 8 ---- .../http-route-stat-name.listeners.yaml | 8 ---- .../xds-ir/http-route-timeout.listeners.yaml | 8 ---- ...ute-weighted-backend-uds-ip.listeners.yaml | 8 ---- ...ighted-backend-with-filters.listeners.yaml | 8 ---- ...http-route-weighted-backend.listeners.yaml | 8 ---- ...te-weighted-invalid-backend.listeners.yaml | 8 ---- .../http-route-with-clientcert.listeners.yaml | 8 ---- .../http-route-with-metadata.listeners.yaml | 10 ----- ...-with-tls-system-truststore.listeners.yaml | 8 ---- ...th-tlsbundle-multiple-certs.listeners.yaml | 16 -------- .../http-route-with-tlsbundle.listeners.yaml | 8 ---- ...http-route-zonal-lb-routing.listeners.yaml | 4 -- ...l-routing-weighted-clusters.listeners.yaml | 8 ---- .../http-route-zonal-routing.listeners.yaml | 8 ---- .../out/xds-ir/http-route.listeners.yaml | 8 ---- .../xds-ir/http-upgrade-spdy.listeners.yaml | 8 ---- ...http-upgrade-websocket-spdy.listeners.yaml | 8 ---- .../xds-ir/http1-preserve-case.listeners.yaml | 16 -------- .../out/xds-ir/http1-trailers.listeners.yaml | 8 ---- .../testdata/out/xds-ir/http10.listeners.yaml | 8 ---- .../out/xds-ir/http2-mixed.listeners.yaml | 8 ---- .../out/xds-ir/http2-route.listeners.yaml | 8 ---- .../testdata/out/xds-ir/http2.listeners.yaml | 8 ---- .../testdata/out/xds-ir/http3.listeners.yaml | 16 -------- .../jsonpatch-missing-resource.listeners.yaml | 8 ---- .../jsonpatch-with-jsonpath.listeners.yaml | 8 ---- .../out/xds-ir/jsonpatch.listeners.yaml | 8 ---- .../jwt-custom-extractor.listeners.yaml | 8 ---- ...-multi-route-multi-provider.listeners.yaml | 8 ---- ...multi-route-single-provider.listeners.yaml | 8 ---- .../out/xds-ir/jwt-optional.listeners.yaml | 8 ---- .../out/xds-ir/jwt-ratelimit.listeners.yaml | 8 ---- ...t-single-route-single-match.listeners.yaml | 8 ---- .../jwt-with-backend-tls-retry.listeners.yaml | 8 ---- .../listener-connection-limit.listeners.yaml | 16 -------- ...ener-overlapping-tls-config.listeners.yaml | 20 ---------- .../listener-proxy-protocol.listeners.yaml | 8 ---- .../listener-tcp-keepalive.listeners.yaml | 16 -------- .../out/xds-ir/load-balancer.listeners.yaml | 8 ---- .../local-ratelimit-distinct.listeners.yaml | 8 ---- .../out/xds-ir/local-ratelimit.listeners.yaml | 8 ---- .../testdata/out/xds-ir/lua.listeners.yaml | 8 ---- .../max-conn-per-socket-event.listeners.yaml | 8 ---- .../metrics-virtual-host.listeners.yaml | 8 ---- .../xds-ir/mixed-tls-jwt-authn.listeners.yaml | 8 ---- ...port-with-different-filters.listeners.yaml | 16 -------- ...ultiple-listeners-same-port.listeners.yaml | 8 ---- ...ertificate-with-custom-data.listeners.yaml | 40 ------------------- ...-forward-client-certificate.listeners.yaml | 40 ------------------- ...client-certificate-disabled.listeners.yaml | 8 ---- .../out/xds-ir/mutual-tls-san.listeners.yaml | 8 ---- .../out/xds-ir/mutual-tls.listeners.yaml | 8 ---- ...dc-and-jwt-with-passthrough.listeners.yaml | 8 ---- ...dc-backend-cluster-provider.listeners.yaml | 8 ---- .../testdata/out/xds-ir/oidc.listeners.yaml | 8 ---- .../out/xds-ir/panic-threshold.listeners.yaml | 8 ---- .../out/xds-ir/path-settings.listeners.yaml | 8 ---- .../port-as-listener-name.listeners.yaml | 40 ------------------- .../proxy-protocol-upstream.listeners.yaml | 8 ---- .../ratelimit-custom-domain.listeners.yaml | 8 ---- .../ratelimit-disable-headers.listeners.yaml | 8 ---- .../ratelimit-endpoint-stats.listeners.yaml | 8 ---- .../ratelimit-global-shared.listeners.yaml | 8 ---- .../ratelimit-headers-and-cidr.listeners.yaml | 8 ---- ...telimit-multi-global-shared.listeners.yaml | 8 ---- .../xds-ir/ratelimit-sourceip.listeners.yaml | 8 ---- .../out/xds-ir/ratelimit.listeners.yaml | 8 ---- .../out/xds-ir/request-buffer.listeners.yaml | 16 -------- .../retry-partial-invalid.listeners.yaml | 8 ---- .../testdata/out/xds-ir/retry.listeners.yaml | 8 ---- ...ypolicy-with-oidc-jwt-authz.listeners.yaml | 8 ---- .../out/xds-ir/simple-tls.listeners.yaml | 8 ---- .../suppress-envoy-headers.listeners.yaml | 8 ---- .../out/xds-ir/timeout.listeners.yaml | 8 ---- ...-with-ciphers-versions-alpn.listeners.yaml | 8 ---- .../xds-ir/tracing-datadog-uds.listeners.yaml | 8 ---- .../out/xds-ir/tracing-datadog.listeners.yaml | 8 ---- .../tracing-endpoint-stats.listeners.yaml | 8 ---- .../out/xds-ir/tracing-zipkin.listeners.yaml | 8 ---- .../out/xds-ir/tracing.listeners.yaml | 8 ---- .../upstream-tcpkeepalive.listeners.yaml | 8 ---- .../testdata/out/xds-ir/wasm.listeners.yaml | 8 ---- internal/xds/translator/translator.go | 34 +--------------- 180 files changed, 1 insertion(+), 1777 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 6acf04ccc1..0298672405 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -1126,14 +1126,6 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: http name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: @@ -1246,14 +1238,6 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: grpc name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index f74abf93cb..c4e6028701 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -978,20 +978,6 @@ "name": "default/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "metadata": { - "filterMetadata": { - "envoy-gateway": { - "resources": [ - { - "kind": "Gateway", - "name": "eg", - "namespace": "default", - "sectionName": "http" - } - ] - } - } - }, "name": "default/eg/http", "perConnectionBufferLimitBytes": 32768 } @@ -1144,20 +1130,6 @@ "name": "default/eg/grpc" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "metadata": { - "filterMetadata": { - "envoy-gateway": { - "resources": [ - { - "kind": "Gateway", - "name": "eg", - "namespace": "default", - "sectionName": "grpc" - } - ] - } - } - }, "name": "default/eg/grpc", "perConnectionBufferLimitBytes": 32768 } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 4063e10e4b..609db3c6b6 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -579,14 +579,6 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: http name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: @@ -699,14 +691,6 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: grpc name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index 1e315a1741..1c8fba4d1d 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -143,14 +143,6 @@ xds: useRemoteAddress: true name: default/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: http name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: @@ -263,14 +255,6 @@ xds: useRemoteAddress: true name: default/eg/grpc maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: default - sectionName: grpc name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index 30b2cc1b00..c696b07001 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -689,20 +689,6 @@ "name": "envoy-gateway-system/eg/http" }, "maxConnectionsToAcceptPerSocketEvent": 1, - "metadata": { - "filterMetadata": { - "envoy-gateway": { - "resources": [ - { - "kind": "Gateway", - "name": "eg", - "namespace": "envoy-gateway-system", - "sectionName": "http" - } - ] - } - } - }, "name": "envoy-gateway-system/eg/http", "perConnectionBufferLimitBytes": 32768 } diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 7f5cc4d314..7c62e33666 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -417,14 +417,6 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: envoy-gateway-system - sectionName: http name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index 9e33881f16..6eeb127d70 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -163,13 +163,5 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: envoy-gateway-system - sectionName: http name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index f9ad0b261b..0553585ed2 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -352,14 +352,6 @@ xds: useRemoteAddress: true name: envoy-gateway-system/eg/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: eg - namespace: envoy-gateway-system - sectionName: http name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index 2a5dccb121..146bc9f121 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -38,14 +38,6 @@ cluster: tcp-route-dest statPrefix: tcp-10080 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http1 perConnectionBufferLimitBytes: 32768 statPrefix: envoy-gateway/gateway-1/http1 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml index 61a2ca94f5..67ce52cb2b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: custom-backend-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml index d11bfa0ef6..c0c5aab4ad 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml index 61a2ca94f5..67ce52cb2b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: custom-backend-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: custom-backend-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml index d11bfa0ef6..c0c5aab4ad 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml index d11bfa0ef6..c0c5aab4ad 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: multiple-custom-backends-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index 883acd408a..7deec13dbb 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: extension-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-listener perConnectionBufferLimitBytes: 32768 statPrefix: mock-extension-inserted-prefix diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml index f10e377561..f9ce671f37 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: extension-post-xdslistener-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdslistener-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml index a2cbde782a..a5bc288824 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml index a082e609d2..877c7b5140 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: extension-post-xdstranslate-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdstranslate-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml index f21d448493..cb8f77fd5e 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: extension-post-xdsvirtualhost-hook-error maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdsvirtualhost-hook-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index a2cbde782a..a5bc288824 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index a277e74fdb..8f78e66fc6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: policyextension-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: policyextension-listener perConnectionBufferLimitBytes: 32768 statPrefix: from-the-policy diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml index 8ef5fb4c4e..b55f7c0187 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.listeners.yaml @@ -98,17 +98,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: first-listener-error perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml index b57535b09f..b9ec83b9e3 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: test-listener-modify maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: test-listener-modify perConnectionBufferLimitBytes: 32768 statPrefix: extension-modified-listener @@ -75,14 +67,6 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - name: extension-injected-listener diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index 2b5f5e8b40..b2e7c7b796 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -180,13 +180,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index 406570e386..9f4b791fbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -141,13 +141,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index cb389c3cd1..02a4d47e52 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -197,13 +197,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index 003a91e046..69b8942922 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -216,13 +216,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index 5bc6484861..58471e8de1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -345,13 +345,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml index e8feae980b..95daf288e1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml @@ -175,13 +175,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 4a0400f990..562b6a1be5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -175,13 +175,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml index fa468e61bf..2ed9678583 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.listeners.yaml @@ -44,13 +44,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml index 9f6c395778..0501674cf7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml index 9f6c395778..0501674cf7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml index 998f503038..261038728f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml @@ -75,13 +75,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml index 998f503038..261038728f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml @@ -75,13 +75,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml index 9f6c395778..0501674cf7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index a6c21a4436..09c320b7f3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml index 41a1c3abc8..7f609a90d1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml @@ -45,13 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml index e930093a2b..cd67a05d25 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml @@ -45,13 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index 67191cb27c..29a61b1b93 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -43,13 +43,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index 69fb9cd577..6f2229df69 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 1500 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index c135718c7f..0a81c11e30 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -35,14 +35,6 @@ useRemoteAddress: false name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -82,14 +74,6 @@ useRemoteAddress: false name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - address: @@ -131,14 +115,6 @@ useRemoteAddress: false name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener perConnectionBufferLimitBytes: 32768 - address: @@ -185,13 +161,5 @@ useRemoteAddress: false name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml index fe79a425b9..ce18164fe2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml @@ -34,14 +34,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index acb9e11cb7..4ec0aeddf6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -33,14 +33,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml index 90876bb592..e0bba0b836 100644 --- a/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml @@ -47,13 +47,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml index 7aa827d5dc..6a7b66b8be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index 7aa827d5dc..6a7b66b8be 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml index c9dbe4269e..7a127ec768 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml @@ -59,13 +59,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml index 32508f7823..14804eca76 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml @@ -126,13 +126,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml index 7ac2f81044..79224eb3d4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml @@ -167,13 +167,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml index 7a293dba3c..c5fb9a58f8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml @@ -177,13 +177,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml index 4565c7a2f9..54c5036236 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml @@ -66,13 +66,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml index cfd9083d7d..7532049e80 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml @@ -68,13 +68,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml index 6651566b09..87765fcd69 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml @@ -67,13 +67,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index 45b2251006..70476f73bc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -66,13 +66,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml index 41a1c3abc8..7f609a90d1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml @@ -45,13 +45,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml index efdfe6e5e2..e0741bc3d4 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml @@ -136,13 +136,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 81582834d8..578b85950b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml index 15dc3de0b5..b28018159a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.listeners.yaml @@ -30,14 +30,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -71,13 +63,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml index b67a194e7b..2da2dbb0b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.listeners.yaml @@ -30,14 +30,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -71,13 +63,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml index d1659b964b..7b5d0e785e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -72,13 +64,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml index 67cc7dd569..1cbee6b41e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -72,13 +64,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml index a3d9094277..3c5a4ce9de 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml @@ -29,14 +29,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -69,14 +61,6 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - address: @@ -110,14 +94,6 @@ useRemoteAddress: true name: third-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener perConnectionBufferLimitBytes: 32768 - address: @@ -151,13 +127,5 @@ useRemoteAddress: true name: fourth-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml index 07175f790e..5f3b4cd635 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml @@ -37,14 +37,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -112,13 +104,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml index 1d746951be..a88611caf1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: listener-enable-endpoint-stats maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: listener-enable-endpoint-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml index 0875a501d8..2208eb5ee2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml @@ -39,13 +39,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml index 89e82d6f69..89d3361c24 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: listener-enable-req-resp-sizes-stats maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: listener-enable-req-resp-sizes-stats perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml index 1d2eb71e64..f869509943 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.listeners.yaml @@ -67,13 +67,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index a2cbde782a..a5bc288824 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml index cdfd59ac43..2b97daa228 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml @@ -40,13 +40,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index 63cf321dec..86036a19d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml index dfae8da1b1..a5bc288824 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml @@ -31,15 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - annotations: - foo: bar - kind: Gateway - name: first-gateway - namespace: first-gateway - sectionName: first-listener name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index 63cf321dec..86036a19d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index 1f5814e8c2..59e6ae249f 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 - address: @@ -74,13 +66,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls-2/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: envoy-gateway/gateway-btls-2/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index 63cf321dec..86036a19d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-btls/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml index 77683b5239..5c7db41545 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-lb-routing.listeners.yaml @@ -29,9 +29,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: [] name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml index 81b9ea5ab3..5c7db41545 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.listeners.yaml @@ -29,13 +29,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml index 81b9ea5ab3..5c7db41545 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.listeners.yaml @@ -29,13 +29,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml index be40ad3cb0..4d0fe90c54 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index 8fea326eb5..22947a5cce 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -37,14 +37,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -87,13 +79,5 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index 58005eba8a..a7721414c8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -33,13 +33,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index 346ceb0855..f8f81a1f1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -34,13 +34,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml index c6e9bcc9fd..368dab5a9b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml index d6b3df2eeb..2a7c6641af 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml @@ -39,13 +39,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index c6e9bcc9fd..368dab5a9b 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index 2e71dec7ee..80d7bc1b38 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -49,14 +49,6 @@ resourceApiVersion: V3 disableStatefulSessionResumption: true disableStatelessSessionResumption: true - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: envoy-gateway/gateway-1/tls-quic udpListenerConfig: downstreamSocketConfig: {} @@ -109,13 +101,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: envoy-gateway/gateway-1/tls perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index 7954f39558..cebf87c73f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -62,13 +62,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index 7954f39558..cebf87c73f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -62,13 +62,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index 5d1321ecce..2385014f06 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -61,13 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index c927c01b35..97c317be07 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -127,13 +127,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index 8da7fd91c7..cb66d4dcf1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -97,13 +97,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml index ebc7ac35e8..051a776b32 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml @@ -64,13 +64,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index b8e3aca1ed..a4d81f0e11 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -64,13 +64,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index 0f4a7d018c..15f6b00844 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -54,13 +54,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml index f14e70b86e..672ec20c19 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.listeners.yaml @@ -63,13 +63,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 7f7eca3552..7cd7ecbd04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -79,14 +71,6 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - address: 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 bc14dec8de..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 @@ -96,18 +96,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: https-1 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: https-2 name: envoy-gateway/gateway-1/https-1 perConnectionBufferLimitBytes: 32768 - address: @@ -164,13 +152,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: https-3 name: envoy-gateway/gateway-1/https-3 perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index da40157f12..f166c8abef 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -60,14 +60,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 92d6ab33c1..93842bc5ce 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 socketOptions: @@ -79,14 +71,6 @@ useRemoteAddress: true name: second-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml index b0cae1c6c7..ee98980e3e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.listeners.yaml @@ -36,13 +36,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index b0cae1c6c7..ee98980e3e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -36,13 +36,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml index dd42add0a1..d7d641dd2d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.listeners.yaml @@ -52,13 +52,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml index 73d693a8f7..05a995136e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml @@ -31,14 +31,6 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 2 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml index d847786d0b..31e76f774a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml @@ -46,13 +46,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index 044408e470..f50d6e0f63 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -102,14 +102,6 @@ useRemoteAddress: true name: default/gateway-1/http drainType: MODIFY_ONLY - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http-quic udpListenerConfig: downstreamSocketConfig: {} @@ -215,13 +207,5 @@ useRemoteAddress: true name: default/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 32214d2b94..bd7e033cf5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -146,13 +146,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml index 709614dc5b..7b0252b6c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml @@ -56,14 +56,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -125,14 +117,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: second-listener perConnectionBufferLimitBytes: 32768 - address: @@ -196,14 +180,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: third-listener perConnectionBufferLimitBytes: 32768 - address: @@ -269,14 +245,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: fourth-listener perConnectionBufferLimitBytes: 32768 - address: @@ -344,13 +312,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: fifth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml index dd11d5a2a8..fcb1f4dd3e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml @@ -56,14 +56,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener perConnectionBufferLimitBytes: 32768 - address: @@ -125,14 +117,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener perConnectionBufferLimitBytes: 32768 - address: @@ -194,14 +178,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener perConnectionBufferLimitBytes: 32768 - address: @@ -263,14 +239,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener perConnectionBufferLimitBytes: 32768 - address: @@ -332,13 +300,5 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http5 name: fifth-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index fed3282676..47b5e2f00d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -56,14 +56,6 @@ disableStatelessSessionResumption: true requireClientCertificate: false maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml index b85ec758e8..6ca9e6eb7e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml @@ -79,14 +79,6 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index 1b504f4bc1..3b1c6edfe4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -56,14 +56,6 @@ disableStatelessSessionResumption: true requireClientCertificate: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml index 058330547e..8f1c1028d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.listeners.yaml @@ -158,13 +158,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml index 86adeb7288..4e20904646 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml @@ -80,13 +80,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index 9c26830866..496d62dc62 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -141,13 +141,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index 57110ebb4b..a25791ea52 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -30,13 +30,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml index f6e94e8d57..ef9ac475fa 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml @@ -31,18 +31,6 @@ useRemoteAddress: true name: default-80 maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 name: tcp-80 perConnectionBufferLimitBytes: 32768 - address: @@ -145,18 +133,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: tcp-443 perConnectionBufferLimitBytes: 32768 - address: @@ -213,14 +189,6 @@ tlsMinimumProtocolVersion: TLSv1_2 disableStatefulSessionResumption: true disableStatelessSessionResumption: true - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-2 - namespace: envoy-gateway - sectionName: https-http3 name: udp-1443 udpListenerConfig: downstreamSocketConfig: {} @@ -276,14 +244,6 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-2 - namespace: envoy-gateway - sectionName: https-http3 name: tcp-1443 perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index 57eff757d7..5848912b9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -41,13 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index df34d8491e..d7dc5d1295 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -40,13 +40,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index 57eff757d7..5848912b9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -41,13 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml index 94139b64d4..8576ebeb03 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.listeners.yaml @@ -61,13 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml index 57eff757d7..5848912b9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml @@ -41,13 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml index 94139b64d4..8576ebeb03 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.listeners.yaml @@ -61,13 +61,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index 57eff757d7..5848912b9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -41,13 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index 57eff757d7..5848912b9c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -41,13 +41,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml index 3448386e4d..1b5504bd87 100644 --- a/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/request-buffer.listeners.yaml @@ -36,14 +36,6 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 - address: @@ -84,13 +76,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-2/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-2 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-2/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml index c89b24ad99..61573e5b44 100644 --- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml @@ -103,13 +103,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 924679c0ae..6f069367c6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -50,13 +50,5 @@ disableStatefulSessionResumption: true disableStatelessSessionResumption: true maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index 0841202a42..26f3b45110 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -56,13 +56,5 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index 95f3962e86..05c4b3c664 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -76,14 +76,6 @@ typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 - address: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml index 3d9a8e99b3..f5d891adb1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.listeners.yaml @@ -57,13 +57,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index 3d9a8e99b3..f5d891adb1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -57,13 +57,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index aa34d999bb..c685e2ac55 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -59,13 +59,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml index 1c7572403a..362f098ff2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml @@ -60,13 +60,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index e04426f4bb..b7497f7924 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -60,13 +60,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index 1914d47bc5..5dd5e46e3c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -31,13 +31,5 @@ useRemoteAddress: true name: first-listener maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index 62d67da17f..35a1d5fdee 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -113,13 +113,5 @@ useRemoteAddress: true name: envoy-gateway/gateway-1/http maxConnectionsToAcceptPerSocketEvent: 1 - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 24ea8dad5c..23393a9e70 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -6,11 +6,9 @@ package translator import ( - "cmp" "errors" "fmt" "runtime" - "slices" "strings" "time" @@ -273,8 +271,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( // The XDS translation is done in a best-effort manner, so we collect all // errors and return them at the end. var ( - ownerGatewayListeners = make(map[string]sets.Set[*ir.ResourceMetadata]) // The set of Gateway HTTPListeners that own the xDS Listener - http3EnabledListeners = make(map[listenerKey]*ir.HTTP3Settings) // Map to track HTTP3 settings for listeners by address and port + http3EnabledListeners = make(map[listenerKey]*ir.HTTP3Settings) // Map to track HTTP3 settings for listeners by address and port errs error ) @@ -329,7 +326,6 @@ func (t *Translator) processHTTPListenerXdsTranslation( errs = errors.Join(errs, err) continue } - ownerGatewayListeners[quicXDSListener.Name] = sets.New[*ir.ResourceMetadata]() } // Create a new TCP listener for HTTP1/HTTP2 traffic. @@ -347,7 +343,6 @@ func (t *Translator) processHTTPListenerXdsTranslation( errs = errors.Join(errs, err) continue } - ownerGatewayListeners[tcpXDSListener.Name] = sets.New[*ir.ResourceMetadata]() // We need to add an HCM to the newly created listener. addHCM = true @@ -401,12 +396,6 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } - // Collect the metadata for the HTTPListener. - ownerGatewayListeners[tcpXDSListener.Name].Insert(httpListener.Metadata) - if http3Enabled { - ownerGatewayListeners[quicXDSListener.Name].Insert(httpListener.Metadata) - } - // Add the secrets referenced by the listener's TLS configuration to the // resource version table. // 1:1 between IR TLSListenerConfig and xDS Secret @@ -486,27 +475,6 @@ func (t *Translator) processHTTPListenerXdsTranslation( } } - // Add the owner Gateway Listeners to the xDS listeners' metadata. - for listenerName, ownerGatewayListeners := range ownerGatewayListeners { - xdsListener := findXdsListener(tCtx, listenerName) - if xdsListener != nil { - sortedListeners := ownerGatewayListeners.UnsortedList() - // Sort by name, namespace, and section name ascending - slices.SortFunc(sortedListeners, func(a, b *ir.ResourceMetadata) int { - if a == nil && b == nil { - return 0 - } - if a == nil { - return -1 - } - if b == nil { - return 1 - } - return cmp.Compare(a.Name+a.Namespace+a.SectionName, b.Name+b.Namespace+b.SectionName) - }) - xdsListener.Metadata = buildXdsMetadataFromMultiple(sortedListeners) - } - } return errs } From 8de03777be3c4af22fd0b9b8716c3f107f1a8441 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 03:39:54 +0000 Subject: [PATCH 32/44] remove listener metadata Signed-off-by: Huabing (Robin) Zhao --- .../extensionpolicy-tcp-udp-http.yaml | 5 -- .../http-route-custom-backend-error.yaml | 5 -- ...custom-backend-multiple-backend-error.yaml | 5 -- .../http-route-custom-backend.yaml | 5 -- .../http-route-custom-backends-mixed.yaml | 5 -- ...-route-custom-backends-multiple-mixed.yaml | 5 -- .../http-route-extension-filter.yaml | 5 -- .../http-route-extension-listener-error.yaml | 5 -- .../http-route-extension-route-error.yaml | 5 -- .../http-route-extension-translate-error.yaml | 5 -- ...ttp-route-extension-virtualhost-error.yaml | 5 -- .../in/extension-xds-ir/http-route.yaml | 5 -- .../in/extension-xds-ir/listener-policy.yaml | 5 -- .../multiple-listeners-same-port-error.yaml | 10 ---- .../post-translate-listeners-routes.yaml | 10 ---- .../in/ratelimit-config/distinct-match.yaml | 5 -- .../distinct-remote-address-match.yaml | 5 -- .../empty-header-matches.yaml | 5 -- .../global-shared-distinct-match.yaml | 5 -- ...lobal-shared-multiple-shared-policies.yaml | 5 -- .../header-and-cidr-matches.yaml | 5 -- .../masked-remote-address-match.yaml | 5 -- .../in/ratelimit-config/multiple-domains.yaml | 5 -- ...multiple-global-shared-distinct-match.yaml | 5 -- .../multiple-listeners-distinct-match.yaml | 10 ---- ...-listeners-same-shared-distinct-match.yaml | 10 ---- ...tiple-listeners-shared-distinct-match.yaml | 10 ---- ...d-remote-address-match-with-same-cidr.yaml | 5 -- .../in/ratelimit-config/multiple-matches.yaml | 5 -- .../in/ratelimit-config/multiple-routes.yaml | 5 -- .../in/ratelimit-config/multiple-rules.yaml | 5 -- .../multiple-shared-and-unshared.yaml | 5 -- .../multiple-shared-ratelimit-rules.yaml | 5 -- .../in/ratelimit-config/value-match.yaml | 5 -- .../testdata/in/xds-ir/accesslog-cel.yaml | 5 -- .../in/xds-ir/accesslog-endpoint-stats.yaml | 5 -- .../in/xds-ir/accesslog-formatters.yaml | 5 -- .../testdata/in/xds-ir/accesslog-invalid.yaml | 5 -- .../in/xds-ir/accesslog-multi-cel.yaml | 5 -- .../in/xds-ir/accesslog-with-format.yaml | 5 -- .../in/xds-ir/accesslog-without-format.yaml | 5 -- .../testdata/in/xds-ir/accesslog.yaml | 5 -- .../testdata/in/xds-ir/api-key-auth.yaml | 5 -- .../in/xds-ir/authorization-client-cidr.yaml | 5 -- .../in/xds-ir/authorization-http-header.yaml | 5 -- .../authorization-multiple-principals.yaml | 5 -- .../in/xds-ir/backend-buffer-limit.yaml | 5 -- .../in/xds-ir/backend-tls-skip-verify.yaml | 5 -- .../in/xds-ir/basic-auth-username-header.yaml | 5 -- .../testdata/in/xds-ir/basic-auth.yaml | 5 -- .../testdata/in/xds-ir/circuit-breaker.yaml | 5 -- .../in/xds-ir/client-buffer-limit.yaml | 5 -- .../in/xds-ir/client-ip-detection.yaml | 20 -------- .../in/xds-ir/client-stream-idle-timeout.yaml | 5 -- .../testdata/in/xds-ir/client-timeout.yaml | 10 ---- .../in/xds-ir/cors-from-httpcorsfilter.yaml | 5 -- .../translator/testdata/in/xds-ir/cors.yaml | 5 -- .../in/xds-ir/custom-filter-order.yaml | 5 -- .../testdata/in/xds-ir/ext-auth-backend.yaml | 5 -- .../testdata/in/xds-ir/ext-auth-body.yaml | 5 -- .../in/xds-ir/ext-auth-recomputation.yaml | 5 -- .../testdata/in/xds-ir/ext-auth.yaml | 5 -- .../testdata/in/xds-ir/ext-proc.yaml | 5 -- .../testdata/in/xds-ir/fault-injection.yaml | 5 -- .../headers-with-disable-request-id.yaml | 10 ---- .../headers-with-generate-request-id.yaml | 10 ---- ...-with-preserve-or-generate-request-id.yaml | 10 ---- .../headers-with-preserve-request-id.yaml | 10 ---- .../headers-with-underscores-action.yaml | 21 +------- .../testdata/in/xds-ir/health-check.yaml | 5 -- .../in/xds-ir/http-early-header-mutation.yaml | 10 ---- .../in/xds-ir/http-endpoint-stats.yaml | 5 -- .../testdata/in/xds-ir/http-health-check.yaml | 5 -- .../xds-ir/http-preserve-client-protocol.yaml | 5 -- .../in/xds-ir/http-req-resp-sizes-stats.yaml | 5 -- .../in/xds-ir/http-route-direct-response.yaml | 5 -- .../in/xds-ir/http-route-dns-cluster.yaml | 5 -- .../in/xds-ir/http-route-invalid.yaml | 5 -- .../testdata/in/xds-ir/http-route-mirror.yaml | 5 -- .../xds-ir/http-route-mirrors-percentage.yaml | 5 -- .../xds-ir/http-route-multiple-matches.yaml | 5 -- ...ttp-route-multiple-mirrors-percentage.yaml | 5 -- .../xds-ir/http-route-multiple-mirrors.yaml | 5 -- .../in/xds-ir/http-route-partial-invalid.yaml | 5 -- .../in/xds-ir/http-route-redirect.yaml | 5 -- .../testdata/in/xds-ir/http-route-regex.yaml | 5 -- .../in/xds-ir/http-route-request-headers.yaml | 5 -- .../http-route-response-add-headers.yaml | 5 -- ...ttp-route-response-add-remove-headers.yaml | 5 -- .../http-route-response-remove-headers.yaml | 5 -- ...tp-route-rewrite-root-path-url-prefix.yaml | 5 -- ...-rewrite-sufixx-with-slash-url-prefix.yaml | 5 -- .../http-route-rewrite-url-fullpath.yaml | 5 -- .../xds-ir/http-route-rewrite-url-host.yaml | 5 -- .../xds-ir/http-route-rewrite-url-prefix.yaml | 5 -- .../xds-ir/http-route-rewrite-url-regex.yaml | 5 -- .../http-route-session-persistence.yaml | 5 -- .../in/xds-ir/http-route-stat-name.yaml | 5 -- .../in/xds-ir/http-route-timeout.yaml | 5 -- .../http-route-weighted-backend-uds-ip.yaml | 5 -- ...p-route-weighted-backend-with-filters.yaml | 5 -- .../xds-ir/http-route-weighted-backend.yaml | 5 -- .../http-route-weighted-invalid-backend.yaml | 5 -- .../in/xds-ir/http-route-with-clientcert.yaml | 5 -- ...http-route-with-tls-system-truststore.yaml | 5 -- ...p-route-with-tlsbundle-multiple-certs.yaml | 10 ---- .../in/xds-ir/http-route-with-tlsbundle.yaml | 5 -- ...route-zonal-routing-weighted-clusters.yaml | 5 -- .../in/xds-ir/http-route-zonal-routing.yaml | 5 -- .../testdata/in/xds-ir/http-route.yaml | 5 -- .../in/xds-ir/http1-preserve-case.yaml | 10 ---- .../testdata/in/xds-ir/http1-trailers.yaml | 5 -- .../translator/testdata/in/xds-ir/http10.yaml | 5 -- .../testdata/in/xds-ir/http2-mixed.yaml | 5 -- .../testdata/in/xds-ir/http2-route.yaml | 5 -- .../translator/testdata/in/xds-ir/http2.yaml | 5 -- .../translator/testdata/in/xds-ir/http3.yaml | 5 -- .../jsonpatch-add-op-empty-jsonpath.yaml | 5 -- .../jsonpatch-add-op-without-value.yaml | 5 -- .../in/xds-ir/jsonpatch-invalid-listener.yaml | 5 -- .../in/xds-ir/jsonpatch-invalid-patch.yaml | 5 -- .../testdata/in/xds-ir/jsonpatch-invalid.yaml | 5 -- .../in/xds-ir/jsonpatch-missing-resource.yaml | 5 -- .../xds-ir/jsonpatch-move-op-with-value.yaml | 5 -- .../jsonpatch-with-jsonpath-invalid.yaml | 5 -- .../in/xds-ir/jsonpatch-with-jsonpath.yaml | 5 -- .../testdata/in/xds-ir/jsonpatch.yaml | 5 -- .../in/xds-ir/jwt-custom-extractor.yaml | 5 -- .../jwt-multi-route-multi-provider.yaml | 5 -- .../jwt-multi-route-single-provider.yaml | 5 -- .../testdata/in/xds-ir/jwt-optional.yaml | 5 -- .../testdata/in/xds-ir/jwt-ratelimit.yaml | 5 -- .../xds-ir/jwt-single-route-single-match.yaml | 5 -- .../in/xds-ir/listener-connection-limit.yaml | 10 ---- .../in/xds-ir/listener-proxy-protocol.yaml | 5 -- .../in/xds-ir/listener-tcp-keepalive.yaml | 10 ---- .../testdata/in/xds-ir/load-balancer.yaml | 5 -- .../in/xds-ir/local-ratelimit-distinct.yaml | 5 -- .../testdata/in/xds-ir/local-ratelimit.yaml | 5 -- .../translator/testdata/in/xds-ir/lua.yaml | 5 -- .../in/xds-ir/max-conn-per-socket-event.yaml | 5 -- .../in/xds-ir/metrics-virtual-host.yaml | 5 -- .../in/xds-ir/mixed-tls-jwt-authn.yaml | 5 -- ...ners-same-port-with-different-filters.yaml | 5 -- .../xds-ir/multiple-listeners-same-port.yaml | 5 -- ...d-client-certificate-with-custom-data.yaml | 25 ---------- ...mutual-tls-forward-client-certificate.yaml | 25 ---------- ...-required-client-certificate-disabled.yaml | 5 -- .../testdata/in/xds-ir/mutual-tls-san.yaml | 5 -- .../testdata/in/xds-ir/mutual-tls.yaml | 5 -- .../xds-ir/oidc-and-jwt-with-passthrough.yaml | 5 -- .../xds-ir/oidc-backend-cluster-provider.yaml | 5 -- .../translator/testdata/in/xds-ir/oidc.yaml | 5 -- .../testdata/in/xds-ir/panic-threshold.yaml | 5 -- .../testdata/in/xds-ir/path-settings.yaml | 5 -- .../in/xds-ir/port-as-listener-name.yaml | 48 ------------------- .../in/xds-ir/proxy-protocol-upstream.yaml | 5 -- .../in/xds-ir/ratelimit-custom-domain.yaml | 5 -- .../in/xds-ir/ratelimit-disable-headers.yaml | 5 -- .../in/xds-ir/ratelimit-endpoint-stats.yaml | 5 -- .../in/xds-ir/ratelimit-global-shared.yaml | 5 -- .../in/xds-ir/ratelimit-headers-and-cidr.yaml | 5 -- .../xds-ir/ratelimit-multi-global-shared.yaml | 5 -- .../in/xds-ir/ratelimit-sourceip.yaml | 5 -- .../testdata/in/xds-ir/ratelimit.yaml | 5 -- .../in/xds-ir/retry-partial-invalid.yaml | 5 -- .../translator/testdata/in/xds-ir/retry.yaml | 5 -- .../testdata/in/xds-ir/simple-tls.yaml | 5 -- .../in/xds-ir/suppress-envoy-headers.yaml | 5 -- .../testdata/in/xds-ir/timeout.yaml | 5 -- .../tls-with-ciphers-versions-alpn.yaml | 5 -- .../in/xds-ir/tracing-datadog-uds.yaml | 5 -- .../testdata/in/xds-ir/tracing-datadog.yaml | 5 -- .../in/xds-ir/tracing-endpoint-stats.yaml | 5 -- .../testdata/in/xds-ir/tracing-zipkin.yaml | 5 -- .../testdata/in/xds-ir/tracing.yaml | 5 -- .../in/xds-ir/upstream-tcpkeepalive.yaml | 5 -- .../translator/testdata/in/xds-ir/wasm.yaml | 5 -- .../extensionpolicy-tcp-udp-http.routes.yaml | 8 ---- ...ttp-route-custom-backend-error.routes.yaml | 8 ---- ...backend-multiple-backend-error.routes.yaml | 8 ---- .../http-route-custom-backend.routes.yaml | 8 ---- ...tp-route-custom-backends-mixed.routes.yaml | 8 ---- ...custom-backends-multiple-mixed.routes.yaml | 8 ---- .../http-route-extension-filter.routes.yaml | 8 ---- ...route-extension-listener-error.routes.yaml | 8 ---- ...tp-route-extension-route-error.routes.yaml | 8 ---- ...oute-extension-translate-error.routes.yaml | 8 ---- ...te-extension-virtualhost-error.routes.yaml | 8 ---- .../extension-xds-ir/http-route.routes.yaml | 8 ---- ...iple-listeners-same-port-error.routes.yaml | 16 ------- ...ost-translate-listeners-routes.routes.yaml | 16 ------- .../out/xds-ir/accesslog-cel.routes.yaml | 8 ---- .../accesslog-endpoint-stats.routes.yaml | 8 ---- .../xds-ir/accesslog-formatters.routes.yaml | 8 ---- .../xds-ir/accesslog-multi-cel.routes.yaml | 8 ---- .../xds-ir/accesslog-with-format.routes.yaml | 8 ---- .../testdata/out/xds-ir/accesslog.routes.yaml | 8 ---- .../out/xds-ir/api-key-auth.routes.yaml | 16 ------- .../authorization-client-cidr.routes.yaml | 8 ---- .../authorization-http-header.routes.yaml | 8 ---- ...horization-multiple-principals.routes.yaml | 8 ---- .../xds-ir/backend-buffer-limit.routes.yaml | 8 ---- .../backend-tls-skip-verify.routes.yaml | 8 ---- .../basic-auth-username-header.routes.yaml | 16 ------- .../out/xds-ir/basic-auth.routes.yaml | 16 ------- .../out/xds-ir/circuit-breaker.routes.yaml | 8 ---- .../xds-ir/client-buffer-limit.routes.yaml | 8 ---- .../xds-ir/client-ip-detection.routes.yaml | 32 ------------- .../client-stream-idle-timeout.routes.yaml | 8 ---- .../out/xds-ir/client-timeout.routes.yaml | 8 ---- .../cors-from-httpcorsfilter.routes.yaml | 8 ---- .../testdata/out/xds-ir/cors.routes.yaml | 8 ---- .../xds-ir/custom-filter-order.routes.yaml | 8 ---- .../out/xds-ir/ext-auth-backend.routes.yaml | 16 ------- .../out/xds-ir/ext-auth-body.routes.yaml | 16 ------- .../xds-ir/ext-auth-recomputation.routes.yaml | 16 ------- .../testdata/out/xds-ir/ext-auth.routes.yaml | 16 ------- .../testdata/out/xds-ir/ext-proc.routes.yaml | 16 ------- .../out/xds-ir/fault-injection.routes.yaml | 8 ---- ...eaders-with-disable-request-id.routes.yaml | 16 ------- ...aders-with-generate-request-id.routes.yaml | 16 ------- ...reserve-or-generate-request-id.routes.yaml | 16 ------- ...aders-with-preserve-request-id.routes.yaml | 16 ------- ...eaders-with-underscores-action.routes.yaml | 32 ------------- .../out/xds-ir/health-check.routes.yaml | 8 ---- .../http-early-header-mutation.routes.yaml | 16 ------- .../xds-ir/http-endpoint-stats.routes.yaml | 8 ---- .../out/xds-ir/http-health-check.routes.yaml | 8 ---- .../http-preserve-client-protocol.routes.yaml | 8 ---- .../http-req-resp-sizes-stats.routes.yaml | 8 ---- .../http-route-direct-response.routes.yaml | 8 ---- .../xds-ir/http-route-dns-cluster.routes.yaml | 8 ---- .../out/xds-ir/http-route-mirror.routes.yaml | 8 ---- .../http-route-mirrors-percentage.routes.yaml | 8 ---- .../http-route-multiple-matches.routes.yaml | 40 ---------------- ...te-multiple-mirrors-percentage.routes.yaml | 8 ---- .../http-route-multiple-mirrors.routes.yaml | 8 ---- .../http-route-partial-invalid.routes.yaml | 8 ---- .../xds-ir/http-route-redirect.routes.yaml | 8 ---- .../out/xds-ir/http-route-regex.routes.yaml | 8 ---- .../http-route-request-headers.routes.yaml | 8 ---- ...ttp-route-response-add-headers.routes.yaml | 8 ---- ...te-response-add-remove-headers.routes.yaml | 8 ---- ...-route-response-remove-headers.routes.yaml | 8 ---- ...e-rewrite-root-path-url-prefix.routes.yaml | 8 ---- ...e-sufixx-with-slash-url-prefix.routes.yaml | 8 ---- ...ttp-route-rewrite-url-fullpath.routes.yaml | 8 ---- .../http-route-rewrite-url-host.routes.yaml | 8 ---- .../http-route-rewrite-url-prefix.routes.yaml | 8 ---- .../http-route-rewrite-url-regex.routes.yaml | 8 ---- ...http-route-session-persistence.routes.yaml | 8 ---- .../xds-ir/http-route-stat-name.routes.yaml | 8 ---- .../out/xds-ir/http-route-timeout.routes.yaml | 8 ---- ...-route-weighted-backend-uds-ip.routes.yaml | 8 ---- ...-weighted-backend-with-filters.routes.yaml | 8 ---- .../http-route-weighted-backend.routes.yaml | 8 ---- ...route-weighted-invalid-backend.routes.yaml | 8 ---- .../http-route-with-clientcert.routes.yaml | 8 ---- ...ute-with-tls-system-truststore.routes.yaml | 8 ---- ...-with-tlsbundle-multiple-certs.routes.yaml | 16 ------- .../http-route-with-tlsbundle.routes.yaml | 8 ---- ...onal-routing-weighted-clusters.routes.yaml | 8 ---- .../http-route-zonal-routing.routes.yaml | 8 ---- .../out/xds-ir/http-route.routes.yaml | 8 ---- .../xds-ir/http1-preserve-case.routes.yaml | 16 ------- .../out/xds-ir/http1-trailers.routes.yaml | 8 ---- .../testdata/out/xds-ir/http10.routes.yaml | 8 ---- .../out/xds-ir/http2-mixed.routes.yaml | 8 ---- .../out/xds-ir/http2-route.routes.yaml | 8 ---- .../testdata/out/xds-ir/http2.routes.yaml | 8 ---- .../testdata/out/xds-ir/http3.routes.yaml | 8 ---- .../jsonpatch-missing-resource.routes.yaml | 8 ---- .../jsonpatch-with-jsonpath.routes.yaml | 8 ---- .../testdata/out/xds-ir/jsonpatch.routes.yaml | 8 ---- .../xds-ir/jwt-custom-extractor.routes.yaml | 8 ---- ...jwt-multi-route-multi-provider.routes.yaml | 8 ---- ...wt-multi-route-single-provider.routes.yaml | 8 ---- .../out/xds-ir/jwt-optional.routes.yaml | 8 ---- .../out/xds-ir/jwt-ratelimit.routes.yaml | 8 ---- .../jwt-single-route-single-match.routes.yaml | 8 ---- .../listener-connection-limit.routes.yaml | 16 ------- .../listener-proxy-protocol.routes.yaml | 8 ---- .../xds-ir/listener-tcp-keepalive.routes.yaml | 16 ------- .../out/xds-ir/load-balancer.routes.yaml | 8 ---- .../local-ratelimit-distinct.routes.yaml | 8 ---- .../out/xds-ir/local-ratelimit.routes.yaml | 8 ---- .../testdata/out/xds-ir/lua.routes.yaml | 8 ---- .../max-conn-per-socket-event.routes.yaml | 8 ---- .../xds-ir/metrics-virtual-host.routes.yaml | 8 ---- .../xds-ir/mixed-tls-jwt-authn.routes.yaml | 8 ---- ...me-port-with-different-filters.routes.yaml | 8 ---- .../multiple-listeners-same-port.routes.yaml | 8 ---- ...t-certificate-with-custom-data.routes.yaml | 40 ---------------- ...tls-forward-client-certificate.routes.yaml | 40 ---------------- ...ed-client-certificate-disabled.routes.yaml | 8 ---- .../out/xds-ir/mutual-tls-san.routes.yaml | 8 ---- .../out/xds-ir/mutual-tls.routes.yaml | 8 ---- .../oidc-and-jwt-with-passthrough.routes.yaml | 8 ---- .../oidc-backend-cluster-provider.routes.yaml | 8 ---- .../testdata/out/xds-ir/oidc.routes.yaml | 8 ---- .../out/xds-ir/panic-threshold.routes.yaml | 8 ---- .../out/xds-ir/path-settings.routes.yaml | 8 ---- .../port-as-listener-name.clusters.yaml | 7 --- .../xds-ir/port-as-listener-name.routes.yaml | 47 ------------------ .../proxy-protocol-upstream.routes.yaml | 8 ---- .../ratelimit-custom-domain.routes.yaml | 8 ---- .../ratelimit-disable-headers.routes.yaml | 8 ---- .../ratelimit-endpoint-stats.routes.yaml | 8 ---- .../ratelimit-global-shared.routes.yaml | 8 ---- .../ratelimit-headers-and-cidr.routes.yaml | 8 ---- .../ratelimit-multi-global-shared.routes.yaml | 8 ---- .../out/xds-ir/ratelimit-sourceip.routes.yaml | 8 ---- .../testdata/out/xds-ir/ratelimit.routes.yaml | 8 ---- .../xds-ir/retry-partial-invalid.routes.yaml | 24 ---------- .../testdata/out/xds-ir/retry.routes.yaml | 16 ------- .../out/xds-ir/simple-tls.routes.yaml | 8 ---- .../xds-ir/suppress-envoy-headers.routes.yaml | 8 ---- .../testdata/out/xds-ir/timeout.routes.yaml | 8 ---- ...tls-with-ciphers-versions-alpn.routes.yaml | 8 ---- .../xds-ir/tracing-datadog-uds.routes.yaml | 8 ---- .../out/xds-ir/tracing-datadog.routes.yaml | 8 ---- .../xds-ir/tracing-endpoint-stats.routes.yaml | 8 ---- .../out/xds-ir/tracing-zipkin.routes.yaml | 8 ---- .../testdata/out/xds-ir/tracing.routes.yaml | 8 ---- .../xds-ir/upstream-tcpkeepalive.routes.yaml | 8 ---- .../testdata/out/xds-ir/wasm.routes.yaml | 8 ---- 327 files changed, 1 insertion(+), 2628 deletions(-) diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 0235711d48..d369fcd432 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -29,11 +29,6 @@ http: controllerName: gateway.envoyproxy.io/gatewayclass-controller hostnames: - '*' - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http isHTTP2: false name: envoy-gateway/gateway-1/http1 path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 542b88cfa9..67a74274ad 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml index 3c857d15ee..eac5fef349 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml index 21342f168c..4d5aa4b915 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml index 33fe90a5a0..3d454b2a28 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml index ef73ffdd57..f4f5a210ea 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml index ca73724452..054de76c71 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index cd23deb24b..6121c76c71 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml index 44123a77a7..f60c406ced 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index 660f5f5869..1140e96a89 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -6,11 +6,6 @@ http: hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml index e7528f9baa..401439514a 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index 14f7ea9d9b..52c29d76d1 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml index b54fd8a4eb..6f462ba015 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/listener-policy.yaml @@ -30,11 +30,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: policyextension-listener path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 5c983e5479..4b376815ea 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -39,11 +34,6 @@ http: externalPort: 80 hostnames: - "foo.net" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml index 3b5e70f238..7f580ad393 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -30,11 +25,6 @@ http: port: 10081 hostnames: - "example.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml index a702470535..30757d9f30 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml index a685246f0f..18d990bb3a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml index 8142047621..74f4f70c50 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml index b23d06c3d2..0a8c2a92f2 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml index 5c18fa7251..a5869c09c8 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml index 8c05f88d3c..843cbe86dd 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml index 94ecdeea81..edaebcafe5 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml index a310be8a39..17fbe5cf03 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml index 2d0461944d..62b47c116a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml index 21e89bb0ac..39ad642b2b 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -40,11 +35,6 @@ http: externalPort: 81 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml index a898961beb..67756c0d08 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -40,11 +35,6 @@ http: port: 10081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml index 2e20067c86..7e96a95f3b 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -41,11 +36,6 @@ http: externalPort: 81 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml index c6252a6af4..60f5429c22 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml index f09ad1e8e5..1b433306c9 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml index 819834c82f..8143c3ed69 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml index 0bb9e6efcf..7129cc969d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml index b584378c0d..0a956afde9 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml index c7264c52b4..0c66e2988a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml index 162e4d9f44..448280bebf 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml index 7d695c9ca3..65c803b7ad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml @@ -42,11 +42,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml index c93f047edc..690f8ca267 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml @@ -38,11 +38,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml index b8b8adcc1f..46baf9ae05 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml @@ -46,11 +46,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml index 5ad0fad7fc..4adf253459 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml @@ -32,11 +32,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml index 68eda0d2d5..ac8f96715f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml @@ -46,11 +46,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml index 5e7ddb36f4..4f8c05c74b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml @@ -54,11 +54,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml index 7788c9f86c..9398865da2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml @@ -51,11 +51,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index 52ef810044..019528d870 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -61,11 +61,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml index 68caefd30e..2ebd7a7813 100644 --- a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml @@ -3,11 +3,6 @@ http: hostnames: - "*" isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml index f3cf8a9a3f..48e893eabb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml index fcc6d75717..1d0a596b2d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml index 446e157fb7..06575a0e5f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml index 06d0596650..c44301437c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml index 0bedf30aa7..59a44399c5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml index b6019aa642..daff09ed87 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml index 0caa52298f..6760950bb1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml index b755d67880..a21ff5c8e5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml index 64aa99703e..f7f352483a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml index a95ddf3cd0..ed56258c69 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -27,11 +22,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -51,11 +41,6 @@ http: port: 8083 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 routes: - name: "third-route" hostname: "*" @@ -75,11 +60,6 @@ http: port: 8084 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 routes: - name: "fourth-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml index 2ebc57b760..0adef47fe7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml index 725b25b1bb..36d319b135 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -32,11 +27,6 @@ tcp: address: "::" port: 10081 externalPort: 81 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp routes: - name: "second-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml index 2c9ddf983e..3fc386ef17 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/cors.yaml b/internal/xds/translator/testdata/in/xds-ir/cors.yaml index 09a69e7bbe..6962aa70ab 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml index 2fc6043678..48c1cb19db 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml @@ -8,11 +8,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml index 3f015a6402..fcc0933785 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml index 111c9c78da..4974948773 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml index e71731e1cc..31e7b289f8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml index 625b842e20..372658d814 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml index 6b03b92bcc..57ebcf46d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml index 0d6c4821e6..1feb321d28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml @@ -8,11 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml index ccf59f343b..860514029d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -26,11 +21,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml index cdd7e65c02..ccdc659568 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -26,11 +21,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml index bd4d1b1815..1acdfd9f1c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -26,11 +21,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" 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 25ecefb8bc..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 @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -26,11 +21,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml index 74b8c88df8..80758f9f05 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml @@ -4,11 +4,6 @@ http: port: 8081 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 routes: - name: "first-route" hostname: "*" @@ -24,11 +19,6 @@ http: port: 8082 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 routes: - name: "second-route" hostname: "*" @@ -46,11 +36,6 @@ http: port: 8083 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 routes: - name: "third-route" hostname: "*" @@ -68,11 +53,6 @@ http: port: 8084 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 routes: - name: "fourth-route" hostname: "*" @@ -85,3 +65,4 @@ http: name: "fourth-route-dest/backend/0" headers: withUnderscoresAction: DropHeader + diff --git a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml index a80656a6aa..df5bafb557 100644 --- a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml @@ -1,11 +1,6 @@ http: - name: "first-listener" address: "::" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml index 46203b6962..2e83c68b65 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 http1: preserveHeaderCase: true path: @@ -31,11 +26,6 @@ http: externalPort: 81 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 headers: earlyAddRequestHeaders: - name: "some-header" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml index 80ff9b8ecb..3f8cf9660e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml @@ -8,11 +8,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml index e032863030..b1148c6bee 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml index 6149dbb645..6edbc4ba6a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml index 911ca14f28..7f5665c540 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml @@ -8,11 +8,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index 38184a7ea6..7b2f000e02 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml index 6d73b90b67..2db061fd42 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml index dd2d977506..9f8e5544f7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index c6c175e8a2..06c53f5781 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml index 231d3890b5..8fc602cee0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml index 64bed5469b..bc6386705e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml index 97065054d4..4292780f56 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml index c1006f467c..3d5c37ab4b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml index 241763e4a7..4c2c3f16fa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index a32f4bcf90..59221187b6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml index 7d58563ead..06919dca12 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index 2638c98ccc..d6e304c0a1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index 5e542434c9..552334a6a7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index 60d403d55c..d9fe40f2ad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index 27e7cff586..576e3a7ac8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml index 38ed8d4ef1..8cec298e2b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml index 7a7179955f..8235109159 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 98439f41cb..8d1ae814e5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index f503cecc5f..979fcb725f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect 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 e52c4db38f..0ed4d199b0 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 @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect 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 0e02721301..451eee0935 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 @@ -6,11 +6,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml index 34a3966f70..39d9c25c39 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml index 3ae4ef78d6..d9fe10ad67 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml index 2d6cebcd17..16affbf480 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml index 3786468487..2fdbe61a1f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml index efde1c5c0b..4c8354e228 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml @@ -3,11 +3,6 @@ http: address: "::" hostnames: - '*' - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index bfda71583a..f66ec16e4f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index 1b1de2232e..f97df2bb5c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml index bd0edaaf44..f4e8892d8e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml index 4dbe6a4303..6f251887ad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml index f1a4e6d04c..7421fccf0a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect @@ -65,11 +60,6 @@ http: hostnames: - 'example.com' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: envoy-gateway/gateway-btls-2/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml index 4aa35d02fe..2338f192de 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml @@ -3,11 +3,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml index 70585a200a..93a68f508e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml index 1c85e387d7..fc079831e7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index b66a0117d4..48ed1b3a54 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml index 11a226b46e..57cd3404cf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 http1: preserveHeaderCase: true path: @@ -31,11 +26,6 @@ http: externalPort: 81 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 http1: preserveHeaderCase: true enableTrailers: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml index 24fd58868f..784281355a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http http1: enableTrailers: true path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http10.yaml b/internal/xds/translator/testdata/in/xds-ir/http10.yaml index a3984b5178..24135e88ac 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http10.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http10.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml index d26376de23..96d7b4e36a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index f13a711a75..ef8c0ac99a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http isHTTP2: true path: mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http2.yaml b/internal/xds/translator/testdata/in/xds-ir/http2.yaml index 1c809a4b49..3efc08942b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http3.yaml b/internal/xds/translator/testdata/in/xds-ir/http3.yaml index 1fd9b4f80f..fda8e53e5c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http3.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http3.yaml @@ -5,11 +5,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: envoy-gateway/gateway-1/tls port: 10443 externalPort: 443 diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml index 2443d50061..80fe230e59 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml @@ -33,11 +33,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index 60781b1cff..2b7fef514b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -38,11 +38,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml index e47ee26ab3..2fcf48f7a8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml @@ -57,11 +57,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index 236a7897a9..baf9a04dc7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -33,11 +33,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml index c6ef82decc..7d4af56ca7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml @@ -61,11 +61,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml index 5dcf4ae737..97be0f49e7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml @@ -33,11 +33,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index 4b9eb2e0cb..dd887b444c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -41,11 +41,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml index 16470fd112..f2980e0c09 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml @@ -22,11 +22,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index 0177f082e2..57fa53686d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -125,11 +125,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index 42fd9f7af0..dd035c24ce 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -114,11 +114,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml index f442cd4a47..ce79dc5541 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml index c13e6f69a0..f235b5fac4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml index 7284f86b53..223c4c64f9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml index 7225c0c33b..9776cdfd0b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml index b12f07b21b..49687d84c7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml index 77fd8adeb7..97c4f5c112 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml index 9d5d0373f0..76e0b09557 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 connection: {} path: mergeSlashes: true @@ -30,11 +25,6 @@ http: externalPort: 81 hostnames: - "foo.net" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 connection: limit: value: 5 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml index ff64ef54c5..0ab6ac80f2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml index e05d35a2ec..bd4ff68f7c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 tcpKeepalive: {} path: mergeSlashes: true @@ -30,11 +25,6 @@ http: externalPort: 81 hostnames: - "foo.net" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 tcpKeepalive: probes: 7 interval: 200 diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index f18d7ed24e..089d734a70 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml index 86f305dba2..354b4b8411 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml index 1664cfa819..8bf3eeb0b8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/lua.yaml b/internal/xds/translator/testdata/in/xds-ir/lua.yaml index 9206bf1488..c696efe60d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/lua.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/lua.yaml @@ -2,11 +2,6 @@ http: - address: 0.0.0.0 hostnames: - '*' - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http isHTTP2: false name: envoy-gateway/gateway-1/http path: diff --git a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml index 8253108e3e..14d7e1cf8d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml index 9b6bbe61d8..4e2f959bc2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml @@ -8,11 +8,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml index 8227f14ed1..3b5ebc9ffe 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml index 0c2799fcbb..e746dc1319 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml @@ -7,11 +7,6 @@ http: hostnames: - 'www.foo.com' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http http3: quicPort: 443 path: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index 7170fee84e..a04b38c483 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml index c47ba92eeb..eb1610b455 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml @@ -5,11 +5,6 @@ http: externalPort: 10001 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -48,11 +43,6 @@ http: externalPort: 10002 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -92,11 +82,6 @@ http: externalPort: 10003 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -137,11 +122,6 @@ http: externalPort: 10004 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -184,11 +164,6 @@ http: externalPort: 10005 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml index d06daef48e..474e1061c1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml @@ -5,11 +5,6 @@ http: externalPort: 10001 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -48,11 +43,6 @@ http: externalPort: 10002 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -91,11 +81,6 @@ http: externalPort: 10003 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -134,11 +119,6 @@ http: externalPort: 10004 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -177,11 +157,6 @@ http: externalPort: 10005 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http5 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml index b8a6decb2a..9d5c4d5ab5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml index 4f23395f71..25ccb402bd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml index 1aeec13177..1143983236 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml index 3c26839bb3..6f8a83876b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - '*' - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml index 7fe0203fc8..126bbb3d28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml index db15011f30..1009dad3a7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml index 278948a933..b0da951fcc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml @@ -8,11 +8,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http routes: - name: "first-route" hostname: "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml index cac77a7f99..521b746ee0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: false escapedSlashesAction: UnescapeAndForward diff --git a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml index d395f1e4b9..4593683994 100644 --- a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.net" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -29,11 +24,6 @@ http: externalPort: 80 hostnames: - "bar.net" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -53,11 +43,6 @@ http: externalPort: 443 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -87,11 +72,6 @@ http: externalPort: 443 hostnames: - "bar.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect @@ -122,11 +102,6 @@ http: http3: quicPort: 443 isHTTP2: false - metadata: - kind: Gateway - name: gateway-2 - namespace: envoy-gateway - sectionName: https-http3 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true @@ -153,10 +128,6 @@ http: weight: 1 hostname: '*' isHTTP2: false - metadata: - kind: HTTPRoute - name: httproute-1 - namespace: default name: httproute/default/httproute-1/rule/0/match/0/* pathMatch: distinct: false @@ -175,11 +146,6 @@ tcp: address: 0.0.0.0 port: 10090 externalPort: 90 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tls routes: - destination: metadata: @@ -205,10 +171,6 @@ tcp: snis: - foo.com - destination: - metadata: - kind: TLSRoute - name: tlsroute-2 - namespace: default name: tlsroute/default/tlsroute-2/rule/-1 settings: - addressType: IP @@ -231,11 +193,6 @@ tcp: address: 0.0.0.0 port: 10091 externalPort: 91 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp routes: - destination: metadata: @@ -261,11 +218,6 @@ udp: address: 0.0.0.0 port: 10090 externalPort: 90 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: udp route: destination: metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml index 5f2e1736ac..bf2b103905 100644 --- a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index d4fc3dac02..d46794a8cb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml index 4a7071a3d9..ba76f3c9ce 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml index 7a86d58ecf..8cf2cbfd0c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml @@ -12,11 +12,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml index f566f8b447..b23d88f431 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml @@ -12,11 +12,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml index 18b27e9b7e..9f47eab5ec 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml index eb7b629201..4d2a2d71dd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml @@ -12,11 +12,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index 3038bae945..0f746b20d1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -11,11 +11,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index 039ff55bc5..bbe76fb0c7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -10,11 +10,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml index 55fcc67f8b..51224fb818 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/retry.yaml b/internal/xds/translator/testdata/in/xds-ir/retry.yaml index c529fff709..09f6b5a46c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index b7a4b165ad..4c91373532 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml index e0d2291746..d3c11a4a0e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml index c37cad34d4..3aae8bbf6e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml index 9dd130a323..5e596460c8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml @@ -8,11 +8,6 @@ http: externalPort: 80 hostnames: - "foo.com" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http tls: ciphers: - ECDHE-ECDSA-AES128-GCM-SHA256 diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml index b3f217a3a1..82e2f322c9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml @@ -36,11 +36,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml index db34d693ba..b80b52e38b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml @@ -35,11 +35,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml index 95cf2fe24a..c60b3af645 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml @@ -40,11 +40,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index 09b7758855..704d824d6f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -41,11 +41,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml index 8e294f81d3..2b171c64d1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml @@ -59,11 +59,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml index 93bafa730f..261d7aed31 100644 --- a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml @@ -5,11 +5,6 @@ http: externalPort: 80 hostnames: - "*" - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml index c791f43392..0b3c459bad 100644 --- a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml @@ -8,11 +8,6 @@ http: hostnames: - '*' isHTTP2: false - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http path: escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml index f56e826f62..bfcb22e483 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http1/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml index ac6f0aa3db..5fd4a3a946 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: custom-backend-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml index 93fb40da11..a1f19ab447 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml index ac6f0aa3db..5fd4a3a946 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: custom-backend-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml index 42b5c43335..842d4e6251 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml index 93fb40da11..a1f19ab447 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: multiple-custom-backends-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml index 19ef021fc5..b259daf0c7 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml index 1e9f398992..3010873c90 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdslistener-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml index 9f5d950177..4f3f33059b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml index 813f94ed29..489bb7edc8 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdstranslate-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml index 29ea16d95d..5af870cc33 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: extension-post-xdsvirtualhost-hook-error/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml index 510a31a1ae..7030f6f4cd 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml index 013522d014..8aaa940169 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener-error/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml index 84c4b0e37c..1461a5960f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/post-translate-listeners-routes.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: test-listener-modify/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml index b687a31f31..46a5169776 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -50,14 +42,6 @@ - query: X-API-KEY-2 - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml index a0daa77b7c..141d60a15d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml index 14f65db3b5..7f2a8ca271 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml index ee164a2136..2d1b96cfc0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml index 1873924c8c..114de4cb02 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -39,14 +31,6 @@ inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml index 1873924c8c..114de4cb02 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -39,14 +31,6 @@ inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo= - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: default - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml index 2439ea7656..a0e9171307 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: @@ -47,14 +31,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener/* routes: - match: @@ -69,14 +45,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml index b20a713c90..243ea76808 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml index 6cbed7a277..12c4fce777 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml index b1309f689a..c6e9c1d93d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - directResponse: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml index e1e32f6ea5..08edfc3c40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -37,14 +29,6 @@ config: {} - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml index e1e32f6ea5..08edfc3c40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -37,14 +29,6 @@ config: {} - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml index e1e32f6ea5..08edfc3c40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -37,14 +29,6 @@ config: {} - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml index e1e32f6ea5..08edfc3c40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: @@ -37,14 +29,6 @@ config: {} - domains: - www.bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_bar_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml index fa132dfb6c..8cef38ab6a 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/gateway_envoyproxy_io routes: - match: @@ -40,14 +32,6 @@ config: {} - domains: - "" - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/ routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml index 4fe2bdc611..1f093f5a0c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml index 2439ea7656..a0e9171307 100755 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: @@ -47,14 +31,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener/* routes: - match: @@ -69,14 +45,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml index b35345d0b6..2f5c4977b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml index b997c3fae7..5f0482832e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: listener-enable-endpoint-stats/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml index 510a31a1ae..7030f6f4cd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml index 96a26cb24a..19e1921fb1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml index dcc3cafc83..63cbc84719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: listener-enable-req-resp-sizes-stats/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml index 8ff0df9396..d4a7fa5ae2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - directResponse: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml index e87533f522..c27e2ea577 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml index c76b78eaf9..c5a187d2c2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml index ce0ff96d72..9f74797a1e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml index 4877ec6522..25584aa3a9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/example_com routes: - match: @@ -33,14 +25,6 @@ - upgradeType: websocket - domains: - example.net - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/example_net routes: - match: @@ -63,14 +47,6 @@ - upgradeType: websocket - domains: - '*.com' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/*_com routes: - match: @@ -82,14 +58,6 @@ - upgradeType: websocket - domains: - '*.net' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/*_net routes: - match: @@ -101,14 +69,6 @@ - upgradeType: websocket - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml index 73d5db24ee..c84213bd2c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml index 0d16ab6edd..37b12b36de 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml index 3111452d93..61face5a3a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml index 1157d5bc25..21d751bc5a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml index 0967aa5e0a..7bc7d162a8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml index bf7e60bb04..1f2c6be405 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml index 548d5c9896..b2241a1181 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml index 64e26caca2..b09594aecd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml index f624be54bf..58a4e27209 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml index e6317c46be..d5a0bd9899 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml index 56c51a3e76..84bc70f04b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml index ce1659a3d8..7a12dc8244 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml index 81de8bab11..69ea825367 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml index b062602fd5..bca1a81eb1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml index 4fb90a7259..ee5a5f691d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - gateway.envoyproxy.io - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/gateway_envoyproxy_io routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml index 5061d89539..52f05f15b8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml index be546233e9..1c335ad621 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml index 969f3b7088..1e620fc92f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml index 44019f528c..3186e1ccfb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml index 2ba374c8e3..bd4f9cfe7e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml index 2ba374c8e3..bd4f9cfe7e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml index 03937b58f6..1d716e5c21 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: envoy-gateway/gateway-btls/http/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: envoy-gateway/gateway-btls-2/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml index 2ba374c8e3..bd4f9cfe7e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-btls/http/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml index 43d4363d85..d2d5e3aefd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml index 510a31a1ae..7030f6f4cd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml index 8101f91ddd..c3acb4088d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml index 54603ea873..4fdedfabf6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml index 053f35ea04..0b5b4bee7b 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml index e653a23d16..f3e513cea4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: envoy-gateway/gateway-1/tls/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml index f5b17deb2b..4a412b3576 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml index 04f637834f..a7273c7a1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* rateLimits: - actions: diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml index 19e35c5809..3f4a7333a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* rateLimits: - actions: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml index eaafb9560f..321ecc1ced 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml index 7dad3190c6..5cd81b5d47 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml index 0272558f8c..7c52b6de16 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml index eaafb9560f..321ecc1ced 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml index bc4d096059..0e312fd928 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml index eaafb9560f..321ecc1ced 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml index 7e698aa3b6..ff93cfff36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml index ffe2caf4ca..07bf30df03 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml index efc36bfe04..65cce8400e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml index cca5650fdd..7fd4979238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml index 089594feda..307616b16e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml index 62cf1f191c..41594a227d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml index 0f9569f0a4..75d30a0592 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml index ecca0d962f..445fa03249 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: default/gateway-1/http/www_foo_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml index 81b7e73cd6..c94d2c09f7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml index 9f2d5aff87..952278bf43 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: second-listener/* routes: - match: @@ -47,14 +31,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: third-listener/* routes: - match: @@ -69,14 +45,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: fourth-listener/* routes: - match: @@ -91,14 +59,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: fifth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml index 5db726893c..952278bf43 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: first-listener/* routes: - match: @@ -25,14 +17,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: second-listener/* routes: - match: @@ -47,14 +31,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http3 name: third-listener/* routes: - match: @@ -69,14 +45,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http4 name: fourth-listener/* routes: - match: @@ -91,14 +59,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http5 name: fifth-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml index 0c534ba06b..9e64eb8111 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - "" - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/ routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml index 1284e00207..532d7d5046 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml index 5e3d03debf..b17df86476 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml index 8bf16b46cb..2170a16d13 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml index b35345d0b6..2f5c4977b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml index 61aad0cfc5..5e095dbe09 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml @@ -129,13 +129,6 @@ '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest localityLbConfig: localityWeightedLbConfig: {} - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: TLSRoute - name: tlsroute-2 - namespace: default name: tlsroute/default/tlsroute-2/rule/-1 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml index 6d98d2b52d..c7a5cbce18 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - foo.net - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 name: foo_net routes: - match: @@ -22,14 +14,6 @@ - upgradeType: websocket - domains: - bar.net - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http-ipv6 name: bar_net routes: - match: @@ -44,14 +28,6 @@ virtualHosts: - domains: - foo.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http1 name: foo_com routes: - match: @@ -66,14 +42,6 @@ virtualHosts: - domains: - bar.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http2 name: bar_com routes: - match: @@ -88,25 +56,10 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-2 - namespace: envoy-gateway - sectionName: https-http3 name: '*' routes: - match: prefix: / - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: HTTPRoute - name: httproute-1 - namespace: default name: httproute/default/httproute-1/rule/0/match/0/* responseHeadersToAdd: - append: true diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml index ce70a4ba6c..479c2cd143 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml index ce70a4ba6c..479c2cd143 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml index ce70a4ba6c..479c2cd143 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml index 30b046f5d2..935fb21d8c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml index eebbab3429..459d975a9b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml index 5740077cbd..9ebf1dd631 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml index d856fae5c3..a82f9d5c45 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml index 30ce0cd18d..ee127d9994 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml index f91cf8e574..f2cacab526 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: @@ -37,14 +29,6 @@ - upgradeType: websocket - domains: - foo - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/foo routes: - match: @@ -66,12 +50,4 @@ - upgradeType: websocket - domains: - bar - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/bar diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml index 7b9034df38..d07883d92c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: @@ -34,14 +26,6 @@ - upgradeType: websocket - domains: - foo - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/foo routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml index 5a36f2271a..ea343799ac 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml index 053f35ea04..0b5b4bee7b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - '*' - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: first-listener/* routes: - match: diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml index 4f5b73b9ac..1e07a621d5 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.routes.yaml @@ -3,14 +3,6 @@ virtualHosts: - domains: - www.example.com - metadata: - filterMetadata: - envoy-gateway: - resources: - - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: http name: envoy-gateway/gateway-1/http/www_example_com routes: - match: From 731215763c00a187dffbb8c80e3ae916eef418fb Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 04:27:50 +0000 Subject: [PATCH 33/44] remove external port Signed-off-by: Huabing (Robin) Zhao --- .../in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml | 3 --- .../extension-xds-ir/http-route-custom-backend-error.yaml | 1 - .../http-route-custom-backend-multiple-backend-error.yaml | 1 - .../in/extension-xds-ir/http-route-custom-backend.yaml | 1 - .../extension-xds-ir/http-route-custom-backends-mixed.yaml | 1 - .../http-route-custom-backends-multiple-mixed.yaml | 1 - .../in/extension-xds-ir/http-route-extension-filter.yaml | 1 - .../http-route-extension-listener-error.yaml | 1 - .../extension-xds-ir/http-route-extension-route-error.yaml | 1 - .../http-route-extension-translate-error.yaml | 1 - .../http-route-extension-virtualhost-error.yaml | 1 - .../translator/testdata/in/extension-xds-ir/http-route.yaml | 1 - .../multiple-listeners-same-port-error.yaml | 2 -- .../extension-xds-ir/post-translate-listeners-routes.yaml | 1 - .../testdata/in/ratelimit-config/distinct-match.yaml | 1 - .../in/ratelimit-config/distinct-remote-address-match.yaml | 1 - .../testdata/in/ratelimit-config/empty-header-matches.yaml | 1 - .../in/ratelimit-config/global-shared-distinct-match.yaml | 1 - .../global-shared-multiple-shared-policies.yaml | 1 - .../in/ratelimit-config/header-and-cidr-matches.yaml | 1 - .../in/ratelimit-config/masked-remote-address-match.yaml | 1 - .../testdata/in/ratelimit-config/multiple-domains.yaml | 1 - .../multiple-global-shared-distinct-match.yaml | 1 - .../ratelimit-config/multiple-listeners-distinct-match.yaml | 2 -- .../multiple-listeners-same-shared-distinct-match.yaml | 1 - .../multiple-listeners-shared-distinct-match.yaml | 2 -- ...multiple-masked-remote-address-match-with-same-cidr.yaml | 1 - .../testdata/in/ratelimit-config/multiple-matches.yaml | 1 - .../testdata/in/ratelimit-config/multiple-routes.yaml | 1 - .../testdata/in/ratelimit-config/multiple-rules.yaml | 1 - .../in/ratelimit-config/multiple-shared-and-unshared.yaml | 1 - .../ratelimit-config/multiple-shared-ratelimit-rules.yaml | 1 - .../testdata/in/ratelimit-config/value-match.yaml | 1 - .../xds/translator/testdata/in/xds-ir/accesslog-cel.yaml | 1 - .../testdata/in/xds-ir/accesslog-endpoint-stats.yaml | 1 - .../translator/testdata/in/xds-ir/accesslog-formatters.yaml | 1 - .../translator/testdata/in/xds-ir/accesslog-invalid.yaml | 1 - .../translator/testdata/in/xds-ir/accesslog-multi-cel.yaml | 1 - .../testdata/in/xds-ir/accesslog-with-format.yaml | 1 - .../testdata/in/xds-ir/accesslog-without-format.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/accesslog.yaml | 1 - .../xds/translator/testdata/in/xds-ir/api-key-auth.yaml | 1 - .../testdata/in/xds-ir/authorization-client-cidr.yaml | 1 - .../testdata/in/xds-ir/authorization-http-header.yaml | 1 - .../testdata/in/xds-ir/authorization-jwt-claim.yaml | 1 - .../testdata/in/xds-ir/authorization-jwt-scope.yaml | 1 - .../in/xds-ir/authorization-multiple-principals.yaml | 1 - .../translator/testdata/in/xds-ir/backend-buffer-limit.yaml | 3 --- .../xds/translator/testdata/in/xds-ir/backend-priority.yaml | 1 - .../testdata/in/xds-ir/backend-tls-skip-verify.yaml | 1 - .../testdata/in/xds-ir/basic-auth-username-header.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml | 1 - .../xds/translator/testdata/in/xds-ir/btp-telemetry.yaml | 1 - .../xds/translator/testdata/in/xds-ir/circuit-breaker.yaml | 1 - .../translator/testdata/in/xds-ir/client-buffer-limit.yaml | 2 -- .../testdata/in/xds-ir/client-stream-idle-timeout.yaml | 2 -- .../xds/translator/testdata/in/xds-ir/client-timeout.yaml | 2 -- internal/xds/translator/testdata/in/xds-ir/compression.yaml | 1 - .../testdata/in/xds-ir/cors-from-httpcorsfilter.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/cors.yaml | 1 - .../in/xds-ir/credential-injection-backend-filter.yaml | 1 - .../translator/testdata/in/xds-ir/credential-injection.yaml | 1 - .../translator/testdata/in/xds-ir/custom-filter-order.yaml | 1 - .../xds/translator/testdata/in/xds-ir/custom-response.yaml | 1 - .../translator/testdata/in/xds-ir/dns-lookup-family.yaml | 1 - .../xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml | 1 - .../xds/translator/testdata/in/xds-ir/ext-auth-body.yaml | 1 - .../testdata/in/xds-ir/ext-auth-recomputation.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml | 1 - .../testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml | 1 - .../xds/translator/testdata/in/xds-ir/fault-injection.yaml | 1 - .../xds/translator/testdata/in/xds-ir/health-check.yaml | 1 - .../translator/testdata/in/xds-ir/http-connect-proxy.yaml | 1 - .../testdata/in/xds-ir/http-connect-terminate.yaml | 1 - .../testdata/in/xds-ir/http-early-header-mutation.yaml | 2 -- .../translator/testdata/in/xds-ir/http-endpoint-stats.yaml | 1 - .../translator/testdata/in/xds-ir/http-health-check.yaml | 1 - .../testdata/in/xds-ir/http-preserve-client-protocol.yaml | 1 - .../testdata/in/xds-ir/http-req-resp-sizes-stats.yaml | 1 - .../testdata/in/xds-ir/http-route-direct-response.yaml | 1 - .../testdata/in/xds-ir/http-route-dns-cluster.yaml | 1 - .../testdata/in/xds-ir/http-route-dynamic-resolver.yaml | 1 - .../translator/testdata/in/xds-ir/http-route-invalid.yaml | 1 - .../translator/testdata/in/xds-ir/http-route-mirror.yaml | 1 - .../testdata/in/xds-ir/http-route-mirrors-percentage.yaml | 1 - .../testdata/in/xds-ir/http-route-multiple-matches.yaml | 1 - .../in/xds-ir/http-route-multiple-mirrors-percentage.yaml | 1 - .../testdata/in/xds-ir/http-route-multiple-mirrors.yaml | 1 - .../testdata/in/xds-ir/http-route-partial-invalid.yaml | 1 - .../translator/testdata/in/xds-ir/http-route-redirect.yaml | 1 - .../xds/translator/testdata/in/xds-ir/http-route-regex.yaml | 1 - .../testdata/in/xds-ir/http-route-request-headers.yaml | 1 - .../testdata/in/xds-ir/http-route-response-add-headers.yaml | 1 - .../in/xds-ir/http-route-response-add-remove-headers.yaml | 1 - .../in/xds-ir/http-route-response-remove-headers.yaml | 1 - .../in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml | 1 - .../http-route-rewrite-sufixx-with-slash-url-prefix.yaml | 1 - .../testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml | 1 - .../testdata/in/xds-ir/http-route-rewrite-url-host.yaml | 1 - .../testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml | 1 - .../testdata/in/xds-ir/http-route-rewrite-url-regex.yaml | 1 - .../testdata/in/xds-ir/http-route-session-persistence.yaml | 1 - .../translator/testdata/in/xds-ir/http-route-stat-name.yaml | 1 - .../translator/testdata/in/xds-ir/http-route-timeout.yaml | 1 - .../in/xds-ir/http-route-weighted-backend-uds-ip.yaml | 1 - .../in/xds-ir/http-route-weighted-backend-with-filters.yaml | 1 - .../testdata/in/xds-ir/http-route-weighted-backend.yaml | 1 - .../in/xds-ir/http-route-weighted-invalid-backend.yaml | 1 - .../testdata/in/xds-ir/http-route-with-clientcert.yaml | 1 - .../testdata/in/xds-ir/http-route-with-metadata.yaml | 1 - .../in/xds-ir/http-route-with-tls-system-truststore.yaml | 1 - .../in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml | 2 -- .../testdata/in/xds-ir/http-route-with-tlsbundle.yaml | 1 - .../xds-ir/http-route-zonal-routing-weighted-clusters.yaml | 1 - .../testdata/in/xds-ir/http-route-zonal-routing.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http-route.yaml | 1 - .../translator/testdata/in/xds-ir/http-upgrade-spdy.yaml | 1 - .../testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml | 1 - .../translator/testdata/in/xds-ir/http1-preserve-case.yaml | 2 -- .../xds/translator/testdata/in/xds-ir/http1-trailers.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http10.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http2-route.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http2.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/http3.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-invalid-listener.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-invalid-patch.yaml | 1 - .../translator/testdata/in/xds-ir/jsonpatch-invalid.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-missing-resource.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml | 1 - .../testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml | 1 - .../translator/testdata/in/xds-ir/jwt-custom-extractor.yaml | 1 - .../testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml | 1 - .../testdata/in/xds-ir/jwt-multi-route-single-provider.yaml | 1 - .../xds/translator/testdata/in/xds-ir/jwt-optional.yaml | 1 - .../xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml | 1 - .../testdata/in/xds-ir/jwt-single-route-single-match.yaml | 1 - .../testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml | 1 - .../testdata/in/xds-ir/listener-connection-limit.yaml | 4 ---- .../testdata/in/xds-ir/listener-proxy-protocol.yaml | 2 -- .../testdata/in/xds-ir/listener-tcp-keepalive.yaml | 4 ---- .../testdata/in/xds-ir/listener-tcp-without-route.yaml | 1 - .../xds/translator/testdata/in/xds-ir/load-balancer.yaml | 1 - .../testdata/in/xds-ir/local-ratelimit-distinct.yaml | 1 - .../xds/translator/testdata/in/xds-ir/local-ratelimit.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/lua.yaml | 1 - .../testdata/in/xds-ir/max-conn-per-socket-event.yaml | 3 --- .../translator/testdata/in/xds-ir/metrics-virtual-host.yaml | 1 - .../translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml | 1 - ...multiple-listeners-same-port-with-different-filters.yaml | 2 -- .../testdata/in/xds-ir/multiple-listeners-same-port.yaml | 6 ------ .../in/xds-ir/multiple-simple-tcp-route-same-port.yaml | 5 ----- ...ual-tls-forward-client-certificate-with-custom-data.yaml | 5 ----- .../in/xds-ir/mutual-tls-forward-client-certificate.yaml | 5 ----- .../mutual-tls-required-client-certificate-disabled.yaml | 2 -- .../xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml | 2 -- internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml | 2 -- .../testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml | 1 - .../testdata/in/xds-ir/oidc-backend-cluster-provider.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/oidc.yaml | 1 - .../xds/translator/testdata/in/xds-ir/panic-threshold.yaml | 1 - .../xds/translator/testdata/in/xds-ir/path-settings.yaml | 1 - .../testdata/in/xds-ir/proxy-protocol-upstream.yaml | 1 - .../testdata/in/xds-ir/ratelimit-custom-domain.yaml | 1 - .../testdata/in/xds-ir/ratelimit-disable-headers.yaml | 1 - .../testdata/in/xds-ir/ratelimit-endpoint-stats.yaml | 1 - .../testdata/in/xds-ir/ratelimit-global-shared.yaml | 1 - .../testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml | 1 - .../testdata/in/xds-ir/ratelimit-multi-global-shared.yaml | 1 - .../translator/testdata/in/xds-ir/ratelimit-sourceip.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml | 1 - .../xds/translator/testdata/in/xds-ir/request-buffer.yaml | 2 -- .../testdata/in/xds-ir/retry-partial-invalid.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/retry.yaml | 1 - .../in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml | 1 - .../testdata/in/xds-ir/suppress-envoy-headers.yaml | 1 - .../translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml | 1 - .../testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml | 1 - .../translator/testdata/in/xds-ir/tcp-route-complex.yaml | 1 - .../testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml | 1 - .../translator/testdata/in/xds-ir/tcp-route-invalid.yaml | 1 - .../xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml | 1 - .../testdata/in/xds-ir/tcp-route-tls-terminate.yaml | 2 -- .../testdata/in/xds-ir/tcp-route-weighted-backend.yaml | 1 - .../testdata/in/xds-ir/tcp-route-with-no-routes.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/timeout.yaml | 1 - .../testdata/in/xds-ir/tls-route-passthrough.yaml | 2 -- .../testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml | 2 -- .../translator/testdata/in/xds-ir/tracing-datadog-uds.yaml | 1 - .../xds/translator/testdata/in/xds-ir/tracing-datadog.yaml | 1 - .../testdata/in/xds-ir/tracing-endpoint-stats.yaml | 1 - .../xds/translator/testdata/in/xds-ir/tracing-invalid.yaml | 1 - .../testdata/in/xds-ir/tracing-unknown-provider-type.yaml | 1 - .../xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/tracing.yaml | 1 - .../translator/testdata/in/xds-ir/udp-endpoint-stats.yaml | 1 - .../testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml | 1 - .../translator/testdata/in/xds-ir/udp-route-invalid.yaml | 1 - .../testdata/in/xds-ir/udp-route-no-endpoints.yaml | 1 - .../testdata/in/xds-ir/udp-route-with-no-routes.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/udp-route.yaml | 1 - .../testdata/in/xds-ir/upstream-tcpkeepalive.yaml | 1 - internal/xds/translator/testdata/in/xds-ir/wasm.yaml | 1 - 209 files changed, 256 deletions(-) diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index d369fcd432..71c96518f7 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -35,7 +35,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: "http-route" hostname: "*" @@ -77,7 +76,6 @@ tcp: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 port: 10080 - externalPort: 80 routes: - destination: name: "tcp-route-dest" @@ -126,4 +124,3 @@ udp: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/udp1 port: 10162 - externalPort: 162 diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml index 67a74274ad..9c41eeb558 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-error.yaml @@ -2,7 +2,6 @@ http: - name: "custom-backend-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml index eac5fef349..7c15856f51 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend-multiple-backend-error.yaml @@ -2,7 +2,6 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml index 4d5aa4b915..bdd872f07e 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backend.yaml @@ -2,7 +2,6 @@ http: - name: "custom-backend-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml index 3d454b2a28..f99460ae7d 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-mixed.yaml @@ -2,7 +2,6 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml index f4f5a210ea..ffa50b77ff 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-custom-backends-multiple-mixed.yaml @@ -2,7 +2,6 @@ http: - name: "multiple-custom-backends-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml index 054de76c71..32f55ec5d7 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-filter.yaml @@ -2,7 +2,6 @@ http: - name: "extension-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml index 6121c76c71..fd4879a735 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-listener-error.yaml @@ -2,7 +2,6 @@ http: - name: "extension-post-xdslistener-hook-error" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml index f60c406ced..2ac532e6c8 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-route-error.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index 1140e96a89..a02bf3e5ff 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -2,7 +2,6 @@ http: - name: "extension-post-xdstranslate-hook-error" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml index 401439514a..20b82f0c4f 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-virtualhost-error.yaml @@ -2,7 +2,6 @@ http: - name: "extension-post-xdsvirtualhost-hook-error" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index 52c29d76d1..4aa6680eb5 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml index 4b376815ea..6052a301e3 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/multiple-listeners-same-port-error.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener-error" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: @@ -31,7 +30,6 @@ http: - name: "second-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.net" path: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml index 7f580ad393..4bd256117f 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/post-translate-listeners-routes.yaml @@ -2,7 +2,6 @@ http: - name: "test-listener-modify" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml index 30757d9f30..7a9a6b0d18 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml index 18d990bb3a..1ab9355d9f 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml index 74f4f70c50..390285f565 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml index 0a8c2a92f2..50929cd847 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml index a5869c09c8..a3271bb665 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/global-shared-multiple-shared-policies.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml index 843cbe86dd..65df64720d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml index edaebcafe5..501c3b49d2 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml index 17fbe5cf03..87f60a62bb 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-domains.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml index 62b47c116a..54e33e635a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-global-shared-distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml index 39ad642b2b..ccc36f04aa 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -32,7 +31,6 @@ http: - name: "second-listener" address: "0.0.0.0" port: 10081 - externalPort: 81 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml index 67756c0d08..b37bc3220a 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-same-shared-distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml index 7e96a95f3b..9d45930773 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-listeners-shared-distinct-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -33,7 +32,6 @@ http: - name: "second-listener" address: "0.0.0.0" port: 10081 - externalPort: 81 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml index 60f5429c22..fae7230914 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml index 1b433306c9..2da0e13a50 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml index 8143c3ed69..909b2388ef 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml index 7129cc969d..351dcf2fae 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml index 0a956afde9..e70a5ecd8d 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-and-unshared.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml index 0c66e2988a..77fc67e7a3 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-shared-ratelimit-rules.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml index 448280bebf..2e0dcf9664 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "0.0.0.0" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml index 65c803b7ad..5a22eccfd8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml @@ -39,7 +39,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml index 690f8ca267..17760201da 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml @@ -35,7 +35,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml index 46baf9ae05..4f9893c566 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml @@ -43,7 +43,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml index 4adf253459..7749fe3c4f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml @@ -29,7 +29,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml index ac8f96715f..989390b135 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml @@ -43,7 +43,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml index 4f8c05c74b..915517dc73 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-with-format.yaml @@ -51,7 +51,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml index 9398865da2..75a28bf769 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml @@ -48,7 +48,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index 019528d870..7b27237294 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -58,7 +58,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml index 2ebd7a7813..30c51a35d2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/api-key-auth.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml index 48e893eabb..168884de1c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-client-cidr.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-3/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml index 1d0a596b2d..ff997db5a4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-http-header.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml index 05a840a9bf..321ad85efa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-claim.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml index 16debebac4..95ffc4a947 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-jwt-scope.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml index 06575a0e5f..8a8edbc2bb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/authorization-multiple-principals.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml index c44301437c..08841b060c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -27,7 +26,6 @@ tcp: connection: bufferLimit: 1500 port: 10081 - externalPort: 81 routes: - name: "tcp-route-dest" destination: @@ -43,7 +41,6 @@ udp: - name: "udp-route" address: "::" port: 10080 - externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml index d62eb83d33..31e142cd48 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-priority.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml index 59a44399c5..fc74c38f36 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-tls-skip-verify.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml index daff09ed87..81ab698e95 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth-username-header.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml index 6760950bb1..b4871881be 100644 --- a/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/basic-auth.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml b/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml index 3cf1b35020..f9826c13bc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/btp-telemetry.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml index a21ff5c8e5..f47bea642c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml index f7f352483a..2c4c5b9cc0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -26,7 +25,6 @@ tcp: connection: bufferLimit: 1500 port: 10081 - externalPort: 81 routes: - name: "tcp-route-dest" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml index 0adef47fe7..ab047aad3c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -27,7 +26,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 metadata: kind: Gateway name: gateway-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml index 36d319b135..41dec4d635 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -26,7 +25,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 routes: - name: "second-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/compression.yaml b/internal/xds/translator/testdata/in/xds-ir/compression.yaml index 037af59ced..6d271a0dd6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/compression.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/compression.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml index 3fc386ef17..3dc98ab340 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors-from-httpcorsfilter.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/cors.yaml b/internal/xds/translator/testdata/in/xds-ir/cors.yaml index 6962aa70ab..90445b5670 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml b/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml index 1ffbbb079a..1d8a4e7973 100644 --- a/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/credential-injection-backend-filter.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/1 diff --git a/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml index 962ab7ab8e..0edc17e02d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/credential-injection.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - credentialInjection: name: httproutefilter/default/credential-injection-1 diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml index 48c1cb19db..4971328e8c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-filter-order.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 1 diff --git a/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml b/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml index 3d136475c6..66a8bb601e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/custom-response.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml b/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml index 89d862e75a..9fcd42b86e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/dns-lookup-family.yaml @@ -36,7 +36,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml index fcc0933785..dfda65a471 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-backend.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml index 4974948773..8b703a27b7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-body.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml index 31e7b289f8..370840868b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth-recomputation.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml index 372658d814..5c7705ad7b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-auth.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml index 98c90b6244..46635150dd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc-with-traffic-settings.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml index 57ebcf46d4..bc4b11ed09 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ext-proc.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml index 1feb321d28..ae7cae975c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml index df5bafb557..1435becff8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml @@ -5,7 +5,6 @@ http: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect port: 10080 - externalPort: 80 hostnames: - "*" routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml index ff2161c606..94d9783d7c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-connect-proxy.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml b/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml index e1e0fc217b..0c5298050a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-connect-terminate.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml index 2e83c68b65..0906e5db7f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" http1: @@ -23,7 +22,6 @@ http: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 hostnames: - "*" headers: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml index 3f8cf9660e..02170f2132 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml @@ -5,7 +5,6 @@ http: - name: "listener-enable-endpoint-stats" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml index b1148c6bee..fc58a4b2fd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml index 6edbc4ba6a..b9384c5e00 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-preserve-client-protocol.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml index 7f5665c540..32dcbd0fe4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml @@ -5,7 +5,6 @@ http: - name: "listener-enable-req-resp-sizes-stats" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index 7b2f000e02..b0267f90b2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml index 2db061fd42..78c42285fc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml index d14db668da..b996416c43 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dynamic-resolver.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml index 9f8e5544f7..42184d4047 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-invalid.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index 06c53f5781..b658e9289c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml index 8fc602cee0..edcee4300b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirrors-percentage.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml index bc6386705e..c74747efdd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-matches.yaml @@ -2,7 +2,6 @@ http: - name: first-listener address: 0.0.0.0 port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml index 4292780f56..e1259346dc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors-percentage.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml index 3d5c37ab4b..f0b6743e99 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml index 4c2c3f16fa..9d61197726 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index 59221187b6..7307a9ee4d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml index 06919dca12..a6a525ac30 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index d6e304c0a1..2690f79154 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index 552334a6a7..c03ff7e929 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index d9fe40f2ad..d406821ca9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index 576e3a7ac8..ad555d3afe 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml index 8cec298e2b..2e58e873c3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml index 8235109159..09f46bd726 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 8d1ae814e5..0562621647 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index 979fcb725f..2f3306ce8a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: 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 0ed4d199b0..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 @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: 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 451eee0935..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 @@ -3,7 +3,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml index 39d9c25c39..09cde40926 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml index d9fe10ad67..d09a10b3c5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-stat-name.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml index 16affbf480..b95b72c5a0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml index 2fdbe61a1f..f94ada950b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml index 4c8354e228..531cf64d47 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml @@ -7,7 +7,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: "first-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index f66ec16e4f..ed7289dabf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index f97df2bb5c..3f60f94e16 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml index f4e8892d8e..03e1021d1d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-clientcert.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml index 5733d8417f..c0b2fce601 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-metadata.yaml @@ -2,7 +2,6 @@ http: - name: first-listener address: 0.0.0.0 port: 10080 - externalPort: 80 metadata: groupVersion: "gateway.networking.k8s.io/v1" kind: "Gateway" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml index 6f251887ad..07d3e9e280 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tls-system-truststore.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml index 7421fccf0a..a180b23ab4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle-multiple-certs.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 0 @@ -65,7 +64,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 - externalPort: 81 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml index 2338f192de..b0a453e792 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-with-tlsbundle.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - backendWeights: invalid: 0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml index 93a68f508e..666d55f8fe 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing-weighted-clusters.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml index fc079831e7..ffd776b067 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-zonal-routing.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index 48ed1b3a54..5f0b477767 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml index bf8419179b..caac615cf1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-spdy.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml index b3766449ce..52b4a7696a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-upgrade-websocket-spdy.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml index 57cd3404cf..23c4a65a20 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" http1: @@ -23,7 +22,6 @@ http: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 hostnames: - "*" http1: diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml index 784281355a..138bc40ec1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" http1: diff --git a/internal/xds/translator/testdata/in/xds-ir/http10.yaml b/internal/xds/translator/testdata/in/xds-ir/http10.yaml index 24135e88ac..6c77f67760 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http10.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http10.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml index 96d7b4e36a..026b3d069f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-mixed.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index ef8c0ac99a..8f14a91d5e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" isHTTP2: true diff --git a/internal/xds/translator/testdata/in/xds-ir/http2.yaml b/internal/xds/translator/testdata/in/xds-ir/http2.yaml index 3efc08942b..27602c958f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http3.yaml b/internal/xds/translator/testdata/in/xds-ir/http3.yaml index fda8e53e5c..15858a8136 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http3.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http3.yaml @@ -7,7 +7,6 @@ http: isHTTP2: false name: envoy-gateway/gateway-1/tls port: 10443 - externalPort: 443 path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml index 80fe230e59..1402be2ca3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml @@ -30,7 +30,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index 2b7fef514b..67387a93db 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -35,7 +35,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml index 2fcf48f7a8..6099f5daba 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml @@ -54,7 +54,6 @@ http: - name: "first-listener" address: "" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index baf9a04dc7..70ae0f1071 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -30,7 +30,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml index 7d4af56ca7..ef60319193 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml @@ -58,7 +58,6 @@ http: - name: "first-listener" address: "" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml index 97be0f49e7..3f78c3da14 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml @@ -30,7 +30,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index dd887b444c..e4210c7f0d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -38,7 +38,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml index f2980e0c09..7b47597073 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml @@ -19,7 +19,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index 57fa53686d..edaffc2247 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -122,7 +122,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index dd035c24ce..ab4aa88959 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -111,7 +111,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml index ce79dc5541..66fc43f92c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml index f235b5fac4..f2ebba7af4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml index 223c4c64f9..4944995ad2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml index 9776cdfd0b..18baee23cf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml index 49687d84c7..b84df0fb04 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml index 97c4f5c112..efa91fec85 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml index 7f8abbc596..f1ba24346d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-with-backend-tls-retry.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml index 76e0b09557..1e194fa32d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" connection: {} @@ -22,7 +21,6 @@ http: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 hostnames: - "foo.net" connection: @@ -45,7 +43,6 @@ tcp: - name: "third-listener" address: "::" port: 10082 - externalPort: 82 connection: limit: value: 3 @@ -68,7 +65,6 @@ tcp: value: 10 closeDelay: 3s port: 10083 - externalPort: 83 routes: - destination: name: "tcp-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml index 0ab6ac80f2..5818d84995 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: @@ -37,7 +36,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 proxyProtocol: optional: false routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml index bd4ff68f7c..3d02ac1c88 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" tcpKeepalive: {} @@ -22,7 +21,6 @@ http: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 hostnames: - "foo.net" tcpKeepalive: @@ -46,7 +44,6 @@ tcp: - name: "third-listener" address: "::" port: 10082 - externalPort: 82 tcpKeepalive: {} routes: - tls: @@ -65,7 +62,6 @@ tcp: tcpKeepalive: probes: 10 port: 10083 - externalPort: 83 routes: - destination: name: "tcp-route-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml index 8055ad2306..48b7ae0e81 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml @@ -9,7 +9,6 @@ tcp: optional: false name: envoy-gateway/gateway-1/tls-1 port: 10443 - externalPort: 443 tcpKeepalive: idleTime: 1200 interval: 60 diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index 089d734a70..b7b9c6690c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml index 354b4b8411..aece519682 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit-distinct.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml index 8bf3eeb0b8..e549de5041 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/lua.yaml b/internal/xds/translator/testdata/in/xds-ir/lua.yaml index c696efe60d..43d7ffa8fa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/lua.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/lua.yaml @@ -8,7 +8,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml index 14d7e1cf8d..aa57f63397 100644 --- a/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/max-conn-per-socket-event.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -26,7 +25,6 @@ tcp: connection: maxAcceptPerSocketEvent: 0 port: 10081 - externalPort: 81 routes: - name: "max-accept-disabled" destination: @@ -39,7 +37,6 @@ tcp: - name: "third-listener" address: "::" port: 10082 - externalPort: 82 routes: - name: "max-accept-default" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml index 4e2f959bc2..39d4ed300c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml @@ -5,7 +5,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml index 3b5ebc9ffe..ad30c19bb3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml index e746dc1319..6eb19b1506 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com hostname: www.foo.com @@ -88,7 +87,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - name: httproute/default/httproute-3/rule/0/match/0/www_bar_com hostname: www.bar.com diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index a04b38c483..ff32004cb9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: @@ -31,7 +30,6 @@ http: - name: "second-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.net" path: @@ -60,7 +58,6 @@ http: - name: "third-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "example.com" path: @@ -79,7 +76,6 @@ http: - name: "fourth-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "example.net" path: @@ -99,7 +95,6 @@ tcp: - name: "fifth-listener" address: "::" port: 10080 - externalPort: 80 routes: - name: "fifth-route" tls: @@ -116,7 +111,6 @@ tcp: - name: "sixth-listener" address: "::" port: 10080 - externalPort: 80 routes: - name: "sixth-route" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml index c337e5b58d..4ce2211ce5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple" destination: @@ -17,7 +16,6 @@ tcp: - name: "tcp-listener-simple-1" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple-1" destination: @@ -32,7 +30,6 @@ tcp: - name: "tcp-listener-simple-2" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple-2" destination: @@ -47,7 +44,6 @@ tcp: - name: "tcp-listener-simple-3" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple-3" destination: @@ -62,7 +58,6 @@ tcp: - name: "tcp-listener-simple-4" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple-4" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml index eb1610b455..a138304010 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10001 - externalPort: 10001 hostnames: - "*" path: @@ -40,7 +39,6 @@ http: - name: "second-listener" address: "::" port: 10002 - externalPort: 10002 hostnames: - "*" path: @@ -79,7 +77,6 @@ http: - name: "third-listener" address: "::" port: 10003 - externalPort: 10003 hostnames: - "*" path: @@ -119,7 +116,6 @@ http: - name: "fourth-listener" address: "::" port: 10004 - externalPort: 10004 hostnames: - "*" path: @@ -161,7 +157,6 @@ http: - name: "fifth-listener" address: "::" port: 10005 - externalPort: 10005 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml index 474e1061c1..cf93007b97 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10001 - externalPort: 10001 hostnames: - "*" path: @@ -40,7 +39,6 @@ http: - name: "second-listener" address: "::" port: 10002 - externalPort: 10002 hostnames: - "*" path: @@ -78,7 +76,6 @@ http: - name: "third-listener" address: "::" port: 10003 - externalPort: 10003 hostnames: - "*" path: @@ -116,7 +113,6 @@ http: - name: "fourth-listener" address: "::" port: 10004 - externalPort: 10004 hostnames: - "*" path: @@ -154,7 +150,6 @@ http: - name: "fifth-listener" address: "::" port: 10005 - externalPort: 10005 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml index 9d5c4d5ab5..492b84f1df 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -39,7 +38,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 tls: certificates: - name: secret-3 diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml index 25ccb402bd..81f750353f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-san.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -53,7 +52,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 tls: alpnProtocols: [] certificates: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml index 1143983236..eecd3be065 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: @@ -39,7 +38,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 tls: certificates: - name: secret-3 diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml index 6f8a83876b..4cddbaafd2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-and-jwt-with-passthrough.yaml @@ -2,7 +2,6 @@ http: - name: envoy-gateway/gateway-1/http address: 0.0.0.0 port: 10080 - externalPort: 80 hostnames: - '*' path: diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml index 126bbb3d28..90e63cadea 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml index 1009dad3a7..0c3c60fd5f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml index b0da951fcc..566dcccb86 100644 --- a/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/panic-threshold.yaml @@ -5,7 +5,6 @@ http: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect port: 10080 - externalPort: 80 hostnames: - "*" routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml index 521b746ee0..d989ec6f2e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml index bf2b103905..9ea98e19fd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index d46794a8cb..f38eeed1d6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml index ba76f3c9ce..b25e2bdd12 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml index 8cf2cbfd0c..e34623adeb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml @@ -9,7 +9,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml index b23d88f431..af7c562775 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-global-shared.yaml @@ -9,7 +9,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml index 9f47eab5ec..066a1d01ca 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml index 4d2a2d71dd..0c67264d02 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-multi-global-shared.yaml @@ -9,7 +9,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index 0f746b20d1..cc27f74e38 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -8,7 +8,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index bbe76fb0c7..9467167760 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -7,7 +7,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml b/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml index 74b7a712b4..54b2ba2659 100644 --- a/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/request-buffer.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 @@ -53,7 +52,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 - externalPort: 81 routes: - destination: name: httproute/default/httproute-2/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml index 51224fb818..557d750867 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/retry.yaml b/internal/xds/translator/testdata/in/xds-ir/retry.yaml index 09f6b5a46c..5ca639cb6e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml index 7b9867f3a1..f3e8399384 100644 --- a/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index 4c91373532..a584ad0a71 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml index d3c11a4a0e..a2519db08b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "foo.com" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml index 444c65070e..747b8d3d42 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml @@ -5,7 +5,6 @@ tcp: - name: "tcp-route-enable-endpoint-stats" address: "::" port: 10080 - externalPort: 80 routes: - destination: name: "tcp-route-simple-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml index b4c419ec28..8365c9706f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml @@ -5,7 +5,6 @@ tcp: - name: "tcp-route-enable-req-resp-sizes-stats" address: "::" port: 10080 - externalPort: 80 routes: - destination: name: "tcp-route-simple-dest" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml index c8cc0eb5fb..62d4ffa1d2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-complex" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-complex" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml index 55d23d6516..80511b1289 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml index 93b63da5ea..d694b2c7e4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-invalid" address: "" port: 10080 - externalPort: 80 routes: - name: "tcp-route-invalid" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml index bd9edfd78a..da4cc242f3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-simple" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-simple" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml index 7f75d59d28..e2723636a2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml @@ -2,7 +2,6 @@ tcp: - name: "tls-listener-terminate" address: "::" port: 10080 - externalPort: 80 routes: - name: "tls-route-terminate" tls: @@ -24,7 +23,6 @@ tcp: - name: "tls-terminate-hostname" address: "::" port: 10080 - externalPort: 80 tls: inspector: snis: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml index 599261a61d..e54b06c8f9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml @@ -2,7 +2,6 @@ tcp: - name: "tcp-listener-weighted-backend" address: "::" port: 10080 - externalPort: 80 routes: - name: "tcp-route-weighted-backend" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml index 9606fd053b..dafca1cf20 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-with-no-routes.yaml @@ -2,4 +2,3 @@ tcp: - name: "tcp-listener-with-no-routes" address: "::" port: 10080 - externalPort: 80 diff --git a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml index 3aae8bbf6e..6e1c3fdc08 100644 --- a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml index cac0dd0a5a..4b294edad6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml @@ -2,7 +2,6 @@ tcp: - name: "tls-passthrough-foo" address: "::" port: 10080 - externalPort: 80 routes: - name: "tls-route-passthrough-foo" tls: @@ -21,7 +20,6 @@ tcp: - name: "tls-passthrough-bar" address: "::" port: 10081 - externalPort: 81 routes: - name: "tls-route-passthrough-bar" tls: diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml index 5e596460c8..5495901ae6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml @@ -5,7 +5,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 hostnames: - "foo.com" tls: @@ -55,7 +54,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - externalPort: 81 tls: ciphers: - ECDHE-ECDSA-AES128-GCM-SHA256 diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml index 82e2f322c9..694c99fd27 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog-uds.yaml @@ -33,7 +33,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml index b80b52e38b..c7c42d9bae 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml @@ -32,7 +32,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml index c60b3af645..1a147187d2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml @@ -37,7 +37,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml index 0735df0698..00329fd9c3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml @@ -24,7 +24,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml index d2a8d06dc4..5d8e2e81d6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml @@ -33,7 +33,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index 704d824d6f..2db97e2646 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -38,7 +38,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml index 2b171c64d1..c0196ca747 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml @@ -56,7 +56,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml index 2af4910547..9516e43cce 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml @@ -5,7 +5,6 @@ udp: - name: "udp-route-enable-endpoint-stats" address: "::" port: 10080 - externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml index 235ca0b530..fe37c063f6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml @@ -5,7 +5,6 @@ udp: - name: "udp-route-enable-req-resp-sizes-stats" address: "::" port: 10080 - externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml index b11964ef5b..94b3bdad06 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-invalid.yaml @@ -1,7 +1,6 @@ udp: - name: "udp-route" port: 10080 - externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml index 7e9fb3e90a..c78d4436d6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-no-endpoints.yaml @@ -3,7 +3,6 @@ udp: - name: "udp-route" address: "0.0.0.0" port: 10162 - externalPort: 162 route: destination: metadata: diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml index e1410ebb37..fc6a647cba 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route-with-no-routes.yaml @@ -2,4 +2,3 @@ udp: - name: "udp-route-with-no-routes" address: "::" port: 10080 - externalPort: 80 diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml index f59b8b33db..e7d5a5a412 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml @@ -2,7 +2,6 @@ udp: - name: "udp-route" address: "::" port: 10080 - externalPort: 80 route: name: "udp-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml index 261d7aed31..e73618c41f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml @@ -2,7 +2,6 @@ http: - name: "first-listener" address: "::" port: 10080 - externalPort: 80 hostnames: - "*" path: diff --git a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml index 0b3c459bad..14bf92ba12 100644 --- a/internal/xds/translator/testdata/in/xds-ir/wasm.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/wasm.yaml @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - externalPort: 80 routes: - destination: name: httproute/default/httproute-1/rule/0 From 4c7e56ee972af2f08864b22e545060a39a19afb9 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 04:35:08 +0000 Subject: [PATCH 34/44] remove listener metadata Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/metadata.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/internal/xds/translator/metadata.go b/internal/xds/translator/metadata.go index e5b10d56cb..6ee726c258 100644 --- a/internal/xds/translator/metadata.go +++ b/internal/xds/translator/metadata.go @@ -27,20 +27,8 @@ func buildXdsMetadata(metadata *ir.ResourceMetadata) *corev3.Metadata { return nil } - return buildXdsMetadataFromMultiple([]*ir.ResourceMetadata{metadata}) -} - -func buildXdsMetadataFromMultiple(metadata []*ir.ResourceMetadata) *corev3.Metadata { - if metadata == nil { - return nil - } - resourcesList := &structpb.ListValue{} - for _, md := range metadata { - if md != nil { - resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(md)) - } - } + resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(metadata)) return &corev3.Metadata{ FilterMetadata: map[string]*structpb.Struct{ From 74ba44297844031528f6aa3d5d121189280aed33 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 04:41:25 +0000 Subject: [PATCH 35/44] remove unnecessary change Signed-off-by: Huabing (Robin) Zhao --- .../listener-overlapping-tls-config.yaml | 22 ++++----- ...tener-overlapping-tls-config.clusters.yaml | 48 ------------------- ...ener-overlapping-tls-config.endpoints.yaml | 24 ---------- ...ener-overlapping-tls-config.listeners.yaml | 6 +-- ...istener-overlapping-tls-config.routes.yaml | 29 +++++------ 5 files changed, 26 insertions(+), 103 deletions(-) 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 3cd9c0b900..a7190896c4 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 @@ -13,7 +13,6 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10443 - externalPort: 443 routes: - destination: name: httproute/envoy-gateway/httproute-1/rule/0 @@ -57,25 +56,24 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10443 - externalPort: 443 routes: - destination: - name: httproute/envoy-gateway/httproute-2/rule/0 + name: httproute/envoy-gateway/httproute-1/rule/0 settings: - addressType: IP endpoints: - host: 7.7.7.7 port: 8080 - name: httproute/envoy-gateway/httproute-2/rule/0/backend/0 + name: httproute/envoy-gateway/httproute-1/rule/0/backend/0 protocol: HTTP weight: 1 hostname: '*.example.com' isHTTP2: false metadata: kind: HTTPRoute - name: httproute-2 + name: httproute-1 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com + name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com pathMatch: distinct: false name: "" @@ -95,30 +93,30 @@ http: kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-3 - name: envoy-gateway/gateway-1/https-3 + sectionName: https-1 + name: envoy-gateway/gateway-1/https-1 path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8443 routes: - destination: - name: httproute/envoy-gateway/httproute-3/rule/0 + name: httproute/envoy-gateway/httproute-1/rule/0 settings: - addressType: IP endpoints: - host: 7.7.7.7 port: 8080 - name: httproute/envoy-gateway/httproute-3/rule/0/backend/0 + name: httproute/envoy-gateway/httproute-1/rule/0/backend/0 protocol: HTTP weight: 1 hostname: foo.example.com isHTTP2: false metadata: kind: HTTPRoute - name: httproute-3 + name: httproute-1 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com + name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com pathMatch: distinct: false name: "" 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 fb8875d973..f04949b663 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,51 +22,3 @@ 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 cd382d0b11..c210427ccd 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,27 +10,3 @@ 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 5c88ff3986..482ba04e91 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-3 + routeConfigName: envoy-gateway/gateway-1/https-1 serverHeaderTransformation: PASS_THROUGH statPrefix: https-8443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https-3 + name: envoy-gateway/gateway-1/https-1 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-3 + name: envoy-gateway/gateway-1/https-1 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 41ab5c2ecf..1380827f57 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 @@ -27,11 +27,8 @@ cluster: httproute/envoy-gateway/httproute-1/rule/0 upgradeConfigs: - upgradeType: websocket -- ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/https-2 - virtualHosts: - domains: - - '*.example.com' + - foo.example.com metadata: filterMetadata: envoy-gateway: @@ -39,8 +36,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-2 - name: envoy-gateway/gateway-1/https-2/*_example_com + sectionName: https-1 + name: envoy-gateway/gateway-1/https-1/foo_example_com routes: - match: prefix: / @@ -49,18 +46,18 @@ envoy-gateway: resources: - kind: HTTPRoute - name: httproute-2 + name: httproute-1 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com + name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com route: - cluster: httproute/envoy-gateway/httproute-2/rule/0 + cluster: httproute/envoy-gateway/httproute-1/rule/0 upgradeConfigs: - upgradeType: websocket - ignorePortInHostMatching: true - name: envoy-gateway/gateway-1/https-3 + name: envoy-gateway/gateway-1/https-2 virtualHosts: - domains: - - foo.example.com + - '*.example.com' metadata: filterMetadata: envoy-gateway: @@ -68,8 +65,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-3 - name: envoy-gateway/gateway-1/https-3/foo_example_com + sectionName: https-2 + name: envoy-gateway/gateway-1/https-2/*_example_com routes: - match: prefix: / @@ -78,10 +75,10 @@ envoy-gateway: resources: - kind: HTTPRoute - name: httproute-3 + name: httproute-1 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com + name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com route: - cluster: httproute/envoy-gateway/httproute-3/rule/0 + cluster: httproute/envoy-gateway/httproute-1/rule/0 upgradeConfigs: - upgradeType: websocket From 49cb214573c335ad8d1fd81da6f297f3df122f5c Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 04:54:26 +0000 Subject: [PATCH 36/44] remove unnecessary change Signed-off-by: Huabing (Robin) Zhao --- .../http-route-extension-translate-error.yaml | 1 - .../testdata/in/xds-ir/client-stream-idle-timeout.yaml | 5 ----- .../testdata/in/xds-ir/headers-with-disable-request-id.yaml | 1 + .../testdata/in/xds-ir/headers-with-generate-request-id.yaml | 1 + .../xds-ir/headers-with-preserve-or-generate-request-id.yaml | 1 + 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml index a02bf3e5ff..8f84f92d48 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route-extension-translate-error.yaml @@ -4,7 +4,6 @@ http: port: 10080 hostnames: - "*" - path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml index ab047aad3c..a118f22bdf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-stream-idle-timeout.yaml @@ -26,11 +26,6 @@ tcp: - name: "second-listener" address: "::" port: 10081 - metadata: - kind: Gateway - name: gateway-1 - namespace: envoy-gateway - sectionName: tcp routes: - name: "second-route" destination: diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml index 860514029d..68f5faebc9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-disable-request-id.yaml @@ -31,3 +31,4 @@ http: - host: "2.2.2.2" port: 8082 name: "second-route-dest/backend/0" + diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml index ccdc659568..ac67c405b4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-generate-request-id.yaml @@ -31,3 +31,4 @@ http: - host: "2.2.2.2" port: 8082 name: "second-route-dest/backend/0" + diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml index 1acdfd9f1c..b72f9722a1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-or-generate-request-id.yaml @@ -31,3 +31,4 @@ http: - host: "2.2.2.2" port: 8082 name: "second-route-dest/backend/0" + From 4073bfa8f8a5416e3ef9db26a7d5659504085252 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Tue, 29 Jul 2025 04:58:12 +0000 Subject: [PATCH 37/44] update test file Signed-off-by: Huabing (Robin) Zhao --- .../listener-overlapping-tls-config.yaml | 20 ++++---- ...tener-overlapping-tls-config.clusters.yaml | 48 +++++++++++++++++++ ...ener-overlapping-tls-config.endpoints.yaml | 24 ++++++++++ ...ener-overlapping-tls-config.listeners.yaml | 6 +-- ...istener-overlapping-tls-config.routes.yaml | 29 ++++++----- 5 files changed, 101 insertions(+), 26 deletions(-) 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/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 1380827f57..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 @@ -27,8 +27,11 @@ cluster: httproute/envoy-gateway/httproute-1/rule/0 upgradeConfigs: - upgradeType: websocket +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/https-2 + virtualHosts: - domains: - - foo.example.com + - '*.example.com' metadata: filterMetadata: envoy-gateway: @@ -36,8 +39,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-1 - name: envoy-gateway/gateway-1/https-1/foo_example_com + sectionName: https-2 + name: envoy-gateway/gateway-1/https-2/*_example_com routes: - match: prefix: / @@ -46,18 +49,18 @@ envoy-gateway: resources: - kind: HTTPRoute - name: httproute-1 + name: httproute-2 namespace: envoy-gateway - name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_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-2 + name: envoy-gateway/gateway-1/https-3 virtualHosts: - domains: - - '*.example.com' + - foo.example.com metadata: filterMetadata: envoy-gateway: @@ -65,8 +68,8 @@ - kind: Gateway name: gateway-1 namespace: envoy-gateway - sectionName: https-2 - name: envoy-gateway/gateway-1/https-2/*_example_com + sectionName: https-3 + name: envoy-gateway/gateway-1/https-3/foo_example_com routes: - match: prefix: / @@ -75,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/*_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 From efc13f7bffac36cc4ca9d6726c3b6e7bc26fcf9f Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 01:41:00 +0000 Subject: [PATCH 38/44] set listener and filter chain names, rollback other names Signed-off-by: Huabing (Robin) Zhao --- .github/workflows/build_and_test.yaml | 11 +- api/v1alpha1/envoygateway_helpers.go | 2 +- api/v1alpha1/envoygateway_types.go | 7 +- internal/gatewayapi/translator_test.go | 13 +- internal/xds/translator/listener.go | 66 ++-- .../xds/translator/server_names_match_test.go | 2 +- ...ener-name.yaml => xds-name-scheme-v1.yaml} | 2 +- .../in/xds-ir/xds-name-scheme-v2.yaml | 240 ++++++++++++++ ....yaml => xds-name-scheme-v1.clusters.yaml} | 0 ...yaml => xds-name-scheme-v1.endpoints.yaml} | 0 .../xds-ir/xds-name-scheme-v1.listeners.yaml | 313 ++++++++++++++++++ ...es.yaml => xds-name-scheme-v1.routes.yaml} | 14 +- ...s.yaml => xds-name-scheme-v1.secrets.yaml} | 0 .../xds-ir/xds-name-scheme-v2.clusters.yaml | 196 +++++++++++ .../xds-ir/xds-name-scheme-v2.endpoints.yaml | 122 +++++++ ...yaml => xds-name-scheme-v2.listeners.yaml} | 24 +- .../out/xds-ir/xds-name-scheme-v2.routes.yaml | 72 ++++ .../xds-ir/xds-name-scheme-v2.secrets.yaml | 18 + internal/xds/translator/translator.go | 30 +- internal/xds/translator/translator_test.go | 4 +- release-notes/current.yaml | 2 +- site/content/en/latest/api/extension_types.md | 2 +- ...ener-name.yaml => xds-name-scheme-v2.yaml} | 2 +- ...ener-name.yaml => xds-name-scheme-v2.yaml} | 2 +- test/e2e/e2e_test.go | 4 +- ...nvoy-patch-policy-xds-name-scheme-v2.yaml} | 0 test/e2e/tests/connection_limit.go | 3 - ... envoy_patch_policy_xds_name_scheme_v2.go} | 8 +- test/e2e/tests/utils.go | 4 +- 29 files changed, 1037 insertions(+), 126 deletions(-) rename internal/xds/translator/testdata/in/xds-ir/{port-as-listener-name.yaml => xds-name-scheme-v1.yaml} (99%) create mode 100644 internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v2.yaml rename internal/xds/translator/testdata/out/xds-ir/{port-as-listener-name.clusters.yaml => xds-name-scheme-v1.clusters.yaml} (100%) rename internal/xds/translator/testdata/out/xds-ir/{port-as-listener-name.endpoints.yaml => xds-name-scheme-v1.endpoints.yaml} (100%) create mode 100644 internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.listeners.yaml rename internal/xds/translator/testdata/out/xds-ir/{port-as-listener-name.routes.yaml => xds-name-scheme-v1.routes.yaml} (82%) rename internal/xds/translator/testdata/out/xds-ir/{port-as-listener-name.secrets.yaml => xds-name-scheme-v1.secrets.yaml} (100%) create mode 100644 internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.clusters.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.endpoints.yaml rename internal/xds/translator/testdata/out/xds-ir/{port-as-listener-name.listeners.yaml => xds-name-scheme-v2.listeners.yaml} (95%) create mode 100644 internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.routes.yaml create mode 100644 internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.secrets.yaml rename test/config/envoy-gateaway-config/{port-as-listener-name.yaml => xds-name-scheme-v2.yaml} (93%) rename test/config/helm/{port-as-listener-name.yaml => xds-name-scheme-v2.yaml} (60%) rename test/e2e/testdata/{envoy-patch-policy-use-protocol-port-as-listener-name.yaml => envoy-patch-policy-xds-name-scheme-v2.yaml} (100%) rename test/e2e/tests/{envoy_patch_policy_listener_name.go => envoy_patch_policy_xds_name_scheme_v2.go} (60%) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 3416fdf55d..91608ba0eb 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -104,10 +104,7 @@ jobs: profile: gateway-namespace-mode - version: v1.33.1 ipFamily: ipv4 - profile: port-as-listener-name - - version: v1.32.5 - ipFamily: ipv6 - profile: port-as-listener-name + profile: xds-name-scheme-v2 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps @@ -157,10 +154,8 @@ jobs: profile: gateway-namespace-mode - version: v1.33.1 ipFamily: ipv4 - profile: port-as-listener-name - - version: v1.32.5 - ipFamily: ipv6 - profile: port-as-listener-name + 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 fd19935772..05a58fcbdc 100644 --- a/api/v1alpha1/envoygateway_helpers.go +++ b/api/v1alpha1/envoygateway_helpers.go @@ -111,7 +111,7 @@ func (e *EnvoyGateway) GatewayNamespaceMode() bool { // defaultRuntimeFlags are the default runtime flags for Envoy Gateway. var defaultRuntimeFlags = map[RuntimeFlag]bool{ - UseProtocolPortAsListenerName: false, + XDSNameSchemeV2: false, } // IsEnabled checks if a runtime flag is enabled in the EnvoyGateway configuration. diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index 610ec70b2e..d069435ab2 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -102,12 +102,13 @@ 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=UseProtocolPortAsListenerName +// +kubebuilder:validation:Enum=xdsNameSchemeV2 type RuntimeFlag string const ( - // UseProtocolPortAsListenerName indicates that the listener name should be derived from the protocol and port. - UseProtocolPortAsListenerName RuntimeFlag = "UseProtocolPortAsListenerName" + // 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/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go index 96f4aa4bc4..982a65b6c0 100644 --- a/internal/gatewayapi/translator_test.go +++ b/internal/gatewayapi/translator_test.go @@ -47,11 +47,10 @@ func mustUnmarshal(t *testing.T, val []byte, out any) { func TestTranslate(t *testing.T) { testCasesConfig := []struct { - name string - EnvoyPatchPolicyEnabled bool - BackendEnabled bool - GatewayNamespaceMode bool - UseProtocolPortAsListenerName bool + name string + EnvoyPatchPolicyEnabled bool + BackendEnabled bool + GatewayNamespaceMode bool }{ { name: "envoypatchpolicy-invalid-feature-disabled", @@ -65,10 +64,6 @@ func TestTranslate(t *testing.T) { name: "gateway-namespace-mode-infra-httproute", GatewayNamespaceMode: true, }, - { - name: "protocol-port-as-listener-name", - UseProtocolPortAsListenerName: true, - }, } inputFiles, err := filepath.Glob(filepath.Join("testdata", "*.in.yaml")) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index aa36f283e6..d22d99f17d 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -200,7 +200,7 @@ func (t *Translator) buildXdsTCPListener( listener := &listenerv3.Listener{ Name: xdsListenerName( listenerDetails.Name, listenerDetails.ExternalPort, - corev3.SocketAddress_TCP, t.useProtocolPortAsListenerName()), + corev3.SocketAddress_TCP, t.xdsNameSchemeV2()), AccessLog: al, SocketOptions: socketOptions, PerConnectionBufferLimitBytes: bufferLimitBytes, @@ -227,12 +227,12 @@ func (t *Translator) buildXdsTCPListener( } // xdsListenerName returns the name of the xDS listener in two formats: -// 1. "tcp-80" if useProtocolPortAsListenerName is true. -// 2. "default/gateway-1/http" if useProtocolPortAsListenerName is false. +// 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, useProtocolPortAsListenerName bool) string { - if useProtocolPortAsListenerName { +func xdsListenerName(name string, externalPort uint32, protocol corev3.SocketAddress_Protocol, xdsNameSchemeV2 bool) string { + if xdsNameSchemeV2 { protocolType := "tcp" if protocol == corev3.SocketAddress_UDP { protocolType = "udp" @@ -272,7 +272,7 @@ func (t *Translator) buildXdsQuicListener( } // Keep the listener name compatible with the old naming scheme listenerName := listenerDetails.Name + "-quic" - if t.useProtocolPortAsListenerName() { + if t.xdsNameSchemeV2() { listenerName = xdsListenerName(listenerDetails.Name, listenerDetails.ExternalPort, corev3.SocketAddress_UDP, true) } xdsListener := &listenerv3.Listener{ @@ -343,11 +343,7 @@ func (t *Translator) addHCMToXDSListener( } // Append port to the statPrefix. - if t.useProtocolPortAsListenerName() { - statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.ExternalPort))}, "-") - } else { - statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.Port))}, "-") - } + statPrefix = strings.Join([]string{statPrefix, strconv.Itoa(int(irListener.Port))}, "-") // Client IP detection useRemoteAddress := true @@ -364,7 +360,7 @@ func (t *Translator) addHCMToXDSListener( Rds: &hcmv3.Rds{ ConfigSource: makeConfigSource(), // Configure route name to be found via RDS. - RouteConfigName: routeConfigName(irListener, t.useProtocolPortAsListenerName()), + RouteConfigName: routeConfigName(irListener), }, }, HttpProtocolOptions: http1ProtocolOptions(irListener.HTTP1), @@ -461,7 +457,7 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: httpListenerFilterChainName(irListener, t.useProtocolPortAsListenerName()), + Name: httpListenerFilterChainName(irListener), } if irListener.TLS != nil { @@ -486,7 +482,7 @@ func (t *Translator) addHCMToXDSListener( } filterChain.TransportSocket = tSocket - err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames, t.useProtocolPortAsListenerName()) + err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames) if err != nil { return err } @@ -504,24 +500,16 @@ func (t *Translator) addHCMToXDSListener( return nil } -func routeConfigName(irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { - // If the ir Listener is HTTP, then the route is merged on the same port. - if useProtocolPortAsListenerName && irListener.TLS == nil { - return fmt.Sprintf("default-%d", irListener.ExternalPort) - } - // If the ir Listener is HTTPS, then each Listener has its own route config because we build a separate - // filter chain for each SNI. +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 } -func httpListenerFilterChainName(irListener *ir.HTTPListener, useProtocolPortAsListenerName bool) string { - return routeConfigName(irListener, useProtocolPortAsListenerName) +func httpListenerFilterChainName(irListener *ir.HTTPListener) string { + return irListener.Name } -func tcpListenerFilterChainName(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute, useProtocolPortAsListenerName bool) string { - if useProtocolPortAsListenerName { - return xdsListener.Name - } +func tcpListenerFilterChainName(irRoute *ir.TCPRoute) string { return irRoute.Name } @@ -592,12 +580,7 @@ func buildEarlyHeaderMutation(headers *ir.HeaderSettings) []*corev3.TypedExtensi } } -func addServerNamesMatch( - xdsListener *listenerv3.Listener, - filterChain *listenerv3.FilterChain, - hostnames []string, - useProtocolPortAsListenerName bool, -) error { +func addServerNamesMatch(xdsListener *listenerv3.Listener, filterChain *listenerv3.FilterChain, hostnames []string) error { // Skip adding ServerNames match for: // 1. nil listeners // 2. UDP (QUIC) listeners used for HTTP3 @@ -615,11 +598,6 @@ func addServerNamesMatch( ServerNames: hostnames, } - // Add hostname suffix to the filter chain name if useProtocolPortAsListenerName is false to avoid conflicts. - if useProtocolPortAsListenerName { - filterChain.Name = fmt.Sprintf("%s/%s", filterChain.Name, strings.ReplaceAll(strings.Join(hostnames, "-"), ".", "_")) - } - if err := addXdsTLSInspectorFilter(xdsListener); err != nil { return err } @@ -722,11 +700,7 @@ func (t *Translator) addXdsTCPFilterChain( } filterChain := &listenerv3.FilterChain{ - Name: tcpListenerFilterChainName( - xdsListener, - irRoute, - t.useProtocolPortAsListenerName(), - ), + Name: tcpListenerFilterChainName(irRoute), Filters: filters, } @@ -735,7 +709,6 @@ func (t *Translator) addXdsTCPFilterChain( xdsListener, filterChain, irRoute.TLS.TLSInspectorConfig.SNIs, - t.useProtocolPortAsListenerName(), ) if err != nil { return err @@ -751,7 +724,6 @@ func (t *Translator) addXdsTCPFilterChain( xdsListener, filterChain, snis, - t.useProtocolPortAsListenerName(), ) if err != nil { return err @@ -1024,7 +996,7 @@ func buildXdsUDPListener( clusterName string, udpListener *ir.UDPListener, accesslog *ir.AccessLog, - useProtocolPortAsListenerName bool, + xdsNameSchemeV2 bool, ) (*listenerv3.Listener, error) { if udpListener == nil { return nil, errors.New("udp listener is nil") @@ -1069,7 +1041,7 @@ func buildXdsUDPListener( return nil, err } xdsListener := &listenerv3.Listener{ - Name: xdsListenerName(udpListener.Name, udpListener.ExternalPort, corev3.SocketAddress_UDP, useProtocolPortAsListenerName), + 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/server_names_match_test.go b/internal/xds/translator/server_names_match_test.go index 5a4a661b28..ce2f8b108b 100644 --- a/internal/xds/translator/server_names_match_test.go +++ b/internal/xds/translator/server_names_match_test.go @@ -97,7 +97,7 @@ func TestAddServerNamesMatch(t *testing.T) { t.Run(tt.name, func(t *testing.T) { filterChain := &listenerv3.FilterChain{} - err := addServerNamesMatch(tt.xdsListener, filterChain, tt.hostnames, false) + err := addServerNamesMatch(tt.xdsListener, filterChain, tt.hostnames) require.NoError(t, err) // Check if filter chain match was added diff --git a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml similarity index 99% rename from internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml rename to internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml index 4593683994..392ea20efc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/port-as-listener-name.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/xds-name-scheme-v1.yaml @@ -100,7 +100,7 @@ http: hostnames: - '*' http3: - quicPort: 443 + quicPort: 1443 isHTTP2: false path: escapedSlashesAction: UnescapeAndRedirect 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/port-as-listener-name.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.clusters.yaml similarity index 100% rename from internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.clusters.yaml rename to internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.clusters.yaml diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.endpoints.yaml similarity index 100% rename from internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.endpoints.yaml rename to internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.endpoints.yaml 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/port-as-listener-name.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml similarity index 82% rename from internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml rename to internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml index c7a5cbce18..01d3a93d1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.routes.yaml @@ -1,9 +1,9 @@ - ignorePortInHostMatching: true - name: default-80 + name: envoy-gateway/gateway-1/http1 virtualHosts: - domains: - foo.net - name: foo_net + name: envoy-gateway/gateway-1/http1/foo_net routes: - match: prefix: / @@ -14,7 +14,7 @@ - upgradeType: websocket - domains: - bar.net - name: bar_net + name: envoy-gateway/gateway-1/http2/bar_net routes: - match: prefix: / @@ -28,7 +28,7 @@ virtualHosts: - domains: - foo.com - name: foo_com + name: envoy-gateway/gateway-1/https1/foo_com routes: - match: prefix: / @@ -42,7 +42,7 @@ virtualHosts: - domains: - bar.com - name: bar_com + name: envoy-gateway/gateway-1/https2/bar_com routes: - match: prefix: / @@ -56,7 +56,7 @@ virtualHosts: - domains: - '*' - name: '*' + name: envoy-gateway/gateway-2/https-http3/* routes: - match: prefix: / @@ -65,7 +65,7 @@ - append: true header: key: alt-svc - value: h3=":443"; ma=86400 + value: h3=":1443"; ma=86400 route: cluster: httproute/default/httproute-1/rule/0 upgradeConfigs: diff --git a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.secrets.yaml similarity index 100% rename from internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.secrets.yaml rename to internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v1.secrets.yaml 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/port-as-listener-name.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml similarity index 95% rename from internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml rename to internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml index ef9ac475fa..e2098bb408 100644 --- a/internal/xds/translator/testdata/out/xds-ir/port-as-listener-name.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/xds-name-scheme-v2.listeners.yaml @@ -25,11 +25,11 @@ configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-80 + routeConfigName: envoy-gateway/gateway-1/http1 serverHeaderTransformation: PASS_THROUGH - statPrefix: http-80 + statPrefix: http-10080 useRemoteAddress: true - name: default-80 + name: envoy-gateway/gateway-1/http1 maxConnectionsToAcceptPerSocketEvent: 1 name: tcp-80 perConnectionBufferLimitBytes: 32768 @@ -65,9 +65,9 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-1/https1 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-443 + statPrefix: https-10443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https1/foo_com + name: envoy-gateway/gateway-1/https1 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -110,9 +110,9 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-1/https2 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-443 + statPrefix: https-10443 useRemoteAddress: true - name: envoy-gateway/gateway-1/https2/bar_com + name: envoy-gateway/gateway-1/https2 transportSocket: name: envoy.transport_sockets.tls typedConfig: @@ -168,7 +168,7 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-2/https-http3 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-1443 + statPrefix: https-11443 useRemoteAddress: true name: envoy-gateway/gateway-2/https-http3 transportSocket: @@ -222,7 +222,7 @@ resourceApiVersion: V3 routeConfigName: envoy-gateway/gateway-2/https-http3 serverHeaderTransformation: PASS_THROUGH - statPrefix: https-1443 + statPrefix: https-11443 useRemoteAddress: true name: envoy-gateway/gateway-2/https-http3 transportSocket: @@ -260,7 +260,7 @@ '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tlsroute/default/tlsroute-1/rule/-1 statPrefix: tls-passthrough-10090 - name: tcp-90/foo_com + name: tlsroute/default/tlsroute-1 - filterChainMatch: serverNames: - bar.com @@ -270,7 +270,7 @@ '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tlsroute/default/tlsroute-2/rule/-1 statPrefix: tls-passthrough-10090 - name: tcp-90/bar_com + name: tlsroute/default/tlsroute-2 listenerFilters: - name: envoy.filters.listener.tls_inspector typedConfig: @@ -289,7 +289,7 @@ '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy cluster: tcproute/default/tcproute statPrefix: tcp-10091 - name: tcp-91 + name: tcproute/default/tcproute-1 maxConnectionsToAcceptPerSocketEvent: 1 name: tcp-91 perConnectionBufferLimitBytes: 32768 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 23393a9e70..fd6fed9ca5 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -71,11 +71,11 @@ type Translator struct { Logger logging.Logger } -func (t *Translator) useProtocolPortAsListenerName() bool { +func (t *Translator) xdsNameSchemeV2() bool { if t.RuntimeFlags == nil { return false } - return t.RuntimeFlags.IsEnabled(egv1a1.UseProtocolPortAsListenerName) + return t.RuntimeFlags.IsEnabled(egv1a1.XDSNameSchemeV2) } type GlobalRateLimitSettings struct { @@ -438,15 +438,10 @@ func (t *Translator) processHTTPListenerXdsTranslation( // // 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". - if !t.useProtocolPortAsListenerName() { - 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, false) - } - } else { - // The new rout config is named after the xDS listener port, for example "80". - routeCfgName = routeConfigName(httpListener, true) + 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 @@ -496,7 +491,7 @@ func (t *Translator) addRouteToRouteConfig( // If the virtual host already exists, we can skip it. for _, vHost := range xdsRouteCfg.VirtualHosts { - if vHost.Name == virtualHostName(httpListener, vHost.Domains[0], t.useProtocolPortAsListenerName()) { + if vHost.Name == virtualHostName(httpListener, vHost.Domains[0]) { vHosts[vHost.Domains[0]] = vHost } } @@ -511,7 +506,7 @@ func (t *Translator) addRouteToRouteConfig( underscoredHostname := strings.ReplaceAll(httpRoute.Hostname, ".", "_") // Allocate virtual host for this httpRoute. vHost = &routev3.VirtualHost{ - Name: virtualHostName(httpListener, underscoredHostname, t.useProtocolPortAsListenerName()), + Name: virtualHostName(httpListener, underscoredHostname), Domains: []string{httpRoute.Hostname}, Metadata: buildXdsMetadata(httpListener.Metadata), } @@ -663,12 +658,7 @@ func (t *Translator) addRouteToRouteConfig( return errs } -func virtualHostName(httpListener *ir.HTTPListener, - underscoredHostname string, useProtocolPortAsListenerName bool, -) string { - if useProtocolPortAsListenerName { - return underscoredHostname // Just use the hostname as it is unique inside the route config - } +func virtualHostName(httpListener *ir.HTTPListener, underscoredHostname string) string { return fmt.Sprintf("%s/%s", httpListener.Name, underscoredHostname) } @@ -878,7 +868,7 @@ func (t *Translator) processUDPListenerXdsTranslation( udpListener.Route.Destination.Name, udpListener, accesslog, - t.useProtocolPortAsListenerName(), + t.xdsNameSchemeV2(), ) if err != nil { // skip this listener if failed to build xds listener diff --git a/internal/xds/translator/translator_test.go b/internal/xds/translator/translator_test.go index 05c72158c1..55acbd90e5 100644 --- a/internal/xds/translator/translator_test.go +++ b/internal/xds/translator/translator_test.go @@ -135,9 +135,9 @@ func TestTranslateXds(t *testing.T) { "tracing-unknown-provider-type": { errMsg: "unknown tracing provider type: AwesomeTelemetry", }, - "port-as-listener-name": { + "xds-name-scheme-v2": { runtimeFlags: &egv1a1.RuntimeFlags{ - Enabled: []egv1a1.RuntimeFlag{egv1a1.UseProtocolPortAsListenerName}, + Enabled: []egv1a1.RuntimeFlag{egv1a1.XDSNameSchemeV2}, }, }, } diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 28b4ea8897..88264b7781 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -4,7 +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 `UseProtocolPortAsListenerName` 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. + 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 6a2ff14ba5..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 | | ----- | ----------- | -| `UseProtocolPortAsListenerName` | UseProtocolPortAsListenerName indicates that the listener name should be derived from the protocol 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/port-as-listener-name.yaml b/test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml similarity index 93% rename from test/config/envoy-gateaway-config/port-as-listener-name.yaml rename to test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml index 1ad6ec622d..37a3dd9d89 100644 --- a/test/config/envoy-gateaway-config/port-as-listener-name.yaml +++ b/test/config/envoy-gateaway-config/xds-name-scheme-v2.yaml @@ -21,4 +21,4 @@ data: url: redis.redis-system.svc.cluster.local:6379 runtimeFlags: enabled: - - UseProtocolPortAsListenerName + - XDSNameSchemeV2 diff --git a/test/config/helm/port-as-listener-name.yaml b/test/config/helm/xds-name-scheme-v2.yaml similarity index 60% rename from test/config/helm/port-as-listener-name.yaml rename to test/config/helm/xds-name-scheme-v2.yaml index 3d5ec4ac29..290d342c3e 100644 --- a/test/config/helm/port-as-listener-name.yaml +++ b/test/config/helm/xds-name-scheme-v2.yaml @@ -2,4 +2,4 @@ config: envoyGateway: runtimeFlags: enabled: - - UseProtocolPortAsListenerName + - XDSNameSchemeV2 diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index d0ad00cfb6..8a335262ee 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -71,13 +71,13 @@ func TestE2E(t *testing.T) { ) } - if tests.UseProtocolPortAsListenerName() { + if tests.XDSNameSchemeV2() { skipTests = append(skipTests, tests.EnvoyPatchPolicyTest.ShortName, ) } else { skipTests = append(skipTests, - tests.EnvoyPatchPolicyUseProtocolPortAsListenerNameTest.ShortName, + tests.EnvoyPatchPolicyXDSNameSchemeV2Test.ShortName, ) } diff --git a/test/e2e/testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml b/test/e2e/testdata/envoy-patch-policy-xds-name-scheme-v2.yaml similarity index 100% rename from test/e2e/testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml rename to test/e2e/testdata/envoy-patch-policy-xds-name-scheme-v2.yaml diff --git a/test/e2e/tests/connection_limit.go b/test/e2e/tests/connection_limit.go index 654f6bf138..15e316fec4 100644 --- a/test/e2e/tests/connection_limit.go +++ b/test/e2e/tests/connection_limit.go @@ -85,9 +85,6 @@ var ConnectionLimitTest = suite.ConformanceTest{ } prefix := "http-10080" - if UseProtocolPortAsListenerName() { - prefix = "http-80" - } gtwName := "connection-limit-gateway" promQL := fmt.Sprintf(`envoy_connection_limit_limited_connections{envoy_connection_limit_prefix="%s",gateway_envoyproxy_io_owning_gateway_name="%s"}`, prefix, gtwName) diff --git a/test/e2e/tests/envoy_patch_policy_listener_name.go b/test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go similarity index 60% rename from test/e2e/tests/envoy_patch_policy_listener_name.go rename to test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go index d36fbd3904..b7c8ce47d5 100644 --- a/test/e2e/tests/envoy_patch_policy_listener_name.go +++ b/test/e2e/tests/envoy_patch_policy_xds_name_scheme_v2.go @@ -14,13 +14,13 @@ import ( ) func init() { - ConformanceTests = append(ConformanceTests, EnvoyPatchPolicyUseProtocolPortAsListenerNameTest) + ConformanceTests = append(ConformanceTests, EnvoyPatchPolicyXDSNameSchemeV2Test) } -var EnvoyPatchPolicyUseProtocolPortAsListenerNameTest = suite.ConformanceTest{ - ShortName: "EnvoyPatchPolicyUseProtocolPortAsListenerName", +var EnvoyPatchPolicyXDSNameSchemeV2Test = suite.ConformanceTest{ + ShortName: "EnvoyPatchPolicyXDSNameSchemeV2", Description: "update xds using EnvoyPatchPolicy", - Manifests: []string{"testdata/envoy-patch-policy-use-protocol-port-as-listener-name.yaml"}, + 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 010945fbf4..99ba299ea2 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -735,8 +735,8 @@ func IsGatewayNamespaceMode() bool { } // TODO(zhaohuabing) remove this after the feature flag is removed. -func UseProtocolPortAsListenerName() bool { - return DeployProfile == "port-as-listener-name" +func XDSNameSchemeV2() bool { + return DeployProfile == "pxds-name-scheme-v2" } func GetGatewayResourceNamespace() string { From 68f941f2fdf10b968ef7a6c84f8e1ed507804393 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 03:22:37 +0000 Subject: [PATCH 39/44] fix gen Signed-off-by: Huabing (Robin) Zhao --- ...typolicy-with-extauth-backendrefs.out.yaml | 1 + ...uritypolicy-with-oidc-backendrefs.out.yaml | 1 + internal/xds/translator/listener.go | 17 +++---------- internal/xds/translator/translator.go | 25 +++++++++++-------- test/e2e/tests/utils.go | 2 +- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml index dc6bc9a4c5..ea8242e1b2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml @@ -238,6 +238,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml index a924ce7d3a..c58aff073f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml @@ -206,6 +206,7 @@ xdsIR: - path: /dev/stdout http: - address: 0.0.0.0 + externalPort: 80 hostnames: - '*' isHTTP2: false diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index d22d99f17d..2e4194999a 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -482,8 +482,7 @@ func (t *Translator) addHCMToXDSListener( } filterChain.TransportSocket = tSocket - err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames) - if err != nil { + if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil { return err } @@ -705,12 +704,7 @@ func (t *Translator) addXdsTCPFilterChain( } if isTLSPassthrough { - err := addServerNamesMatch( - xdsListener, - filterChain, - irRoute.TLS.TLSInspectorConfig.SNIs, - ) - if err != nil { + if err := addServerNamesMatch(xdsListener, filterChain, irRoute.TLS.TLSInspectorConfig.SNIs); err != nil { return err } } @@ -720,12 +714,7 @@ func (t *Translator) addXdsTCPFilterChain( if cfg := irRoute.TLS.TLSInspectorConfig; cfg != nil { snis = cfg.SNIs } - err := addServerNamesMatch( - xdsListener, - filterChain, - snis, - ) - if err != nil { + if err := addServerNamesMatch(xdsListener, filterChain, snis); err != nil { return err } tSocket, err := buildXdsDownstreamTLSSocket(irRoute.TLS.Terminate) diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index fd6fed9ca5..c076e1f6e4 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -489,13 +489,6 @@ func (t *Translator) addRouteToRouteConfig( err error ) - // If the virtual host already exists, we can skip it. - for _, vHost := range xdsRouteCfg.VirtualHosts { - if vHost.Name == virtualHostName(httpListener, vHost.Domains[0]) { - vHosts[vHost.Domains[0]] = vHost - } - } - // Check if an extension is loaded that wants to modify xDS Routes after they have been generated for _, httpRoute := range httpListener.Routes { // 1:1 between IR HTTPRoute Hostname and xDS VirtualHost. @@ -793,8 +786,13 @@ func (t *Translator) processTCPListenerXdsTranslation( } } if err := t.addXdsTCPFilterChain( - xdsListener, route, route.Destination.Name, accesslog, - tcpListener.Timeout, tcpListener.Connection); err != nil { + xdsListener, + route, + route.Destination.Name, + accesslog, + tcpListener.Timeout, + tcpListener.Connection, + ); err != nil { errs = errors.Join(errs, err) } } @@ -815,8 +813,13 @@ func (t *Translator) processTCPListenerXdsTranslation( }, } if err := t.addXdsTCPFilterChain( - xdsListener, emptyRoute, emptyClusterName, accesslog, - tcpListener.Timeout, tcpListener.Connection); err != nil { + xdsListener, + emptyRoute, + emptyClusterName, + accesslog, + tcpListener.Timeout, + tcpListener.Connection, + ); err != nil { errs = errors.Join(errs, err) } } diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go index 99ba299ea2..286d3c2282 100644 --- a/test/e2e/tests/utils.go +++ b/test/e2e/tests/utils.go @@ -736,7 +736,7 @@ func IsGatewayNamespaceMode() bool { // TODO(zhaohuabing) remove this after the feature flag is removed. func XDSNameSchemeV2() bool { - return DeployProfile == "pxds-name-scheme-v2" + return DeployProfile == "xds-name-scheme-v2" } func GetGatewayResourceNamespace() string { From 287e50ea80c01bd4e0bfc77cf2a569b05c127518 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 04:10:21 +0000 Subject: [PATCH 40/44] minor change Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 2e4194999a..2a50723d0f 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -457,7 +457,7 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: httpListenerFilterChainName(irListener), + Name: httpsListenerFilterChainName(irListener), } if irListener.TLS != nil { @@ -490,6 +490,7 @@ func (t *Translator) addHCMToXDSListener( } else { // Add the HTTP filter chain as the default filter chain // Make sure one does not exist + // TODO(zhaohuabing): this branch never gets called, clean the code if xdsListener.DefaultFilterChain != nil { return errors.New("default filter chain already exists") } @@ -504,11 +505,11 @@ func routeConfigName(irListener *ir.HTTPListener) string { return irListener.Name } -func httpListenerFilterChainName(irListener *ir.HTTPListener) string { +func httpsListenerFilterChainName(irListener *ir.HTTPListener) string { return irListener.Name } -func tcpListenerFilterChainName(irRoute *ir.TCPRoute) string { +func tlsListenerFilterChainName(irRoute *ir.TCPRoute) string { return irRoute.Name } @@ -699,7 +700,7 @@ func (t *Translator) addXdsTCPFilterChain( } filterChain := &listenerv3.FilterChain{ - Name: tcpListenerFilterChainName(irRoute), + Name: tlsListenerFilterChainName(irRoute), Filters: filters, } From 7928d4809c76f154bbbd65da3391924870566f40 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 04:18:36 +0000 Subject: [PATCH 41/44] remove unnecessary change Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 3 +++ internal/xds/translator/translator.go | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 2a50723d0f..0924dd9469 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -505,10 +505,13 @@ func routeConfigName(irListener *ir.HTTPListener) string { 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 } diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index c076e1f6e4..388dee573d 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -483,10 +483,10 @@ func (t *Translator) addRouteToRouteConfig( http3Settings *ir.HTTP3Settings, ) error { var ( - vHosts = map[string]*routev3.VirtualHost{} // store virtual hosts by domain - virtualHostsToAdd []*routev3.VirtualHost // newly created virtual hosts to be added to the route config - errs error // the accumulated errors - err error + vHosts = map[string]*routev3.VirtualHost{} // store virtual hosts by domain + vHostList []*routev3.VirtualHost // keep track of order by using a list as well as the map + errs error // the accumulated errors + err error ) // Check if an extension is loaded that wants to modify xDS Routes after they have been generated @@ -523,7 +523,7 @@ func (t *Translator) addRouteToRouteConfig( } } vHosts[httpRoute.Hostname] = vHost - virtualHostsToAdd = append(virtualHostsToAdd, vHost) + vHostList = append(vHostList, vHost) } var xdsRoute *routev3.Route @@ -634,7 +634,7 @@ func (t *Translator) addRouteToRouteConfig( } } - for _, vHost := range virtualHostsToAdd { + for _, vHost := range vHostList { // Check if an extension want to modify the Virtual Host we just generated // If no extension exists (or it doesn't subscribe to this hook) then this is a quick no-op. if err = processExtensionPostVHostHook(vHost, t.ExtensionManager); err != nil { @@ -647,7 +647,7 @@ func (t *Translator) addRouteToRouteConfig( } } } - xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, virtualHostsToAdd...) + xdsRouteCfg.VirtualHosts = append(xdsRouteCfg.VirtualHosts, vHostList...) return errs } From d95f35d85dbfab368305078cb551c9f015b06e33 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 04:53:02 +0000 Subject: [PATCH 42/44] update the default filter chain name Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 14 ++++++++++++-- .../out/xds-ir/xds-name-scheme-v2.listeners.yaml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 0924dd9469..79c3e98d66 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -457,7 +457,6 @@ func (t *Translator) addHCMToXDSListener( filterChain := &listenerv3.FilterChain{ Filters: filters, - Name: httpsListenerFilterChainName(irListener), } if irListener.TLS != nil { @@ -481,6 +480,7 @@ func (t *Translator) addHCMToXDSListener( } } filterChain.TransportSocket = tSocket + filterChain.Name = httpsListenerFilterChainName(irListener) if err := addServerNamesMatch(xdsListener, filterChain, irListener.Hostnames); err != nil { return err @@ -490,10 +490,10 @@ func (t *Translator) addHCMToXDSListener( } else { // Add the HTTP filter chain as the default filter chain // Make sure one does not exist - // TODO(zhaohuabing): this branch never gets called, clean the code if xdsListener.DefaultFilterChain != nil { return errors.New("default filter chain already exists") } + filterChain.Name = httpListenerDefaultFilterChainName(irListener, t.xdsNameSchemeV2() ) xdsListener.DefaultFilterChain = filterChain } @@ -505,6 +505,16 @@ func routeConfigName(irListener *ir.HTTPListener) string { return irListener.Name } +// port value is used for the default filter chain name for HTTP listeners, as multiple HTTP listeners are merged into +// one filter chain. +func httpListenerDefaultFilterChainName(irListener *ir.HTTPListener, nameSchemeV2 bool) string { + if nameSchemeV2 { + return fmt.Sprint("http-", irListener.ExternalPort) + } + // For backward compatibility, we use the listener name as the filter chain name. + return irListener.Name +} + // irListener name is used as the filter chain name for HTTPS listener, as Listener is 1:1 mapping to the filter chain // The Gateway API layer ensures that each listener has a unique combination of hostname and port. func httpsListenerFilterChainName(irListener *ir.HTTPListener) string { 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 index e2098bb408..b1b39aa28e 100644 --- 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 @@ -29,7 +29,7 @@ serverHeaderTransformation: PASS_THROUGH statPrefix: http-10080 useRemoteAddress: true - name: envoy-gateway/gateway-1/http1 + name: http-80 maxConnectionsToAcceptPerSocketEvent: 1 name: tcp-80 perConnectionBufferLimitBytes: 32768 From a9406bb823bb18ad37d97df34ce3268354bb6962 Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 05:01:07 +0000 Subject: [PATCH 43/44] address comment Signed-off-by: Huabing (Robin) Zhao --- api/v1alpha1/envoygateway_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1alpha1/envoygateway_types.go b/api/v1alpha1/envoygateway_types.go index d069435ab2..86a6c1f4ea 100644 --- a/api/v1alpha1/envoygateway_types.go +++ b/api/v1alpha1/envoygateway_types.go @@ -102,7 +102,7 @@ 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 +// +kubebuilder:validation:Enum=XDSNameSchemeV2 type RuntimeFlag string const ( From 523588ce059920afd7d7644ce1f95ca076274f5e Mon Sep 17 00:00:00 2001 From: "Huabing (Robin) Zhao" Date: Wed, 30 Jul 2025 05:14:43 +0000 Subject: [PATCH 44/44] fix gen Signed-off-by: Huabing (Robin) Zhao --- internal/xds/translator/listener.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 79c3e98d66..f02784e29d 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -493,7 +493,7 @@ func (t *Translator) addHCMToXDSListener( if xdsListener.DefaultFilterChain != nil { return errors.New("default filter chain already exists") } - filterChain.Name = httpListenerDefaultFilterChainName(irListener, t.xdsNameSchemeV2() ) + filterChain.Name = httpListenerDefaultFilterChainName(irListener, t.xdsNameSchemeV2()) xdsListener.DefaultFilterChain = filterChain }