listener set validations

Author: zac-nixon

controllers/gateway/gateway_controller.go

@@ -231,12 +231,16 @@ func (r *gatewayReconciler) reconcileHelper(ctx context.Context, req reconcile.R
 
 	loaderResults, err := r.gatewayLoader.LoadRoutesForGateway(ctx, *gw, r.routeFilter, r.controllerName, resolvedDefaultTGC)
 
-	if err != nil || loaderResults.ValidationResults.HasErrors {
+	validationHasErrors := false
+	if loaderResults != nil {
+		validationHasErrors = loaderResults.ValidationResults.HasErrors()
+	}
+	if err != nil || validationHasErrors {
 		var loaderErr routeutils.LoaderError
-		if errors.As(err, &loaderErr) || loaderResults.ValidationResults.HasErrors {
+		if errors.As(err, &loaderErr) || validationHasErrors {
 			var gatewayReason gwv1.GatewayConditionReason
 			var gatewayMessage string
-			if loaderErr == nil && loaderResults.ValidationResults.HasErrors {
+			if loaderErr == nil && validationHasErrors {
 				gatewayReason = gwv1.GatewayReasonAccepted
 				gatewayMessage = gateway_constants.GatewayAcceptedFalseMessage
 			} else {

controllers/gateway/listener_status_utils.go

@@ -11,8 +11,9 @@ import (
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-func buildListenerStatus(gateway gwv1.Gateway, listeners []gwv1.Listener, attachedRoutesMap map[gwv1.SectionName]int32, validateListenerResults routeutils.ListenerValidationResults, isProgrammed bool) []gwv1.ListenerStatus {
+func buildListenerStatus(gateway gwv1.Gateway, listeners []gwv1.Listener, attachedRoutesMap map[gwv1.SectionName]int32, validatedListeners routeutils.ValidatedGatewayListeners, isProgrammed bool) []gwv1.ListenerStatus {
 	var listenerStatuses []gwv1.ListenerStatus
+	validateListenerResults := validatedListeners.GatewayListenerValidation
 
 	for _, listener := range listeners {
 		listenerValidationResult := validateListenerResults.Results[listener.Name]

controllers/gateway/listener_status_utils_test.go

@@ -16,7 +16,7 @@ func Test_buildListenerStatus(t *testing.T) {
 		name                    string
 		gateway                 gwv1.Gateway
 		attachedRoutesMap       map[gwv1.SectionName]int32
-		validateListenerResults routeutils.ListenerValidationResults
+		validateListenerResults routeutils.ValidatedGatewayListeners
 		supportedKinds          []gwv1.RouteGroupKind
 		isProgrammed            bool
 		expectedListenerCount   int
@@ -37,11 +37,13 @@ func Test_buildListenerStatus(t *testing.T) {
 				},
 			},
 			attachedRoutesMap: map[gwv1.SectionName]int32{"listener1": 1},
-			validateListenerResults: routeutils.ListenerValidationResults{
-				Results: map[gwv1.SectionName]routeutils.ListenerValidationResult{
-					"listener1": {Reason: gwv1.ListenerReasonAccepted, Message: "accepted", SupportedKinds: []gwv1.RouteGroupKind{{
-						Kind: "HTTPRoute",
-					}}},
+			validateListenerResults: routeutils.ValidatedGatewayListeners{
+				GatewayListenerValidation: routeutils.ListenerValidationResults{
+					Results: map[gwv1.SectionName]routeutils.ListenerValidationResult{
+						"listener1": {Reason: gwv1.ListenerReasonAccepted, Message: "accepted", SupportedKinds: []gwv1.RouteGroupKind{{
+							Kind: "HTTPRoute",
+						}}},
+					},
 				},
 			},
 			supportedKinds: []gwv1.RouteGroupKind{{
@@ -59,7 +61,7 @@ func Test_buildListenerStatus(t *testing.T) {
 				},
 			},
 			attachedRoutesMap:       map[gwv1.SectionName]int32{},
-			validateListenerResults: routeutils.ListenerValidationResults{},
+			validateListenerResults: routeutils.ValidatedGatewayListeners{},
 			isProgrammed:            true,
 			expectedListenerCount:   0,
 		},

pkg/gateway/routeutils/listener_set.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
@@ -21,7 +23,7 @@ const (
 )
 
 type listenerSetLoader interface {
-	retrieveListenersFromListenerSets(ctx context.Context, gateway gwv1.Gateway) ([]gwv1.Listener, []*gwv1.ListenerSet, error)
+	retrieveListenersFromListenerSets(ctx context.Context, gateway gwv1.Gateway) (listenerSetLoadResult, []*gwv1.ListenerSet, error)
 }
 
 type listenerSetLoaderImpl struct {
@@ -34,30 +36,40 @@ func newListenerSetLoader(k8sClient client.Client, logger logr.Logger) listenerS
 	return &listenerSetLoaderImpl{
 		k8sClient:         k8sClient,
 		namespaceSelector: newNamespaceSelector(k8sClient),
-		logger:            logger.WithName("listener-set-loader"),
+		logger:            logger,
 	}
 }
 
-func (l *listenerSetLoaderImpl) retrieveListenersFromListenerSets(ctx context.Context, gateway gwv1.Gateway) ([]gwv1.Listener, []*gwv1.ListenerSet, error) {
+type listenerSetLoadResult struct {
+	listenersPerListenerSet map[types.NamespacedName][]listenerSetListenerSource
+	acceptedListenerSets    []*gwv1.ListenerSet
+}
+
+func (l *listenerSetLoaderImpl) retrieveListenersFromListenerSets(ctx context.Context, gateway gwv1.Gateway) (listenerSetLoadResult, []*gwv1.ListenerSet, error) {
 	listenerSets := &gwv1.ListenerSetList{}
 	err := l.k8sClient.List(ctx, listenerSets)
 	if err != nil {
-		return nil, nil, err
+		return listenerSetLoadResult{}, nil, err
 	}
 
 	rejectedListenerSets := make([]*gwv1.ListenerSet, 0)
 
-	var result []gwv1.Listener
+	listenersPerListenerSet := make(map[types.NamespacedName][]listenerSetListenerSource)
+	acceptedListenerSets := make([]*gwv1.ListenerSet, 0)
 	for i, item := range listenerSets.Items {
 		handshake, err := l.listenerSetGatewayHandshake(ctx, item, gateway)
 		if err != nil {
-			return nil, nil, err
+			return listenerSetLoadResult{}, nil, err
 		}
 		switch handshake {
 		case acceptedHandshakeState:
+			var convertedListeners []listenerSetListenerSource
 			for _, listener := range item.Spec.Listeners {
-				result = append(result, l.convertListenerSetListenerToGatewayListener(listener))
+				convertedListeners = append(convertedListeners, l.convertListenerSetListenerToGatewayListener(item, listener))
 			}
+			itemPtr := &listenerSets.Items[i]
+			listenersPerListenerSet[k8s.NamespacedName(itemPtr)] = convertedListeners
+			acceptedListenerSets = append(acceptedListenerSets, itemPtr)
 			break
 		case gatewayRejectedHandshakeState:
 			rejectedListenerSets = append(rejectedListenerSets, &listenerSets.Items[i])
@@ -69,7 +81,10 @@ func (l *listenerSetLoaderImpl) retrieveListenersFromListenerSets(ctx context.Co
 
 	}
 
-	return result, rejectedListenerSets, nil
+	return listenerSetLoadResult{
+		listenersPerListenerSet: listenersPerListenerSet,
+		acceptedListenerSets:    acceptedListenerSets,
+	}, rejectedListenerSets, nil
 }
 
 func (l *listenerSetLoaderImpl) listenerSetGatewayHandshake(ctx context.Context, listenerSet gwv1.ListenerSet, gw gwv1.Gateway) (handshakeState, error) {
@@ -110,15 +125,19 @@ func (l *listenerSetLoaderImpl) convertListenerSetParentRef(ref gwv1.ParentGatew
 	}
 }
 
-func (l *listenerSetLoaderImpl) convertListenerSetListenerToGatewayListener(entry gwv1.ListenerEntry) gwv1.Listener {
-	return gwv1.Listener{
+func (l *listenerSetLoaderImpl) convertListenerSetListenerToGatewayListener(listenerSet gwv1.ListenerSet, entry gwv1.ListenerEntry) listenerSetListenerSource {
+	v := gwv1.Listener{
 		Name:          entry.Name,
 		Hostname:      entry.Hostname,
 		Port:          entry.Port,
 		Protocol:      entry.Protocol,
 		TLS:           entry.TLS,
 		AllowedRoutes: entry.AllowedRoutes,
 	}
+	return listenerSetListenerSource{
+		parentRef: listenerSet,
+		listener:  v,
+	}
 }
 
 var _ listenerSetLoader = &listenerSetLoaderImpl{}