diff --git a/internal/controller/evpn/fabric_controller.go b/internal/controller/evpn/fabric_controller.go index cfc0671ff..e5cca9015 100644 --- a/internal/controller/evpn/fabric_controller.go +++ b/internal/controller/evpn/fabric_controller.go @@ -1008,12 +1008,11 @@ func (r *FabricReconciler) reconcileBGP(ctx context.Context, device *v1alpha1.De bgp.Spec.AdminState = v1alpha1.AdminStateUp bgp.Spec.ASNumber = fabric.Spec.Overlay.IBGP.ASNumber bgp.Spec.RouterID = routerID + // "retain route-target all" is an eBGP-only construct; iBGP route + // reflectors reflect all EVPN routes regardless of imported RTs. bgp.Spec.AddressFamilies = &v1alpha1.BGPAddressFamilies{ L2vpnEvpn: &v1alpha1.BGPL2vpnEvpn{ Enabled: true, - RouteTargetPolicy: &v1alpha1.BGPRouteTargetPolicy{ - RetainAll: true, - }, }, } return controllerutil.SetOwnerReference(fabric, bgp, r.Scheme) diff --git a/internal/controller/evpn/fabric_controller_test.go b/internal/controller/evpn/fabric_controller_test.go index 517e25d38..c9a720f15 100644 --- a/internal/controller/evpn/fabric_controller_test.go +++ b/internal/controller/evpn/fabric_controller_test.go @@ -397,12 +397,11 @@ var _ = Describe("Fabric Controller", func() { g.Expect(lo0.Spec.IPv4).NotTo(BeNil()) g.Expect(bgp.Spec.RouterID).To(Equal(lo0.Spec.IPv4.Addresses[0].Addr().String())) - // L2VPN EVPN must be enabled with retainAll. + // iBGP fabric: retain route-target all is not configured. g.Expect(bgp.Spec.AddressFamilies).NotTo(BeNil()) g.Expect(bgp.Spec.AddressFamilies.L2vpnEvpn).NotTo(BeNil()) g.Expect(bgp.Spec.AddressFamilies.L2vpnEvpn.Enabled).To(BeTrue()) - g.Expect(bgp.Spec.AddressFamilies.L2vpnEvpn.RouteTargetPolicy).NotTo(BeNil()) - g.Expect(bgp.Spec.AddressFamilies.L2vpnEvpn.RouteTargetPolicy.RetainAll).To(BeTrue()) + g.Expect(bgp.Spec.AddressFamilies.L2vpnEvpn.RouteTargetPolicy).To(BeNil()) g.Expect(bgp.OwnerReferences).To(ContainElement(SatisfyAll( HaveField("Kind", "Fabric"),