m/node: move clusternet under network
Move the clusternet network side under the core/network umbrella and
rename it to overlay. Also split out types.go into the ipam package
to get the overlay package out of a lot of dependents which only import
it for the Prefixes type which should be part of the ipam package.
This is a clean move with no functional changes intended yet, these
will be stacked on top.
Change-Id: I6a6a6964af9d608f9ec3bf75b386c010cfff1df4
Reviewed-on: https://review.monogon.dev/c/monogon/+/4500
Tested-by: Jenkins CI
Reviewed-by: Jan Schär <jan@monogon.tech>
diff --git a/metropolis/node/core/main.go b/metropolis/node/core/main.go
index df9dd78..5c4ec33 100644
--- a/metropolis/node/core/main.go
+++ b/metropolis/node/core/main.go
@@ -12,12 +12,12 @@
"source.monogon.dev/go/logging"
"source.monogon.dev/metropolis/node/core/cluster"
- "source.monogon.dev/metropolis/node/core/clusternet"
"source.monogon.dev/metropolis/node/core/devmgr"
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/metropolis/node/core/localstorage/declarative"
"source.monogon.dev/metropolis/node/core/metrics"
"source.monogon.dev/metropolis/node/core/network"
+ "source.monogon.dev/metropolis/node/core/network/ipam"
"source.monogon.dev/metropolis/node/core/productinfo"
"source.monogon.dev/metropolis/node/core/roleserve"
"source.monogon.dev/metropolis/node/core/rpc/resolver"
@@ -121,7 +121,7 @@
}
metrics.CoreRegistry.MustRegister(dns.MetricsRegistry)
- var podNetwork memory.Value[*clusternet.Prefixes]
+ var podNetwork memory.Value[*ipam.Prefixes]
networkSvc := network.New(nil, []string{"hosts", "kubernetes"}, &podNetwork)
networkSvc.DHCPVendorClassID = "dev.monogon.metropolis.node.v1"
timeSvc := timesvc.New()