conformance: Enable HTTPRouteBackendProtocolH2C conformance test (#2136)

* nit Signed-off-by: zirain <zirain2009@gmail.com> * build Cluster depends on route type and service appProtocol Signed-off-by: zirain <zirain2009@gmail.com> * enable HTTPRouteBackendProtocolH2C conformance test Signed-off-by: zirain <zirain2009@gmail.com> * lint Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * address comment Signed-off-by: zirain <zirain2009@gmail.com> * move to package internal/ir Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com>
envoyproxy · Nov 1, 2023 · 6d532c1 · 6d532c1
1 parent 6e81fb3
commit 6d532c1
Show file tree

Hide file tree

Showing 99 changed files with 212 additions and 35 deletions.
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/discovery/v1"
+	discoveryv1 "k8s.io/api/discovery/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a1 "sigs.k8s.io/gateway-api/apis/v1alpha2"
@@ -1005,6 +1005,7 @@ func (t *Translator) processDestination(backendRef gwapiv1.BackendRef,
 	}
 
 	var endpoints []*ir.DestinationEndpoint
+	protocol := inspectAppProtocolByRouteKind(routeType)
 	switch KindDerefOr(backendRef.Kind, KindService) {
 	case KindServiceImport:
 		serviceImport := resources.GetServiceImport(backendNamespace, string(backendRef.Name))
@@ -1037,12 +1038,18 @@ func (t *Translator) processDestination(backendRef gwapiv1.BackendRef,
 			}
 		}
 
+		// support HTTPRouteBackendProtocolH2C
+		if servicePort.AppProtocol != nil &&
+			*servicePort.AppProtocol == "kubernetes.io/h2c" {
+			protocol = ir.HTTP2
+		}
+
 		// Route to endpoints by default
 		if !t.EndpointRoutingDisabled {
 			endpointSlices := resources.GetEndpointSlicesForBackend(backendNamespace, string(backendRef.Name), KindDerefOr(backendRef.Kind, KindService))
 			endpoints = getIREndpointsFromEndpointSlice(endpointSlices, servicePort.Name, servicePort.Protocol)
 		} else {
-			// Fall back to Service CluserIP routing
+			// Fall back to Service ClusterIP routing
 			ep := ir.NewDestEndpoint(
 				service.Spec.ClusterIP,
 				uint32(*backendRef.Port))
@@ -1052,11 +1059,28 @@ func (t *Translator) processDestination(backendRef gwapiv1.BackendRef,
 
 	ds = &ir.DestinationSetting{
 		Weight:    &weight,
+		Protocol:  protocol,
 		Endpoints: endpoints,
 	}
 	return ds, weight
 }
 
+func inspectAppProtocolByRouteKind(kind gwapiv1.Kind) ir.AppProtocol {
+	switch kind {
+	case KindUDPRoute:
+		return ir.UDP
+	case KindHTTPRoute:
+		return ir.HTTP
+	case KindTCPRoute:
+		return ir.TCP
+	case KindGRPCRoute:
+		return ir.GRPC
+	case KindTLSRoute:
+		return ir.HTTPS
+	}
+	return ir.TCP
+}
+
 // processAllowedListenersForParentRefs finds out if the route attaches to one of our
 // Gateways' listeners, and if so, gets the list of listeners that allow it to
 // attach for each parentRef.
@@ -1127,7 +1151,7 @@ func (t *Translator) processAllowedListenersForParentRefs(routeContext RouteCont
 	return relevantRoute
 }
 
-func getIREndpointsFromEndpointSlice(endpointSlices []*v1.EndpointSlice, portName string, portProtocol corev1.Protocol) []*ir.DestinationEndpoint {
+func getIREndpointsFromEndpointSlice(endpointSlices []*discoveryv1.EndpointSlice, portName string, portProtocol corev1.Protocol) []*ir.DestinationEndpoint {
 	endpoints := []*ir.DestinationEndpoint{}
 	for _, endpointSlice := range endpointSlices {
 		for _, endpoint := range endpointSlice.Endpoints {

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml
@@ -248,6 +248,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         loadBalancer:
@@ -274,6 +275,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: gateway.envoyproxy.io
         loadBalancer:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml
@@ -266,6 +266,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/-1/*
@@ -302,6 +303,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: gateway.envoyproxy.io
         name: httproute/default/httproute-1/rule/0/match/0/gateway_envoyproxy_io

diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml
@@ -122,6 +122,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         extensionRefs:
         - object:

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
@@ -111,6 +111,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*

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
@@ -118,6 +118,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

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
@@ -184,6 +184,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: foo.bar.com
         name: httproute/default/httproute-1/rule/0/match/0/foo_bar_com
@@ -203,6 +204,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8080
+          protocol: HTTPS
           weight: 1
       name: envoy-gateway/gateway-1/tls-passthrough/tlsroute-1
       port: 10090

diff --git a/...istener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/...istener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml
@@ -120,6 +120,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

diff --git a/.../gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/.../gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml
@@ -120,6 +120,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

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
@@ -117,6 +117,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml
@@ -111,6 +111,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml
@@ -128,6 +128,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp/tcproute-1
       port: 10162

diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml
@@ -128,6 +128,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp/udproute-1
       port: 10162
diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml
@@ -117,6 +117,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*

diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml
@@ -126,6 +126,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp1/tcproute-1
       port: 10162

diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml
@@ -124,6 +124,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp1/udproute-1
       port: 10162
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
@@ -180,6 +180,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: foo.com
         name: httproute/default/httproute-2/rule/0/match/0/foo_com
@@ -196,6 +197,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: foo.com
         name: httproute/default/httproute-1/rule/0/match/0/foo_com
@@ -219,6 +221,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: bar.com
         name: httproute/default/httproute-2/rule/0/match/0/bar_com
@@ -235,6 +238,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: bar.com
         name: httproute/default/httproute-1/rule/0/match/0/bar_com

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
@@ -175,6 +175,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*
@@ -190,6 +191,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp/tcproute-1
       port: 10080

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
@@ -175,6 +175,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: HTTP
             weight: 1
         hostname: '*'
         name: httproute/default/httproute-1/rule/0/match/0/*
@@ -190,6 +191,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp/udproute-1
       port: 10080
diff --git a/...l/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/...l/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml
@@ -163,6 +163,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp1/tcproute-1
       port: 10162
@@ -174,6 +175,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp2/tcproute-2
       port: 10163

diff --git a/...atewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/...atewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml
@@ -159,6 +159,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp1/tcproute-1
       port: 10161
@@ -170,6 +171,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8163
+          protocol: TCP
           weight: 1
       name: envoy-gateway/gateway-1/tcp2/tcproute-1
       port: 10162

diff --git a/...l/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/...l/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml
@@ -163,6 +163,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp1/udproute-1
       port: 10162
@@ -173,6 +174,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp2/udproute-2
       port: 10163
diff --git a/...atewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/...atewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml
@@ -159,6 +159,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp1/udproute-1
       port: 10161
@@ -169,6 +170,7 @@ xdsIR:
         - endpoints:
           - host: 7.7.7.7
             port: 8162
+          protocol: UDP
           weight: 1
       name: envoy-gateway/gateway-1/udp2/udproute-1
       port: 10162
diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml
@@ -115,6 +115,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         headerMatches:
         - distinct: false

diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml
@@ -119,6 +119,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/0/*
@@ -135,6 +136,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/1/*

diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml
@@ -117,6 +117,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/1/*
@@ -133,6 +134,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         headerMatches:
         - distinct: false

diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml
@@ -120,6 +120,7 @@ xdsIR:
           - endpoints:
             - host: 7.7.7.7
               port: 8080
+            protocol: GRPC
             weight: 1
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/-1/*