From 08da69f7aa56c1e47cf957768b56249eef172b80 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 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkg/cluster/rings.go b/pkg/cluster/rings.go index cc44c13..6327c1e 100644 --- a/pkg/cluster/rings.go +++ b/pkg/cluster/rings.go @@ -196,15 +196,12 @@ func (r *Ring) AddPeer(p *Machine) bool { return true } -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 +func (*Ring) setRingZeroAllowedIPs(rp *RingPeer) { + // ring0 peer rp.AllowCIDR(rp.Address, 32) + + // everyone on ring0 has a leg on ring1 + rp.AllowCIDR(rp.Node.RingOneAddress(), 32) } // ForEachMachine calls a function for each Machine in the ring