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/metrics/BUILD.bazel b/metropolis/node/core/metrics/BUILD.bazel
index bc94863..861d59f 100644
--- a/metropolis/node/core/metrics/BUILD.bazel
+++ b/metropolis/node/core/metrics/BUILD.bazel
@@ -11,7 +11,7 @@
visibility = ["//visibility:public"],
deps = [
"//go/types/mapsets",
- "//metropolis/node",
+ "//metropolis/node/allocs",
"//metropolis/node/core/curator/proto/api",
"//metropolis/node/core/curator/watcher",
"//metropolis/node/core/identity",
@@ -32,7 +32,7 @@
"xFakeExporterPath": "$(rlocationpath //metropolis/node/core/metrics/fake_exporter )",
},
deps = [
- "//metropolis/node",
+ "//metropolis/node/allocs",
"//metropolis/node/core/curator/proto/api",
"//metropolis/test/util",
"//osbase/supervisor",
diff --git a/metropolis/node/core/metrics/exporters.go b/metropolis/node/core/metrics/exporters.go
index 003a690..fe7044d 100644
--- a/metropolis/node/core/metrics/exporters.go
+++ b/metropolis/node/core/metrics/exporters.go
@@ -11,7 +11,7 @@
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/osbase/supervisor"
)
@@ -36,7 +36,7 @@
Gatherer prometheus.Gatherer
// Port on which an exporter is/will be running to which metrics requests will be
// proxied to. Exactly one of Gatherer or Port must be set.
- Port node.Port
+ Port allocs.Port
// Executable to run to start the exporter. If empty, no executable will be
// started.
Executable string
@@ -59,10 +59,10 @@
},
{
Name: "node",
- Port: node.MetricsNodeListenerPort,
+ Port: allocs.PortMetricsNodeListener,
Executable: "/metrics/bin/node_exporter",
Arguments: []string{
- "--web.listen-address=127.0.0.1:" + node.MetricsNodeListenerPort.PortString(),
+ "--web.listen-address=127.0.0.1:" + allocs.PortMetricsNodeListener.PortString(),
"--collector.buddyinfo",
"--collector.zoneinfo",
"--collector.tcpstat",
@@ -77,23 +77,23 @@
},
{
Name: "etcd",
- Port: node.MetricsEtcdListenerPort,
+ Port: allocs.PortMetricsEtcdListener,
},
{
Name: "kubernetes-scheduler",
- Port: node.MetricsKubeSchedulerListenerPort,
+ Port: allocs.PortMetricsKubeSchedulerListener,
},
{
Name: "kubernetes-controller-manager",
- Port: node.MetricsKubeControllerManagerListenerPort,
+ Port: allocs.PortMetricsKubeControllerManagerListener,
},
{
Name: "kubernetes-apiserver",
- Port: node.MetricsKubeAPIServerListenerPort,
+ Port: allocs.PortMetricsKubeAPIServerListener,
},
{
Name: "containerd",
- Port: node.MetricsContainerdListenerPort,
+ Port: allocs.PortMetricsContainerdListener,
Path: "/v1/metrics",
},
}
diff --git a/metropolis/node/core/metrics/metrics.go b/metropolis/node/core/metrics/metrics.go
index 9abed54..e547c5d 100644
--- a/metropolis/node/core/metrics/metrics.go
+++ b/metropolis/node/core/metrics/metrics.go
@@ -12,7 +12,7 @@
"net/http"
"os/exec"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/core/identity"
"source.monogon.dev/osbase/supervisor"
)
@@ -29,7 +29,7 @@
// Each exporter is exposed on a separate path, /metrics/<name>, where <name> is
// the name of the exporter.
//
-// The HTTPS listener is bound to node.MetricsPort.
+// The HTTPS listener is bound to allocs.PortMetrics.
type Service struct {
// Credentials used to run the TLS/HTTPS listener and verify incoming
// connections.
@@ -67,7 +67,7 @@
// anyone/anything with a valid cluster certificate to access them.
}
- addr := net.JoinHostPort("", node.MetricsPort.PortString())
+ addr := net.JoinHostPort("", allocs.PortMetrics.PortString())
if s.enableDynamicAddr {
addr = ""
}
diff --git a/metropolis/node/core/metrics/metrics_test.go b/metropolis/node/core/metrics/metrics_test.go
index ebb59a9..d494222 100644
--- a/metropolis/node/core/metrics/metrics_test.go
+++ b/metropolis/node/core/metrics/metrics_test.go
@@ -20,7 +20,7 @@
apb "source.monogon.dev/metropolis/node/core/curator/proto/api"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/test/util"
"source.monogon.dev/osbase/supervisor"
"source.monogon.dev/osbase/test/freeport"
@@ -51,7 +51,7 @@
panic(err)
}
defer closer.Close()
- port := node.Port(p)
+ port := allocs.Port(p)
return &Exporter{
Name: name,