Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 9 additions & 32 deletions internal/gatewayapi/contexts.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,6 @@ type GatewayContext struct {
listeners map[v1beta1.SectionName]*ListenerContext
}

func (g *GatewayContext) SetCondition(conditionType v1beta1.GatewayConditionType, status metav1.ConditionStatus, reason v1beta1.GatewayConditionReason, message string) {
cond := metav1.Condition{
Type: string(conditionType),
Status: status,
Reason: string(reason),
Message: message,
ObservedGeneration: g.Generation,
LastTransitionTime: metav1.NewTime(time.Now()),
}

idx := -1
for i, existing := range g.Status.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 {
g.Status.Conditions[idx] = cond
} else {
g.Status.Conditions = append(g.Status.Conditions, cond)
}
}

func (g *GatewayContext) GetListenerContext(listenerName v1beta1.SectionName) *ListenerContext {
if g.listeners == nil {
g.listeners = make(map[v1beta1.SectionName]*ListenerContext)
Expand Down Expand Up @@ -135,6 +104,10 @@ func (l *ListenerContext) SetCondition(conditionType v1beta1.ListenerConditionTy
}
}

func (l *ListenerContext) ResetConditions() {
l.gateway.Status.Listeners[l.listenerStatusIdx].Conditions = make([]metav1.Condition, 0)
}

func (l *ListenerContext) SetSupportedKinds(kinds ...v1beta1.RouteGroupKind) {
l.gateway.Status.Listeners[l.listenerStatusIdx].SupportedKinds = kinds
}
Expand Down Expand Up @@ -213,7 +186,7 @@ func (h *HTTPRouteContext) GetRouteParentContext(forParentRef v1beta1.ParentRefe

var parentRef *v1beta1.ParentReference
for i, p := range h.Spec.ParentRefs {
if p == forParentRef {
if reflect.DeepEqual(p, forParentRef) {
parentRef = &h.Spec.ParentRefs[i]
break
}
Expand Down Expand Up @@ -295,6 +268,10 @@ func (r *RouteParentContext) SetCondition(conditionType v1beta1.RouteConditionTy
}
}

func (r *RouteParentContext) ResetConditions() {
r.route.Status.Parents[r.routeParentStatusIdx].Conditions = make([]metav1.Condition, 0)
}

func (r *RouteParentContext) IsAccepted() bool {
for _, cond := range r.route.Status.Parents[r.routeParentStatusIdx].Conditions {
if cond.Type == string(v1beta1.RouteConditionAccepted) && cond.Status == metav1.ConditionTrue {
Expand Down
11 changes: 3 additions & 8 deletions internal/gatewayapi/contexts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ func TestContexts(t *testing.T) {
Gateway: gateway,
}

gctx.SetCondition(v1beta1.GatewayConditionReady, metav1.ConditionTrue, v1beta1.GatewayReasonReady, "Gateway is ready")

require.Len(t, gateway.Status.Conditions, 1)
require.EqualValues(t, gateway.Status.Conditions[0].Type, v1beta1.GatewayConditionReady)
require.EqualValues(t, gateway.Status.Conditions[0].Status, metav1.ConditionTrue)
require.EqualValues(t, gateway.Status.Conditions[0].Reason, v1beta1.GatewayReasonReady)
require.EqualValues(t, gateway.Status.Conditions[0].Message, "Gateway is ready")

lctx := gctx.GetListenerContext("http")
require.NotNil(t, lctx)

Expand All @@ -53,4 +45,7 @@ func TestContexts(t *testing.T) {
require.Len(t, gateway.Status.Listeners, 1)
require.Len(t, gateway.Status.Listeners[0].SupportedKinds, 1)
require.EqualValues(t, gateway.Status.Listeners[0].SupportedKinds[0].Kind, "HTTPRoute")

lctx.ResetConditions()
require.Len(t, gateway.Status.Listeners[0].Conditions, 0)
}
6 changes: 5 additions & 1 deletion internal/gatewayapi/translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ func (t *Translator) GetRelevantGateways(gateways []*v1beta1.Gateway) []*Gateway

for _, listener := range gateway.Spec.Listeners {
l := gc.GetListenerContext(listener.Name)
// Reset attached route count since it will be recomputed during translation.
// Reset conditions and attached route count
// since it will be recomputed during translation.
l.ResetConditions()
l.ResetAttachedRoutes()
}

Expand Down Expand Up @@ -637,6 +639,8 @@ func (t *Translator) ProcessHTTPRoutes(httpRoutes []*v1beta1.HTTPRoute, gateways
relevantRoute = true

parentRefCtx := httpRoute.GetRouteParentContext(parentRef)
// Reset conditions since they will be recomputed during translation
parentRefCtx.ResetConditions()

if !HasReadyListener(selectedListeners) {
parentRefCtx.SetCondition(v1beta1.RouteConditionAccepted, metav1.ConditionFalse, "NoReadyListeners", "There are no ready listeners for this parent ref")
Expand Down
7 changes: 5 additions & 2 deletions internal/provider/kubernetes/httproute.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,13 @@ func (r *httpRouteReconciler) subscribeAndUpdateStatus(ctx context.Context) {
NamespacedName: key,
Resource: new(gwapiv1b1.HTTPRoute),
Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
if _, ok := obj.(*gwapiv1b1.HTTPRoute); !ok {
h, ok := obj.(*gwapiv1b1.HTTPRoute)
if !ok {
panic(fmt.Sprintf("unsupported object type %T", obj))
}
return val
hCopy := h.DeepCopy()
hCopy.Status.Parents = val.Status.Parents
return hCopy
}),
})
}
Expand Down
2 changes: 1 addition & 1 deletion internal/status/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (u *UpdateWriter) Send(update Update) {
// Gateway
// HTTPRoute
func isStatusEqual(objA, objB interface{}) bool {
opts := cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")
opts := cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime", "ObservedGeneration")
switch a := objA.(type) {
case *gwapiv1b1.GatewayClass:
if b, ok := objB.(*gwapiv1b1.GatewayClass); ok {
Expand Down