adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #141 from squat/fix_graph

Browse Source 
pkg/mesh: fix panic in graph
This commit is contained in:
Lucas Servén Marín 2021-03-25 13:05:55 +01:00 committed by GitHub
commit 9a6ec98343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mesh/graph.go
View File

@ -27,7 +27,7 @@ import (
func (t *Topology) Dot() (string, error) { func (t *Topology) Dot() (string, error) {
g := gographviz.NewGraph() g := gographviz.NewGraph()
g.Name = "kilo" g.Name = "kilo"
if err := g.AddAttr("kilo", string(gographviz.Label), graphEscape(t.wireGuardCIDR.String())); err != nil { if err := g.AddAttr("kilo", string(gographviz.Label), graphEscape((&net.IPNet{IP: t.wireGuardCIDR.IP.Mask(t.wireGuardCIDR.Mask), Mask: t.wireGuardCIDR.Mask}).String())); err != nil {
return "", fmt.Errorf("failed to add label to graph") return "", fmt.Errorf("failed to add label to graph")
} }
if err := g.AddAttr("kilo", string(gographviz.LabelLOC), "t"); err != nil { if err := g.AddAttr("kilo", string(gographviz.LabelLOC), "t"); err != nil {

6
pkg/mesh/mesh.go
View File

@ -477,7 +477,11 @@ func (m *Mesh) applyTopology() {
return return
} }
// Update the node's WireGuard IP. // Update the node's WireGuard IP.
m.wireGuardIP = t.wireGuardCIDR if t.leader {
m.wireGuardIP = t.wireGuardCIDR
} else {
m.wireGuardIP = nil
}
conf := t.Conf() conf := t.Conf()
buf, err := conf.Bytes() buf, err := conf.Bytes()
if err != nil { if err != nil {

8
pkg/mesh/topology.go
View File

@ -50,8 +50,10 @@ type Topology struct {
// subnet is the Pod subnet of the local node. // subnet is the Pod subnet of the local node.
subnet *net.IPNet subnet *net.IPNet
// wireGuardCIDR is the allocated CIDR of the WireGuard // wireGuardCIDR is the allocated CIDR of the WireGuard
// interface of the local node. If the local node is not // interface of the local node within the Kilo subnet.
// the leader, then it is nil. // If the local node is not the leader of a location, then
// the IP is the 0th address in the subnet, i.e. the CIDR
// is equal to the Kilo subnet.
wireGuardCIDR *net.IPNet wireGuardCIDR *net.IPNet
} }
@ -104,7 +106,7 @@ func NewTopology(nodes map[string]*Node, peers map[string]*Peer, granularity Gra
localLocation = nodeLocationPrefix + hostname localLocation = nodeLocationPrefix + hostname
} }
t := Topology{key: key, port: port, hostname: hostname, location: localLocation, persistentKeepalive: persistentKeepalive, privateIP: nodes[hostname].InternalIP, subnet: nodes[hostname].Subnet} t := Topology{key: key, port: port, hostname: hostname, location: localLocation, persistentKeepalive: persistentKeepalive, privateIP: nodes[hostname].InternalIP, subnet: nodes[hostname].Subnet, wireGuardCIDR: subnet}
for location := range topoMap { for location := range topoMap {
// Sort the location so the result is stable. // Sort the location so the result is stable.
sort.Slice(topoMap[location], func(i, j int) bool { sort.Slice(topoMap[location], func(i, j int) bool {

2
pkg/mesh/topology_test.go
View File

@ -215,7 +215,7 @@ func TestNewTopology(t *testing.T) {
location: logicalLocationPrefix + nodes["b"].Location, location: logicalLocationPrefix + nodes["b"].Location,
subnet: nodes["c"].Subnet, subnet: nodes["c"].Subnet,
privateIP: nodes["c"].InternalIP, privateIP: nodes["c"].InternalIP,
wireGuardCIDR: nil, wireGuardCIDR: DefaultKiloSubnet,
segments: []*segment{ segments: []*segment{
{ {
allowedIPs: []*net.IPNet{nodes["a"].Subnet, nodes["a"].InternalIP, {IP: w1, Mask: net.CIDRMask(32, 32)}}, allowedIPs: []*net.IPNet{nodes["a"].Subnet, nodes["a"].InternalIP, {IP: w1, Mask: net.CIDRMask(32, 32)}},