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/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index 5c58c2a..6532f4f 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -13,7 +13,7 @@
visibility = ["//:__subpackages__"],
deps = [
"//go/logging",
- "//metropolis/node",
+ "//metropolis/node/allocs",
"//metropolis/node/core/consensus/client",
"//metropolis/node/core/localstorage",
"//osbase/event",
diff --git a/metropolis/node/core/consensus/configuration.go b/metropolis/node/core/consensus/configuration.go
index 8c4bd06..dfd70f2 100644
--- a/metropolis/node/core/consensus/configuration.go
+++ b/metropolis/node/core/consensus/configuration.go
@@ -15,7 +15,7 @@
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/embed"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/osbase/pki"
)
@@ -90,7 +90,7 @@
// over TLS. This requires TLS credentials to be present on disk, and will be
// disabled for bootstrapping the instance.
func (c *Config) build(enablePeers bool) *embed.Config {
- port := int(node.ConsensusPort)
+ port := int(allocs.PortConsensus)
if p := c.testOverrides.externalPort; p != 0 {
port = p
}
@@ -98,7 +98,7 @@
if c.testOverrides.externalAddress != "" {
host = c.testOverrides.externalAddress
}
- etcdPort := int(node.MetricsEtcdListenerPort)
+ etcdPort := int(allocs.PortMetricsEtcdListener)
if p := c.testOverrides.etcdMetricsPort; p != 0 {
etcdPort = p
}
diff --git a/metropolis/node/core/consensus/consensus.go b/metropolis/node/core/consensus/consensus.go
index f6addd8..f00a7a9 100644
--- a/metropolis/node/core/consensus/consensus.go
+++ b/metropolis/node/core/consensus/consensus.go
@@ -33,12 +33,12 @@
// | node-foo |
// |---------------------|
// | .--------------------.
-// | | etcd |<---etcd/TLS--. (node.ConsensusPort)
+// | | etcd |<---etcd/TLS--. (allocs.PortConsensus)
// | '--------------------' |
// | ^ Domain Socket | |
// | | etcd/plain | |
// | .--------------------. |
-// | | curator |<---gRPC/TLS----. (node.CuratorServicePort)
+// | | curator |<---gRPC/TLS----. (allocs.PortCuratorService)
// | '--------------------' | |
// | ^ Domain Socket | | |
// | | gRPC/plain | | |
diff --git a/metropolis/node/core/consensus/status.go b/metropolis/node/core/consensus/status.go
index 0886531..5bf0416 100644
--- a/metropolis/node/core/consensus/status.go
+++ b/metropolis/node/core/consensus/status.go
@@ -13,7 +13,7 @@
clientv3 "go.etcd.io/etcd/client/v3"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/osbase/event"
"source.monogon.dev/osbase/pki"
@@ -103,7 +103,7 @@
var extraNames []string
name := nodeID
- port := int(node.ConsensusPort)
+ port := int(allocs.PortConsensus)
for _, opt := range opts {
if opt.externalAddress != "" {
name = opt.externalAddress