Merge pull request 'cluster: drop wg1.conf' (#58)

Reviewed-on: #58

cmd/jpictl/list.go

@@ -108,7 +108,7 @@ func (*inventory) renderRingOneZone(out *tools.LazyBuffer, r *cluster.Region, z
 	z.ForEachMachine(func(m *cluster.Machine) bool {
 		addr := m.RingOneAddress()
 		cidr := netip.PrefixFrom(addr, 32)
-		_ = out.Printf("%s\t\t%s-%v\n", cidr, m.Name, 1)
+		_ = out.Printf("%s\t\t%s\n", cidr, m.Name)
 		return false
 	})
 	return nil

pkg/cluster/rings.go

@@ -191,20 +191,12 @@ func (r *Ring) AddPeer(p *Machine) bool {
 		},
 	}
 
-	switch {
+	r.setRingZeroAllowedIPs(rp)
-	case r.ID == rings.RingZeroID:
-		r.setRingZeroAllowedIPs(rp)
-	case p.IsGateway():
-		r.setRingOneGatewayAllowedIPs(rp)
-	default:
-		r.setRingOneNodeAllowedIPs(rp)
-	}
-
 	r.Peers = append(r.Peers, rp)
 	return true
 }
 
-func (r *Ring) setRingZeroAllowedIPs(rp *RingPeer) {
+func (*Ring) setRingZeroAllowedIPs(rp *RingPeer) {
 	// ring0 peer
 	rp.AllowCIDR(rp.Address, 32)
 
@@ -212,39 +204,6 @@ func (r *Ring) setRingZeroAllowedIPs(rp *RingPeer) {
 	rp.AllowCIDR(rp.Node.RingOneAddress(), 32)
 }
 
-func (r *Ring) setRingOneGatewayAllowedIPs(rp *RingPeer) {
-	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)
-		}
-		return false
-	})
-
-	// ring1 gateways also connect to all ring0 addresses
-	r.ForEachZone(func(z *Zone) bool {
-		z.ForEachMachine(func(p *Machine) bool {
-			if p.IsGateway() {
-				addr, _ := p.RingZeroAddress()
-				rp.AllowCIDR(addr, 32)
-			}
-			return false
-		})
-		return false
-	})
-}
-
-func (*Ring) setRingOneNodeAllowedIPs(rp *RingPeer) {
-	// only to the peer itself
-	rp.AllowCIDR(rp.Address, 32)
-}
-
 // ForEachMachine calls a function for each Machine in the ring
 // until instructed to terminate the loop
 func (r *Ring) ForEachMachine(fn func(*Machine) bool) {