From 22603d178f0627e374b83b43b13996c9893288ef Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Wed, 7 Feb 2024 00:23:15 +0000 Subject: [PATCH] use forwarded apiserver port, for drivers that neededs it --- cmd/minikube/cmd/status.go | 7 +++---- pkg/minikube/node/start.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go index 8249b903d1..c8319405fb 100644 --- a/cmd/minikube/cmd/status.go +++ b/cmd/minikube/cmd/status.go @@ -403,10 +403,9 @@ func nodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*St if cc.Addons["auto-pause"] { hostname, _, port, err = driver.AutoPauseProxyEndpoint(&cc, &n, host.DriverName) } else { - if config.IsHA(cc) { - hostname = cc.KubernetesConfig.APIServerHAVIP - port = cc.APIServerPort - } else { + hostname = cc.KubernetesConfig.APIServerHAVIP + port = cc.APIServerPort + if !config.IsHA(cc) || driver.NeedsPortForward(cc.Driver) { hostname, _, port, err = driver.ControlPlaneEndpoint(&cc, &n, host.DriverName) } } diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 6ec58cd007..0d0e18efd8 100755 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -625,7 +625,7 @@ func setupKubeadm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node, func setupKubeconfig(h host.Host, cc config.ClusterConfig, n config.Node, clusterName string) *kubeconfig.Settings { host := cc.KubernetesConfig.APIServerHAVIP port := cc.APIServerPort - if !config.IsHA(cc) { + if !config.IsHA(cc) || driver.NeedsPortForward(cc.Driver) { var err error if host, _, port, err = driver.ControlPlaneEndpoint(&cc, &n, h.DriverName); err != nil { exit.Message(reason.DrvCPEndpoint, fmt.Sprintf("failed to construct cluster server address: %v", err), out.V{"profileArg": fmt.Sprintf("--profile=%s", clusterName)})