Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GRPCRoute to SupportedKinds #990

Merged
merged 1 commit into from
Feb 8, 2023
Merged

Add GRPCRoute to SupportedKinds #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/gatewayapi/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/envoyproxy-valid.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...rnal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...tewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...ayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...estdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...tdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...a/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...estdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...tewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...nal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...estdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions ...api/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions .../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading