metropolis/cli/metroctl: dont write hostPort and report correct context
Change-Id: I9ddccf35cf7a1fe7ee839250ceab0925fe8f0138
Reviewed-on: https://review.monogon.dev/c/monogon/+/1811
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/cli/metroctl/BUILD.bazel b/metropolis/cli/metroctl/BUILD.bazel
index 71258e9..984bd98 100644
--- a/metropolis/cli/metroctl/BUILD.bazel
+++ b/metropolis/cli/metroctl/BUILD.bazel
@@ -27,7 +27,6 @@
"//metropolis/cli/metroctl/core",
"//metropolis/cli/pkg/context",
"//metropolis/cli/pkg/datafile",
- "//metropolis/node",
"//metropolis/node/core/identity",
"//metropolis/node/core/rpc",
"//metropolis/pkg/logtree",
diff --git a/metropolis/cli/metroctl/cmd_takeownership.go b/metropolis/cli/metroctl/cmd_takeownership.go
index 2c37340..740dfb1 100644
--- a/metropolis/cli/metroctl/cmd_takeownership.go
+++ b/metropolis/cli/metroctl/cmd_takeownership.go
@@ -3,7 +3,6 @@
import (
"context"
"log"
- "net"
"os"
"os/exec"
@@ -11,7 +10,6 @@
"source.monogon.dev/metropolis/cli/metroctl/core"
clicontext "source.monogon.dev/metropolis/cli/pkg/context"
- "source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/rpc"
apb "source.monogon.dev/metropolis/proto/api"
)
@@ -70,11 +68,11 @@
}
// TODO(q3k, issues/144): this only works as long as all nodes are kubernetes controller
// nodes. This won't be the case for too long. Figure this out.
- apiserver := "https://" + net.JoinHostPort(flags.clusterEndpoints[0], node.KubernetesAPIWrappedPort.PortString())
- if err := core.InstallKubeletConfig(metroctlPath, connectOptions(), "metroctl", apiserver); err != nil {
+ configName := "metroctl"
+ if err := core.InstallKubeletConfig(metroctlPath, connectOptions(), configName, flags.clusterEndpoints[0]); err != nil {
log.Fatalf("Failed to install metroctl/k8s integration: %v", err)
}
- log.Println("Success! kubeconfig is set up. You can now run kubectl --context=metropolis ... to access the Kubernetes cluster.")
+ log.Printf("Success! kubeconfig is set up. You can now run kubectl --context=%s ... to access the Kubernetes cluster.", configName)
}
func init() {
diff --git a/metropolis/handbook/src/ch02-00-local-demo-cluster.md b/metropolis/handbook/src/ch02-00-local-demo-cluster.md
index 50cf22d..69e2e71 100644
--- a/metropolis/handbook/src/ch02-00-local-demo-cluster.md
+++ b/metropolis/handbook/src/ch02-00-local-demo-cluster.md
@@ -121,7 +121,7 @@
The cluster state should be reflected by *kubectl* output:
```shell
-kubectl --context=metropolis get nodes
+kubectl --context=metroctl get nodes
NAME STATUS ROLES AGE VERSION
metropolis-4fb5a2aa4eec34080bea02ac8020028d Ready <none> 98m v1.24.0+mngn