baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Include status addresses when comparing Gateway statuses

Browse source
This commit is contained in:
Kevin Pollet 2024-08-05 12:22:04 +02:00 committed by GitHub
parent ccc11a69f1
commit 5380e48747
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pkg/provider/kubernetes/gateway/client.go
View file

@ -684,32 +684,9 @@ func translateNotFoundError(err error) (bool, error) {
} }
func gatewayStatusEqual(statusA, statusB gatev1.GatewayStatus) bool { func gatewayStatusEqual(statusA, statusB gatev1.GatewayStatus) bool {
if len(statusA.Listeners) != len(statusB.Listeners) { return reflect.DeepEqual(statusA.Addresses, statusB.Addresses) &&
return false listenersStatusEqual(statusA.Listeners, statusB.Listeners) &&
} conditionsEqual(statusA.Conditions, statusB.Conditions)
if !conditionsEqual(statusA.Conditions, statusB.Conditions) {
return false
}
listenerMatches := 0
for _, newListener := range statusB.Listeners {
for _, oldListener := range statusA.Listeners {
if newListener.Name == oldListener.Name {
if !conditionsEqual(newListener.Conditions, oldListener.Conditions) {
return false
}
if newListener.AttachedRoutes != oldListener.AttachedRoutes {
return false
}
listenerMatches++
}
}
}
return listenerMatches == len(statusA.Listeners)
} }
func routeParentStatusesEqual(routeParentStatusesA, routeParentStatusesB []gatev1alpha2.RouteParentStatus) bool { func routeParentStatusesEqual(routeParentStatusesA, routeParentStatusesB []gatev1alpha2.RouteParentStatus) bool {
@ -737,15 +714,17 @@ func routeParentStatusesEqual(routeParentStatusesA, routeParentStatusesB []gatev
} }
func routeParentStatusEqual(sA, sB gatev1alpha2.RouteParentStatus) bool { func routeParentStatusEqual(sA, sB gatev1alpha2.RouteParentStatus) bool {
if !reflect.DeepEqual(sA.ParentRef, sB.ParentRef) { return sA.ControllerName == sB.ControllerName &&
return false reflect.DeepEqual(sA.ParentRef, sB.ParentRef) &&
conditionsEqual(sA.Conditions, sB.Conditions)
} }
if sA.ControllerName != sB.ControllerName { func listenersStatusEqual(listenerA, listenerB []gatev1.ListenerStatus) bool {
return false return slices.EqualFunc(listenerA, listenerB, func(lA gatev1.ListenerStatus, lB gatev1.ListenerStatus) bool {
} return lA.Name == lB.Name &&
lA.AttachedRoutes == lB.AttachedRoutes &&
return conditionsEqual(sA.Conditions, sB.Conditions) conditionsEqual(lA.Conditions, lB.Conditions)
})
} }
func conditionsEqual(conditionsA, conditionsB []metav1.Condition) bool { func conditionsEqual(conditionsA, conditionsB []metav1.Condition) bool {