m/n/kubernetes: remove --port flag from services
From logs:
Flag --port has been deprecated, This flag has no effect now and will be removed in v1.24.
So that's what we do. We had this flag only set to disable insecure
serving, and insecure serving has been removed in upstream, thereby
rendering the use of this flag a no-op.
Controller-manager PR: https://github.com/kubernetes/kubernetes/pull/96216
Scheduler PR: https://github.com/kubernetes/kubernetes/pull/96345
Change-Id: If9009aa6f7c72a5ec8b7baf2326964167059c0a1
Reviewed-on: https://review.monogon.dev/c/monogon/+/665
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/node/kubernetes/controller-manager.go b/metropolis/node/kubernetes/controller-manager.go
index 8298de1..d26a2af 100644
--- a/metropolis/node/kubernetes/controller-manager.go
+++ b/metropolis/node/kubernetes/controller-manager.go
@@ -74,7 +74,6 @@
pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: config.serviceAccountPrivKey})),
args.FileOpt("--root-ca-file", "root-ca.pem",
pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: config.rootCA})),
- "--port=0", // Kill insecure serving
"--use-service-account-credentials=true", // Enables things like PSP enforcement
fmt.Sprintf("--cluster-cidr=%v", config.clusterNet.String()),
args.FileOpt("--tls-cert-file", "server-cert.pem",
diff --git a/metropolis/node/kubernetes/scheduler.go b/metropolis/node/kubernetes/scheduler.go
index 08ba37f..6007142 100644
--- a/metropolis/node/kubernetes/scheduler.go
+++ b/metropolis/node/kubernetes/scheduler.go
@@ -56,7 +56,6 @@
defer args.Close()
cmd := exec.CommandContext(ctx, "/kubernetes/bin/kube", "kube-scheduler",
args.FileOpt("--kubeconfig", "kubeconfig", config.kubeConfig),
- "--port=0", // Kill insecure serving
args.FileOpt("--tls-cert-file", "server-cert.pem",
pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: config.serverCert})),
args.FileOpt("--tls-private-key-file", "server-key.pem",