Skip to content

fix: keep sending unready/non-serving endpoints as unhealthy #7253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −16
Open

fix: keep sending unready/non-serving endpoints as unhealthy #7253

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66df46d
fix: keep sending unready/non-serving endpoints as unhealthy
y-rabie Oct 16, 2025
df433e0
Merge branch 'main' into keep-unready-endpoints
y-rabie Oct 16, 2025
57b1b4f
Merge branch 'main' into keep-unready-endpoints
jukie Oct 28, 2025
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
29 changes: 14 additions & 15 deletions internal/gatewayapi/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,24 +1932,23 @@ func getIREndpointsFromEndpointSlice(endpointSlice *discoveryv1.EndpointSlice, p
continue
}
conditions := endpoint.Conditions

// Unknown Serving/Terminating (nil) should fall-back to Ready, see https://pkg.go.dev/k8s.io/api/discovery/v1#EndpointConditions
// So drain the endpoint if:
// 1. Both `Terminating` and `Serving` are != null, and either `Terminating=true` or `Serving=false`
// 2. Or `Ready=false`
var draining bool
if conditions.Serving != nil && conditions.Terminating != nil {
// Check if the endpoint is serving
if !*conditions.Serving {
continue
}
// Drain the endpoint if it is being terminated
draining := *conditions.Terminating
for _, address := range endpoint.Addresses {
ep := ir.NewDestEndpoint(nil, address, uint32(*endpointPort.Port), draining, endpoint.Zone)
endpoints = append(endpoints, ep)
}
} else if conditions.Ready == nil || *conditions.Ready {
for _, address := range endpoint.Addresses {
ep := ir.NewDestEndpoint(nil, address, uint32(*endpointPort.Port), false, endpoint.Zone)
endpoints = append(endpoints, ep)
}
draining = *conditions.Terminating || !*conditions.Serving
} else {
draining = conditions.Ready != nil && !*conditions.Ready
}

for _, address := range endpoint.Addresses {
ep := ir.NewDestEndpoint(nil, address, uint32(*endpointPort.Port), draining, endpoint.Zone)
endpoints = append(endpoints, ep)
}

}
}

Expand Down
4 changes: 3 additions & 1 deletion internal/gatewayapi/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func TestGetIREndpointsFromEndpointSlices(t *testing.T) {
expectedAddrType: ir.MIXED,
},
{
name: "Keep serving and terminating as draining",
name: "Keep non-serving or terminating as draining",
endpointSlices: []*discoveryv1.EndpointSlice{
{
ObjectMeta: metav1.ObjectMeta{Name: "slice1"},
Expand All @@ -201,6 +201,8 @@ func TestGetIREndpointsFromEndpointSlices(t *testing.T) {
portProtocol: corev1.ProtocolTCP,
expectedEndpoints: []*ir.DestinationEndpoint{
{Host: "192.0.2.1", Port: 80, Draining: true},
{Host: "192.0.2.2", Port: 80, Draining: true},
{Host: "192.0.2.3", Port: 80, Draining: true},
},
expectedAddrType: ir.IP,
},
Expand Down
Loading