Compare commits

..

2 Commits

Author SHA1 Message Date
amery a07ed61e00 zones: WIP
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-22 23:35:26 +00:00
amery 2f51a463b2 zones: reduce writeEnvZone() complexity
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-22 22:53:13 +00:00
3 changed files with 69 additions and 19 deletions
+26 -19
View File
@@ -31,25 +31,7 @@ func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")
// ZONE{zoneID}_GW
firstNodeID := 0
gatewayID := 0
z.ForEachMachine(func(p *Machine) bool {
nodeID := p.ID()
if firstNodeID == 0 {
firstNodeID = nodeID
}
if _, found := p.getRingInfo(0); found {
gatewayID = nodeID
}
return gatewayID != 0
})
if gatewayID == 0 {
gatewayID = firstNodeID
}
gatewayID := getRingZeroGatewayID(z)
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
// ZONE{zoneID}_IP
@@ -95,3 +77,28 @@ func genEnvZoneNodes(z *Zone) string {
}
return strings.Join(s, " ")
}
func getRingZeroGatewayID(z *Zone) int {
var firstNodeID, gatewayID int
z.ForEachMachine(func(p *Machine) bool {
nodeID := p.ID()
if firstNodeID == 0 {
firstNodeID = nodeID
}
if p.Gateway() {
gatewayID = nodeID
}
return gatewayID != 0
})
switch {
case gatewayID == 0:
return firstNodeID
default:
return gatewayID
}
}
+28
View File
@@ -47,6 +47,34 @@ func (m *Machine) ID() int {
return m.id
}
// Gateway tells if the Machine is a ring0 gateway
func (m *Machine) Gateway() bool {
m.mu.Lock()
defer m.mu.Unlock()
if ri, found := m.getRingInfo(0); found {
return ri.Enabled
}
return false
}
func (m *Machine) SetGateway(enable bool) error {
m.mu.Lock()
defer m.mu.Unlock()
ri, found := m.getRingInfo(0)
switch {
case !found && !enable:
return nil
case !found:
return m.createRingInfo(0, true)
default:
ri.Enabled = enable
return nil
}
}
// FullName returns the Name of the machine including domain name
func (m *Machine) FullName() string {
if domain := m.zone.zones.domain; domain != "" {
+15
View File
@@ -134,3 +134,18 @@ func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
return nil
}
func (m *Machine) createRingInfo(ring int, enabled bool) error {
keys, err := wireguard.NewKeyPair()
if err != nil {
return err
}
ri := &RingInfo{
Ring: ring,
Enabled: enabled,
Keys: keys,
}
return m.applyRingInfo(ring, ri)
}