Skip to content

Fixes for external routing #1176

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: master
Choose a base branch
from
Open

Fixes for external routing #1176

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0455be2
fix(agent): filter imports in external VRF
edipascale Nov 4, 2025
ad47e24
fix(agent): prefer external routes in ext. VRF
edipascale Nov 4, 2025
51ba7a7
fix(agent): prevent peering via external IRB VLAN
edipascale Nov 4, 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
54 changes: 49 additions & 5 deletions pkg/agent/dozer/bcm/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,34 @@ func planExternals(agent *agentapi.Agent, spec *dozer.Spec) error {
Action: dozer.SpecPrefixListActionPermit,
}
}

spec.RouteMaps[ipnsSubnetsRouteMapName(ipnsName)] = &dozer.SpecRouteMap{
Statements: map[string]*dozer.SpecRouteMapStatement{
"10": {
Conditions: dozer.SpecRouteMapConditions{
MatchPrefixList: pointer.To(ipnsSubnetsPrefixListName(ipnsName)),
},
Result: dozer.SpecRouteMapResultAccept,
},
},
}

aclName := ipNsNoExtPeeringACLName(ipnsName)
entries := map[uint32]*dozer.SpecACLEntry{}
for idx, subnet := range ipns.Subnets {
entries[uint32(idx+1)] = &dozer.SpecACLEntry{ //nolint:gosec
SourceAddress: pointer.To(subnet),
DestinationAddress: pointer.To(subnet),
Action: dozer.SpecACLEntryActionDrop,
}
}
entries[65535] = &dozer.SpecACLEntry{
Action: dozer.SpecACLEntryActionAccept,
}
spec.ACLs[aclName] = &dozer.SpecACL{
Description: pointer.To("Prevent VPCs to cross-talk via the external"),
Entries: entries,
}
}

attachedExternals := map[string]bool{}
Expand Down Expand Up @@ -977,10 +1005,11 @@ func planExternals(agent *agentapi.Agent, spec *dozer.Spec) error {
RouterID: pointer.To(protocolIP.String()),
NetworkImportCheck: pointer.To(true),
IPv4Unicast: dozer.SpecVRFBGPIPv4Unicast{
Enabled: true,
MaxPaths: pointer.To(getMaxPaths(agent)),
Networks: map[string]*dozer.SpecVRFBGPNetwork{},
ImportVRFs: map[string]*dozer.SpecVRFBGPImportVRF{},
Enabled: true,
MaxPaths: pointer.To(getMaxPaths(agent)),
Networks: map[string]*dozer.SpecVRFBGPNetwork{},
ImportVRFs: map[string]*dozer.SpecVRFBGPImportVRF{},
ImportPolicy: pointer.To(ipnsSubnetsPrefixListName(external.IPv4Namespace)),
},
L2VPNEVPN: dozer.SpecVRFBGPL2VPNEVPN{
Enabled: agent.IsSpineLeaf(),
Expand Down Expand Up @@ -1009,7 +1038,8 @@ func planExternals(agent *agentapi.Agent, spec *dozer.Spec) error {
Conditions: dozer.SpecRouteMapConditions{
MatchCommunityList: pointer.To(commList),
},
Result: dozer.SpecRouteMapResultAccept,
SetLocalPreference: pointer.To(uint32(500)),
Result: dozer.SpecRouteMapResultAccept,
},
"100": {
Result: dozer.SpecRouteMapResultReject,
Expand Down Expand Up @@ -1054,6 +1084,12 @@ func planExternals(agent *agentapi.Agent, spec *dozer.Spec) error {
VNI: pointer.To(extVNI),
VLAN: pointer.To(irbVLAN),
}
if spec.ACLInterfaces == nil {
spec.ACLInterfaces = map[string]*dozer.SpecACLInterface{}
}
spec.ACLInterfaces[irbIface] = &dozer.SpecACLInterface{
Ingress: pointer.To(ipNsNoExtPeeringACLName(external.IPv4Namespace)),
}
}

for name, attach := range agent.Spec.ExternalAttachments {
Expand Down Expand Up @@ -3135,6 +3171,10 @@ func ipNsExternalCommsRouteMapName(ipns string) string {
return fmt.Sprintf("ipns-ext-communities--%s", ipns)
}

func ipNsNoExtPeeringACLName(ipns string) string {
return fmt.Sprintf("no-ipns-peering--%s", ipns)
}

func vpcExtImportVrfPrefixListName(vpc, ext string) string {
return fmt.Sprintf("import-vrf--%s--%s", vpc, ext)
}
Expand Down Expand Up @@ -3183,6 +3223,10 @@ func ipnsSubnetsPrefixListName(ipns string) string {
return fmt.Sprintf("ipns-subnets--%s", ipns)
}

func ipnsSubnetsRouteMapName(ipns string) string {
return fmt.Sprintf("ipns-subnets--%s", ipns)
}

func vpcFilteringAccessListName(vpc string, subnet string) string {
return fmt.Sprintf("vpc-filtering--%s--%s", vpc, subnet)
}
Expand Down
Loading