From 1ac5f661ed8dd3bdca8536d4fab7efa3e8511d32 Mon Sep 17 00:00:00 2001 From: Miles Bryant Date: Wed, 2 Jul 2025 13:36:18 +0100 Subject: [PATCH] Don't log irrelevant zone hints message on no endpoints Update pkg/proxy/topology.go Co-authored-by: Dan Winship Add unit test case --- pkg/proxy/topology.go | 6 ++++++ pkg/proxy/topology_test.go | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/pkg/proxy/topology.go b/pkg/proxy/topology.go index c91961d7cec..c76ea30c91d 100644 --- a/pkg/proxy/topology.go +++ b/pkg/proxy/topology.go @@ -153,6 +153,12 @@ func CategorizeEndpoints(endpoints []Endpoint, svcInfo ServicePort, nodeName str // hinted for this node's zone, then it returns "PreferSameZone". // - Otherwise it returns "" (meaning, no topology / default traffic distribution). func topologyModeFromHints(svcInfo ServicePort, endpoints []Endpoint, nodeName, zone string) string { + if len(endpoints) == 0 { + // The code below assumes at least 1 endpoint; if there are no endpoints, + // there are no hints. + return "" + } + hasEndpointForNode := false allEndpointsHaveNodeHints := true hasEndpointForZone := false diff --git a/pkg/proxy/topology_test.go b/pkg/proxy/topology_test.go index 807dc513d95..c5ef39dbbc6 100644 --- a/pkg/proxy/topology_test.go +++ b/pkg/proxy/topology_test.go @@ -390,6 +390,13 @@ func TestCategorizeEndpoints(t *testing.T) { clusterEndpoints: nil, localEndpoints: sets.New[string]("10.0.0.1:80"), allEndpoints: sets.New[string]("10.0.0.1:80"), + }, { + name: "empty cluster endpoints when no service endpoints exist", + serviceInfo: &BaseServicePortInfo{}, + endpoints: nil, + clusterEndpoints: sets.New[string](), + localEndpoints: nil, + allEndpoints: nil, }} for _, tc := range testCases {