Add GRPCRoute to SupportedKinds

Fixes: #950 Signed-off-by: Arko Dasgupta <arko@tetrate.io>
envoyproxy · Feb 8, 2023 · c71ced8 · c71ced8
1 parent d01daec
commit c71ced8
Show file tree

Hide file tree

Showing 105 changed files with 247 additions and 366 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...rnal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/...rnal/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/...tewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/...tewayapi/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
@@ -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/...ayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/...ayapi/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/...estdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/...estdata/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/...tdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/...tdata/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/...a/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/...a/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/...estdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/...estdata/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/...tewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/...tewayapi/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/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/...ata/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/...nal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/...nal/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
@@ -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
@@ -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
@@ -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/...estdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/...estdata/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
@@ -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
@@ -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/...api/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/...api/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/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/.../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/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/.../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
@@ -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
@@ -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