Skip to content

follow up listenerset policy attachment #9621

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
zirain merged 3 commits into from
Aug 2, 2026
+87 −112
Merged

follow up listenerset policy attachment #9621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c258446
perf: translate for listenerset
kkk777-7 Jul 30, 2026
6e8cf34
use: common helper
kkk777-7 Jul 30, 2026
0b57de8
Merge branch 'main' into follow-up-ls-attachment
kkk777-7 Jul 31, 2026
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
118 changes: 43 additions & 75 deletions internal/gatewayapi/backendtrafficpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,47 +531,52 @@ func (t *Translator) ProcessBackendTrafficPolicies(
}
}

// Process the policies targeting ListenerSet Listeners
for i, currPolicy := range backendTrafficPolicies {
policyName := utils.NamespacedName(currPolicy)
// Only resolve TargetRefs from targetRefs field since TargetSelectors can't specify sectionName.
targetRefs := resolvePolicyTargetsFromReferences(currPolicy.Spec.PolicyTargetReferences, currPolicy.Namespace)
for _, currTarget := range targetRefs {
if isListenerSetListener(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = backendTrafficPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
// Only run the ListenerSet-specific translation when at least one ListenerSet exists.
// When none are present, no policy can successfully attach to a ListenerSet (the target resolves to
// nil and processing returns early), so these loops would be pure overhead.
if len(resources.ListenerSets) > 0 {
// Process the policies targeting ListenerSet Listeners
for i, currPolicy := range backendTrafficPolicies {
policyName := utils.NamespacedName(currPolicy)
// Only resolve TargetRefs from targetRefs field since TargetSelectors can't specify sectionName.
targetRefs := resolvePolicyTargetsFromReferences(currPolicy.Spec.PolicyTargetReferences, currPolicy.Namespace)
for _, currTarget := range targetRefs {
if isListenerSetListener(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = backendTrafficPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}
t.processBackendTrafficPolicyForListenerSet(xdsIR,
gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
t.processBackendTrafficPolicyForListenerSet(xdsIR,
gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
}
}

// Process the policies targeting ListenerSets
for i, currPolicy := range backendTrafficPolicies {
policyName := utils.NamespacedName(currPolicy)
targetRefs := resolvePolicyTargets(
currPolicy.Spec.PolicyTargetReferences,
resources.ListenerSets,
resources.ReferenceGrants,
egv1a1.GroupName,
egv1a1.KindBackendTrafficPolicy,
currPolicy.Namespace,
t.GetNamespace,
)
for _, currTarget := range targetRefs {
if isListenerSet(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = backendTrafficPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
// Process the policies targeting ListenerSets
for i, currPolicy := range backendTrafficPolicies {
policyName := utils.NamespacedName(currPolicy)
targetRefs := resolvePolicyTargets(
currPolicy.Spec.PolicyTargetReferences,
resources.ListenerSets,
resources.ReferenceGrants,
egv1a1.GroupName,
egv1a1.KindBackendTrafficPolicy,
currPolicy.Namespace,
t.GetNamespace,
)
for _, currTarget := range targetRefs {
if isListenerSet(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = backendTrafficPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}
t.processBackendTrafficPolicyForListenerSet(xdsIR,
gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
t.processBackendTrafficPolicyForListenerSet(xdsIR,
gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
}
}
Expand Down Expand Up @@ -1772,7 +1777,7 @@ func (t *Translator) translateBackendTrafficPolicyForGateway(
return t.translateBackendTrafficPolicyForListeners(
policy,
gtwCtx,
gatewayBackendTrafficPolicyTargetListeners(gtwCtx, target),
gatewayPolicyTargetListeners(gtwCtx, target),
target.SectionName == nil,
xdsIR,
)
Expand All @@ -1788,49 +1793,12 @@ func (t *Translator) translateBackendTrafficPolicyForListenerSet(
return t.translateBackendTrafficPolicyForListeners(
policy,
gtwCtx,
listenerSetBackendTrafficPolicyTargetListeners(gtwCtx, listenerSet, target),
listenerSetPolicyTargetListeners(gtwCtx, listenerSet, target),
false,
xdsIR,
)
}

func gatewayBackendTrafficPolicyTargetListeners(
gtwCtx *GatewayContext,
target policyTargetReferenceWithSectionName,
) []*ListenerContext {
listeners := make([]*ListenerContext, 0, len(gtwCtx.listeners))
for _, listener := range gtwCtx.listeners {
if target.SectionName != nil {
if listener.isFromListenerSet() || listener.Name != *target.SectionName {
continue
}
}
listeners = append(listeners, listener)
}
return listeners
}

func listenerSetBackendTrafficPolicyTargetListeners(
gtwCtx *GatewayContext,
listenerSet *gwapiv1.ListenerSet,
target policyTargetReferenceWithSectionName,
) []*ListenerContext {
listeners := make([]*ListenerContext, 0, len(gtwCtx.listeners))
for _, listener := range gtwCtx.listeners {
if !listener.isFromListenerSet() {
continue
}
if listener.listenerSet.Namespace != listenerSet.Namespace || listener.listenerSet.Name != listenerSet.Name {
continue
}
if target.SectionName != nil && listener.Name != *target.SectionName {
continue
}
listeners = append(listeners, listener)
}
return listeners
}

func (t *Translator) translateBackendTrafficPolicyForListeners(
policy *egv1a1.BackendTrafficPolicy,
gtwCtx *GatewayContext,
Expand Down
2 changes: 1 addition & 1 deletion internal/gatewayapi/envoyextensionpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (t *Translator) ProcessEnvoyExtensionPolicies(
}
}

// Only run the ListenerSet-specific　translation when at least one ListenerSet exists.
// Only run the ListenerSet-specific translation when at least one ListenerSet exists.
// When none are present, no policy can successfully attach to a ListenerSet (the target resolves to
// nil and processing returns early), so these loops would be pure overhead.
if len(resources.ListenerSets) > 0 {
Expand Down
79 changes: 43 additions & 36 deletions internal/gatewayapi/securitypolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,49 +192,56 @@ func (t *Translator) ProcessSecurityPolicies(
}
}
}
// Process the policies targeting ListenerSets Listeners
for i, currPolicy := range securityPolicies {
policyName := utils.NamespacedName(currPolicy)
// Only resolve TargetRefs from targetRefs field since TargetSelectors can't specify sectionName.
targetRefs := resolvePolicyTargetsFromReferences(currPolicy.Spec.PolicyTargetReferences, currPolicy.Namespace)
for _, currTarget := range targetRefs {
if isListenerSetListener(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = securityPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}

t.processSecurityPolicyForListenerSet(resources, xdsIR, gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
// Only run the ListenerSet-specific translation when at least one ListenerSet exists.
// When none are present, no policy can successfully attach to a ListenerSet (the target resolves to
// nil and processing returns early), so these loops would be pure overhead.
if len(resources.ListenerSets) > 0 {
// Process the policies targeting ListenerSets Listeners
for i, currPolicy := range securityPolicies {
policyName := utils.NamespacedName(currPolicy)
// Only resolve TargetRefs from targetRefs field since TargetSelectors can't specify sectionName.
targetRefs := resolvePolicyTargetsFromReferences(currPolicy.Spec.PolicyTargetReferences, currPolicy.Namespace)
for _, currTarget := range targetRefs {
if isListenerSetListener(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = securityPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}

t.processSecurityPolicyForListenerSet(resources, xdsIR, gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
}
}
}
// Process the policies targeting ListenerSets
for i, currPolicy := range securityPolicies {
policyName := utils.NamespacedName(currPolicy)
targetRefs := resolvePolicyTargets(
currPolicy.Spec.PolicyTargetReferences,
resources.ListenerSets,
resources.ReferenceGrants,
egv1a1.GroupName,
egv1a1.KindSecurityPolicy,
currPolicy.Namespace,
t.GetNamespace,
)
for _, currTarget := range targetRefs {
if isListenerSet(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = securityPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}
// Process the policies targeting ListenerSets
for i, currPolicy := range securityPolicies {
policyName := utils.NamespacedName(currPolicy)
targetRefs := resolvePolicyTargets(
currPolicy.Spec.PolicyTargetReferences,
resources.ListenerSets,
resources.ReferenceGrants,
egv1a1.GroupName,
egv1a1.KindSecurityPolicy,
currPolicy.Namespace,
t.GetNamespace,
)
for _, currTarget := range targetRefs {
if isListenerSet(currTarget) {
policy, found := handledPolicies[policyName]
if !found {
policy = securityPolicies[i]
handledPolicies[policyName] = policy
res = append(res, policy)
}

t.processSecurityPolicyForListenerSet(resources, xdsIR, gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
t.processSecurityPolicyForListenerSet(resources, xdsIR, gatewayMap, listenerSetMap, overrides, merged, policy, currTarget)
}
}
}
}

// Process the policies targeting Gateway Listeners
for i, currPolicy := range securityPolicies {
policyName := utils.NamespacedName(currPolicy)
Expand Down