cluster: change wg0.conf to allow ring0/32 and ring1/32 on each peer

Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-07-29 18:04:25 +00:00
parent 6e3bb24b36
commit 08da69f7aa
1 changed files with 5 additions and 8 deletions
@@ -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