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/service_worker.go b/metropolis/node/kubernetes/service_worker.go
index 5e28788..0eb6435 100644
--- a/metropolis/node/kubernetes/service_worker.go
+++ b/metropolis/node/kubernetes/service_worker.go
@@ -16,7 +16,7 @@
"k8s.io/client-go/tools/clientcmd"
"source.monogon.dev/go/net/tinylb"
- "source.monogon.dev/metropolis/node"
+ "source.monogon.dev/metropolis/node/allocs"
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/metropolis/node/core/metrics"
"source.monogon.dev/metropolis/node/core/network"
@@ -66,7 +66,7 @@
// available apiservers, and Kubernetes components do not implement client-side
// load-balancing.
err := supervisor.Run(ctx, "apiproxy", func(ctx context.Context) error {
- lis, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", node.KubernetesWorkerLocalAPIPort))
+ lis, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", allocs.PortKubernetesWorkerLocalAPI))
if err != nil {
return fmt.Errorf("failed to listen: %w", err)
}
@@ -95,7 +95,7 @@
ClusterDomain: s.c.ClusterDomain,
KubeletDirectory: &s.c.Root.Data.Kubernetes.Kubelet,
EphemeralDirectory: &s.c.Root.Ephemeral,
- ClusterDNS: []net.IP{node.ContainerDNSIP},
+ ClusterDNS: []net.IP{allocs.IPContainerDNS},
}
// Gather all required material to send over for certficiate issuance to the
@@ -229,16 +229,16 @@
// //metropolis/node/core/roleserve/worker_kubernetes.go.
s.c.Network.DNS.SetHandler("kubernetes", dnsService)
- if err := s.c.Network.AddLoopbackIP(node.ContainerDNSIP); err != nil {
+ if err := s.c.Network.AddLoopbackIP(allocs.IPContainerDNS); err != nil {
return fmt.Errorf("failed to add local IP for container DNS: %w", err)
}
defer func() {
- if err := s.c.Network.ReleaseLoopbackIP(node.ContainerDNSIP); err != nil {
+ if err := s.c.Network.ReleaseLoopbackIP(allocs.IPContainerDNS); err != nil {
supervisor.Logger(ctx).Errorf("Failed to release local IP for container DNS: %v", err)
}
}()
runDNSListener := func(ctx context.Context) error {
- return s.c.Network.DNS.RunListenerAddr(ctx, net.JoinHostPort(node.ContainerDNSIP.String(), "53"))
+ return s.c.Network.DNS.RunListenerAddr(ctx, net.JoinHostPort(allocs.IPContainerDNS.String(), "53"))
}
kvmDevicePlugin := kvmdevice.Plugin{