cluster: fix wg1.conf generator

Signed-off-by: Nagy Károly Gábriel <k@jpi.io>
2024-07-25 21:05:47 +03:00
parent f9462d3e0b
commit 48ece57bbc
1 changed files with 15 additions and 4 deletions
@@ -225,17 +225,28 @@ func (r *Ring) setRingZeroAllowedIPs(rp *RingPeer) {
 	rp.AllowCIDR(rp.Address, 32)
 }

+// revive:disable:cognitive-complexity
 func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {
+	// revive:enable:cognitive-complexity
 	regionID, zoneID, _, _ := r.Decode(rp.Address)

 	// peer
 	rp.AllowCIDR(rp.Address, 32)

 	// ring1 gateways connect to all other ring1 networks
-	r.ForEachZone(func(z *Zone) bool {
-		if !z.Is(regionID, zoneID) {
-			subnet := z.RingOnePrefix()
-			rp.AllowSubnet(subnet)
+	m, ok := r.ZoneIterator.(RegionIterator)
+	if !ok {
+		panic("Cannot iterate Region from Zone")
+	}
+	m.ForEachRegion(func(r2 *Region) bool {
+		if r2.IsPrimary() {
+			r.ForEachZone(func(z *Zone) bool {
+				if !z.Is(regionID, zoneID) {
+					subnet := z.RingOnePrefix()
+					rp.AllowSubnet(subnet)
+				}
+				return false
+			})
 		}
 		return false
 	})