metropolis/node: dont allocate node ports in constructor
All good things are three, and this should be the final installment in
the saga of getting ports reserved. The Kubernetes codebase always
starts a recovery after initialization of a new port allocator, which
currently makes it very unhappy as we already allocated the system
ports, but we are trying to do the same in the recovery by pretending to
be a service. Anyway, this removes the initial part of the patch and
only uses the recovery way of reserving the ports. This still creates an
annoying message sometimes, but I can't find the code path which creates
them.
Change-Id: Ib7d9ec5d00cbde7371d876c31c63b5312024a187
Reviewed-on: https://review.monogon.dev/c/monogon/+/2027
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/third_party/go/patches/k8s-reserve-metropolis-ports.patch b/third_party/go/patches/k8s-reserve-metropolis-ports.patch
index ac201a8..1756d7b 100644
--- a/third_party/go/patches/k8s-reserve-metropolis-ports.patch
+++ b/third_party/go/patches/k8s-reserve-metropolis-ports.patch
@@ -1,27 +1,3 @@
-diff --git a/pkg/registry/core/service/portallocator/allocator.go b/pkg/registry/core/service/portallocator/allocator.go
---- a/pkg/registry/core/service/portallocator/allocator.go (revision f66044f4361b9f1f96f0053dd46cb7dce5e990a8)
-+++ b/pkg/registry/core/service/portallocator/allocator.go (revision bdd789d982712179c6a849ceed7f12e063b3fce3)
-@@ -25,6 +25,7 @@
- "k8s.io/kubernetes/pkg/registry/core/service/allocator"
-
- "k8s.io/klog/v2"
-+ "source.monogon.dev/metropolis/node"
- )
-
- // Interface manages the allocation of ports out of a range. Interface
-@@ -70,6 +71,12 @@
- }
- var err error
- a.alloc, err = allocatorFactory(max, rangeSpec)
-+
-+ for _, p := range node.SystemPorts {
-+ // We ignore errors as these could only happen if the port we try to
-+ // allocate is out of range, which we dont really care about.
-+ _, _ = a.alloc.Allocate(int(p))
-+ }
- return a, err
- }
-
diff --git a/pkg/registry/core/service/portallocator/controller/repair.go b/pkg/registry/core/service/portallocator/controller/repair.go
--- a/pkg/registry/core/service/portallocator/controller/repair.go (revision f66044f4361b9f1f96f0053dd46cb7dce5e990a8)
+++ b/pkg/registry/core/service/portallocator/controller/repair.go (revision bdd789d982712179c6a849ceed7f12e063b3fce3)