From 015bf78714194a1d046d32a95714a82f9eb46df2 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Wed, 19 Jul 2023 14:17:56 -0700 Subject: [PATCH] Use `/` to create internal IR names instead of `-` * Also had to replace `/` with `-` when creating K8s resource names :) Fixes: https://github.com/envoyproxy/gateway/issues/1640 Signed-off-by: Arko Dasgupta --- ...-single-route-single-match-to-xds.all.json | 28 ++++---- ...-single-route-single-match-to-xds.all.yaml | 28 ++++---- ...e-route-single-match-to-xds.bootstrap.yaml | 2 +- ...gle-route-single-match-to-xds.cluster.yaml | 6 +- ...le-route-single-match-to-xds.listener.yaml | 12 ++-- ...ingle-route-single-match-to-xds.route.yaml | 12 ++-- .../translate/out/default-resources.all.yaml | 68 +++++++++---------- .../out/echo-gateway-api.cluster.yaml | 6 +- .../out/from-gateway-api-to-xds.all.json | 68 +++++++++---------- .../out/from-gateway-api-to-xds.all.yaml | 68 +++++++++---------- .../from-gateway-api-to-xds.bootstrap.yaml | 2 +- .../out/from-gateway-api-to-xds.cluster.yaml | 22 +++--- .../out/from-gateway-api-to-xds.endpoint.yaml | 12 ++-- .../out/from-gateway-api-to-xds.listener.yaml | 22 +++--- .../out/from-gateway-api-to-xds.route.yaml | 18 ++--- .../translate/out/multiple-xds.route.json | 20 +++--- .../translate/out/quickstart.route.yaml | 10 +-- internal/gatewayapi/helpers.go | 12 ++-- .../testdata/disable-accesslog.out.yaml | 8 +-- .../testdata/envoypatchpolicy-valid.out.yaml | 8 +-- .../testdata/envoyproxy-accesslog.out.yaml | 8 +-- .../testdata/envoyproxy-valid.out.yaml | 8 +-- ...th-extension-filter-invalid-group.out.yaml | 8 +-- ...ith-non-matching-extension-filter.out.yaml | 8 +-- ...with-unsupported-extension-filter.out.yaml | 8 +-- ...route-with-valid-extension-filter.out.yaml | 10 +-- ...-namespace-with-allowed-httproute.out.yaml | 10 +-- ...mespace-with-disallowed-httproute.out.yaml | 8 +-- ...way-with-addresses-with-ipaddress.out.yaml | 6 +- ...valid-allowed-namespaces-selector.out.yaml | 6 +- ...with-invalid-allowed-routes-group.out.yaml | 6 +- ...allowed-routes-kind-and-supported.out.yaml | 6 +- ...-with-invalid-allowed-routes-kind.out.yaml | 6 +- ...th-invalid-allowed-tls-route-kind.out.yaml | 6 +- ...nvalid-multiple-tls-configuration.out.yaml | 6 +- ...id-tls-configuration-invalid-mode.out.yaml | 6 +- ...configuration-no-certificate-refs.out.yaml | 6 +- ...ion-no-valid-certificate-for-fqdn.out.yaml | 6 +- ...nfiguration-secret-does-not-exist.out.yaml | 6 +- ...uration-secret-in-other-namespace.out.yaml | 6 +- ...configuration-secret-is-not-valid.out.yaml | 6 +- ...ssing-allowed-namespaces-selector.out.yaml | 6 +- ...h-listener-with-tcp-with-hostname.out.yaml | 6 +- ...route-with-mismatch-port-protocol.out.yaml | 6 +- ...h-tcproute-with-multiple-backends.out.yaml | 6 +- ...with-tcproute-with-multiple-rules.out.yaml | 6 +- ...her-namespace-allowed-by-refgrant.out.yaml | 10 +-- ...ith-tls-terminate-and-passthrough.out.yaml | 12 ++-- ...h-listener-with-udp-with-hostname.out.yaml | 6 +- ...route-with-mismatch-port-protocol.out.yaml | 6 +- ...h-udproute-with-multiple-backends.out.yaml | 6 +- ...with-udproute-with-multiple-rules.out.yaml | 6 +- ...-listener-with-unmatched-tcproute.out.yaml | 6 +- ...-listener-with-unmatched-udproute.out.yaml | 6 +- ...istener-with-unsupported-protocol.out.yaml | 6 +- ...ith-same-algorithm-different-fqdn.out.yaml | 10 +-- ...-valid-multiple-tls-configuration.out.yaml | 10 +-- ...ener-with-valid-tls-configuration.out.yaml | 10 +-- ...with-preexisting-status-condition.out.yaml | 10 +-- ...-listener-with-multiple-tcproutes.out.yaml | 8 +-- ...-listener-with-multiple-udproutes.out.yaml | 8 +-- ...teway-with-stale-status-condition.out.yaml | 10 +-- ...listeners-on-same-tcp-or-tls-port.out.yaml | 8 +-- ...th-two-listeners-on-same-udp-port.out.yaml | 8 +-- ...d-tlsroute-same-hostname-and-port.out.yaml | 6 +- ...isteners-with-multiple-httproutes.out.yaml | 18 ++--- ...eners-with-same-port-and-hostname.out.yaml | 6 +- ...me-port-and-incompatible-protocol.out.yaml | 6 +- ...-with-same-port-http-tcp-protocol.out.yaml | 12 ++-- ...-with-same-port-http-udp-protocol.out.yaml | 12 ++-- ...s-with-tcproutes-with-sectionname.out.yaml | 10 +-- ...ith-tcproutes-without-sectionname.out.yaml | 10 +-- ...s-with-udproutes-with-sectionname.out.yaml | 10 +-- ...ith-udproutes-without-sectionname.out.yaml | 10 +-- .../grpcroute-with-header-match.out.yaml | 10 +-- ...ute-with-method-and-service-match.out.yaml | 12 ++-- .../grpcroute-with-method-match.out.yaml | 12 ++-- ...oute-with-request-header-modifier.out.yaml | 10 +-- .../grpcroute-with-service-match.out.yaml | 12 ++-- ...way-with-more-different-listeners.out.yaml | 38 +++++------ ...ng-to-gateway-with-more-listeners.out.yaml | 38 +++++------ ...wo-listeners-with-different-ports.out.yaml | 14 ++-- ...ing-to-gateway-with-two-listeners.out.yaml | 14 ++-- .../httproute-attaching-to-gateway.out.yaml | 10 +-- ...taching-to-listener-matching-port.out.yaml | 10 +-- ...ner-on-gateway-with-two-listeners.out.yaml | 12 ++-- .../httproute-attaching-to-listener.out.yaml | 10 +-- ...ing-to-listener-non-matching-port.out.yaml | 8 +-- ...-multiple-backends-and-no-weights.out.yaml | 10 +-- ...ith-multiple-backends-and-weights.out.yaml | 10 +-- ...her-namespace-allowed-by-refgrant.out.yaml | 10 +-- .../httproute-with-empty-matches.out.yaml | 10 +-- ...er-duplicate-add-multiple-filters.out.yaml | 10 +-- ...with-header-filter-duplicate-adds.out.yaml | 10 +-- ...duplicate-remove-multiple-filters.out.yaml | 10 +-- ...h-header-filter-duplicate-removes.out.yaml | 10 +-- ...header-filter-empty-header-values.out.yaml | 10 +-- ...-with-header-filter-empty-headers.out.yaml | 8 +-- ...ith-header-filter-invalid-headers.out.yaml | 8 +-- ...ute-with-header-filter-no-headers.out.yaml | 10 +-- ...th-header-filter-no-valid-headers.out.yaml | 8 +-- ...tproute-with-header-filter-remove.out.yaml | 10 +-- ...with-invalid-backend-ref-bad-port.out.yaml | 10 +-- ...invalid-backend-ref-invalid-group.out.yaml | 10 +-- ...-invalid-backend-ref-invalid-kind.out.yaml | 10 +-- ...-with-invalid-backend-ref-no-port.out.yaml | 10 +-- ...th-invalid-backend-ref-no-service.out.yaml | 10 +-- ...lid-backendref-in-other-namespace.out.yaml | 10 +-- ...oute-with-invalid-ratelimitfilter.out.yaml | 8 +-- ...ute-with-mirror-filter-duplicates.out.yaml | 10 +-- ...route-with-mirror-filter-multiple.out.yaml | 10 +-- ...ith-mirror-filter-service-no-port.out.yaml | 10 +-- ...h-mirror-filter-service-not-found.out.yaml | 10 +-- .../httproute-with-mirror-filter.out.yaml | 10 +-- ...ith-non-existent-authenfilter-ref.out.yaml | 8 +-- ...ith-non-matching-authenfilter-ref.out.yaml | 8 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 8 +-- ...ct-filter-full-path-replace-https.out.yaml | 10 +-- ...ute-with-redirect-filter-hostname.out.yaml | 10 +-- ...direct-filter-invalid-filter-type.out.yaml | 8 +-- ...th-redirect-filter-invalid-scheme.out.yaml | 8 +-- ...th-redirect-filter-invalid-status.out.yaml | 8 +-- ...ter-prefix-replace-with-port-http.out.yaml | 10 +-- ...-with-response-header-filter-adds.out.yaml | 10 +-- ...er-duplicate-add-multiple-filters.out.yaml | 10 +-- ...onse-header-filter-duplicate-adds.out.yaml | 10 +-- ...duplicate-remove-multiple-filters.out.yaml | 10 +-- ...e-header-filter-duplicate-removes.out.yaml | 10 +-- ...header-filter-empty-header-values.out.yaml | 10 +-- ...ponse-header-filter-empty-headers.out.yaml | 8 +-- ...nse-header-filter-invalid-headers.out.yaml | 8 +-- ...response-header-filter-no-headers.out.yaml | 10 +-- ...se-header-filter-no-valid-headers.out.yaml | 8 +-- ...ith-response-header-filter-remove.out.yaml | 10 +-- ...single-rule-with-exact-path-match.out.yaml | 10 +-- ...ingle-rule-with-http-method-match.out.yaml | 10 +-- ...h-single-rule-with-multiple-rules.out.yaml | 14 ++-- ...h-prefix-and-exact-header-matches.out.yaml | 10 +-- ...e-invalid-backend-refs-no-service.out.yaml | 10 +-- ...httproute-with-sourceip-ratelimit.out.yaml | 10 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 10 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 12 ++-- ...ite-filter-full-path-replace-http.out.yaml | 10 +-- ...te-filter-hostname-prefix-replace.out.yaml | 10 +-- ...e-with-urlrewrite-filter-hostname.out.yaml | 10 +-- ...ewrite-filter-invalid-filter-type.out.yaml | 10 +-- ...rlrewrite-filter-invalid-hostname.out.yaml | 8 +-- ...e-filter-invalid-multiple-filters.out.yaml | 8 +-- ...lrewrite-filter-invalid-path-type.out.yaml | 8 +-- ...th-urlrewrite-filter-invalid-path.out.yaml | 8 +-- ...th-urlrewrite-filter-missing-path.out.yaml | 8 +-- ...ewrite-filter-prefix-replace-http.out.yaml | 10 +-- ...httproute-with-valid-authenfilter.out.yaml | 10 +-- ...th-valid-multi-match-authenfilter.out.yaml | 12 ++-- ...id-multi-match-multi-authenfilter.out.yaml | 12 ++-- ...proute-with-valid-ratelimitfilter.out.yaml | 10 +-- ...ng-to-gateway-with-unset-hostname.out.yaml | 10 +-- .../httproutes-with-multiple-matches.out.yaml | 18 ++--- ...teway-with-listener-tls-terminate.out.yaml | 8 +-- .../tlsroute-attaching-to-gateway.out.yaml | 8 +-- .../testdata/tlsroute-multiple.out.yaml | 10 +-- ...attaching-to-gateway-with-no-mode.out.yaml | 6 +- ...her-namespace-allowed-by-refgrant.out.yaml | 8 +-- .../tlsroute-with-empty-hostname.out.yaml | 8 +-- ...oute-with-empty-listener-hostname.out.yaml | 8 +-- ...er-both-passthrough-and-cert-data.out.yaml | 6 +- internal/provider/utils/utils.go | 13 ++-- 167 files changed, 912 insertions(+), 909 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json index fc053b3a66..344e7b8e61 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json @@ -1,6 +1,6 @@ { "xds": { - "envoy-gateway-system-eg": { + "envoy-gateway-system/eg": { "configs": [ { "@type": "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump", @@ -183,7 +183,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com", + "clusterName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com", "endpoints": [ { "lbEndpoints": [ @@ -222,9 +222,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com" + "serviceName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com" }, - "name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com", + "name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS" @@ -350,7 +350,7 @@ "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication", "providers": { - "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example": { + "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example": { "remoteJwks": { "cacheDuration": "300s", "httpUri": { @@ -362,8 +362,8 @@ } }, "requirementMap": { - "envoy-gateway-system-backend-rule-0-match-0-www.example.com": { - "providerName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example" + "envoy-gateway-system/backend/rule/0/match/0-www.example.com": { + "providerName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example" } } } @@ -383,7 +383,7 @@ "ads": {}, "resourceApiVersion": "V3" }, - "routeConfigName": "envoy-gateway-system-eg-http" + "routeConfigName": "envoy-gateway-system/eg/http" }, "statPrefix": "http", "upgradeConfigs": [ @@ -396,7 +396,7 @@ } ] }, - "name": "envoy-gateway-system-eg-http", + "name": "envoy-gateway-system/eg/http", "perConnectionBufferLimitBytes": 32768 } } @@ -410,13 +410,13 @@ "routeConfig": { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "ignorePortInHostMatching": true, - "name": "envoy-gateway-system-eg-http", + "name": "envoy-gateway-system/eg/http", "virtualHosts": [ { "domains": [ "*" ], - "name": "envoy-gateway-system-eg-http", + "name": "envoy-gateway-system/eg/http", "routes": [ { "match": { @@ -430,14 +430,14 @@ ], "pathSeparatedPrefix": "/foo" }, - "name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com", + "name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com", "route": { - "cluster": "envoy-gateway-system-backend-rule-0-match-0-www.example.com" + "cluster": "envoy-gateway-system/backend/rule/0/match/0-www.example.com" }, "typedPerFilterConfig": { "envoy.filters.http.jwt_authn": { "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig", - "requirementName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com" + "requirementName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com" } } } diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml index 09622c3d76..040df2cf7f 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml @@ -1,5 +1,5 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: configs: - '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump bootstrap: @@ -103,7 +103,7 @@ xds: dynamicEndpointConfigs: - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: envoy-gateway-system-backend-rule-0-match-0-www.example.com + clusterName: envoy-gateway-system/backend/rule/0/match/0-www.example.com endpoints: - lbEndpoints: - endpoint: @@ -125,8 +125,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -208,7 +208,7 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication providers: - envoy-gateway-system-backend-rule-0-match-0-www.example.com-example: + envoy-gateway-system/backend/rule/0/match/0-www.example.com-example: remoteJwks: cacheDuration: 300s httpUri: @@ -216,8 +216,8 @@ xds: timeout: 5s uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json requirementMap: - envoy-gateway-system-backend-rule-0-match-0-www.example.com: - providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example + envoy-gateway-system/backend/rule/0/match/0-www.example.com: + providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -228,23 +228,23 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway-system-eg-http + routeConfigName: envoy-gateway-system/eg/http statPrefix: http upgradeConfigs: - upgradeType: websocket useRemoteAddress: true - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http virtualHosts: - domains: - '*' - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http routes: - match: headers: @@ -252,10 +252,10 @@ xds: stringMatch: exact: www.example.com pathSeparatedPrefix: /foo - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com route: - cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com + cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig - requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com + requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml index 09dea57300..fb207fdf33 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml @@ -1,5 +1,5 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump bootstrap: admin: diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml index 0a7dc4d3a4..fddbec4474 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml @@ -1,5 +1,5 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: @@ -12,8 +12,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml index 56dc6b73d1..ccc28abb4b 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml @@ -1,5 +1,5 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.ListenersConfigDump dynamicListeners: - activeState: @@ -47,7 +47,7 @@ xds: typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication providers: - envoy-gateway-system-backend-rule-0-match-0-www.example.com-example: + envoy-gateway-system/backend/rule/0/match/0-www.example.com-example: remoteJwks: cacheDuration: 300s httpUri: @@ -55,8 +55,8 @@ xds: timeout: 5s uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json requirementMap: - envoy-gateway-system-backend-rule-0-match-0-www.example.com: - providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example + envoy-gateway-system/backend/rule/0/match/0-www.example.com: + providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example - name: envoy.filters.http.router typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -67,10 +67,10 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: envoy-gateway-system-eg-http + routeConfigName: envoy-gateway-system/eg/http statPrefix: http upgradeConfigs: - upgradeType: websocket useRemoteAddress: true - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml index dbf9d56b43..ce59385a3d 100644 --- a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml @@ -1,15 +1,15 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http virtualHosts: - domains: - '*' - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http routes: - match: headers: @@ -17,10 +17,10 @@ xds: stringMatch: exact: www.example.com pathSeparatedPrefix: /foo - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com route: - cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com + cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig - requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com + requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com 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 a401f613de..997a44389c 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -421,7 +421,7 @@ udpRoutes: name: eg sectionName: udp xds: - default-eg: + default/eg: configs: - '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump bootstrap: @@ -525,7 +525,7 @@ xds: dynamicEndpointConfigs: - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.example.com + clusterName: default/backend/rule/0/match/0-www.example.com endpoints: - lbEndpoints: - endpoint: @@ -538,7 +538,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.grpc-example.com + clusterName: default/backend/rule/0/match/0-www.grpc-example.com endpoints: - lbEndpoints: - endpoint: @@ -551,7 +551,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tls-passthrough-backend + clusterName: default/eg/tls-passthrough/backend endpoints: - lbEndpoints: - endpoint: @@ -564,7 +564,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tcp-backend + clusterName: default/eg/tcp/backend endpoints: - lbEndpoints: - endpoint: @@ -576,7 +576,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-udp-backend + clusterName: default/eg/udp/backend endpoints: - lbEndpoints: - endpoint: @@ -598,8 +598,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.example.com - name: default-backend-rule-0-match-0-www.example.com + serviceName: default/backend/rule/0/match/0-www.example.com + name: default/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -613,8 +613,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.grpc-example.com - name: default-backend-rule-0-match-0-www.grpc-example.com + serviceName: default/backend/rule/0/match/0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -633,8 +633,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tls-passthrough-backend - name: default-eg-tls-passthrough-backend + serviceName: default/eg/tls-passthrough/backend + name: default/eg/tls-passthrough/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -648,8 +648,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tcp-backend - name: default-eg-tcp-backend + serviceName: default/eg/tcp/backend + name: default/eg/tcp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -663,8 +663,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-udp-backend - name: default-eg-udp-backend + serviceName: default/eg/udp/backend + name: default/eg/udp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -721,12 +721,12 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-http + routeConfigName: default/eg/http statPrefix: http upgradeConfigs: - upgradeType: websocket useRemoteAddress: true - name: default-eg-http + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -787,10 +787,10 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-grpc + routeConfigName: default/eg/grpc statPrefix: http useRemoteAddress: true - name: default-eg-grpc + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -829,13 +829,13 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tls-passthrough-backend + cluster: default/eg/tls-passthrough/backend statPrefix: passthrough listenerFilters: - name: envoy.filters.listener.tls_inspector typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector - name: default-eg-tls-passthrough-backend + name: default/eg/tls-passthrough/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -871,9 +871,9 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tcp-backend + cluster: default/eg/tcp/backend statPrefix: tcp - name: default-eg-tcp-backend + name: default/eg/tcp/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -915,19 +915,19 @@ xds: name: route typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route - cluster: default-eg-udp-backend + cluster: default/eg/udp/backend statPrefix: service - name: default-eg-udp-backend + name: default/eg/udp/backend - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-http + name: default/eg/http virtualHosts: - domains: - '*' - name: default-eg-http + name: default/eg/http routes: - match: headers: @@ -935,17 +935,17 @@ xds: stringMatch: exact: www.example.com prefix: / - name: default-backend-rule-0-match-0-www.example.com + name: default/backend/rule/0/match/0-www.example.com route: - cluster: default-backend-rule-0-match-0-www.example.com + cluster: default/backend/rule/0/match/0-www.example.com - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-grpc + name: default/eg/grpc virtualHosts: - domains: - '*' - name: default-eg-grpc + name: default/eg/grpc routes: - match: headers: @@ -953,6 +953,6 @@ xds: stringMatch: exact: www.grpc-example.com path: /com.example.Things/DoThing - name: default-backend-rule-0-match-0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com route: - cluster: default-backend-rule-0-match-0-www.grpc-example.com + cluster: default/backend/rule/0/match/0-www.grpc-example.com diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml index 6e2f32bbf4..6c73701ff4 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml @@ -82,7 +82,7 @@ httpRoutes: parentRef: name: eg xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: @@ -95,8 +95,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS 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 4fe835608a..7cb80a5ab9 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 @@ -1,6 +1,6 @@ { "xds": { - "default-eg": { + "default/eg": { "configs": [ { "@type": "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump", @@ -183,7 +183,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "default-backend-rule-0-match-0-www.example.com", + "clusterName": "default/backend/rule/0/match/0-www.example.com", "endpoints": [ { "lbEndpoints": [ @@ -208,7 +208,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "default-backend-rule-0-match-0-www.grpc-example.com", + "clusterName": "default/backend/rule/0/match/0-www.grpc-example.com", "endpoints": [ { "lbEndpoints": [ @@ -233,7 +233,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "default-eg-tls-passthrough-backend", + "clusterName": "default/eg/tls-passthrough/backend", "endpoints": [ { "lbEndpoints": [ @@ -258,7 +258,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "default-eg-tcp-backend", + "clusterName": "default/eg/tcp/backend", "endpoints": [ { "lbEndpoints": [ @@ -282,7 +282,7 @@ { "endpointConfig": { "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", - "clusterName": "default-eg-udp-backend", + "clusterName": "default/eg/udp/backend", "endpoints": [ { "lbEndpoints": [ @@ -321,9 +321,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "default-backend-rule-0-match-0-www.example.com" + "serviceName": "default/backend/rule/0/match/0-www.example.com" }, - "name": "default-backend-rule-0-match-0-www.example.com", + "name": "default/backend/rule/0/match/0-www.example.com", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS" @@ -342,9 +342,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "default-backend-rule-0-match-0-www.grpc-example.com" + "serviceName": "default/backend/rule/0/match/0-www.grpc-example.com" }, - "name": "default-backend-rule-0-match-0-www.grpc-example.com", + "name": "default/backend/rule/0/match/0-www.grpc-example.com", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS", @@ -371,9 +371,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "default-eg-tls-passthrough-backend" + "serviceName": "default/eg/tls-passthrough/backend" }, - "name": "default-eg-tls-passthrough-backend", + "name": "default/eg/tls-passthrough/backend", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS" @@ -392,9 +392,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "default-eg-tcp-backend" + "serviceName": "default/eg/tcp/backend" }, - "name": "default-eg-tcp-backend", + "name": "default/eg/tcp/backend", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS" @@ -413,9 +413,9 @@ "ads": {}, "resourceApiVersion": "V3" }, - "serviceName": "default-eg-udp-backend" + "serviceName": "default/eg/udp/backend" }, - "name": "default-eg-udp-backend", + "name": "default/eg/udp/backend", "outlierDetection": {}, "perConnectionBufferLimitBytes": 32768, "type": "EDS" @@ -501,7 +501,7 @@ "ads": {}, "resourceApiVersion": "V3" }, - "routeConfigName": "default-eg-http" + "routeConfigName": "default/eg/http" }, "statPrefix": "http", "upgradeConfigs": [ @@ -514,7 +514,7 @@ } ] }, - "name": "default-eg-http", + "name": "default/eg/http", "perConnectionBufferLimitBytes": 32768 } } @@ -608,7 +608,7 @@ "ads": {}, "resourceApiVersion": "V3" }, - "routeConfigName": "default-eg-grpc" + "routeConfigName": "default/eg/grpc" }, "statPrefix": "http", "useRemoteAddress": true @@ -616,7 +616,7 @@ } ] }, - "name": "default-eg-grpc", + "name": "default/eg/grpc", "perConnectionBufferLimitBytes": 32768 } } @@ -678,7 +678,7 @@ } } ], - "cluster": "default-eg-tls-passthrough-backend", + "cluster": "default/eg/tls-passthrough/backend", "statPrefix": "passthrough" } } @@ -693,7 +693,7 @@ } } ], - "name": "default-eg-tls-passthrough-backend", + "name": "default/eg/tls-passthrough/backend", "perConnectionBufferLimitBytes": 32768 } } @@ -750,14 +750,14 @@ } } ], - "cluster": "default-eg-tcp-backend", + "cluster": "default/eg/tcp/backend", "statPrefix": "tcp" } } ] } ], - "name": "default-eg-tcp-backend", + "name": "default/eg/tcp/backend", "perConnectionBufferLimitBytes": 32768 } } @@ -819,7 +819,7 @@ "name": "route", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route", - "cluster": "default-eg-udp-backend" + "cluster": "default/eg/udp/backend" } } } @@ -828,7 +828,7 @@ } } ], - "name": "default-eg-udp-backend" + "name": "default/eg/udp/backend" } } } @@ -841,13 +841,13 @@ "routeConfig": { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "ignorePortInHostMatching": true, - "name": "default-eg-http", + "name": "default/eg/http", "virtualHosts": [ { "domains": [ "*" ], - "name": "default-eg-http", + "name": "default/eg/http", "routes": [ { "match": { @@ -861,9 +861,9 @@ ], "prefix": "/" }, - "name": "default-backend-rule-0-match-0-www.example.com", + "name": "default/backend/rule/0/match/0-www.example.com", "route": { - "cluster": "default-backend-rule-0-match-0-www.example.com" + "cluster": "default/backend/rule/0/match/0-www.example.com" } } ] @@ -875,13 +875,13 @@ "routeConfig": { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "ignorePortInHostMatching": true, - "name": "default-eg-grpc", + "name": "default/eg/grpc", "virtualHosts": [ { "domains": [ "*" ], - "name": "default-eg-grpc", + "name": "default/eg/grpc", "routes": [ { "match": { @@ -895,9 +895,9 @@ ], "path": "/com.example.Things/DoThing" }, - "name": "default-backend-rule-0-match-0-www.grpc-example.com", + "name": "default/backend/rule/0/match/0-www.grpc-example.com", "route": { - "cluster": "default-backend-rule-0-match-0-www.grpc-example.com" + "cluster": "default/backend/rule/0/match/0-www.grpc-example.com" } } ] 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 44de8fb9d1..d4d4ed9031 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 @@ -1,5 +1,5 @@ xds: - default-eg: + default/eg: configs: - '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump bootstrap: @@ -103,7 +103,7 @@ xds: dynamicEndpointConfigs: - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.example.com + clusterName: default/backend/rule/0/match/0-www.example.com endpoints: - lbEndpoints: - endpoint: @@ -116,7 +116,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.grpc-example.com + clusterName: default/backend/rule/0/match/0-www.grpc-example.com endpoints: - lbEndpoints: - endpoint: @@ -129,7 +129,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tls-passthrough-backend + clusterName: default/eg/tls-passthrough/backend endpoints: - lbEndpoints: - endpoint: @@ -142,7 +142,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tcp-backend + clusterName: default/eg/tcp/backend endpoints: - lbEndpoints: - endpoint: @@ -154,7 +154,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-udp-backend + clusterName: default/eg/udp/backend endpoints: - lbEndpoints: - endpoint: @@ -176,8 +176,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.example.com - name: default-backend-rule-0-match-0-www.example.com + serviceName: default/backend/rule/0/match/0-www.example.com + name: default/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -191,8 +191,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.grpc-example.com - name: default-backend-rule-0-match-0-www.grpc-example.com + serviceName: default/backend/rule/0/match/0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -211,8 +211,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tls-passthrough-backend - name: default-eg-tls-passthrough-backend + serviceName: default/eg/tls-passthrough/backend + name: default/eg/tls-passthrough/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -226,8 +226,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tcp-backend - name: default-eg-tcp-backend + serviceName: default/eg/tcp/backend + name: default/eg/tcp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -241,8 +241,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-udp-backend - name: default-eg-udp-backend + serviceName: default/eg/udp/backend + name: default/eg/udp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -299,12 +299,12 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-http + routeConfigName: default/eg/http statPrefix: http upgradeConfigs: - upgradeType: websocket useRemoteAddress: true - name: default-eg-http + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -365,10 +365,10 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-grpc + routeConfigName: default/eg/grpc statPrefix: http useRemoteAddress: true - name: default-eg-grpc + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -407,13 +407,13 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tls-passthrough-backend + cluster: default/eg/tls-passthrough/backend statPrefix: passthrough listenerFilters: - name: envoy.filters.listener.tls_inspector typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector - name: default-eg-tls-passthrough-backend + name: default/eg/tls-passthrough/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -449,9 +449,9 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tcp-backend + cluster: default/eg/tcp/backend statPrefix: tcp - name: default-eg-tcp-backend + name: default/eg/tcp/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -493,19 +493,19 @@ xds: name: route typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route - cluster: default-eg-udp-backend + cluster: default/eg/udp/backend statPrefix: service - name: default-eg-udp-backend + name: default/eg/udp/backend - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-http + name: default/eg/http virtualHosts: - domains: - '*' - name: default-eg-http + name: default/eg/http routes: - match: headers: @@ -513,17 +513,17 @@ xds: stringMatch: exact: www.example.com prefix: / - name: default-backend-rule-0-match-0-www.example.com + name: default/backend/rule/0/match/0-www.example.com route: - cluster: default-backend-rule-0-match-0-www.example.com + cluster: default/backend/rule/0/match/0-www.example.com - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-grpc + name: default/eg/grpc virtualHosts: - domains: - '*' - name: default-eg-grpc + name: default/eg/grpc routes: - match: headers: @@ -531,6 +531,6 @@ xds: stringMatch: exact: www.grpc-example.com path: /com.example.Things/DoThing - name: default-backend-rule-0-match-0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com route: - cluster: default-backend-rule-0-match-0-www.grpc-example.com + cluster: default/backend/rule/0/match/0-www.grpc-example.com diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml index d2e826e635..57e60fca3d 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml @@ -1,5 +1,5 @@ xds: - default-eg: + default/eg: '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump bootstrap: admin: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml index 1d49660245..e5afb13ecb 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml @@ -1,5 +1,5 @@ xds: - default-eg: + default/eg: '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: @@ -12,8 +12,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.example.com - name: default-backend-rule-0-match-0-www.example.com + serviceName: default/backend/rule/0/match/0-www.example.com + name: default/backend/rule/0/match/0-www.example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -27,8 +27,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-backend-rule-0-match-0-www.grpc-example.com - name: default-backend-rule-0-match-0-www.grpc-example.com + serviceName: default/backend/rule/0/match/0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -47,8 +47,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tls-passthrough-backend - name: default-eg-tls-passthrough-backend + serviceName: default/eg/tls-passthrough/backend + name: default/eg/tls-passthrough/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -62,8 +62,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-tcp-backend - name: default-eg-tcp-backend + serviceName: default/eg/tcp/backend + name: default/eg/tcp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS @@ -77,8 +77,8 @@ xds: edsConfig: ads: {} resourceApiVersion: V3 - serviceName: default-eg-udp-backend - name: default-eg-udp-backend + serviceName: default/eg/udp/backend + name: default/eg/udp/backend outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml index 1b530bd290..a0577804bb 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml @@ -1,10 +1,10 @@ xds: - default-eg: + default/eg: '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump dynamicEndpointConfigs: - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.example.com + clusterName: default/backend/rule/0/match/0-www.example.com endpoints: - lbEndpoints: - endpoint: @@ -17,7 +17,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-backend-rule-0-match-0-www.grpc-example.com + clusterName: default/backend/rule/0/match/0-www.grpc-example.com endpoints: - lbEndpoints: - endpoint: @@ -30,7 +30,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tls-passthrough-backend + clusterName: default/eg/tls-passthrough/backend endpoints: - lbEndpoints: - endpoint: @@ -43,7 +43,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-tcp-backend + clusterName: default/eg/tcp/backend endpoints: - lbEndpoints: - endpoint: @@ -55,7 +55,7 @@ xds: locality: {} - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment - clusterName: default-eg-udp-backend + clusterName: default/eg/udp/backend endpoints: - lbEndpoints: - endpoint: 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 922f3e6dee..cbbac8a8d4 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 @@ -1,5 +1,5 @@ xds: - default-eg: + default/eg: '@type': type.googleapis.com/envoy.admin.v3.ListenersConfigDump dynamicListeners: - activeState: @@ -53,12 +53,12 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-http + routeConfigName: default/eg/http statPrefix: http upgradeConfigs: - upgradeType: websocket useRemoteAddress: true - name: default-eg-http + name: default/eg/http perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -119,10 +119,10 @@ xds: configSource: ads: {} resourceApiVersion: V3 - routeConfigName: default-eg-grpc + routeConfigName: default/eg/grpc statPrefix: http useRemoteAddress: true - name: default-eg-grpc + name: default/eg/grpc perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -161,13 +161,13 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tls-passthrough-backend + cluster: default/eg/tls-passthrough/backend statPrefix: passthrough listenerFilters: - name: envoy.filters.listener.tls_inspector typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector - name: default-eg-tls-passthrough-backend + name: default/eg/tls-passthrough/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -203,9 +203,9 @@ xds: inlineString: | [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %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%" path: /dev/stdout - cluster: default-eg-tcp-backend + cluster: default/eg/tcp/backend statPrefix: tcp - name: default-eg-tcp-backend + name: default/eg/tcp/backend perConnectionBufferLimitBytes: 32768 - activeState: listener: @@ -247,6 +247,6 @@ xds: name: route typedConfig: '@type': type.googleapis.com/envoy.extensions.filters.udp.udp_proxy.v3.Route - cluster: default-eg-udp-backend + cluster: default/eg/udp/backend statPrefix: service - name: default-eg-udp-backend + name: default/eg/udp/backend diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml index 5a74e2445b..26b90da985 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml @@ -1,15 +1,15 @@ xds: - default-eg: + default/eg: '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-http + name: default/eg/http virtualHosts: - domains: - '*' - name: default-eg-http + name: default/eg/http routes: - match: headers: @@ -17,17 +17,17 @@ xds: stringMatch: exact: www.example.com prefix: / - name: default-backend-rule-0-match-0-www.example.com + name: default/backend/rule/0/match/0-www.example.com route: - cluster: default-backend-rule-0-match-0-www.example.com + cluster: default/backend/rule/0/match/0-www.example.com - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: default-eg-grpc + name: default/eg/grpc virtualHosts: - domains: - '*' - name: default-eg-grpc + name: default/eg/grpc routes: - match: headers: @@ -35,6 +35,6 @@ xds: stringMatch: exact: www.grpc-example.com path: /com.example.Things/DoThing - name: default-backend-rule-0-match-0-www.grpc-example.com + name: default/backend/rule/0/match/0-www.grpc-example.com route: - cluster: default-backend-rule-0-match-0-www.grpc-example.com + cluster: default/backend/rule/0/match/0-www.grpc-example.com diff --git a/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json b/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json index ca955059f5..5c173523db 100644 --- a/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json +++ b/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json @@ -1,19 +1,19 @@ { "xds": { - "default-eg": { + "default/eg": { "@type": "type.googleapis.com/envoy.admin.v3.RoutesConfigDump", "dynamicRouteConfigs": [ { "routeConfig": { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "ignorePortInHostMatching": true, - "name": "default-eg-http", + "name": "default/eg/http", "virtualHosts": [ { "domains": [ "*" ], - "name": "default-eg-http", + "name": "default/eg/http", "routes": [ { "match": { @@ -27,9 +27,9 @@ ], "prefix": "/" }, - "name": "default-backend-rule-0-match-0-www.example.com", + "name": "default/backend/rule/0/match/0-www.example.com", "route": { - "cluster": "default-backend-rule-0-match-0-www.example.com" + "cluster": "default/backend/rule/0/match/0-www.example.com" } } ] @@ -39,20 +39,20 @@ } ] }, - "default-eg2": { + "default/eg2": { "@type": "type.googleapis.com/envoy.admin.v3.RoutesConfigDump", "dynamicRouteConfigs": [ { "routeConfig": { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "ignorePortInHostMatching": true, - "name": "default-eg2-http", + "name": "default/eg2/http", "virtualHosts": [ { "domains": [ "*" ], - "name": "default-eg2-http", + "name": "default/eg2/http", "routes": [ { "match": { @@ -66,9 +66,9 @@ ], "prefix": "/v2/" }, - "name": "default-backend-rule-0-match-0-www.example2.com", + "name": "default/backend/rule/0/match/0-www.example2.com", "route": { - "cluster": "default-backend-rule-0-match-0-www.example2.com" + "cluster": "default/backend/rule/0/match/0-www.example2.com" } } ] diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml index fba28e6479..fca71e3503 100644 --- a/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml @@ -1,15 +1,15 @@ xds: - envoy-gateway-system-eg: + envoy-gateway-system/eg: '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump dynamicRouteConfigs: - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http virtualHosts: - domains: - '*' - name: envoy-gateway-system-eg-http + name: envoy-gateway-system/eg/http routes: - match: headers: @@ -17,6 +17,6 @@ xds: stringMatch: exact: www.example.com prefix: / - name: envoy-gateway-system-backend-rule-0-match-0-www.example.com + name: envoy-gateway-system/backend/rule/0/match/0-www.example.com route: - cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com + cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com diff --git a/internal/gatewayapi/helpers.go b/internal/gatewayapi/helpers.go index e31a4a03fa..8ac0c1c05b 100644 --- a/internal/gatewayapi/helpers.go +++ b/internal/gatewayapi/helpers.go @@ -386,27 +386,27 @@ type crossNamespaceTo struct { } func irStringKey(gatewayNs, gatewayName string) string { - return fmt.Sprintf("%s-%s", gatewayNs, gatewayName) + return fmt.Sprintf("%s/%s", gatewayNs, gatewayName) } func irHTTPListenerName(listener *ListenerContext) string { - return fmt.Sprintf("%s-%s-%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name) + return fmt.Sprintf("%s/%s/%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name) } func irTLSListenerName(listener *ListenerContext, tlsRoute *TLSRouteContext) string { - return fmt.Sprintf("%s-%s-%s-%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, tlsRoute.Name) + return fmt.Sprintf("%s/%s/%s/%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, tlsRoute.Name) } func irTCPListenerName(listener *ListenerContext, tcpRoute *TCPRouteContext) string { - return fmt.Sprintf("%s-%s-%s-%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, tcpRoute.Name) + return fmt.Sprintf("%s/%s/%s/%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, tcpRoute.Name) } func irUDPListenerName(listener *ListenerContext, udpRoute *UDPRouteContext) string { - return fmt.Sprintf("%s-%s-%s-%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, udpRoute.Name) + return fmt.Sprintf("%s/%s/%s/%s", listener.gateway.Namespace, listener.gateway.Name, listener.Name, udpRoute.Name) } func routeName(route RouteContext, ruleIdx, matchIdx int) string { - return fmt.Sprintf("%s-%s-rule-%d-match-%d", route.GetNamespace(), route.GetName(), ruleIdx, matchIdx) + return fmt.Sprintf("%s/%s/rule/%d/match/%d", route.GetNamespace(), route.GetName(), ruleIdx, matchIdx) } func irTLSConfigs(tlsSecrets []*v1.Secret) []*ir.TLSListenerConfig { diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index df07b092b4..65984f568a 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: config: apiVersion: config.gateway.envoyproxy.io/v1alpha1 @@ -109,13 +109,13 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: http: - address: 0.0.0.0 hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index f63d17c4c5..da74aa6614 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -48,9 +48,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -59,7 +59,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 jsonPatches: - name: envoy-gateway-gateway-1-http diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 35897760a4..c87b1e8d27 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: config: apiVersion: config.gateway.envoyproxy.io/v1alpha1 @@ -123,9 +123,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: openTelemetry: - host: otel-collector.monitoring.svc.cluster.local @@ -143,5 +143,5 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index be8e40706a..3deb8244e4 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: config: apiVersion: config.gateway.envoyproxy.io/v1alpha1 @@ -107,9 +107,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -118,5 +118,5 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml index 3b66b753eb..6cb42b8480 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml @@ -83,7 +83,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -96,9 +96,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -107,5 +107,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 25d91cb512..58be9d1583 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 5d8b8e1b68..306004acac 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 26db982e57..156d913fc1 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -128,7 +128,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 1ea5df0d3b..a92d9e5c43 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 @@ -70,7 +70,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -83,9 +83,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,7 +94,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -104,7 +104,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-httproute-1-rule-0-match-0-* + name: envoy-gateway/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 72bf1a8424..e574101502 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 @@ -70,7 +70,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -83,9 +83,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,5 +94,5 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 18e7dccba4..bd6fa4c9d3 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -37,7 +37,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: addresses: - 1.2.3.4 @@ -53,9 +53,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml index 0e89ca59fb..a5ff0f7fd1 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml @@ -73,7 +73,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -81,9 +81,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml index 9ae9fab64c..d58e401633 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml @@ -69,7 +69,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -77,9 +77,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml index f6f06db553..7743c4dbde 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml @@ -71,7 +71,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -79,9 +79,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml index ec9626fe38..fff2f75e09 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml @@ -69,7 +69,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -77,9 +77,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml index 305ba6f8d3..5bbb66e313 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml @@ -37,7 +37,7 @@ gateways: name: tls supportedKinds: [] infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -45,7 +45,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -79,7 +79,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml index fe2d1def2a..af5098c227 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml @@ -84,7 +84,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -92,9 +92,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml index 571d90b7d3..02bfac71a4 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml @@ -72,7 +72,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -80,9 +80,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml index 1d05528279..031633dc5a 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml @@ -67,7 +67,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -75,9 +75,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml index c8e7a06d87..6bd21582eb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml @@ -79,7 +79,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml index b3358c82ef..c58c5f1a2e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml @@ -76,7 +76,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml index 72b55b6f32..9975d4e9c2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml @@ -78,7 +78,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -86,9 +86,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml index fe8d213873..b50ec90c58 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml @@ -76,7 +76,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml index 5c63fb926b..350d400c6c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml @@ -66,7 +66,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -74,9 +74,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml index 40bb12cbd4..8f26e8bea8 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml @@ -29,7 +29,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -37,9 +37,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 b05ba806db..273b92ef18 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -80,7 +80,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 9d66faa450..3e89dd2c01 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -84,7 +84,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 6538deee10..1d4c80ca13 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -85,7 +85,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 9274342ba9..341a97b69e 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 @@ -77,7 +77,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -90,9 +90,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -101,7 +101,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-tls + name: envoy-gateway/gateway-1/tls port: 10443 routes: - backendWeights: @@ -111,7 +111,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 feeeaabb6c..2b8b024d9d 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 @@ -102,7 +102,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -119,7 +119,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -153,7 +153,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -162,7 +162,7 @@ xdsIR: hostnames: - foo.bar.com isHTTP2: false - name: envoy-gateway-gateway-1-tls-terminate + name: envoy-gateway/gateway-1/tls-terminate port: 10443 routes: - backendWeights: @@ -172,7 +172,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo.bar.com + name: default/httproute-1/rule/0/match/0-foo.bar.com pathMatch: distinct: false name: "" @@ -187,7 +187,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-passthrough-tlsroute-1 + name: envoy-gateway/gateway-1/tls-passthrough/tlsroute-1 port: 10090 tls: passthrough: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml index 70b35532cc..e537dfd6ac 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml @@ -29,7 +29,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -37,9 +37,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 8fe47004c1..9d113ae74e 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -80,7 +80,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 e565731a3a..8e913bbf90 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -84,7 +84,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 f2d4dbbba4..838561f410 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -85,7 +85,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 17dbf5fc8e..ce090506b4 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,9 +46,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 ac1916e8b8..6aba5cb0bf 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,9 +46,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml index 3ce15feda4..64ca07aeec 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml @@ -66,7 +66,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -74,9 +74,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 44c8afe854..3ce47ff4f4 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 @@ -79,7 +79,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -92,9 +92,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -103,7 +103,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-tls + name: envoy-gateway/gateway-1/tls port: 10443 routes: - backendWeights: @@ -113,7 +113,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 0545523649..c07cecf90b 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 @@ -79,7 +79,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -92,9 +92,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -103,7 +103,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-tls + name: envoy-gateway/gateway-1/tls port: 10443 routes: - backendWeights: @@ -113,7 +113,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 3bebdc5f67..5ec1bf518d 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 @@ -76,7 +76,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -89,9 +89,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -100,7 +100,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-tls + name: envoy-gateway/gateway-1/tls port: 10443 routes: - backendWeights: @@ -110,7 +110,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 a91cfe2682..46d29ce131 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -70,7 +70,7 @@ httpRoutes: name: gateway-1 namespace: default infraIR: - default-gateway-1: + default/gateway-1: proxy: listeners: - address: "" @@ -83,9 +83,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: default - name: default-gateway-1 + name: default/gateway-1 xdsIR: - default-gateway-1: + default/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,7 +94,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: default-gateway-1-http + name: default/gateway-1/http port: 10080 routes: - backendWeights: @@ -104,7 +104,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 48dff51fc6..57a1e35564 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -111,7 +111,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -120,6 +120,6 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp-tcproute-1 + name: envoy-gateway/gateway-1/tcp/tcproute-1 port: 10162 tls: {} 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 f58346f8cc..493a997b45 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 @@ -33,7 +33,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -46,7 +46,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -111,7 +111,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -120,5 +120,5 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp-udproute-1 + name: envoy-gateway/gateway-1/udp/udproute-1 port: 10162 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 1449cc0bdd..c6ea094bc2 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -76,7 +76,7 @@ httpRoutes: name: gateway-1 namespace: default infraIR: - default-gateway-1: + default/gateway-1: proxy: listeners: - address: "" @@ -89,9 +89,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: default - name: default-gateway-1 + name: default/gateway-1 xdsIR: - default-gateway-1: + default/gateway-1: accessLog: text: - path: /dev/stdout @@ -100,7 +100,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: default-gateway-1-https + name: default/gateway-1/https port: 10443 routes: - backendWeights: @@ -110,7 +110,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 006b2b140e..1b8999d17c 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 @@ -57,7 +57,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -70,7 +70,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -104,7 +104,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -113,6 +113,6 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp1-tcproute-1 + name: envoy-gateway/gateway-1/tcp1/tcproute-1 port: 10162 tls: {} 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 7a2b0cdd90..e6a9a148b6 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 @@ -55,7 +55,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -68,7 +68,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -102,7 +102,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -111,5 +111,5 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp1-udproute-1 + name: envoy-gateway/gateway-1/udp1/udproute-1 port: 10162 diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml index b0378e4849..7354c4bca1 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml @@ -96,7 +96,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -104,7 +104,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -138,7 +138,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 a11001bb53..275f2ef603 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 @@ -130,7 +130,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -147,9 +147,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -158,7 +158,7 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10080 routes: - backendWeights: @@ -168,7 +168,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-2-rule-0-match-0-foo.com + name: default/httproute-2/rule/0/match/0-foo.com pathMatch: distinct: false name: "" @@ -180,7 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo.com + name: default/httproute-1/rule/0/match/0-foo.com pathMatch: distinct: false name: "" @@ -189,7 +189,7 @@ xdsIR: hostnames: - bar.com isHTTP2: false - name: envoy-gateway-gateway-1-http-2 + name: envoy-gateway/gateway-1/http-2 port: 10081 routes: - backendWeights: @@ -199,7 +199,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-2-rule-0-match-0-bar.com + name: default/httproute-2/rule/0/match/0-bar.com pathMatch: distinct: false name: "" @@ -211,7 +211,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar.com + name: default/httproute-1/rule/0/match/0-bar.com pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml index 475217ff4c..1db35a718b 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml @@ -96,7 +96,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -104,9 +104,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml index a75eb4684f..bf38a49951 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml @@ -96,7 +96,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -104,9 +104,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 d91294cb94..aaa119a831 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 @@ -93,7 +93,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -110,7 +110,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -144,7 +144,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -153,7 +153,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -163,7 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" @@ -173,6 +173,6 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp-tcproute-1 + name: envoy-gateway/gateway-1/tcp/tcproute-1 port: 10080 tls: {} 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 7961ae3326..281b56f018 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 @@ -93,7 +93,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -110,7 +110,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -144,7 +144,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -153,7 +153,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -163,7 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" @@ -173,5 +173,5 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp-udproute-1 + name: envoy-gateway/gateway-1/udp/udproute-1 port: 10080 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 b52cb842c6..7b9b015a0c 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 @@ -55,7 +55,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -72,7 +72,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -141,7 +141,7 @@ tcpRoutes: namespace: envoy-gateway sectionName: tcp2 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -150,13 +150,13 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp1-tcproute-1 + name: envoy-gateway/gateway-1/tcp1/tcproute-1 port: 10162 tls: {} - address: 0.0.0.0 destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp2-tcproute-2 + name: envoy-gateway/gateway-1/tcp2/tcproute-2 port: 10163 tls: {} 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 5a6e2b0008..b07f780ddb 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 @@ -55,7 +55,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -72,7 +72,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -137,7 +137,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -146,13 +146,13 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp1-tcproute-1 + name: envoy-gateway/gateway-1/tcp1/tcproute-1 port: 10161 tls: {} - address: 0.0.0.0 destinations: - host: 7.7.7.7 port: 8163 - name: envoy-gateway-gateway-1-tcp2-tcproute-1 + name: envoy-gateway/gateway-1/tcp2/tcproute-1 port: 10162 tls: {} 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 a73070e0d2..d75610332a 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 @@ -55,7 +55,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -72,7 +72,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -141,7 +141,7 @@ udpRoutes: namespace: envoy-gateway sectionName: udp2 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -150,11 +150,11 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp1-udproute-1 + name: envoy-gateway/gateway-1/udp1/udproute-1 port: 10162 - address: 0.0.0.0 destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp2-udproute-2 + name: envoy-gateway/gateway-1/udp2/udproute-2 port: 10163 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 90fe5af086..dc5bb894ff 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 @@ -55,7 +55,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -72,7 +72,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 udpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: UDPRoute @@ -137,7 +137,7 @@ udpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -146,11 +146,11 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp1-udproute-1 + name: envoy-gateway/gateway-1/udp1/udproute-1 port: 10161 - address: 0.0.0.0 destinations: - host: 7.7.7.7 port: 8162 - name: envoy-gateway-gateway-1-udp2-udproute-1 + name: envoy-gateway/gateway-1/udp2/udproute-1 port: 10162 diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index edd81986eb..7c0fe46dba 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -74,7 +74,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,7 +98,7 @@ xdsIR: hostnames: - '*' isHTTP2: true - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -112,4 +112,4 @@ xdsIR: - distinct: false exact: foo name: magic - name: default-grpcroute-1-rule-0-match-0-* + name: default/grpcroute-1/rule/0/match/0-* 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 9f04e56bc1..2260eefaea 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 @@ -78,7 +78,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -91,9 +91,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -102,7 +102,7 @@ xdsIR: hostnames: - '*' isHTTP2: true - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -112,7 +112,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match-0-* + name: default/grpcroute-1/rule/0/match/0-* pathMatch: distinct: false exact: /com.example/Example @@ -124,7 +124,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match-1-* + name: default/grpcroute-1/rule/0/match/1-* pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 2185dfa5ed..8984e6aa5c 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -76,7 +76,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -89,9 +89,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -100,7 +100,7 @@ xdsIR: hostnames: - '*' isHTTP2: true - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -110,7 +110,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match-1-* + name: default/grpcroute-1/rule/0/match/1-* pathMatch: distinct: false name: "" @@ -126,4 +126,4 @@ xdsIR: - distinct: false name: :path suffix: /ExampleExact - name: default-grpcroute-1-rule-0-match-0-* + name: default/grpcroute-1/rule/0/match/0-* 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 00f039dcd9..9b19d6268d 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -75,7 +75,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -88,9 +88,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -99,7 +99,7 @@ xdsIR: hostnames: - '*' isHTTP2: true - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addRequestHeaders: @@ -113,4 +113,4 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match--1-* + name: default/grpcroute-1/rule/0/match/-1-* diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index c059a4a48d..2f3d10b2a9 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -76,7 +76,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -89,9 +89,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -100,7 +100,7 @@ xdsIR: hostnames: - '*' isHTTP2: true - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -110,7 +110,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match-1-* + name: default/grpcroute-1/rule/0/match/1-* pathMatch: distinct: false name: "" @@ -122,7 +122,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-grpcroute-1-rule-0-match-0-* + name: default/grpcroute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 dcdc203d7c..6969c22af3 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 @@ -246,7 +246,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -287,9 +287,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -298,7 +298,7 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10081 routes: - backendWeights: @@ -308,7 +308,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo.com + name: default/httproute-1/rule/0/match/0-foo.com pathMatch: distinct: false name: "" @@ -317,7 +317,7 @@ xdsIR: hostnames: - bar.com isHTTP2: false - name: envoy-gateway-gateway-1-http-2 + name: envoy-gateway/gateway-1/http-2 port: 10082 routes: - backendWeights: @@ -327,7 +327,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar.com + name: default/httproute-1/rule/0/match/0-bar.com pathMatch: distinct: false name: "" @@ -336,7 +336,7 @@ xdsIR: hostnames: - foo1.com isHTTP2: false - name: envoy-gateway-gateway-1-http-3 + name: envoy-gateway/gateway-1/http-3 port: 10083 routes: - backendWeights: @@ -346,7 +346,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo1.com + name: default/httproute-1/rule/0/match/0-foo1.com pathMatch: distinct: false name: "" @@ -355,7 +355,7 @@ xdsIR: hostnames: - bar1.com isHTTP2: false - name: envoy-gateway-gateway-1-http-4 + name: envoy-gateway/gateway-1/http-4 port: 10084 routes: - backendWeights: @@ -365,7 +365,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar1.com + name: default/httproute-1/rule/0/match/0-bar1.com pathMatch: distinct: false name: "" @@ -374,7 +374,7 @@ xdsIR: hostnames: - foo2.com isHTTP2: false - name: envoy-gateway-gateway-1-http-5 + name: envoy-gateway/gateway-1/http-5 port: 10085 routes: - backendWeights: @@ -384,7 +384,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo2.com + name: default/httproute-1/rule/0/match/0-foo2.com pathMatch: distinct: false name: "" @@ -393,7 +393,7 @@ xdsIR: hostnames: - bar2.com isHTTP2: false - name: envoy-gateway-gateway-1-http-6 + name: envoy-gateway/gateway-1/http-6 port: 10086 routes: - backendWeights: @@ -403,7 +403,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar2.com + name: default/httproute-1/rule/0/match/0-bar2.com pathMatch: distinct: false name: "" @@ -412,7 +412,7 @@ xdsIR: hostnames: - foo3.com isHTTP2: false - name: envoy-gateway-gateway-1-http-7 + name: envoy-gateway/gateway-1/http-7 port: 10087 routes: - backendWeights: @@ -422,7 +422,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo3.com + name: default/httproute-1/rule/0/match/0-foo3.com pathMatch: distinct: false name: "" @@ -431,7 +431,7 @@ xdsIR: hostnames: - bar3.com isHTTP2: false - name: envoy-gateway-gateway-1-http-8 + name: envoy-gateway/gateway-1/http-8 port: 10088 routes: - backendWeights: @@ -441,7 +441,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar3.com + name: default/httproute-1/rule/0/match/0-bar3.com pathMatch: distinct: false name: "" 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 45168352e1..7102df2c5c 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 @@ -246,7 +246,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -259,9 +259,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -270,7 +270,7 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10080 routes: - backendWeights: @@ -280,7 +280,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo.com + name: default/httproute-1/rule/0/match/0-foo.com pathMatch: distinct: false name: "" @@ -289,7 +289,7 @@ xdsIR: hostnames: - bar.com isHTTP2: false - name: envoy-gateway-gateway-1-http-2 + name: envoy-gateway/gateway-1/http-2 port: 10080 routes: - backendWeights: @@ -299,7 +299,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar.com + name: default/httproute-1/rule/0/match/0-bar.com pathMatch: distinct: false name: "" @@ -308,7 +308,7 @@ xdsIR: hostnames: - foo1.com isHTTP2: false - name: envoy-gateway-gateway-1-http-3 + name: envoy-gateway/gateway-1/http-3 port: 10080 routes: - backendWeights: @@ -318,7 +318,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo1.com + name: default/httproute-1/rule/0/match/0-foo1.com pathMatch: distinct: false name: "" @@ -327,7 +327,7 @@ xdsIR: hostnames: - bar1.com isHTTP2: false - name: envoy-gateway-gateway-1-http-4 + name: envoy-gateway/gateway-1/http-4 port: 10080 routes: - backendWeights: @@ -337,7 +337,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar1.com + name: default/httproute-1/rule/0/match/0-bar1.com pathMatch: distinct: false name: "" @@ -346,7 +346,7 @@ xdsIR: hostnames: - foo2.com isHTTP2: false - name: envoy-gateway-gateway-1-http-5 + name: envoy-gateway/gateway-1/http-5 port: 10080 routes: - backendWeights: @@ -356,7 +356,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo2.com + name: default/httproute-1/rule/0/match/0-foo2.com pathMatch: distinct: false name: "" @@ -365,7 +365,7 @@ xdsIR: hostnames: - bar2.com isHTTP2: false - name: envoy-gateway-gateway-1-http-6 + name: envoy-gateway/gateway-1/http-6 port: 10080 routes: - backendWeights: @@ -375,7 +375,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar2.com + name: default/httproute-1/rule/0/match/0-bar2.com pathMatch: distinct: false name: "" @@ -384,7 +384,7 @@ xdsIR: hostnames: - foo3.com isHTTP2: false - name: envoy-gateway-gateway-1-http-7 + name: envoy-gateway/gateway-1/http-7 port: 10080 routes: - backendWeights: @@ -394,7 +394,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo3.com + name: default/httproute-1/rule/0/match/0-foo3.com pathMatch: distinct: false name: "" @@ -403,7 +403,7 @@ xdsIR: hostnames: - bar3.com isHTTP2: false - name: envoy-gateway-gateway-1-http-8 + name: envoy-gateway/gateway-1/http-8 port: 10080 routes: - backendWeights: @@ -413,7 +413,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar3.com + name: default/httproute-1/rule/0/match/0-bar3.com pathMatch: distinct: false name: "" 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 9eb071b327..ad2a2be63f 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 @@ -100,7 +100,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -117,9 +117,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -128,7 +128,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -138,7 +138,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" @@ -147,7 +147,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-tls + name: envoy-gateway/gateway-1/tls port: 10443 routes: - backendWeights: @@ -157,7 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 d12d34b987..decc633fb1 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 @@ -96,7 +96,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -109,9 +109,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -120,7 +120,7 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10080 routes: - backendWeights: @@ -130,7 +130,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-foo.com + name: default/httproute-1/rule/0/match/0-foo.com pathMatch: distinct: false name: "" @@ -139,7 +139,7 @@ xdsIR: hostnames: - bar.com isHTTP2: false - name: envoy-gateway-gateway-1-http-2 + name: envoy-gateway/gateway-1/http-2 port: 10080 routes: - backendWeights: @@ -149,7 +149,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar.com + name: default/httproute-1/rule/0/match/0-bar.com pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 30f5896d70..74cf2100f0 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -70,7 +70,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -83,9 +83,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,7 +94,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -104,7 +104,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 1acf9236c5..b4f94fe50c 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 @@ -74,7 +74,7 @@ httpRoutes: port: 80 sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,7 +98,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -108,7 +108,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 9ae09daff6..0014413ced 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 @@ -98,7 +98,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http-2 infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -111,9 +111,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -122,13 +122,13 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10080 - address: 0.0.0.0 hostnames: - bar.com isHTTP2: false - name: envoy-gateway-gateway-1-http-2 + name: envoy-gateway/gateway-1/http-2 port: 10080 routes: - backendWeights: @@ -138,7 +138,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-bar.com + name: default/httproute-1/rule/0/match/0-bar.com pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 942c2acb46..387b6266a4 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -72,7 +72,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -85,9 +85,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -96,7 +96,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -106,7 +106,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 9a8e43f97e..48977213c4 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 @@ -73,7 +73,7 @@ httpRoutes: namespace: envoy-gateway port: 81 infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -86,9 +86,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -97,5 +97,5 @@ xdsIR: hostnames: - foo.com isHTTP2: false - name: envoy-gateway-gateway-1-http-1 + name: envoy-gateway/gateway-1/http-1 port: 10080 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 490f7d3147..3dc83340d1 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 @@ -74,7 +74,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,7 +98,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -114,7 +114,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 b5d2c6895c..bbff88ba67 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 @@ -77,7 +77,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -90,9 +90,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -101,7 +101,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -117,7 +117,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 3 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 fe1fbe7f35..5315861283 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 @@ -72,7 +72,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -85,9 +85,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -96,7 +96,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -106,7 +106,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 9f6c141012..4f7ba21c5a 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -69,7 +69,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -82,9 +82,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -93,7 +93,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -103,4 +103,4 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match--1-* + name: default/httproute-1/rule/0/match/-1-* 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 89464e3b8d..8ce62218e6 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 @@ -90,7 +90,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -103,9 +103,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -114,7 +114,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addRequestHeaders: @@ -138,7 +138,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 855651c246..339a539fb9 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 @@ -100,7 +100,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -113,9 +113,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -124,7 +124,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addRequestHeaders: @@ -154,7 +154,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 5f836d12cd..b026511d03 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 @@ -86,7 +86,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -99,9 +99,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -110,7 +110,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -124,7 +124,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 5f3389b88b..da3fff3471 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 4797f28774..e35f415742 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 @@ -84,7 +84,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -97,9 +97,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -108,7 +108,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addRequestHeaders: @@ -129,7 +129,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 edc96af2df..f8959f3325 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 @@ -86,7 +86,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -99,9 +99,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -110,5 +110,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 84ec9c40fc..42d01206c0 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 @@ -87,7 +87,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -100,9 +100,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -111,5 +111,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 844a3d0987..7f0211f31b 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 @@ -78,7 +78,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -91,9 +91,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -102,7 +102,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -116,7 +116,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 72339af630..6b63414fb9 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,5 +106,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 927c174d36..da63e852ae 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -120,7 +120,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 67de11677e..7a6ddfb981 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 @@ -71,7 +71,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -95,7 +95,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -103,7 +103,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 9a4f5900e2..f848fc9df7 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 @@ -74,7 +74,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,7 +98,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -106,7 +106,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 ab93a04cff..3a16290309 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 @@ -72,7 +72,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -85,9 +85,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -96,7 +96,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -104,7 +104,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 524b493ad4..11aa9a94ba 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 @@ -71,7 +71,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -95,7 +95,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -103,7 +103,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 2468119222..c5a3d9b61e 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 @@ -71,7 +71,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -95,7 +95,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -103,7 +103,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 316e95b380..0871775896 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 @@ -72,7 +72,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -85,9 +85,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -96,7 +96,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -104,7 +104,7 @@ xdsIR: valid: 0 directResponse: statusCode: 500 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml index 7d8076d5dd..aca06ffd49 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml @@ -83,7 +83,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -96,9 +96,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -107,5 +107,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 ff00e037fe..51e2b1f0ec 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -88,7 +88,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -101,9 +101,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -112,7 +112,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -130,7 +130,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 039c9ca3a1..2f91c02e79 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -88,7 +88,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -101,9 +101,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -112,7 +112,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -133,7 +133,7 @@ xdsIR: - host: 7.6.5.4 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 7988c88a33..2175c52420 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -120,7 +120,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 177ca496ce..b7394358b4 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -120,7 +120,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index 136af25ecc..6a76c87188 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -124,7 +124,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml index 2572842243..c420d7a3ef 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml index c786e2295a..fe5b1467ce 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 1a49ce54f9..48a6b7d2ac 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 @@ -74,7 +74,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,5 +98,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 b856c1022d..182c75a830 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 @@ -83,7 +83,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -96,9 +96,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -107,7 +107,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -117,7 +117,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 f583f4f420..be344d6426 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -115,7 +115,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 a651c4d4eb..f40b5b4879 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 eee42bf7bc..ca0ab708b8 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,5 +105,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 33523de8f1..ce8da17a08 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 @@ -80,7 +80,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -93,9 +93,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -104,5 +104,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 585b15708b..33dae3591d 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 @@ -84,7 +84,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -97,9 +97,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -108,7 +108,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -118,7 +118,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 1121e05d78..5c9e64aea2 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 @@ -96,7 +96,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -109,9 +109,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -120,7 +120,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addResponseHeaders: @@ -150,7 +150,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 3264d62e15..2ab46fce18 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 @@ -90,7 +90,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -103,9 +103,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -114,7 +114,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addResponseHeaders: @@ -138,7 +138,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 012b3a8407..10ca6e9763 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 @@ -100,7 +100,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -113,9 +113,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -124,7 +124,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addResponseHeaders: @@ -154,7 +154,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 c032657ec5..f12fd5227b 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 @@ -86,7 +86,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -99,9 +99,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -110,7 +110,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -124,7 +124,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 82e398ddb6..ab5fb68d05 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 3eb0d1a9fe..e81020cf1d 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 @@ -84,7 +84,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -97,9 +97,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -108,7 +108,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - addResponseHeaders: @@ -129,7 +129,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 18921eea7b..9743c18b70 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 @@ -86,7 +86,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -99,9 +99,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -110,5 +110,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 7e8f31a8c3..659ac2f68a 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 @@ -87,7 +87,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -100,9 +100,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -111,5 +111,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 622fe2799e..17e5963495 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 @@ -78,7 +78,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -91,9 +91,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -102,7 +102,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -116,7 +116,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 4c7db3c2a4..70eb6d8119 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,5 +106,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 dfd50861f9..2a35ec4efd 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -120,7 +120,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 e903ec14a4..7ac8233ab5 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 @@ -71,7 +71,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -84,9 +84,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -95,7 +95,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -105,7 +105,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 cfa3fe6aa3..cc52748f37 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 @@ -69,7 +69,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -82,9 +82,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -93,7 +93,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -107,4 +107,4 @@ xdsIR: - distinct: false exact: POST name: :method - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* 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 c178a92b52..efc61eeda0 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 @@ -101,7 +101,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -114,9 +114,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -125,7 +125,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -139,7 +139,7 @@ xdsIR: - distinct: false name: Header-1 safeRegex: '*regex*' - name: default-httproute-1-rule-2-match-0-* + name: default/httproute-1/rule/2/match/0-* pathMatch: distinct: false name: "" @@ -155,7 +155,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-1-match-0-* + name: default/httproute-1/rule/1/match/0-* pathMatch: distinct: false name: "" @@ -171,7 +171,7 @@ xdsIR: - distinct: false exact: exact name: Header-1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact 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 77ede73f1b..23d6b34aa7 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 @@ -75,7 +75,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -88,9 +88,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -99,7 +99,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -116,7 +116,7 @@ xdsIR: - distinct: false exact: Val-2 name: Header-2 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 4b11550b83..02cb80660d 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 @@ -75,7 +75,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -88,9 +88,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -99,7 +99,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -109,7 +109,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: default-httproute-1-rule-0-match-0-* + name: default/httproute-1/rule/0/match/0-* pathMatch: distinct: false exact: /exact diff --git a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml index aede0120be..e9f515f339 100644 --- a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 9276a0dd77..6912916b73 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 @@ -73,7 +73,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -86,9 +86,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -97,7 +97,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -111,7 +111,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 ca72a0ba30..f7aeb4c292 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 @@ -74,7 +74,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -87,9 +87,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -98,7 +98,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -112,7 +112,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" @@ -128,7 +128,7 @@ xdsIR: - distinct: false exact: whales.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-whales.envoyproxy.io + name: default/httproute-1/rule/0/match/0-whales.envoyproxy.io pathMatch: distinct: false name: "" 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 08075cb94b..f08414c2dc 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 b8e18eb1f0..121a34bf50 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,7 +106,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -120,7 +120,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 c7655656a6..2df22c7872 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -79,7 +79,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -92,9 +92,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -103,7 +103,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -117,7 +117,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 3b202f9d03..288a89d94c 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 @@ -79,7 +79,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -92,9 +92,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -103,7 +103,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -117,7 +117,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 9dc4d9665d..c5aa3d6938 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 @@ -85,7 +85,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -98,9 +98,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -109,5 +109,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 1297cd05d7..607d3377fc 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 @@ -87,7 +87,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -100,9 +100,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -111,5 +111,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 a9ca92d1de..9b343f3a51 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 @@ -83,7 +83,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -96,9 +96,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -107,5 +107,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 6fc81f8b82..01f58b9837 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 @@ -82,7 +82,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -95,9 +95,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -106,5 +106,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 3dfb97bbf9..06180b84af 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 @@ -80,7 +80,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -93,9 +93,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -104,5 +104,5 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 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 909a533814..3321abd3cd 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 @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml index a2c4811571..a489414751 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml index 2855baf750..c795dd089d 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml @@ -95,7 +95,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -108,9 +108,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -119,7 +119,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -133,7 +133,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false exact: /test/path/1 @@ -156,7 +156,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-1-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/1/match/0-gateway.envoyproxy.io pathMatch: distinct: false exact: /test/path/2 diff --git a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml index 2ca13f4d09..c45699a233 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml @@ -95,7 +95,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -108,9 +108,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -119,7 +119,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -133,7 +133,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false exact: /test/path/1 @@ -156,7 +156,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-1-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/1/match/0-gateway.envoyproxy.io pathMatch: distinct: false exact: /test/path/2 diff --git a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml index b35bc285b6..278c67aec8 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml @@ -81,7 +81,7 @@ httpRoutes: namespace: envoy-gateway sectionName: http infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -94,9 +94,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -105,7 +105,7 @@ xdsIR: hostnames: - '*.envoyproxy.io' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -119,7 +119,7 @@ xdsIR: - distinct: false exact: gateway.envoyproxy.io name: :authority - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io + name: default/httproute-1/rule/0/match/0-gateway.envoyproxy.io pathMatch: distinct: false name: "" 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 27774dfd1a..28cbca568f 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 @@ -72,7 +72,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -85,9 +85,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -96,7 +96,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -110,7 +110,7 @@ xdsIR: - distinct: false name: :authority suffix: envoyproxy.io - name: default-httproute-1-rule-0-match-0-*.envoyproxy.io + name: default/httproute-1/rule/0/match/0-*.envoyproxy.io pathMatch: distinct: false name: "" diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index 28d8a1db7d..130eae2c87 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -220,7 +220,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -233,9 +233,9 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -244,7 +244,7 @@ xdsIR: hostnames: - '*' isHTTP2: false - name: envoy-gateway-gateway-1-http + name: envoy-gateway/gateway-1/http port: 10080 routes: - backendWeights: @@ -258,7 +258,7 @@ xdsIR: - distinct: false exact: example.com name: :authority - name: envoy-gateway-httproute-2-rule-0-match-0-example.com + name: envoy-gateway/httproute-2/rule/0/match/0-example.com pathMatch: distinct: false name: "" @@ -278,7 +278,7 @@ xdsIR: - distinct: false exact: example.com name: :authority - name: envoy-gateway-httproute-3-rule-0-match-0-example.com + name: envoy-gateway/httproute-3/rule/0/match/0-example.com pathMatch: distinct: false name: "" @@ -297,7 +297,7 @@ xdsIR: - distinct: false exact: one name: version - name: envoy-gateway-httproute-4-rule-0-match-0-example.net + name: envoy-gateway/httproute-4/rule/0/match/0-example.net pathMatch: distinct: false name: "" @@ -313,7 +313,7 @@ xdsIR: - distinct: false exact: example.net name: :authority - name: envoy-gateway-httproute-5-rule-0-match-0-example.net + name: envoy-gateway/httproute-5/rule/0/match/0-example.net pathMatch: distinct: false name: "" @@ -325,7 +325,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-httproute-1-rule-0-match-0-* + name: envoy-gateway/httproute-1/rule/0/match/0-* pathMatch: distinct: false name: "" 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 4eedcc2dd3..814dd1783c 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 @@ -39,7 +39,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -52,7 +52,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tcpRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute @@ -86,7 +86,7 @@ tcpRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -95,7 +95,7 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8080 - name: envoy-gateway-gateway-1-tls-tcproute-1 + name: envoy-gateway/gateway-1/tls/tcproute-1 port: 10090 tls: terminate: diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index a09c7e4790..18d26c52cd 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -36,7 +36,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -49,7 +49,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -83,7 +83,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -93,7 +93,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-1 + name: envoy-gateway/gateway-1/tls/tlsroute-1 port: 10090 tls: passthrough: diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index a42fba925f..b49cfb0be4 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -48,7 +48,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -117,7 +117,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -127,7 +127,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-1 + name: envoy-gateway/gateway-1/tls/tlsroute-1 port: 10091 tls: passthrough: @@ -138,7 +138,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-2 + name: envoy-gateway/gateway-1/tls/tlsroute-2 port: 10091 tls: passthrough: diff --git a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml index a1f1c98a8f..64956827b8 100644 --- a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml @@ -30,7 +30,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -38,7 +38,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -72,7 +72,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout 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 feb788eb8a..3844ee9783 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 @@ -36,7 +36,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -49,7 +49,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -84,7 +84,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,7 +94,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-1 + name: envoy-gateway/gateway-1/tls/tlsroute-1 port: 10090 tls: passthrough: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index 90aef72326..cf23a735a3 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -48,7 +48,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -82,7 +82,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -92,7 +92,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-1 + name: envoy-gateway/gateway-1/tls/tlsroute-1 port: 10091 tls: passthrough: 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 cd24529cc2..884544ed3a 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -48,7 +48,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -84,7 +84,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout @@ -94,7 +94,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 weight: 1 - name: envoy-gateway-gateway-1-tls-tlsroute-1 + name: envoy-gateway/gateway-1/tls/tlsroute-1 port: 10091 tls: passthrough: diff --git a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml index bd50afe68f..b335875713 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml @@ -35,7 +35,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute infraIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: proxy: listeners: - address: "" @@ -43,7 +43,7 @@ infraIR: labels: gateway.envoyproxy.io/owning-gateway-name: gateway-1 gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway - name: envoy-gateway-gateway-1 + name: envoy-gateway/gateway-1 tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TLSRoute @@ -77,7 +77,7 @@ tlsRoutes: name: gateway-1 namespace: envoy-gateway xdsIR: - envoy-gateway-gateway-1: + envoy-gateway/gateway-1: accessLog: text: - path: /dev/stdout diff --git a/internal/provider/utils/utils.go b/internal/provider/utils/utils.go index df5e7a2c9f..2796434cfb 100644 --- a/internal/provider/utils/utils.go +++ b/internal/provider/utils/utils.go @@ -23,14 +23,17 @@ func NamespacedName(obj client.Object) types.NamespacedName { } // GetHashedName returns a partially hashed name for the string including up to 48 characters of the original name before the hash -func GetHashedName(name string) string { +func GetHashedName(nsName string) string { h := sha256.New() // Using sha256 instead of sha1 due to Blocklisted import crypto/sha1: weak cryptographic primitive (gosec) - hSum := h.Sum([]byte(name)) + hSum := h.Sum([]byte(nsName)) hashedName := strings.ToLower(fmt.Sprintf("%x", hSum)) - if len(name) > 48 { - return fmt.Sprintf("%s-%s", name[0:48], hashedName[0:8]) + // replace `/` with `-` to create a valid K8s resource name + resourceName := strings.ReplaceAll(nsName, "/", "-") + + if len(resourceName) > 48 { + return fmt.Sprintf("%s-%s", resourceName[0:48], hashedName[0:8]) } - return fmt.Sprintf("%s-%s", name, hashedName[0:8]) + return fmt.Sprintf("%s-%s", resourceName, hashedName[0:8]) }