Check listeners conditions serially

Author: levikobi

conformance/utils/config/timeout.go

@@ -44,9 +44,9 @@ type TimeoutConfig struct {
 	// Max value for conformant implementation: None
 	GatewayStatusMustHaveListeners time.Duration
 
-	// GatewayListenersMustHaveCondition represents the maximum time for a Gateway to have all listeners with a specific condition.
+	// GatewayListenersMustHaveConditions represents the maximum time for a Gateway to have all listeners with a specific condition.
 	// Max value for conformant implementation: None
-	GatewayListenersMustHaveCondition time.Duration
+	GatewayListenersMustHaveConditions time.Duration
 
 	// GWCMustBeAccepted represents the maximum time for a GatewayClass to have an Accepted condition set to true.
 	// Max value for conformant implementation: None
@@ -100,24 +100,24 @@ type TimeoutConfig struct {
 // DefaultTimeoutConfig populates a TimeoutConfig with the default values.
 func DefaultTimeoutConfig() TimeoutConfig {
 	return TimeoutConfig{
-		CreateTimeout:                     60 * time.Second,
-		DeleteTimeout:                     10 * time.Second,
-		GetTimeout:                        10 * time.Second,
-		GatewayMustHaveAddress:            180 * time.Second,
-		GatewayMustHaveCondition:          180 * time.Second,
-		GatewayStatusMustHaveListeners:    60 * time.Second,
-		GatewayListenersMustHaveCondition: 60 * time.Second,
-		GWCMustBeAccepted:                 180 * time.Second,
-		HTTPRouteMustNotHaveParents:       60 * time.Second,
-		HTTPRouteMustHaveCondition:        60 * time.Second,
-		TLSRouteMustHaveCondition:         60 * time.Second,
-		RouteMustHaveParents:              60 * time.Second,
-		ManifestFetchTimeout:              10 * time.Second,
-		MaxTimeToConsistency:              30 * time.Second,
-		NamespacesMustBeReady:             300 * time.Second,
-		RequestTimeout:                    10 * time.Second,
-		LatestObservedGenerationSet:       60 * time.Second,
-		RequiredConsecutiveSuccesses:      3,
+		CreateTimeout:                      60 * time.Second,
+		DeleteTimeout:                      10 * time.Second,
+		GetTimeout:                         10 * time.Second,
+		GatewayMustHaveAddress:             180 * time.Second,
+		GatewayMustHaveCondition:           180 * time.Second,
+		GatewayStatusMustHaveListeners:     60 * time.Second,
+		GatewayListenersMustHaveConditions: 60 * time.Second,
+		GWCMustBeAccepted:                  180 * time.Second,
+		HTTPRouteMustNotHaveParents:        60 * time.Second,
+		HTTPRouteMustHaveCondition:         60 * time.Second,
+		TLSRouteMustHaveCondition:          60 * time.Second,
+		RouteMustHaveParents:               60 * time.Second,
+		ManifestFetchTimeout:               10 * time.Second,
+		MaxTimeToConsistency:               30 * time.Second,
+		NamespacesMustBeReady:              300 * time.Second,
+		RequestTimeout:                     10 * time.Second,
+		LatestObservedGenerationSet:        60 * time.Second,
+		RequiredConsecutiveSuccesses:       3,
 	}
 }
 
@@ -141,8 +141,8 @@ func SetupTimeoutConfig(timeoutConfig *TimeoutConfig) {
 	if timeoutConfig.GatewayStatusMustHaveListeners == 0 {
 		timeoutConfig.GatewayStatusMustHaveListeners = defaultTimeoutConfig.GatewayStatusMustHaveListeners
 	}
-	if timeoutConfig.GatewayListenersMustHaveCondition == 0 {
-		timeoutConfig.GatewayListenersMustHaveCondition = defaultTimeoutConfig.GatewayListenersMustHaveCondition
+	if timeoutConfig.GatewayListenersMustHaveConditions == 0 {
+		timeoutConfig.GatewayListenersMustHaveConditions = defaultTimeoutConfig.GatewayListenersMustHaveConditions
 	}
 	if timeoutConfig.GWCMustBeAccepted == 0 {
 		timeoutConfig.GWCMustBeAccepted = defaultTimeoutConfig.GWCMustBeAccepted

conformance/utils/kubernetes/helpers.go

@@ -24,7 +24,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
@@ -72,12 +71,12 @@ func NewGatewayRef(nn types.NamespacedName, listenerNames ...string) GatewayRef
 	}
 }
 
-// GWCMustBeAcceptedConditionTrue waits until the specified GatewayClass has an Accepted condition set with a status value equal to True.
+// GWCMustHaveAcceptedConditionTrue waits until the specified GatewayClass has an Accepted condition set with a status value equal to True.
 func GWCMustHaveAcceptedConditionTrue(t *testing.T, c client.Client, timeoutConfig config.TimeoutConfig, gwcName string) string {
 	return gwcMustBeAccepted(t, c, timeoutConfig, gwcName, string(metav1.ConditionTrue))
 }
 
-// GWCMustBeAcceptedConditionAny waits until the specified GatewayClass has an Accepted condition set with a status set to any value.
+// GWCMustHaveAcceptedConditionAny waits until the specified GatewayClass has an Accepted condition set with a status set to any value.
 func GWCMustHaveAcceptedConditionAny(t *testing.T, c client.Client, timeoutConfig config.TimeoutConfig, gwcName string) string {
 	return gwcMustBeAccepted(t, c, timeoutConfig, gwcName, "")
 }
@@ -429,34 +428,25 @@ func WaitForGatewayAddress(t *testing.T, client client.Client, timeoutConfig con
 func GatewayListenersMustHaveConditions(t *testing.T, client client.Client, timeoutConfig config.TimeoutConfig, gwName types.NamespacedName, conditions []metav1.Condition) {
 	t.Helper()
 
-	var wg sync.WaitGroup
-	wg.Add(len(conditions))
-
-	for _, condition := range conditions {
-		go func(condition metav1.Condition) {
-			defer wg.Done()
-
-			waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, timeoutConfig.GatewayListenersMustHaveCondition, true, func(ctx context.Context) (bool, error) {
-				var gw gatewayv1.Gateway
-				if err := client.Get(ctx, gwName, &gw); err != nil {
-					return false, fmt.Errorf("error fetching Gateway: %w", err)
-				}
+	waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, timeoutConfig.GatewayListenersMustHaveConditions, true, func(ctx context.Context) (bool, error) {
+		var gw gatewayv1.Gateway
+		if err := client.Get(ctx, gwName, &gw); err != nil {
+			return false, fmt.Errorf("error fetching Gateway: %w", err)
+		}
 
-				for _, listener := range gw.Status.Listeners {
-					if !findConditionInList(t, listener.Conditions, condition.Type, string(condition.Status), condition.Reason) {
-						return false, nil
-					}
+		for _, condition := range conditions {
+			for _, listener := range gw.Status.Listeners {
+				if !findConditionInList(t, listener.Conditions, condition.Type, string(condition.Status), condition.Reason) {
+					t.Logf("gateway %s doesn't have %s condition set to %s on %s listener", gwName, condition.Type, condition.Status, listener.Name)
+					return false, nil
 				}
+			}
+		}
 
-				return true, nil
-			})
-
-			require.NoErrorf(t, waitErr, "error waiting for Gateway status to have the %s condition set to %s on all listeners",
-				condition.Type, condition.Status)
-		}(condition)
-	}
+		return true, nil
+	})
 
-	wg.Wait()
+	require.NoErrorf(t, waitErr, "error waiting for Gateway status to have conditions matching expectations on all listeners")
 }
 
 // GatewayMustHaveZeroRoutes validates that the gateway has zero routes attached.  The status