Remove duplicate parentRefs from httproute status

Author: bjee19

internal/controller/state/graph/graph_test.go

@@ -786,7 +786,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[0].Name,
 			},
 			{
-				Idx: 1,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,
@@ -799,7 +799,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[1].Name,
 			},
 			{
-				Idx: 2,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,
@@ -816,7 +816,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[2].Name,
 			},
 			{
-				Idx: 3,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,
@@ -868,7 +868,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[0].Name,
 			},
 			{
-				Idx: 1,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,
@@ -881,7 +881,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[1].Name,
 			},
 			{
-				Idx: 2,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,
@@ -894,7 +894,7 @@ func TestBuildGraph(t *testing.T) {
 				SectionName: &gw1.Source.Spec.Listeners[2].Name,
 			},
 			{
-				Idx: 3,
+				Idx: 0,
 				Gateway: &ParentRefGateway{
 					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
 					EffectiveNginxProxy: np1Effective,

internal/controller/state/graph/route_common.go

@@ -322,8 +322,12 @@ func buildSectionNameRefs(
 					SectionName: &l.Source.Name,
 					Port:        p.Port,
 				})
-				parentRefIndex++
 			}
+
+			// if the ParentRefs we create are for each listener in the same gateway, we keep the
+			// parentRefIndex the same so when we look at a route's parentRef's we can see
+			// if the parentRef is a unique parentRef or one we created internally
+			parentRefIndex++
 			continue
 		}
 

internal/controller/state/graph/route_common_test.go

@@ -124,7 +124,7 @@ func TestBuildSectionNameRefs(t *testing.T) {
 			SectionName: helpers.GetPointer[gatewayv1.SectionName]("http"),
 		},
 		{
-			Idx:         5,
+			Idx:         4,
 			Gateway:     CreateParentRefGateway(gws[gwNsName3]),
 			SectionName: helpers.GetPointer[gatewayv1.SectionName]("https"),
 		},

internal/controller/status/prepare_requests.go

@@ -95,6 +95,32 @@ func PrepareRouteRequests(
 	return reqs
 }
 
+func removeDuplicateIndexParentRefs(parentRefs []graph.ParentRef) []graph.ParentRef {
+	idxCount := make(map[int]int)
+	for _, ref := range parentRefs {
+		idxCount[ref.Idx]++
+	}
+
+	seen := make(map[int]bool)
+	result := make([]graph.ParentRef, 0, len(parentRefs))
+
+	for _, ref := range parentRefs {
+		if seen[ref.Idx] {
+			continue // skip duplicates
+		}
+		seen[ref.Idx] = true
+
+		// If this Idx was duplicated, clear SectionName
+		if idxCount[ref.Idx] > 1 {
+			ref.SectionName = nil
+		}
+
+		result = append(result, ref)
+	}
+
+	return result
+}
+
 func prepareRouteStatus(
 	gatewayCtlrName string,
 	parentRefs []graph.ParentRef,
@@ -103,11 +129,13 @@ func prepareRouteStatus(
 	transitionTime metav1.Time,
 	srcGeneration int64,
 ) v1.RouteStatus {
-	parents := make([]v1.RouteParentStatus, 0, len(parentRefs))
+	processedParentRefs := removeDuplicateIndexParentRefs(parentRefs)
+
+	parents := make([]v1.RouteParentStatus, 0, len(processedParentRefs))
 
 	defaultConds := conditions.NewDefaultRouteConditions()
 
-	for _, ref := range parentRefs {
+	for _, ref := range processedParentRefs {
 		failedAttachmentCondCount := 0
 		if ref.Attachment != nil {
 			failedAttachmentCondCount = len(ref.Attachment.FailedConditions)

internal/controller/status/prepare_requests_test.go

@@ -72,6 +72,12 @@ var (
 			{
 				SectionName: helpers.GetPointer[v1.SectionName]("listener-80-3"),
 			},
+			{
+				SectionName: helpers.GetPointer[v1.SectionName]("listener-443-1"),
+			},
+			{
+				SectionName: helpers.GetPointer[v1.SectionName]("listener-443-2"),
+			},
 		},
 	}
 
@@ -110,6 +116,22 @@ var (
 				FailedConditions: []conditions.Condition{invalidAttachmentCondition},
 			},
 		},
+		{
+			Idx:         3,
+			Gateway:     &graph.ParentRefGateway{NamespacedName: gwNsName},
+			SectionName: commonRouteSpecValid.ParentRefs[3].SectionName,
+			Attachment: &graph.ParentRefAttachmentStatus{
+				Attached: true,
+			},
+		},
+		{
+			Idx:         3,
+			Gateway:     &graph.ParentRefGateway{NamespacedName: gwNsName},
+			SectionName: commonRouteSpecValid.ParentRefs[4].SectionName,
+			Attachment: &graph.ParentRefAttachmentStatus{
+				Attached: true,
+			},
+		},
 	}
 
 	parentRefsInvalid = []graph.ParentRef{
@@ -213,6 +235,31 @@ var (
 					},
 				},
 			},
+			{
+				ParentRef: v1.ParentReference{
+					Namespace: helpers.GetPointer(v1.Namespace(gwNsName.Namespace)),
+					Name:      v1.ObjectName(gwNsName.Name),
+				},
+				ControllerName: gatewayCtlrName,
+				Conditions: []metav1.Condition{
+					{
+						Type:               string(v1.RouteConditionAccepted),
+						Status:             metav1.ConditionTrue,
+						ObservedGeneration: 3,
+						LastTransitionTime: transitionTime,
+						Reason:             string(v1.RouteReasonAccepted),
+						Message:            "The route is accepted",
+					},
+					{
+						Type:               string(v1.RouteConditionResolvedRefs),
+						Status:             metav1.ConditionTrue,
+						ObservedGeneration: 3,
+						LastTransitionTime: transitionTime,
+						Reason:             string(v1.RouteReasonResolvedRefs),
+						Message:            "All references are resolved",
+					},
+				},
+			},
 		},
 	}