github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.31

Browse Source
This commit is contained in:
Kubernetes Release Robot 2024-08-04 04:51:47 +00:00
commit 1d1cc29e6c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/proxy/topology.go
View File

@ -160,19 +160,23 @@ func canUseTopology(endpoints []Endpoint, svcInfo ServicePort, nodeLabels map[st
} }
} }
zone, ok := nodeLabels[v1.LabelTopologyZone] zone, foundZone := nodeLabels[v1.LabelTopologyZone]
if !ok || zone == "" {
klog.V(2).InfoS("Skipping topology aware endpoint filtering since node is missing label", "label", v1.LabelTopologyZone)
return false
}
hasEndpointForZone := false hasEndpointForZone := false
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
if !endpoint.IsReady() { if !endpoint.IsReady() {
continue continue
} }
// If any of the endpoints do not have zone hints, we bail out
if endpoint.ZoneHints().Len() == 0 { if endpoint.ZoneHints().Len() == 0 {
klog.V(2).InfoS("Skipping topology aware endpoint filtering since one or more endpoints is missing a zone hint", "endpoint", endpoint) klog.V(7).InfoS("Skipping topology aware endpoint filtering since one or more endpoints is missing a zone hint", "endpoint", endpoint)
return false
}
// If we've made it this far, we have endpoints with hints set. Now we check if there is a
// zone label, if there isn't one we log a warning and bail out
if !foundZone || zone == "" {
klog.V(2).InfoS("Skipping topology aware endpoint filtering since node is missing label", "label", v1.LabelTopologyZone)
return false return false
} }
@ -182,10 +186,9 @@ func canUseTopology(endpoints []Endpoint, svcInfo ServicePort, nodeLabels map[st
} }
if !hasEndpointForZone { if !hasEndpointForZone {
klog.V(2).InfoS("Skipping topology aware endpoint filtering since no hints were provided for zone", "zone", zone) klog.V(7).InfoS("Skipping topology aware endpoint filtering since no hints were provided for zone", "zone", zone)
return false return false
} }
return true return true
} }