use forwarded apiserver port, for drivers that neededs it

pull/17909/head
Predrag Rogic 2024-02-07 00:23:15 +00:00
parent 86e00e66d7
commit 22603d178f
No known key found for this signature in database
GPG Key ID: F1FF5748C4855229
2 changed files with 4 additions and 5 deletions

View File

@ -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)
}
}

View File

@ -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)})