diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go index 95a9c7b7e88c87489f187da9aaf7eb5c4e6418f6..8e6f48e49120eca9c6e83d222c765a639161fed9 100644 --- a/cmd/minikube/cmd/status.go +++ b/cmd/minikube/cmd/status.go @@ -222,7 +222,7 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status return st, nil } - hostname, _, port, err := driver.ControlPaneEndpoint(&cc, &n, host.DriverName) + hostname, _, port, err := driver.ControlPlaneEndpoint(&cc, &n, host.DriverName) if err != nil { glog.Errorf("forwarded endpoint: %v", err) st.Kubeconfig = Misconfigured diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 15e338b948f300d55fed81fdfb3a2fe246ea0a29..beddabb004a57996203dfce356a406343ba302fb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -366,7 +366,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time out.T(out.HealthCheck, "Verifying Kubernetes components...") // TODO: #7706: for better performance we could use k.client inside minikube to avoid asking for external IP:PORT - hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver) + hostname, _, port, err := driver.ControlPlaneEndpoint(&cfg, &n, cfg.Driver) if err != nil { return errors.Wrap(err, "get control plane endpoint") } @@ -513,7 +513,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error { return errors.Wrap(err, "primary control plane") } - hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &cp, cfg.Driver) + hostname, _, port, err := driver.ControlPlaneEndpoint(&cfg, &cp, cfg.Driver) if err != nil { return errors.Wrap(err, "control plane") } diff --git a/pkg/minikube/driver/endpoint.go b/pkg/minikube/driver/endpoint.go index dc9507a4d9d5235ab24f8d7ddb6885280794ab1b..f4a7ccfdf5025295c56982e9f98fee2e475d2a5a 100644 --- a/pkg/minikube/driver/endpoint.go +++ b/pkg/minikube/driver/endpoint.go @@ -24,8 +24,8 @@ import ( "k8s.io/minikube/pkg/minikube/constants" ) -// ControlPaneEndpoint returns the location where callers can reach this cluster -func ControlPaneEndpoint(cc *config.ClusterConfig, cp *config.Node, driverName string) (string, net.IP, int, error) { +// ControlPlaneEndpoint returns the location where callers can reach this cluster +func ControlPlaneEndpoint(cc *config.ClusterConfig, cp *config.Node, driverName string) (string, net.IP, int, error) { if NeedsPortForward(driverName) { port, err := oci.ForwardedPort(cc.Driver, cc.Name, cp.Port) hostname := oci.DefaultBindIPV4 diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go index 0910ba35fc9f845ccdbaaab773f35bff03c88518..66f1421d3689309f100ce5f414fec18c5af258ff 100644 --- a/pkg/minikube/mustload/mustload.go +++ b/pkg/minikube/mustload/mustload.go @@ -119,7 +119,7 @@ func Running(name string) ClusterController { exit.WithError("Unable to get command runner", err) } - hostname, ip, port, err := driver.ControlPaneEndpoint(cc, &cp, host.DriverName) + hostname, ip, port, err := driver.ControlPlaneEndpoint(cc, &cp, host.DriverName) if err != nil { exit.WithError("Unable to get forwarded endpoint", err) } diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 438ddd3f022bd92cb47f57a8d34d9877183dd0a8..e8b90a66f0073fe304d9194f86f6b8c5c8ac33f8 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -312,7 +312,7 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu } func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string, error) { - hostname, _, port, err := driver.ControlPaneEndpoint(&cc, &n, h.DriverName) + hostname, _, port, err := driver.ControlPlaneEndpoint(&cc, &n, h.DriverName) if err != nil { return "", err }