Skip to content

Handle duplicate kinds in listener allowed kinds #3810

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

Merged
merged 1 commit into from
Aug 30, 2025
Merged

Handle duplicate kinds in listener allowed kinds #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions internal/controller/state/graph/gateway_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ func getAndValidateListenerSupportedKinds(listener v1.Listener) (
}

if listener.AllowedRoutes != nil && listener.AllowedRoutes.Kinds != nil {
supportedKinds = make([]v1.RouteGroupKind, 0, len(listener.AllowedRoutes.Kinds))
unique := make(map[string]struct{})
supportedKinds = make([]v1.RouteGroupKind, 0)
for _, kind := range listener.AllowedRoutes.Kinds {
if !validProtocolRouteKind(kind) {
group := v1.GroupName
Expand All @@ -298,7 +299,15 @@ func getAndValidateListenerSupportedKinds(listener v1.Listener) (
conds = append(conds, conditions.NewListenerInvalidRouteKinds(msg)...)
continue
}
supportedKinds = append(supportedKinds, kind)
// Use group/kind as key for uniqueness
key := string(kind.Kind)
if kind.Group != nil {
key = string(*kind.Group) + "/" + key
}
if _, exists := unique[key]; !exists {
unique[key] = struct{}{}
supportedKinds = append(supportedKinds, kind)
}
}
return conds, supportedKinds
}
Expand Down
14 changes: 14 additions & 0 deletions internal/controller/state/graph/gateway_listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,20 @@ func TestGetAndValidateListenerSupportedKinds(t *testing.T) {
name: "valid and invalid kinds",
expected: []v1.RouteGroupKind{HTTPRouteGroupKind},
},
{
protocol: v1.HTTPProtocolType,
kind: []v1.RouteGroupKind{
HTTPRouteGroupKind,
GRPCRouteGroupKind,
GRPCRouteGroupKind,
},
expectErr: false,
name: "handle duplicate kinds",
expected: []v1.RouteGroupKind{
HTTPRouteGroupKind,
GRPCRouteGroupKind,
},
},
{
protocol: v1.TLSProtocolType,
kind: []v1.RouteGroupKind{
Expand Down
Loading