update

Signed-off-by: bitliu <bitliu@tencent.com>
envoyproxy · Jan 9, 2023 · f6a179e · f6a179e
1 parent d8fc059
commit f6a179e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/internal/gatewayapi/contexts.go b/internal/gatewayapi/contexts.go
@@ -494,11 +494,12 @@ func (r *RouteParentContext) SetCondition(route RouteContext, conditionType v1be
 	idx := -1
 	routeStatus := route.GetRouteStatus()
 	for i, existing := range routeStatus.Parents[r.routeParentStatusIdx].Conditions {
-		if existing.Type == cond.Type && existing.ObservedGeneration == cond.ObservedGeneration {
+		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 {
+				existing.Message == cond.Message &&
+				existing.ObservedGeneration == cond.ObservedGeneration {
 				return
 			}
 			idx = i

diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go
@@ -495,14 +495,7 @@ func (r *gatewayAPIReconciler) statusUpdateForGateway(gtw *gwapiv1b1.Gateway, sv
 			}
 			gCopy := g.DeepCopy()
 			gCopy.Status.Conditions = status.MergeConditions(gCopy.Status.Conditions, gtw.Status.Conditions...)
-			for index := range gCopy.Status.Conditions {
-				gCopy.Status.Conditions[index].ObservedGeneration = gtw.Generation
-			}
-			for listenerIndex, listener := range gCopy.Status.Listeners {
-				for index := range listener.Conditions {
-					gCopy.Status.Listeners[listenerIndex].Conditions[index].ObservedGeneration = gtw.Generation
-				}
-			}
+
 			gCopy.Status.Addresses = gtw.Status.Addresses
 			return gCopy
 		}),
@@ -903,14 +896,6 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) {
 						gCopy := g.DeepCopy()
 						gCopy.Status.Listeners = val.Status.Listeners
 
-						for index := range gCopy.Status.Conditions {
-							gCopy.Status.Conditions[index].ObservedGeneration = gCopy.Generation
-						}
-						for listenerIndex, listener := range gCopy.Status.Listeners {
-							for index := range listener.Conditions {
-								gCopy.Status.Listeners[listenerIndex].Conditions[index].ObservedGeneration = gCopy.Generation
-							}
-						}
 						return gCopy
 					}),
 				})
@@ -940,11 +925,6 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) {
 						hCopy := h.DeepCopy()
 						hCopy.Status.Parents = val.Status.Parents
 
-						for parentIndex, parent := range hCopy.Status.Parents {
-							for conditionIndex := range parent.Conditions {
-								hCopy.Status.Parents[parentIndex].Conditions[conditionIndex].ObservedGeneration = hCopy.Generation
-							}
-						}
 						return hCopy
 					}),
 				})