Merge pull request #3897 from u5surf/issue-3878

tstromberg · web-flow · commit 20b9cfd0f3a9 · 2019-03-21T11:33:54.000-07:00
Replace server name in updateKubeConfig if --apiserver-name exists #3878
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -458,6 +458,9 @@ func updateKubeConfig(h *host.Host, c *cfg.Config) *kubeconfig.KubeConfigSetup {
 	}
 	addr = strings.Replace(addr, "tcp://", "https://", -1)
 	addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(c.KubernetesConfig.NodePort), -1)
+	if c.KubernetesConfig.APIServerName != constants.APIServerName {
+		addr = strings.Replace(addr, c.KubernetesConfig.NodeIP, c.KubernetesConfig.APIServerName, -1)
+	}
 
 	kcs := &kubeconfig.KubeConfigSetup{
 		ClusterName:          cfg.GetMachineName(),

Original file line number	Diff line number	Diff line change
`@@ -458,6 +458,9 @@ func updateKubeConfig(h host.Host, c cfg.Config) *kubeconfig.KubeConfigSetup {`
`458`	`458`	`}`
`459`	`459`	`addr = strings.Replace(addr, "tcp://", "https://", -1)`
`460`	`460`	`addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(c.KubernetesConfig.NodePort), -1)`
	`461`	`+ if c.KubernetesConfig.APIServerName != constants.APIServerName {`
	`462`	`+ addr = strings.Replace(addr, c.KubernetesConfig.NodeIP, c.KubernetesConfig.APIServerName, -1)`
	`463`	`+ }`
`461`	`464`
`462`	`465`	`kcs := &kubeconfig.KubeConfigSetup{`
`463`	`466`	`ClusterName: cfg.GetMachineName(),`