From c71ced89d499d633ad97a438e5e4fdec6b2dff92 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 7 Feb 2023 13:17:03 -0800 Subject: [PATCH] Add GRPCRoute to SupportedKinds Fixes: https://github.com/envoyproxy/gateway/issues/950 Signed-off-by: Arko Dasgupta --- go.mod | 2 +- go.sum | 4 +- internal/gatewayapi/listener.go | 3 +- .../testdata/envoyproxy-valid.out.yaml | 5 +-- ...-namespace-with-allowed-httproute.out.yaml | 5 +-- ...mespace-with-disallowed-httproute.out.yaml | 5 +-- ...valid-allowed-namespaces-selector.out.yaml | 5 +-- ...-with-invalid-allowed-routes-kind.out.yaml | 2 +- ...id-tls-configuration-invalid-mode.out.yaml | 5 +-- ...configuration-no-certificate-refs.out.yaml | 5 +-- ...nfiguration-secret-does-not-exist.out.yaml | 5 +-- ...uration-secret-in-other-namespace.out.yaml | 5 +-- ...configuration-secret-is-not-valid.out.yaml | 5 +-- ...ssing-allowed-namespaces-selector.out.yaml | 5 +-- ...her-namespace-allowed-by-refgrant.out.yaml | 5 +-- ...ith-tls-terminate-and-passthrough.out.yaml | 5 +-- ...ener-with-valid-tls-configuration.out.yaml | 5 +-- ...with-preexisting-status-condition.out.yaml | 5 +-- ...teway-with-stale-status-condition.out.yaml | 5 +-- ...d-tlsroute-same-hostname-and-port.out.yaml | 5 +-- ...isteners-with-multiple-httproutes.out.yaml | 10 ++--- ...eners-with-same-port-and-hostname.out.yaml | 10 ++--- ...me-port-and-incompatible-protocol.out.yaml | 10 ++--- ...-with-same-port-http-tcp-protocol.out.yaml | 5 +-- ...-with-same-port-http-udp-protocol.out.yaml | 5 +-- .../grpcroute-with-header-match.out.yaml | 5 +-- ...oute-with-request-header-modifier.out.yaml | 5 +-- ...way-with-more-different-listeners.out.yaml | 40 ++++++++----------- ...ng-to-gateway-with-more-listeners.out.yaml | 40 ++++++++----------- ...wo-listeners-with-different-ports.out.yaml | 10 ++--- ...ing-to-gateway-with-two-listeners.out.yaml | 10 ++--- .../httproute-attaching-to-gateway.out.yaml | 5 +-- ...taching-to-listener-matching-port.out.yaml | 5 +-- ...ner-on-gateway-with-two-listeners.out.yaml | 10 ++--- .../httproute-attaching-to-listener.out.yaml | 5 +-- ...ing-to-listener-non-matching-port.out.yaml | 5 +-- ...-multiple-backends-and-no-weights.out.yaml | 5 +-- ...ith-multiple-backends-and-weights.out.yaml | 5 +-- ...her-namespace-allowed-by-refgrant.out.yaml | 5 +-- .../httproute-with-empty-matches.out.yaml | 2 + ...er-duplicate-add-multiple-filters.out.yaml | 5 +-- ...with-header-filter-duplicate-adds.out.yaml | 5 +-- ...duplicate-remove-multiple-filters.out.yaml | 5 +-- ...h-header-filter-duplicate-removes.out.yaml | 5 +-- ...header-filter-empty-header-values.out.yaml | 5 +-- ...-with-header-filter-empty-headers.out.yaml | 5 +-- ...ith-header-filter-invalid-headers.out.yaml | 5 +-- ...ute-with-header-filter-no-headers.out.yaml | 5 +-- ...th-header-filter-no-valid-headers.out.yaml | 5 +-- ...tproute-with-header-filter-remove.out.yaml | 5 +-- ...with-invalid-backend-ref-bad-port.out.yaml | 5 +-- ...invalid-backend-ref-invalid-group.out.yaml | 5 +-- ...-invalid-backend-ref-invalid-kind.out.yaml | 5 +-- ...-with-invalid-backend-ref-no-port.out.yaml | 5 +-- ...th-invalid-backend-ref-no-service.out.yaml | 5 +-- ...lid-backendref-in-other-namespace.out.yaml | 5 +-- ...oute-with-invalid-ratelimitfilter.out.yaml | 5 +-- ...ute-with-mirror-filter-duplicates.out.yaml | 5 +-- ...route-with-mirror-filter-multiple.out.yaml | 5 +-- ...ith-mirror-filter-service-no-port.out.yaml | 5 +-- ...h-mirror-filter-service-not-found.out.yaml | 5 +-- .../httproute-with-mirror-filter.out.yaml | 5 +-- ...ith-non-existent-authenfilter-ref.out.yaml | 5 +-- ...ith-non-matching-authenfilter-ref.out.yaml | 5 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 5 +-- ...ct-filter-full-path-replace-https.out.yaml | 5 +-- ...ute-with-redirect-filter-hostname.out.yaml | 5 +-- ...direct-filter-invalid-filter-type.out.yaml | 5 +-- ...th-redirect-filter-invalid-scheme.out.yaml | 5 +-- ...th-redirect-filter-invalid-status.out.yaml | 5 +-- ...ter-prefix-replace-with-port-http.out.yaml | 5 +-- ...-with-response-header-filter-adds.out.yaml | 5 +-- ...er-duplicate-add-multiple-filters.out.yaml | 5 +-- ...onse-header-filter-duplicate-adds.out.yaml | 5 +-- ...duplicate-remove-multiple-filters.out.yaml | 5 +-- ...e-header-filter-duplicate-removes.out.yaml | 5 +-- ...header-filter-empty-header-values.out.yaml | 5 +-- ...ponse-header-filter-empty-headers.out.yaml | 5 +-- ...nse-header-filter-invalid-headers.out.yaml | 5 +-- ...response-header-filter-no-headers.out.yaml | 5 +-- ...se-header-filter-no-valid-headers.out.yaml | 5 +-- ...ith-response-header-filter-remove.out.yaml | 5 +-- ...single-rule-with-exact-path-match.out.yaml | 5 +-- ...ingle-rule-with-http-method-match.out.yaml | 5 +-- ...h-single-rule-with-multiple-rules.out.yaml | 5 +-- ...h-prefix-and-exact-header-matches.out.yaml | 5 +-- ...e-invalid-backend-refs-no-service.out.yaml | 5 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 5 +-- ...to-gateway-with-wildcard-hostname.out.yaml | 5 +-- ...ite-filter-full-path-replace-http.out.yaml | 5 +-- ...te-filter-hostname-prefix-replace.out.yaml | 5 +-- ...e-with-urlrewrite-filter-hostname.out.yaml | 5 +-- ...ewrite-filter-invalid-filter-type.out.yaml | 5 +-- ...rlrewrite-filter-invalid-hostname.out.yaml | 5 +-- ...e-filter-invalid-multiple-filters.out.yaml | 5 +-- ...lrewrite-filter-invalid-path-type.out.yaml | 5 +-- ...th-urlrewrite-filter-invalid-path.out.yaml | 5 +-- ...th-urlrewrite-filter-missing-path.out.yaml | 5 +-- ...ewrite-filter-prefix-replace-http.out.yaml | 5 +-- ...httproute-with-valid-authenfilter.out.yaml | 5 +-- ...th-valid-multi-match-authenfilter.out.yaml | 5 +-- ...id-multi-match-multi-authenfilter.out.yaml | 5 +-- ...proute-with-valid-ratelimitfilter.out.yaml | 5 +-- ...ng-to-gateway-with-unset-hostname.out.yaml | 5 +-- .../httproutes-with-multiple-matches.out.yaml | 5 +-- 105 files changed, 247 insertions(+), 366 deletions(-) diff --git a/go.mod b/go.mod index c8f16e207187..f207c1dfb846 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/apiextensions-apiserver v0.26.1 // indirect k8s.io/component-base v0.26.1 // indirect - k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/klog/v2 v2.90.0 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/go.sum b/go.sum index 04b73bff5122..c056940915ae 100644 --- a/go.sum +++ b/go.sum @@ -710,8 +710,8 @@ k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M= +k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go index 6a522da29b58..7952d6c14c7b 100644 --- a/internal/gatewayapi/listener.go +++ b/internal/gatewayapi/listener.go @@ -56,8 +56,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR XdsIRMap case v1beta1.TLSProtocolType: t.validateAllowedRoutes(listener, KindTLSRoute) case v1beta1.HTTPProtocolType, v1beta1.HTTPSProtocolType: - // Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - t.validateAllowedRoutes(listener, KindHTTPRoute) // , KindGRPCRoute) + t.validateAllowedRoutes(listener, KindHTTPRoute, KindGRPCRoute) case v1beta1.TCPProtocolType: t.validateAllowedRoutes(listener, KindTCPRoute) case v1beta1.UDPProtocolType: diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index 8ab5db16b123..197350495ea0 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 ecc24ee38b3c..cbfabf6c0d37 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 e0dc7b991269..77a713d820db 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 6445a1a95098..ca29b4a2d0ae 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 @@ -25,9 +25,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 b862d1cb2c17..56796a08e9a8 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 @@ -25,7 +25,7 @@ gateways: - type: ResolvedRefs status: "False" reason: InvalidRouteKinds - message: "FooRoute is not supported, kind must be one of [HTTPRoute]" + message: "FooRoute is not supported, kind must be one of [HTTPRoute GRPCRoute]" - type: Programmed status: "False" reason: Invalid 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 2dbaa4fe7f54..6a2bc8693530 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 @@ -24,9 +24,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 6988251faada..2c833ec64d33 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 @@ -21,9 +21,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 ed7772e2d0f3..b977bc34f8cf 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 @@ -23,9 +23,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: ResolvedRefs 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 ee637005f0a2..1b65b6168450 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 @@ -24,9 +24,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: ResolvedRefs 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 cc136316ca5d..ed528ceea007 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 @@ -23,9 +23,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: ResolvedRefs 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 fd76907c089a..840677528d62 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 4e12b187822e..ada48115a1c2 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 @@ -24,9 +24,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 717a4acc9214..ba567ad9da46 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 @@ -43,9 +43,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 08ab3cebcaaa..c87265514ef8 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 @@ -23,9 +23,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 d99ff51855db..8e44f4517a15 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 9ac860671535..dfc919e2c076 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -23,9 +23,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 7cfd2f0be841..6c9d2c52fe00 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 @@ -29,9 +29,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute conditions: - type: Conflicted status: "True" 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 0a8dbe49bd10..a1adbc2f79aa 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 @@ -27,9 +27,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute AttachedRoutes: 2 conditions: - type: Programmed @@ -40,9 +39,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute AttachedRoutes: 2 conditions: - type: Programmed 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 750fe1bbfdba..a8c0338088eb 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 @@ -27,9 +27,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute conditions: - type: Conflicted status: "True" @@ -43,9 +42,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute conditions: - type: Conflicted status: "True" 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 ebce62cfa8c1..2fef42d83c51 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 @@ -27,9 +27,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute conditions: - type: Conflicted status: "True" @@ -43,9 +42,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute conditions: - type: Conflicted status: "True" 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 4c2a7aedaaf6..ea329c1c2d62 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 @@ -26,9 +26,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute AttachedRoutes: 1 conditions: - type: Programmed 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 5d18eb6d1371..4dc246cd4a86 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 @@ -26,9 +26,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute AttachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index 1e35904a82e3..c079abc9d3da 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 cb8b2b505a3d..6317a505ca84 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 17fad6913e90..e164bc777e97 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 @@ -69,9 +69,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -82,9 +81,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -95,9 +93,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -108,9 +105,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -121,9 +117,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -134,9 +129,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -147,9 +141,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -160,9 +153,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 3becf27dccd7..888cec7b822a 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 @@ -69,9 +69,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -82,9 +81,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -95,9 +93,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -108,9 +105,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -121,9 +117,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -134,9 +129,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -147,9 +141,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -160,9 +153,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 9708ba2179c9..9eaaff055c45 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 @@ -29,9 +29,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -42,9 +41,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 2a91cfc2fa67..48fda6fe312d 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 @@ -27,9 +27,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -40,9 +39,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 589fef477ff0..9c3c5b1610e6 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 c63ffaff08f1..9c46f628163f 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 6100711322ef..3284e4680184 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 @@ -27,9 +27,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed @@ -40,9 +39,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 0a0e3b07e592..8f4a72fdab5b 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 116fe1bcebc2..c6563470683c 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 90002b9fc563..9bc2ab142a5d 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4bb84b11b93b..92d6bcd835f9 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 45c75a51921c..1392c99fda37 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 67b1ac08d439..7811a43d1b43 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -19,6 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 614e48d4fbc4..e1b32d78b83e 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4e5267b77f1a..988c92257b71 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4294262fdd3e..e5f12f7a2e41 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 0a75822aae92..5ed6519cd121 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 d78407b9b4af..6b9e635658aa 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 f2a2cebc46a4..26ee5e62cd9b 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 a0de9906f3a2..66734cf3c684 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 65078fb2535e..c7d970f4b818 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 6633cb693d57..808f1a56fb18 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 dfa525d74cf0..25c9b78cb544 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 5f0487305a95..ca2070932c08 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 12486d8599cf..219f59ad8e47 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 ced06b6d6348..9782dae7db0e 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 bfe9084f58c8..062dc105a145 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 674a90614765..65fac131f86d 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 7675eb61f314..7aa9f45a0254 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml index 8acb3ec82eeb..87e6e492a189 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 2a12e0569fb8..71797efd24b3 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 f21678a5c8b3..ca51c868cecb 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 e2b5788c36ba..d8210da35354 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 1205a2c3819f..9d6aac7a9a26 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index 334acccc077c..030671132208 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 e703cb32b9c8..2fddf2b4f2aa 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 6c92311f8b93..39695171feb4 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4ecd6204715f..9e27285d0568 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 05d8b3639514..5c7eaae72bf9 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 f1c22a74c044..71636d2de9fe 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 fd6580f09d3a..4a2d2d4faea8 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 40ab22021693..79a022b65423 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 539fa60e9c53..992e9ede5ea0 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 0bd19c88ac61..e40c12c99b63 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 6d6508de86fc..e4c3cf4a4895 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 9d6645b0b703..66bb52643879 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 c42fec4d2468..b0fd746b0dff 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 9ed56f75924f..ed03bdc3220f 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 212a0e952643..c0e2f4b1fc9e 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 70ab5264118b..e9186328ccea 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 ef5d31cebd20..ff7be180eadd 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 749061fdac78..8182e7022eff 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 552a9b737c82..c91e70c26a89 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 59ed84508045..a5e7dac43760 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 11b80f8a288a..caf07769b05b 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 6e7d2f356ef7..57e444ece345 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 e857b382bc41..b5c519bda4e2 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 78f81eeebff2..d8600ab3574d 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 a28e840d5f9b..5fb12c1cc47f 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4c30c0d77562..870cfb13d21d 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 c0d3a3d3f520..77b1dbe4254d 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 78c38ef508d1..31201bfaaf1a 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 056148fd012f..b6c9b72b80c6 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4488ba83e0d1..196d0782f71b 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 91fa694a1d3c..188ccef163ce 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 dc2ee071cf71..e41932971141 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 a65870188839..fa74572d94c3 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 25e880f52750..25794a648b5c 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 84b7624cfb0f..55de97aa1b70 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 520669ccea5a..d119a0b68ea7 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 8fe273d438d8..270f29f22020 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 77513245f10f..dc054b67c777 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml index 4cf66b13bc87..3bc81f0f440f 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 05f22036e5d1..67b8df468017 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 c59468263070..54a9c93d1946 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 @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml index 5b984b50c20e..8be7071f2e02 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml @@ -20,9 +20,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 d9f11730d643..b8c0cc61c477 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 @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index 4b105d8f9e44..6a6cec386b95 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -19,9 +19,8 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: HTTPRoute - # Uncomment when https://github.com/envoyproxy/gateway/issues/950 is fixed - #- group: gateway.networking.k8s.io - #kind: GRPCRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute attachedRoutes: 5 conditions: - type: Programmed