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/kubernetes/metricsproxy/BUILD.bazel b/metropolis/node/kubernetes/metricsproxy/BUILD.bazel
index 7f89450..186bd57 100644
--- a/metropolis/node/kubernetes/metricsproxy/BUILD.bazel
+++ b/metropolis/node/kubernetes/metricsproxy/BUILD.bazel
@@ -6,7 +6,7 @@
importpath = "source.monogon.dev/metropolis/node/kubernetes/metricsproxy",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node",
+ "//metropolis/node/allocs",
"//metropolis/node/kubernetes/pki",
"//osbase/supervisor",
"@io_k8s_kubernetes//cmd/kubeadm/app/constants",
diff --git a/metropolis/node/kubernetes/metricsproxy/metricsproxy.go b/metropolis/node/kubernetes/metricsproxy/metricsproxy.go
index 1b98fa8..c098fac 100644
--- a/metropolis/node/kubernetes/metricsproxy/metricsproxy.go
+++ b/metropolis/node/kubernetes/metricsproxy/metricsproxy.go
@@ -17,7 +17,7 @@
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/kubernetes/pki"
"source.monogon.dev/osbase/supervisor"
)
@@ -30,9 +30,9 @@
type kubernetesExporter struct {
Name string
// TargetPort on which this exporter is running.
- TargetPort node.Port
+ TargetPort allocs.Port
// TargetPort on which the unauthenticated exporter should run.
- ListenPort node.Port
+ ListenPort allocs.Port
// ServerName used to verify the tls connection.
ServerName string
}
@@ -42,19 +42,19 @@
{
Name: "kubernetes-scheduler",
TargetPort: constants.KubeSchedulerPort,
- ListenPort: node.MetricsKubeSchedulerListenerPort,
+ ListenPort: allocs.PortMetricsKubeSchedulerListener,
ServerName: "kube-scheduler.local",
},
{
Name: "kubernetes-controller-manager",
TargetPort: constants.KubeControllerManagerPort,
- ListenPort: node.MetricsKubeControllerManagerListenerPort,
+ ListenPort: allocs.PortMetricsKubeControllerManagerListener,
ServerName: "kube-controller-manager.local",
},
{
Name: "kubernetes-apiserver",
- TargetPort: node.KubernetesAPIPort,
- ListenPort: node.MetricsKubeAPIServerListenerPort,
+ TargetPort: allocs.PortKubernetesAPI,
+ ListenPort: allocs.PortMetricsKubeAPIServerListener,
ServerName: "kubernetes",
},
}