Skip to content

fix: Filter chain translation uses incorrect parent ns #12936

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
davidjumani merged 4 commits into from
Nov 21, 2025
Merged

fix: Filter chain translation uses incorrect parent ns #12936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a8d8ef
fix: Filter chain translation uses incorrect parent ns
davidjumani Nov 20, 2025
d833589
Merge branch 'main' into fix-incorrect-l-ns
davidjumani Nov 20, 2025
6da4e92
fix failing test
davidjumani Nov 20, 2025
e043b00
fix lint
davidjumani Nov 20, 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
47 changes: 24 additions & 23 deletions internal/kgateway/translator/listener/gateway_listener_translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,24 @@ func TranslateListeners(
})(nil)

validatedListeners := validateGateway(gateway, reporter, settings)
mergedListeners := mergeGWListeners(queries, gateway.Namespace, validatedListeners, *gateway, routesForGw, reporter, settings)
mergedListeners := mergeGWListeners(queries, validatedListeners, *gateway, routesForGw, reporter, settings)
translatedListeners := mergedListeners.translateListeners(kctx, ctx, queries, reporter)

return translatedListeners
}

func mergeGWListeners(
queries query.GatewayQueries,
gatewayNamespace string,
listeners []ir.Listener,
parentGw ir.Gateway,
routesForGw *query.RoutesForGwResult,
reporter reports.Reporter,
settings ListenerTranslatorConfig,
) *MergedListeners {
ml := &MergedListeners{
parentGw: parentGw,
GatewayNamespace: gatewayNamespace,
Queries: queries,
settings: settings,
parentGw: parentGw,
Queries: queries,
settings: settings,
}
for _, listener := range listeners {
result := routesForGw.GetListenerResult(listener.Parent, string(listener.Name))
Expand All @@ -96,11 +94,10 @@ func mergeGWListeners(
}

type MergedListeners struct {
GatewayNamespace string
parentGw ir.Gateway
Listeners []*MergedListener
Queries query.GatewayQueries
settings ListenerTranslatorConfig
parentGw ir.Gateway
Listeners []*MergedListener
Queries query.GatewayQueries
settings ListenerTranslatorConfig
}

func (ml *MergedListeners) AppendListener(
Expand Down Expand Up @@ -160,7 +157,6 @@ func (ml *MergedListeners) appendHttpListener(
// create a new filter chain for the listener
ml.Listeners = append(ml.Listeners, &MergedListener{
name: GenerateListenerName(listener),
gatewayNamespace: ml.GatewayNamespace,
port: finalPort,
httpFilterChain: fc,
listenerReporter: reporter,
Expand All @@ -182,6 +178,7 @@ func (ml *MergedListeners) appendHttpsListener(

mfc := httpsFilterChain{
gatewayListenerName: query.GenerateRouteKey(listener.Parent, string(listener.Name)),
parentNamespace: listener.Parent.GetNamespace(),
sniDomain: listener.Hostname,
tls: tls,
routesWithHosts: routesWithHosts,
Expand All @@ -200,7 +197,6 @@ func (ml *MergedListeners) appendHttpsListener(

ml.Listeners = append(ml.Listeners, &MergedListener{
name: GenerateListenerName(listener),
gatewayNamespace: ml.GatewayNamespace,
port: finalPort,
httpsFilterChains: []httpsFilterChain{mfc},
listenerReporter: reporter,
Expand All @@ -217,6 +213,7 @@ func (ml *MergedListeners) AppendTcpListener(
) {
parent := tcpFilterChainParent{
gatewayListenerName: query.GenerateRouteKey(listener.Parent, string(listener.Name)),
parentNamespace: listener.Parent.GetNamespace(),
routesWithHosts: routeInfos,
}
fc := tcpFilterChain{
Expand All @@ -235,7 +232,6 @@ func (ml *MergedListeners) AppendTcpListener(
// create a new filter chain for the listener
ml.Listeners = append(ml.Listeners, &MergedListener{
name: GenerateListenerName(listener),
gatewayNamespace: ml.GatewayNamespace,
port: finalPort,
TcpFilterChains: []tcpFilterChain{fc},
listenerReporter: reporter,
Expand All @@ -252,6 +248,7 @@ func (ml *MergedListeners) AppendTlsListener(
) {
parent := tcpFilterChainParent{
gatewayListenerName: query.GenerateRouteKey(listener.Parent, string(listener.Name)),
parentNamespace: listener.Parent.GetNamespace(),
routesWithHosts: routeInfos,
}
tls := listener.TLS
Expand All @@ -276,7 +273,6 @@ func (ml *MergedListeners) AppendTlsListener(
// create a new filter chain for the listener
ml.Listeners = append(ml.Listeners, &MergedListener{
name: GenerateListenerName(listener),
gatewayNamespace: ml.GatewayNamespace,
port: finalPort,
TcpFilterChains: []tcpFilterChain{fc},
listenerReporter: reporter,
Expand All @@ -301,7 +297,6 @@ func (ml *MergedListeners) translateListeners(

type MergedListener struct {
name string
gatewayNamespace string
port gwv1.PortNumber
httpFilterChain *httpFilterChain
httpsFilterChains []httpsFilterChain
Expand Down Expand Up @@ -335,7 +330,7 @@ func (ml *MergedListener) TranslateListener(
kctx,
ctx,
mfc.gatewayListenerName,
ml.gatewayNamespace,
mfc.parentNamespace,
queries,
reporter,
ml.listenerReporter,
Expand All @@ -352,7 +347,7 @@ func (ml *MergedListener) TranslateListener(
// Translate TCP listeners (if any exist)
var matchedTcpListeners []ir.TcpIR
for _, tfc := range ml.TcpFilterChains {
if tcpListener := tfc.translateTcpFilterChain(kctx, ctx, ml.gatewayNamespace, queries, ml.name, reporter); tcpListener != nil {
if tcpListener := tfc.translateTcpFilterChain(kctx, ctx, tfc.parents.parentNamespace, queries, ml.name, reporter); tcpListener != nil {
matchedTcpListeners = append(matchedTcpListeners, *tcpListener)
}
}
Expand Down Expand Up @@ -402,7 +397,10 @@ type tcpFilterChain struct {

type tcpFilterChainParent struct {
gatewayListenerName string
routesWithHosts []*query.RouteInfo
// Although the parent gateway is the same for all listeners,
// they can belong to different listenersets in different namespaces
parentNamespace string
routesWithHosts []*query.RouteInfo
}

func (tc *tcpFilterChain) translateTcpFilterChain(
Expand Down Expand Up @@ -678,10 +676,13 @@ func (httpFilterChain *httpFilterChain) translateHttpFilterChain(

type httpsFilterChain struct {
gatewayListenerName string
sniDomain *gwv1.Hostname
tls *gwv1.ListenerTLSConfig
routesWithHosts []*query.RouteInfo
attachedPolicies ir.AttachedPolicies
// Although the parent gateway is the same for all listeners,
// they can belong to different listenersets in different namespaces
parentNamespace string
sniDomain *gwv1.Hostname
tls *gwv1.ListenerTLSConfig
routesWithHosts []*query.RouteInfo
attachedPolicies ir.AttachedPolicies
}

func (httpsFilterChain *httpsFilterChain) translateHttpsFilterChain(
Expand Down
27 changes: 14 additions & 13 deletions internal/kgateway/translator/listener/gateway_listener_translator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ var (
func lisToIr(l gwv1.Listener) ir.Listener {
return ir.Listener{
Listener: l,
Parent: &gwv1.Gateway{},
Parent: &gwv1.Gateway{
ObjectMeta: metav1.ObjectMeta{
Name: "gw",
Namespace: "default",
},
},
}
}

Expand Down Expand Up @@ -115,9 +120,8 @@ var _ = Describe("Translator TCPRoute Listener", func() {
gatewayReporter := statusReporter.Gateway(gateway)
listenerReporter = gatewayReporter.Listener(&gwListener)
ml = &listener.MergedListeners{
Listeners: []*listener.MergedListener{},
Queries: queries,
GatewayNamespace: "default",
Listeners: []*listener.MergedListener{},
Queries: queries,
}

})
Expand Down Expand Up @@ -609,9 +613,8 @@ var _ = Describe("Translator TCPRoute Listener", func() {

// Re-create the MergedListeners with the test reporter to capture status
testMl := &listener.MergedListeners{
Listeners: []*listener.MergedListener{},
Queries: queries,
GatewayNamespace: "default",
Listeners: []*listener.MergedListener{},
Queries: queries,
}
testMl.AppendTcpListener(lisToIr(gwListener), routes, testListenerReporter)
testMl.Listeners[0].TranslateListener(krt.TestingDummyContext{}, ctx, nil, testStatusReporter)
Expand Down Expand Up @@ -664,9 +667,8 @@ var _ = Describe("Translator TCPRoute Listener", func() {
gatewayReporter := statusReporter.Gateway(gateway)
listenerReporter = gatewayReporter.Listener(&gwListener)
ml = &listener.MergedListeners{
Listeners: []*listener.MergedListener{},
Queries: queries,
GatewayNamespace: "default",
Listeners: []*listener.MergedListener{},
Queries: queries,
}
})

Expand Down Expand Up @@ -891,9 +893,8 @@ var _ = Describe("Translator TCPRoute Listener", func() {
gatewayReporter := statusReporter.Gateway(gateway)
listenerReporter = gatewayReporter.Listener(&gwListener)
ml = &listener.MergedListeners{
Listeners: []*listener.MergedListener{},
Queries: queries,
GatewayNamespace: "default",
Listeners: []*listener.MergedListener{},
Queries: queries,
}
})

Expand Down