add TLS and UDP listener tests. Fix bugs that were found from the tests

Author: zac-nixon

controllers/gateway/route_reconciler.go

@@ -75,7 +75,7 @@ func (d *routeReconcilerImpl) handleItemError(routeData routeutils.RouteData, er
 }
 
 func (d *routeReconcilerImpl) handleRouteStatusUpdate(routeData routeutils.RouteData) error {
-	d.logger.V(1).Info("Handling route status update", "route", routeData.RouteMetadata.RouteName)
+	d.logger.Info("Handling route status update", "route", routeData)
 	routeName := routeData.RouteMetadata.RouteName
 	routeNamespace := routeData.RouteMetadata.RouteNamespace
 	routeKind := routeData.RouteMetadata.RouteKind
@@ -106,6 +106,7 @@ func (d *routeReconcilerImpl) handleRouteStatusUpdate(routeData routeutils.Route
 
 	// compare it with original status, patch if different
 	if !d.isRouteStatusIdentical(routeOld, route) {
+		d.logger.Info("Patching route status!", "route", route)
 		if err := d.k8sClient.Status().Patch(context.Background(), route, client.MergeFrom(routeOld)); err != nil {
 			d.logger.Error(err, "Failed to patch route status")
 			return err
@@ -321,6 +322,7 @@ func (d *routeReconcilerImpl) isRouteStatusIdentical(routeOld client.Object, rou
 
 	// compare if both have same parent number
 	if len(routeOldStatus) != len(routeNewStatus) {
+		d.logger.Info("Route status is not identical, parent number is different", "route", route)
 		return false
 	}
 
@@ -348,11 +350,13 @@ func (d *routeReconcilerImpl) isRouteStatusIdentical(routeOld client.Object, rou
 
 		// Compare ControllerName
 		if oldStatus.ControllerName != newStatus.ControllerName {
+			d.logger.Info("Controller name dif")
 			return false
 		}
 
 		// Compare Conditions
-		if !areConditionsEqual(oldStatus.Conditions, newStatus.Conditions) {
+		if !areConditionsEqual(oldStatus.Conditions, newStatus.Conditions, d.logger) {
+			d.logger.Info("conditions diff")
 			return false
 		}
 	}
@@ -418,8 +422,9 @@ func getParentStatusKey(ref gwv1.ParentReference) string {
 }
 
 // Helper function to compare conditions
-func areConditionsEqual(oldConditions, newConditions []metav1.Condition) bool {
+func areConditionsEqual(oldConditions, newConditions []metav1.Condition, logger logr.Logger) bool {
 	if len(oldConditions) != len(newConditions) {
+		logger.Info("cond size is diff")
 		return false
 	}
 
@@ -431,6 +436,7 @@ func areConditionsEqual(oldConditions, newConditions []metav1.Condition) bool {
 	for _, newCondition := range newConditions {
 		oldCondition, exists := oldConditionMap[newCondition.Type]
 		if !exists {
+			logger.Info("cond not exist in old")
 			return false
 		}
 
@@ -439,6 +445,7 @@ func areConditionsEqual(oldConditions, newConditions []metav1.Condition) bool {
 			oldCondition.Status != newCondition.Status ||
 			oldCondition.Reason != newCondition.Reason ||
 			oldCondition.Message != newCondition.Message {
+			logger.Info("cond param change")
 			return false
 		}
 	}

pkg/gateway/model/model_build_listener.go

@@ -157,6 +157,7 @@ func (l listenerBuilderImpl) buildL4ListenerSpec(ctx context.Context, stack core
 	}
 	backend := routeDescriptor.GetAttachedRules()[0].GetBackends()[0]
 	targetGroup, tgErr := l.tgBuilder.buildTargetGroup(stack, gw, lbCfg, lb.Spec.IPAddressType, routeDescriptor, backend, securityGroups.backendSecurityGroupToken)
+	l.logger.Info("Built this target group", "tg", targetGroup, "route", routeDescriptor.GetRouteNamespacedName())
 	if tgErr != nil {
 		return &elbv2model.ListenerSpec{}, tgErr
 	}

pkg/gateway/model/model_build_target_group.go

@@ -100,8 +100,9 @@ func (t *targetGroupBuilderImpl) buildTargetGroup(stack core.Stack,
 	gw *gwv1.Gateway, lbConfig elbv2gw.LoadBalancerConfiguration, lbIPType elbv2model.IPAddressType, routeDescriptor routeutils.RouteDescriptor, backend routeutils.Backend, backendSGIDToken core.StringToken) (*elbv2model.TargetGroup, error) {
 
 	targetGroupProps := backend.ELBV2TargetGroupProps
-	tgResID := t.buildTargetGroupResourceID(k8s.NamespacedName(gw), k8s.NamespacedName(backend.Service), routeDescriptor.GetRouteNamespacedName(), backend.ServicePort.TargetPort)
+	tgResID := t.buildTargetGroupResourceID(k8s.NamespacedName(gw), k8s.NamespacedName(backend.Service), routeDescriptor.GetRouteNamespacedName(), routeDescriptor.GetRouteKind(), backend.ServicePort.TargetPort)
 	if tg, exists := t.tgByResID[tgResID]; exists {
+		fmt.Println("TG already exists. Returning cached version")
 		return tg, nil
 	}
 
@@ -129,7 +130,7 @@ func (builder *targetGroupBuilderImpl) buildTargetGroupBindingSpec(gw *gwv1.Gate
 	if targetType == elbv2api.TargetTypeInstance {
 		targetPort = intstr.FromInt32(backend.ServicePort.NodePort)
 	}
-	tgbNetworking := builder.buildTargetGroupBindingNetworking(targetPort, *tgSpec.HealthCheckConfig.Port, *backend.ServicePort, backendSGIDToken)
+	tgbNetworking := builder.buildTargetGroupBindingNetworking(targetPort, *tgSpec.HealthCheckConfig.Port, tgSpec.Protocol, backendSGIDToken)
 
 	multiClusterEnabled := builder.buildTargetGroupBindingMultiClusterFlag(tgProps)
 
@@ -175,14 +176,14 @@ func (builder *targetGroupBuilderImpl) buildTargetGroupBindingSpec(gw *gwv1.Gate
 	}
 }
 
-func (builder *targetGroupBuilderImpl) buildTargetGroupBindingNetworking(targetPort intstr.IntOrString, healthCheckPort intstr.IntOrString, svcPort corev1.ServicePort, backendSGIDToken core.StringToken) *elbv2model.TargetGroupBindingNetworking {
+func (builder *targetGroupBuilderImpl) buildTargetGroupBindingNetworking(targetPort intstr.IntOrString, healthCheckPort intstr.IntOrString, tgProtocol elbv2model.Protocol, backendSGIDToken core.StringToken) *elbv2model.TargetGroupBindingNetworking {
 	if backendSGIDToken == nil {
 		return nil
 	}
 	protocolTCP := elbv2api.NetworkingProtocolTCP
 	protocolUDP := elbv2api.NetworkingProtocolUDP
 
-	udpSupported := svcPort.Protocol == corev1.ProtocolUDP
+	udpSupported := tgProtocol == elbv2model.ProtocolUDP || tgProtocol == elbv2model.ProtocolTCP_UDP
 
 	if builder.disableRestrictedSGRules {
 		ports := []elbv2api.NetworkingPort{
@@ -282,7 +283,7 @@ func (builder *targetGroupBuilderImpl) buildTargetGroupSpec(gw *gwv1.Gateway, ro
 		return elbv2model.TargetGroupSpec{}, err
 	}
 	tgPort := builder.buildTargetGroupPort(targetType, *backend.ServicePort)
-	name := builder.buildTargetGroupName(targetGroupProps, k8s.NamespacedName(gw), route.GetRouteNamespacedName(), k8s.NamespacedName(backend.Service), tgPort, targetType, tgProtocol, tgProtocolVersion)
+	name := builder.buildTargetGroupName(targetGroupProps, k8s.NamespacedName(gw), route.GetRouteNamespacedName(), route.GetRouteKind(), k8s.NamespacedName(backend.Service), tgPort, targetType, tgProtocol, tgProtocolVersion)
 	return elbv2model.TargetGroupSpec{
 		Name:                  name,
 		TargetType:            targetType,
@@ -300,7 +301,7 @@ var invalidTargetGroupNamePattern = regexp.MustCompile("[[:^alnum:]]")
 
 // buildTargetGroupName will calculate the targetGroup's name.
 func (builder *targetGroupBuilderImpl) buildTargetGroupName(targetGroupProps *elbv2gw.TargetGroupProps,
-	gwKey types.NamespacedName, routeKey types.NamespacedName, svcKey types.NamespacedName, tgPort int32,
+	gwKey types.NamespacedName, routeKey types.NamespacedName, routeKind routeutils.RouteKind, svcKey types.NamespacedName, tgPort int32,
 	targetType elbv2model.TargetType, tgProtocol elbv2model.Protocol, tgProtocolVersion *elbv2model.ProtocolVersion) string {
 
 	if targetGroupProps != nil && targetGroupProps.TargetGroupName != nil {
@@ -313,6 +314,7 @@ func (builder *targetGroupBuilderImpl) buildTargetGroupName(targetGroupProps *el
 	_, _ = uuidHash.Write([]byte(gwKey.Name))
 	_, _ = uuidHash.Write([]byte(routeKey.Namespace))
 	_, _ = uuidHash.Write([]byte(routeKey.Name))
+	_, _ = uuidHash.Write([]byte(routeKind))
 	_, _ = uuidHash.Write([]byte(svcKey.Namespace))
 	_, _ = uuidHash.Write([]byte(svcKey.Name))
 	_, _ = uuidHash.Write([]byte(strconv.Itoa(int(tgPort))))
@@ -660,8 +662,8 @@ func (builder *targetGroupBuilderImpl) convertMapToAttributes(attributeMap map[s
 	return convertedAttributes
 }
 
-func (builder *targetGroupBuilderImpl) buildTargetGroupResourceID(gwKey types.NamespacedName, svcKey types.NamespacedName, routeKey types.NamespacedName, port intstr.IntOrString) string {
-	return fmt.Sprintf("%s/%s:%s-%s:%s-%s:%s", gwKey.Namespace, gwKey.Name, routeKey.Namespace, routeKey.Name, svcKey.Namespace, svcKey.Name, port.String())
+func (builder *targetGroupBuilderImpl) buildTargetGroupResourceID(gwKey types.NamespacedName, svcKey types.NamespacedName, routeKey types.NamespacedName, routeKind routeutils.RouteKind, port intstr.IntOrString) string {
+	return fmt.Sprintf("%s/%s:%s-%s:%s-%s-%s:%s", gwKey.Namespace, gwKey.Name, routeKey.Namespace, routeKey.Name, routeKind, svcKey.Namespace, svcKey.Name, port.String())
 }
 
 func (builder *targetGroupBuilderImpl) buildTargetGroupBindingNodeSelector(tgProps *elbv2gw.TargetGroupProps, targetType elbv2model.TargetType) *metav1.LabelSelector {