pass conformance test

Author: Revolyssup

internal/controller/gateway_controller.go

@@ -98,7 +98,7 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	tctx := &translator.TranslateContext{
 		Secrets: make(map[types.NamespacedName]*corev1.Secret),
 	}
-	if err := r.processListenerConfig(tctx, gateway.Spec.Listeners, ns); err != nil {
+	if err := r.processListenerConfig(tctx, gateway, ns); err != nil {
 		acceptStatus = status{
 			status: false,
 			msg:    err.Error(),
@@ -220,8 +220,9 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj clie
 	return recs
 }
 
-func (r *GatewayReconciler) processListenerConfig(tctx *translator.TranslateContext, listeners []gatewayv1.Listener, ns string) error {
+func (r *GatewayReconciler) processListenerConfig(tctx *translator.TranslateContext, gateway *gatewayv1.Gateway, ns string) error {
 	var terror error
+	listeners := gateway.Spec.Listeners
 	for _, listener := range listeners {
 		if listener.TLS == nil || listener.TLS.CertificateRefs == nil {
 			continue
@@ -237,13 +238,14 @@ func (r *GatewayReconciler) processListenerConfig(tctx *translator.TranslateCont
 					Name:      string(ref.Name),
 				}, &secret); err != nil {
 					log.Error(err, "failed to get secret", "namespace", ns, "name", string(ref.Name))
+					SetGatewayListenerConditionProgrammed(gateway, string(listener.Name), false, err.Error())
+					SetGatewayListenerConditionResolvedRefs(gateway, string(listener.Name), false, err.Error())
 					terror = err
 					break
 				}
 				log.Info("Setting secret for listener", "listener", listener.Name, "secret", secret.Name, " namespace", ns)
 				tctx.Secrets[types.NamespacedName{Namespace: ns, Name: string(ref.Name)}] = &secret
 			}
-
 		}
 	}
 	return terror

internal/controller/utils.go

@@ -43,6 +43,15 @@ func setGatewayCondition(gw *gatewayv1.Gateway, newCondition metav1.Condition) {
 	gw.Status.Conditions = MergeCondition(gw.Status.Conditions, newCondition)
 }
 
+func setListenerCondition(gw *gatewayv1.Gateway, listenerName string, newCondition metav1.Condition) {
+	for i, listener := range gw.Status.Listeners {
+		if listener.Name == gatewayv1.SectionName(listenerName) {
+			gw.Status.Listeners[i].Conditions = MergeCondition(listener.Conditions, newCondition)
+			return
+		}
+	}
+}
+
 func reconcileGatewaysMatchGatewayClass(gatewayClass client.Object, gateways []gatewayv1.Gateway) (recs []reconcile.Request) {
 	for _, gateway := range gateways {
 		if string(gateway.Spec.GatewayClassName) == gatewayClass.GetName() {
@@ -91,6 +100,72 @@ func SetGatewayConditionAccepted(gw *gatewayv1.Gateway, status bool, message str
 	return
 }
 
+func SetGatewayListenerConditionAccepted(gw *gatewayv1.Gateway, listenerName string, status bool, message string) (ok bool) {
+	conditionStatus := metav1.ConditionTrue
+	if !status {
+		conditionStatus = metav1.ConditionFalse
+	}
+
+	condition := metav1.Condition{
+		Type:               string(gatewayv1.ListenerConditionAccepted),
+		Status:             conditionStatus,
+		Reason:             string(gatewayv1.ListenerConditionAccepted),
+		ObservedGeneration: gw.GetGeneration(),
+		Message:            message,
+		LastTransitionTime: metav1.Now(),
+	}
+
+	if !IsConditionPresentAndEqual(gw.Status.Conditions, condition) {
+		setListenerCondition(gw, listenerName, condition)
+		ok = true
+	}
+	return
+}
+
+func SetGatewayListenerConditionProgrammed(gw *gatewayv1.Gateway, listenerName string, status bool, message string) (ok bool) {
+	conditionStatus := metav1.ConditionTrue
+	if !status {
+		conditionStatus = metav1.ConditionFalse
+	}
+
+	condition := metav1.Condition{
+		Type:               string(gatewayv1.ListenerConditionProgrammed),
+		Status:             conditionStatus,
+		Reason:             string(gatewayv1.ListenerReasonProgrammed),
+		ObservedGeneration: gw.GetGeneration(),
+		Message:            message,
+		LastTransitionTime: metav1.Now(),
+	}
+
+	if !IsConditionPresentAndEqual(gw.Status.Conditions, condition) {
+		setListenerCondition(gw, listenerName, condition)
+		ok = true
+	}
+	return
+}
+
+func SetGatewayListenerConditionResolvedRefs(gw *gatewayv1.Gateway, listenerName string, status bool, message string) (ok bool) {
+	conditionStatus := metav1.ConditionTrue
+	if !status {
+		conditionStatus = metav1.ConditionFalse
+	}
+
+	condition := metav1.Condition{
+		Type:               string(gatewayv1.ListenerConditionResolvedRefs),
+		Status:             conditionStatus,
+		Reason:             string(gatewayv1.ListenerReasonResolvedRefs),
+		ObservedGeneration: gw.GetGeneration(),
+		Message:            message,
+		LastTransitionTime: metav1.Now(),
+	}
+
+	if !IsConditionPresentAndEqual(gw.Status.Conditions, condition) {
+		setListenerCondition(gw, listenerName, condition)
+		ok = true
+	}
+	return
+}
+
 func SetGatewayConditionProgrammed(gw *gatewayv1.Gateway, status bool, message string) (ok bool) {
 	conditionStatus := metav1.ConditionTrue
 	if !status {
@@ -288,21 +363,17 @@ func checkRouteAcceptedByListener(
 			return false, gatewayv1.RouteReasonNoMatchingParent, nil
 		}
 	}
-
 	if parentRef.Port != nil {
 		if *parentRef.Port != listener.Port {
 			return false, gatewayv1.RouteReasonNoMatchingParent, nil
 		}
 	}
-
 	if !routeMatchesListenerType(route, listener) {
 		return false, gatewayv1.RouteReasonNoMatchingParent, nil
 	}
-
 	if !routeHostnamesIntersectsWithListenerHostname(route, listener) {
 		return false, gatewayv1.RouteReasonNoMatchingListenerHostname, nil
 	}
-
 	if ok, err := routeMatchesListenerAllowedRoutes(ctx, mgrc, route, listener.AllowedRoutes, gateway.Namespace, parentRef.Namespace); err != nil {
 		return false, gatewayv1.RouteReasonNotAllowedByListeners, fmt.Errorf("failed matching listener %s to a route %s for gateway %s: %w",
 			listener.Name, route.GetName(), gateway.Name, err,
@@ -480,7 +551,6 @@ func getAttachedRoutesForListener(ctx context.Context, mgrc client.Client, gatew
 	if err := mgrc.List(ctx, &httpRouteList); err != nil {
 		return 0, err
 	}
-
 	var attachedRoutes int32
 	for _, route := range httpRouteList.Items {
 		route := route
@@ -534,7 +604,6 @@ func getListenerStatus(
 		if err != nil {
 			return nil, err
 		}
-
 		var (
 			reasonResolvedRef = string(gatewayv1.ListenerReasonResolvedRefs)
 			statusResolvedRef = metav1.ConditionTrue

internal/controlplane/translator/gateway.go

@@ -51,6 +51,10 @@ func (t *Translator) translateSecret(tctx *TranslateContext, listener gatewayv1.
 				}
 				name := listener.TLS.CertificateRefs[0].Name
 				secret := tctx.Secrets[types.NamespacedName{Namespace: ns, Name: string(ref.Name)}]
+				if secret == nil {
+					log.Error("secret not found", "namespace", ns, "name", name)
+					return nil, fmt.Errorf("secret not found for %s/%s", ns, name)
+				}
 				if secret.Data == nil {
 					log.Error("secret data is nil", "secret", secret)
 					return nil, fmt.Errorf("no secret data found for %s/%s", ns, name)

test/conformance/conformance_test.go

@@ -27,7 +27,6 @@ var skippedTestsForSSL = []string{
 var skippedTestsForTraditionalRoutes = []string{
 	// TODO: Support ReferenceGrant resource
 	tests.HTTPRouteInvalidReferenceGrant.ShortName,
-	tests.GatewayWithAttachedRoutes.ShortName,
 	tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant.ShortName,
 	tests.HTTPRouteReferenceGrant.ShortName,
 	tests.GatewayInvalidTLSConfiguration.ShortName,