m/node/allocs: split new package off m/node
The metropolis/node package contains various unrelated things. One of
these things are node-wide allocations of identifiers.
These are moved here to the new metropolis/node/allocs package.
Additionally, the constants are renamed to move the type of identifier
in front.
Change-Id: Ibc841ca64d4450a7054463e6d2d44753a118e07a
Reviewed-on: https://review.monogon.dev/c/monogon/+/4566
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/cli/metroctl/core/rpc.go b/metropolis/cli/metroctl/core/rpc.go
index a8f933c..cd5678d 100644
--- a/metropolis/cli/metroctl/core/rpc.go
+++ b/metropolis/cli/metroctl/core/rpc.go
@@ -15,7 +15,7 @@
"golang.org/x/net/proxy"
"google.golang.org/grpc"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/node/core/rpc/resolver"
"source.monogon.dev/metropolis/proto/api"
@@ -45,7 +45,7 @@
return nil, fmt.Errorf("no cluster endpoints specified")
}
for _, eps := range c.Endpoints {
- ep := resolver.NodeByHostPort(eps, uint16(node.CuratorServicePort))
+ ep := resolver.NodeByHostPort(eps, uint16(allocs.PortCuratorService))
r.AddEndpoint(ep)
}
opts = append(opts, grpc.WithResolvers(r))
@@ -76,7 +76,7 @@
creds := rpc.NewAuthenticatedCredentials(tlsc, rpc.WantRemoteCluster(ca), rpc.WantRemoteNode(nodeId))
dialOpts = append(dialOpts, grpc.WithTransportCredentials(creds))
- endpoint := net.JoinHostPort(nodeAddr, node.NodeManagementPort.PortString())
+ endpoint := net.JoinHostPort(nodeAddr, allocs.PortNodeManagement.PortString())
return grpc.NewClient(endpoint, dialOpts...)
}