From 3a586ecaf282703fa9e0677075d5b7decc54de00 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 29 Jul 2024 18:04:25 +0000 Subject: [PATCH] cluster: change wg0.conf to allow ring0/32 and ring1/32 on each peer Signed-off-by: Alejandro Mery --- pkg/cluster/rings.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/cluster/rings.go b/pkg/cluster/rings.go index 721fdcf..c6083b2 100644 --- a/pkg/cluster/rings.go +++ b/pkg/cluster/rings.go @@ -205,14 +205,11 @@ func (r *Ring) AddPeer(p *Machine) bool { } func (r *Ring) setRingZeroAllowedIPs(rp *RingPeer) { - regionID, zoneID, _, _ := r.Decode(rp.Address) - - // everyone on ring0 is a gateway to ring1 - subnet, _ := rings.RingOnePrefix(regionID, zoneID) - rp.AllowSubnet(subnet) - - // peer + // ring0 peer rp.AllowCIDR(rp.Address, 32) + + // everyone on ring0 has a leg on ring1 + rp.AllowCIDR(rp.Node.RingOneAddress(), 32) } func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {