Support cross-namespace routing with TLSRoutes

Author: Kate Osborn

internal/mode/static/state/change_processor_test.go

@@ -228,6 +228,7 @@ func BuildGraph(
 		processedGws.GetAllNsNames(),
 		state.Services,
 		npCfg,
+		refGrantResolver,
 	)
 
 	bindRoutesToListeners(routes, l4routes, gw, state.Namespaces)

internal/mode/static/state/graph/graph.go

@@ -81,6 +81,14 @@ func fromGRPCRoute(namespace string) fromResource {
 	}
 }
 
+func fromTLSRoute(namespace string) fromResource {
+	return fromResource{
+		group:     v1.GroupName,
+		kind:      kinds.TLSRoute,
+		namespace: namespace,
+	}
+}
+
 // newReferenceGrantResolver creates a new referenceGrantResolver.
 func newReferenceGrantResolver(refGrants map[types.NamespacedName]*v1beta1.ReferenceGrant) *referenceGrantResolver {
 	allowed := make(map[allowedReference]struct{})

internal/mode/static/state/graph/reference_grant.go

@@ -233,17 +233,34 @@ func TestFromGRPCRoute(t *testing.T) {
 	g.Expect(ref).To(Equal(exp))
 }
 
+func TestFromTLSRoute(t *testing.T) {
+	ref := fromTLSRoute("ns")
+
+	exp := fromResource{
+		group:     v1beta1.GroupName,
+		kind:      kinds.TLSRoute,
+		namespace: "ns",
+	}
+
+	g := NewWithT(t)
+	g.Expect(ref).To(Equal(exp))
+}
+
 func TestRefAllowedFrom(t *testing.T) {
 	gwNs := "gw-ns"
 	hrNs := "hr-ns"
 	grNs := "gr-ns"
+	trNs := "tr-ns"
 
 	allowedHTTPRouteNs := "hr-allowed-ns"
 	allowedHTTPRouteNsName := types.NamespacedName{Namespace: allowedHTTPRouteNs, Name: "all-allowed-in-ns"}
 
 	allowedGRPCRouteNs := "gr-allowed-ns"
 	allowedGRPCRouteNsName := types.NamespacedName{Namespace: allowedGRPCRouteNs, Name: "all-allowed-in-ns"}
 
+	allowedTLSRouteNs := "tr-allowed-ns"
+	allowedTLSRouteNsName := types.NamespacedName{Namespace: allowedTLSRouteNs, Name: "all-allowed-in-ns"}
+
 	allowedGatewayNs := "gw-allowed-ns"
 	allowedGatewayNsName := types.NamespacedName{Namespace: allowedGatewayNs, Name: "all-allowed-in-ns"}
 
@@ -298,11 +315,28 @@ func TestRefAllowedFrom(t *testing.T) {
 				},
 			},
 		},
+		{Namespace: allowedTLSRouteNs, Name: "tr-2-svc"}: {
+			Spec: v1beta1.ReferenceGrantSpec{
+				From: []v1beta1.ReferenceGrantFrom{
+					{
+						Group:     v1beta1.GroupName,
+						Kind:      kinds.TLSRoute,
+						Namespace: v1beta1.Namespace(trNs),
+					},
+				},
+				To: []v1beta1.ReferenceGrantTo{
+					{
+						Kind: "Service",
+					},
+				},
+			},
+		},
 	}
 
 	resolver := newReferenceGrantResolver(refGrants)
 	refAllowedFromGRPCRoute := resolver.refAllowedFrom(fromGRPCRoute(grNs))
 	refAllowedFromHTTPRoute := resolver.refAllowedFrom(fromHTTPRoute(hrNs))
+	refAllowedFromTLSRoute := resolver.refAllowedFrom(fromTLSRoute(trNs))
 	refAllowedFromGateway := resolver.refAllowedFrom(fromGateway(gwNs))
 
 	tests := []struct {
@@ -347,6 +381,18 @@ func TestRefAllowedFrom(t *testing.T) {
 			toResource:     toService(notAllowedNsName),
 			expAllowed:     false,
 		},
+		{
+			name:           "ref allowed from tlsroute to service",
+			refAllowedFrom: refAllowedFromTLSRoute,
+			toResource:     toService(allowedTLSRouteNsName),
+			expAllowed:     true,
+		},
+		{
+			name:           "ref not allowed from tlsroute to service",
+			refAllowedFrom: refAllowedFromTLSRoute,
+			toResource:     toService(notAllowedNsName),
+			expAllowed:     false,
+		},
 	}
 
 	for _, test := range tests {

internal/mode/static/state/graph/reference_grant_test.go

@@ -178,14 +178,21 @@ func buildL4RoutesForGateways(
 	gatewayNsNames []types.NamespacedName,
 	services map[types.NamespacedName]*apiv1.Service,
 	npCfg *NginxProxy,
+	resolver *referenceGrantResolver,
 ) map[L4RouteKey]*L4Route {
 	if len(gatewayNsNames) == 0 {
 		return nil
 	}
 
 	routes := make(map[L4RouteKey]*L4Route)
 	for _, route := range tlsRoutes {
-		r := buildTLSRoute(route, gatewayNsNames, services, npCfg)
+		r := buildTLSRoute(
+			route,
+			gatewayNsNames,
+			services,
+			npCfg,
+			resolver.refAllowedFrom(fromTLSRoute(route.Namespace)),
+		)
 		if r != nil {
 			routes[CreateRouteKeyL4(route)] = r
 		}

internal/mode/static/state/graph/route_common.go

@@ -2436,11 +2436,14 @@ func TestBuildL4RoutesForGateways_NoGateways(t *testing.T) {
 		},
 	}
 
+	refGrantResolver := newReferenceGrantResolver(nil)
+
 	g.Expect(buildL4RoutesForGateways(
 		tlsRoutes,
 		nil,
 		services,
 		nil,
+		refGrantResolver,
 	)).To(BeNil())
 }
 

internal/mode/static/state/graph/route_common_test.go

@@ -16,6 +16,7 @@ func buildTLSRoute(
 	gatewayNsNames []types.NamespacedName,
 	services map[types.NamespacedName]*apiv1.Service,
 	npCfg *NginxProxy,
+	refGrantResolver func(resource toResource) bool,
 ) *L4Route {
 	r := &L4Route{
 		Source: gtr,
@@ -53,15 +54,14 @@ func buildTLSRoute(
 		return r
 	}
 
-	cond, br := validateBackendRefTLSRoute(gtr, services, npCfg)
+	br, cond := validateBackendRefTLSRoute(gtr, services, npCfg, refGrantResolver)
 
 	r.Spec.BackendRef = br
 	r.Valid = true
 	r.Attachable = true
 
 	if cond != nil {
 		r.Conditions = append(r.Conditions, *cond)
-		r.Valid = false
 	}
 
 	return r
@@ -70,12 +70,26 @@ func buildTLSRoute(
 func validateBackendRefTLSRoute(gtr *v1alpha2.TLSRoute,
 	services map[types.NamespacedName]*apiv1.Service,
 	npCfg *NginxProxy,
-) (*conditions.Condition, BackendRef) {
+	refGrantResolver func(resource toResource) bool,
+) (BackendRef, *conditions.Condition) {
 	// Length of BackendRefs and Rules is guaranteed to be one due to earlier check in buildTLSRoute
 	refPath := field.NewPath("spec").Child("rules").Index(0).Child("backendRefs").Index(0)
 
 	ref := gtr.Spec.Rules[0].BackendRefs[0]
 
+	if valid, cond := validateBackendRef(
+		ref,
+		gtr.Namespace,
+		refGrantResolver,
+		refPath,
+	); !valid {
+		backendRef := BackendRef{
+			Valid: false,
+		}
+
+		return backendRef, &cond
+	}
+
 	ns := gtr.Namespace
 	if ref.Namespace != nil {
 		ns = string(*ref.Namespace)
@@ -86,48 +100,30 @@ func validateBackendRefTLSRoute(gtr *v1alpha2.TLSRoute,
 		Name:      string(gtr.Spec.Rules[0].BackendRefs[0].Name),
 	}
 
-	backendRef := BackendRef{
-		Valid: true,
-	}
-	var cond *conditions.Condition
-
-	if ref.Port == nil {
-		valErr := field.Required(refPath.Child("port"), "port cannot be nil")
-		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteBackendRefUnsupportedValue(valErr.Error()))
-
-		return cond, backendRef
-	}
-
 	svcIPFamily, svcPort, err := getIPFamilyAndPortFromRef(
 		ref,
 		svcNsName,
 		services,
 		refPath,
 	)
 
-	backendRef.ServicePort = svcPort
-	backendRef.SvcNsName = svcNsName
+	backendRef := BackendRef{
+		SvcNsName:   svcNsName,
+		ServicePort: svcPort,
+		Valid:       true,
+	}
 
 	if err != nil {
 		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteBackendRefRefBackendNotFound(err.Error()))
-	} else if err := verifyIPFamily(npCfg, svcIPFamily); err != nil {
-		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteInvalidIPFamily(err.Error()))
-	} else if ref.Group != nil && !(*ref.Group == "core" || *ref.Group == "") {
-		valErr := field.NotSupported(refPath.Child("group"), *ref.Group, []string{"core", ""})
-		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteBackendRefInvalidKind(valErr.Error()))
-	} else if ref.Kind != nil && *ref.Kind != "Service" {
-		valErr := field.NotSupported(refPath.Child("kind"), *ref.Kind, []string{"Service"})
-		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteBackendRefInvalidKind(valErr.Error()))
-	} else if ref.Namespace != nil && string(*ref.Namespace) != gtr.Namespace {
-		msg := "Cross-namespace routing is not supported"
+
+		return backendRef, helpers.GetPointer(staticConds.NewRouteBackendRefRefBackendNotFound(err.Error()))
+	}
+
+	if err := verifyIPFamily(npCfg, svcIPFamily); err != nil {
 		backendRef.Valid = false
-		cond = helpers.GetPointer(staticConds.NewRouteBackendRefUnsupportedValue(msg))
+
+		return backendRef, helpers.GetPointer(staticConds.NewRouteInvalidIPFamily(err.Error()))
 	}
-	// FIXME(sarthyparty): Add check for invalid weights, we removed checks to pass the conformance test
-	return cond, backendRef
+
+	return backendRef, nil
 }