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/test/e2e/suites/kubernetes/run_test.go b/metropolis/test/e2e/suites/kubernetes/run_test.go
index 8333567..64da63e 100644
--- a/metropolis/test/e2e/suites/kubernetes/run_test.go
+++ b/metropolis/test/e2e/suites/kubernetes/run_test.go
@@ -32,6 +32,7 @@
"k8s.io/utils/ptr"
common "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
apb "source.monogon.dev/metropolis/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
"source.monogon.dev/metropolis/test/e2e/connectivity"
@@ -620,7 +621,7 @@
}
u := url.URL{
Scheme: "https",
- Host: net.JoinHostPort(cluster.NodeIDs[1], common.MetricsPort.PortString()),
+ Host: net.JoinHostPort(cluster.NodeIDs[1], allocs.PortMetrics.PortString()),
Path: "/metrics/containerd",
}
res, err := cl.Get(u.String())