Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
2024-07-26 21:37:06 +00:00
parent dd9447d771
commit a1164027dc
+11
View File
@@ -3,6 +3,7 @@ package cluster
import (
"fmt"
"io/fs"
"log"
"net/netip"
"strconv"
@@ -231,26 +232,36 @@ func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {
// peer
rp.AllowCIDR(rp.Address, 32)
log.Println(rp.Node.Name, "0:", rp.Address, regionID, zoneID)
// ring1 gateways connect to all other ring1 networks
r.ForEachZone(func(z *Zone) bool {
log.Println(rp.Node.Name, "1:", z.Name, z.RegionID(), z.ID)
if !z.Is(regionID, zoneID) {
subnet := z.RingOnePrefix()
rp.AllowSubnet(subnet)
log.Println(rp.Node.Name, "1.1:", rp.PeerConfig.AllowedIPs)
}
return false
})
// ring1 gateways also connect to all ring0 addresses
r.ForEachZone(func(z *Zone) bool {
log.Println(rp.Node.Name, "2:", z.Name, z.RegionID(), z.ID)
z.ForEachMachine(func(p *Machine) bool {
log.Println(rp.Node.Name, "2.1:", p.Name, p.IsGateway())
if p.IsGateway() {
addr, _ := p.RingZeroAddress()
rp.AllowCIDR(addr, 32)
log.Println(rp.Node.Name, "2.2:", rp.PeerConfig.AllowedIPs)
}
return false
})
return false
})
log.Println(rp.Node.Name, "3:", rp.PeerConfig.AllowedIPs)
}
func (*Ring) setRingOneNodeAllowedIPs(rp *RingPeer) {