modify getAndValidateSupportedKind

Author: salonichf5

internal/mode/static/state/change_processor_test.go

@@ -519,12 +519,15 @@ var _ = Describe("ChangeProcessor", func() {
 						Source: gw1,
 						Listeners: []*graph.Listener{
 							{
-								Name:           "listener-80-1",
-								Source:         gw1.Spec.Listeners[0],
-								Valid:          true,
-								Attachable:     true,
-								Routes:         map[graph.RouteKey]*graph.L7Route{routeKey1: expRouteHR1},
-								SupportedKinds: []v1.RouteGroupKind{{Kind: kinds.HTTPRoute}},
+								Name:       "listener-80-1",
+								Source:     gw1.Spec.Listeners[0],
+								Valid:      true,
+								Attachable: true,
+								Routes:     map[graph.RouteKey]*graph.L7Route{routeKey1: expRouteHR1},
+								SupportedKinds: []v1.RouteGroupKind{
+									{Kind: v1.Kind(kinds.HTTPRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+									{Kind: v1.Kind(kinds.GRPCRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+								},
 							},
 							{
 								Name:           "listener-443-1",
@@ -533,7 +536,10 @@ var _ = Describe("ChangeProcessor", func() {
 								Attachable:     true,
 								Routes:         map[graph.RouteKey]*graph.L7Route{routeKey1: expRouteHR1},
 								ResolvedSecret: helpers.GetPointer(client.ObjectKeyFromObject(diffNsTLSSecret)),
-								SupportedKinds: []v1.RouteGroupKind{{Kind: kinds.HTTPRoute}},
+								SupportedKinds: []v1.RouteGroupKind{
+									{Kind: v1.Kind(kinds.HTTPRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+									{Kind: v1.Kind(kinds.GRPCRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+								},
 							},
 						},
 						Valid: true,

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

@@ -11,6 +11,7 @@ import (
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions"
+	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds"
 	staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions"
 )
@@ -228,18 +229,10 @@ func getAndValidateListenerSupportedKinds(listener v1.Listener) (
 	[]conditions.Condition,
 	[]v1.RouteGroupKind,
 ) {
-	if listener.AllowedRoutes == nil || listener.AllowedRoutes.Kinds == nil {
-		return nil, []v1.RouteGroupKind{
-			{
-				Kind: kinds.HTTPRoute,
-			},
-		}
-	}
 	var conds []conditions.Condition
+	supportedKinds := make([]v1.RouteGroupKind, 0)
 
-	supportedKinds := make([]v1.RouteGroupKind, 0, len(listener.AllowedRoutes.Kinds))
-
-	validHTTPProtocolRouteKind := func(kind v1.RouteGroupKind) bool {
+	validRouteKind := func(kind v1.RouteGroupKind) bool {
 		if kind.Kind != v1.Kind(kinds.HTTPRoute) && kind.Kind != v1.Kind(kinds.GRPCRoute) {
 			return false
 		}
@@ -249,17 +242,25 @@ func getAndValidateListenerSupportedKinds(listener v1.Listener) (
 		return true
 	}
 
-	switch listener.Protocol {
-	case v1.HTTPProtocolType, v1.HTTPSProtocolType:
+	if listener.AllowedRoutes != nil && listener.AllowedRoutes.Kinds != nil {
 		for _, kind := range listener.AllowedRoutes.Kinds {
-			if !validHTTPProtocolRouteKind(kind) {
+			if !validRouteKind(kind) {
 				msg := fmt.Sprintf("Unsupported route kind \"%s/%s\"", *kind.Group, kind.Kind)
 				conds = append(conds, staticConds.NewListenerInvalidRouteKinds(msg)...)
 				continue
 			}
 			supportedKinds = append(supportedKinds, kind)
 		}
+	} else {
+		switch listener.Protocol {
+		case v1.HTTPProtocolType, v1.HTTPSProtocolType:
+			supportedKinds = []v1.RouteGroupKind{
+				{Kind: v1.Kind(kinds.HTTPRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+				{Kind: v1.Kind(kinds.GRPCRoute), Group: helpers.GetPointer[v1.Group](v1.GroupName)},
+			}
+		}
 	}
+
 	return conds, supportedKinds
 }
 

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

@@ -289,11 +289,13 @@ func TestValidateListenerHostname(t *testing.T) {
 }
 
 func TestGetAndValidateListenerSupportedKinds(t *testing.T) {
-	HTTPRouteGroupKind := []v1.RouteGroupKind{
-		{
-			Kind:  kinds.HTTPRoute,
-			Group: helpers.GetPointer[v1.Group](v1.GroupName),
-		},
+	HTTPRouteGroupKind := v1.RouteGroupKind{
+		Kind:  kinds.HTTPRoute,
+		Group: helpers.GetPointer[v1.Group](v1.GroupName),
+	}
+	GRPCRouteGroupKind := v1.RouteGroupKind{
+		Kind:  kinds.GRPCRoute,
+		Group: helpers.GetPointer[v1.Group](v1.GroupName),
 	}
 	TCPRouteGroupKind := []v1.RouteGroupKind{
 		{
@@ -312,7 +314,6 @@ func TestGetAndValidateListenerSupportedKinds(t *testing.T) {
 			protocol:  v1.TCPProtocolType,
 			expectErr: false,
 			name:      "unsupported protocol is ignored",
-			kind:      TCPRouteGroupKind,
 			expected:  []v1.RouteGroupKind{},
 		},
 		{
@@ -336,43 +337,38 @@ func TestGetAndValidateListenerSupportedKinds(t *testing.T) {
 		},
 		{
 			protocol:  v1.HTTPProtocolType,
-			kind:      HTTPRouteGroupKind,
+			kind:      []v1.RouteGroupKind{HTTPRouteGroupKind},
 			expectErr: false,
 			name:      "valid HTTP",
-			expected:  HTTPRouteGroupKind,
+			expected:  []v1.RouteGroupKind{HTTPRouteGroupKind},
 		},
 		{
 			protocol:  v1.HTTPSProtocolType,
-			kind:      HTTPRouteGroupKind,
+			kind:      []v1.RouteGroupKind{HTTPRouteGroupKind},
 			expectErr: false,
 			name:      "valid HTTPS",
-			expected:  HTTPRouteGroupKind,
+			expected:  []v1.RouteGroupKind{HTTPRouteGroupKind},
 		},
 		{
 			protocol:  v1.HTTPSProtocolType,
 			expectErr: false,
 			name:      "valid HTTPS no kind specified",
 			expected: []v1.RouteGroupKind{
-				{
-					Kind: kinds.HTTPRoute,
-				},
+				HTTPRouteGroupKind, GRPCRouteGroupKind,
 			},
 		},
 		{
 			protocol: v1.HTTPProtocolType,
 			kind: []v1.RouteGroupKind{
-				{
-					Kind:  kinds.HTTPRoute,
-					Group: helpers.GetPointer[v1.Group](v1.GroupName),
-				},
+				HTTPRouteGroupKind,
 				{
 					Kind:  "bad-kind",
 					Group: helpers.GetPointer[v1.Group](v1.GroupName),
 				},
 			},
 			expectErr: true,
 			name:      "valid and invalid kinds",
-			expected:  HTTPRouteGroupKind,
+			expected:  []v1.RouteGroupKind{HTTPRouteGroupKind},
 		},
 	}