add RouteStatus API to RouteContext interface (#859)

* add RouteStatus API to RouteContext interface Deduplicates the code associated with route status conditions Signed-off-by: Arko Dasgupta <[email protected]>
envoyproxy · Jan 5, 2023 · 50e0bcb · 50e0bcb
1 parent 085e6fa
commit 50e0bcb
Showing 1 changed file with 34 additions and 71 deletions.
diff --git a/internal/gatewayapi/contexts.go b/internal/gatewayapi/contexts.go
@@ -198,6 +198,9 @@ type RouteContext interface {
 	// GetHostnames returns the hosts targeted by the Route object.
 	GetHostnames() []string
 
+	// GetRouteStatus returns the RouteStatus object associated with the Route.
+	GetRouteStatus() *v1beta1.RouteStatus
+
 	// TODO: [v1alpha2-v1beta1] This should not be required once all Route
 	// objects being implemented are of type v1beta1.
 	// GetParentReferences returns the ParentReference of the Route object.
@@ -232,6 +235,10 @@ func (h *HTTPRouteContext) GetParentReferences() []v1beta1.ParentReference {
 	return h.Spec.ParentRefs
 }
 
+func (h *HTTPRouteContext) GetRouteStatus() *v1beta1.RouteStatus {
+	return &h.Status.RouteStatus
+}
+
 func (h *HTTPRouteContext) GetRouteParentContext(forParentRef v1beta1.ParentReference) *RouteParentContext {
 	if h.parentRefs == nil {
 		h.parentRefs = make(map[v1beta1.ParentReference]*RouteParentContext)
@@ -299,6 +306,10 @@ func (t *TLSRouteContext) GetHostnames() []string {
 	return hostnames
 }
 
+func (t *TLSRouteContext) GetRouteStatus() *v1beta1.RouteStatus {
+	return &t.Status.RouteStatus
+}
+
 func (t *TLSRouteContext) GetParentReferences() []v1beta1.ParentReference {
 	parentReferences := make([]v1beta1.ParentReference, len(t.Spec.ParentRefs))
 	for idx, p := range t.Spec.ParentRefs {
@@ -389,6 +400,10 @@ func (u *UDPRouteContext) GetParentReferences() []v1beta1.ParentReference {
 	return parentReferences
 }
 
+func (u *UDPRouteContext) GetRouteStatus() *v1beta1.RouteStatus {
+	return &u.Status.RouteStatus
+}
+
 func (u *UDPRouteContext) GetRouteParentContext(forParentRef v1beta1.ParentReference) *RouteParentContext {
 	if u.parentRefs == nil {
 		u.parentRefs = make(map[v1beta1.ParentReference]*RouteParentContext)
@@ -477,88 +492,36 @@ func (r *RouteParentContext) SetCondition(route RouteContext, conditionType v1be
 	}
 
 	idx := -1
-	switch route.GetRouteType() {
-	case KindHTTPRoute:
-		for i, existing := range r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions {
-			if existing.Type == cond.Type {
-				// return early if the condition is unchanged
-				if existing.Status == cond.Status &&
-					existing.Reason == cond.Reason &&
-					existing.Message == cond.Message {
-					return
-				}
-				idx = i
-				break
-			}
-		}
-
-		if idx > -1 {
-			r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions[idx] = cond
-		} else {
-			r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions = append(r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions, cond)
-		}
-	case KindTLSRoute:
-		for i, existing := range r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions {
-			if existing.Type == cond.Type {
-				// return early if the condition is unchanged
-				if existing.Status == cond.Status &&
-					existing.Reason == cond.Reason &&
-					existing.Message == cond.Message {
-					return
-				}
-				idx = i
-				break
-			}
-		}
-
-		if idx > -1 {
-			r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions[idx] = cond
-		} else {
-			r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions = append(r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions, cond)
-		}
-	case KindUDPRoute:
-		for i, existing := range r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions {
-			if existing.Type == cond.Type {
-				// return early if the condition is unchanged
-				if existing.Status == cond.Status &&
-					existing.Reason == cond.Reason &&
-					existing.Message == cond.Message {
-					return
-				}
-				idx = i
-				break
+	routeStatus := route.GetRouteStatus()
+	for i, existing := range routeStatus.Parents[r.routeParentStatusIdx].Conditions {
+		if existing.Type == cond.Type {
+			// return early if the condition is unchanged
+			if existing.Status == cond.Status &&
+				existing.Reason == cond.Reason &&
+				existing.Message == cond.Message {
+				return
 			}
+			idx = i
+			break
 		}
+	}
 
-		if idx > -1 {
-			r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions[idx] = cond
-		} else {
-			r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions = append(r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions, cond)
-		}
+	if idx > -1 {
+		routeStatus.Parents[r.routeParentStatusIdx].Conditions[idx] = cond
+	} else {
+		routeStatus.Parents[r.routeParentStatusIdx].Conditions = append(routeStatus.Parents[r.routeParentStatusIdx].Conditions, cond)
 	}
 }
 
 func (r *RouteParentContext) ResetConditions(route RouteContext) {
-	switch route.GetRouteType() {
-	case KindHTTPRoute:
-		r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions = make([]metav1.Condition, 0)
-	case KindTLSRoute:
-		r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions = make([]metav1.Condition, 0)
-	case KindUDPRoute:
-		r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions = make([]metav1.Condition, 0)
-	}
+	routeStatus := route.GetRouteStatus()
+	routeStatus.Parents[r.routeParentStatusIdx].Conditions = make([]metav1.Condition, 0)
 }
 
 func (r *RouteParentContext) IsAccepted(route RouteContext) bool {
 	var conditions []metav1.Condition
-	switch route.GetRouteType() {
-	case KindHTTPRoute:
-		conditions = r.httpRoute.Status.Parents[r.routeParentStatusIdx].Conditions
-	case KindTLSRoute:
-		conditions = r.tlsRoute.Status.Parents[r.routeParentStatusIdx].Conditions
-	case KindUDPRoute:
-		conditions = r.udpRoute.Status.Parents[r.routeParentStatusIdx].Conditions
-	}
+	routeStatus := route.GetRouteStatus()
+	conditions = routeStatus.Parents[r.routeParentStatusIdx].Conditions
 	for _, cond := range conditions {
 		if cond.Type == string(v1beta1.RouteConditionAccepted) && cond.Status == metav1.ConditionTrue {
 			return true