Browse Source

cluster: fix wg1.conf generator

Signed-off-by: Nagy Károly Gábriel <k@jpi.io>
Nagy Károly Gábriel 4 months ago
parent
commit
0ba3a756f6
Signed by: karasz
GPG Key ID: FA002E83BC206F83
  1. 12
      pkg/cluster/rings.go

12
pkg/cluster/rings.go

@ -6,6 +6,7 @@ import (
"net/netip" "net/netip"
"strconv" "strconv"
"darvaza.org/core"
"git.jpi.io/amery/jpictl/pkg/rings" "git.jpi.io/amery/jpictl/pkg/rings"
"git.jpi.io/amery/jpictl/pkg/wireguard" "git.jpi.io/amery/jpictl/pkg/wireguard"
) )
@ -225,13 +226,21 @@ func (r *Ring) setRingZeroAllowedIPs(rp *RingPeer) {
rp.AllowCIDR(rp.Address, 32) rp.AllowCIDR(rp.Address, 32)
} }
// revive:disable:cognitive-complexity
func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) { func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {
// revive:enable:cognitive-complexity
regionID, zoneID, _, _ := r.Decode(rp.Address) regionID, zoneID, _, _ := r.Decode(rp.Address)
// peer // peer
rp.AllowCIDR(rp.Address, 32) rp.AllowCIDR(rp.Address, 32)
// ring1 gateways connect to all other ring1 networks // ring1 gateways connect to all other ring1 networks
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 { r.ForEachZone(func(z *Zone) bool {
if !z.Is(regionID, zoneID) { if !z.Is(regionID, zoneID) {
subnet := z.RingOnePrefix() subnet := z.RingOnePrefix()
@ -239,6 +248,9 @@ func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {
} }
return false return false
}) })
}
return false
})
// ring1 gateways also connect to all ring0 addresses // ring1 gateways also connect to all ring0 addresses
r.ForEachZone(func(z *Zone) bool { r.ForEachZone(func(z *Zone) bool {

Loading…
Cancel
Save