Merge pull request #7141 from laozc/fix-hostname

Fix node name for "none" driver

pkg/minikube/bootstrapper/bsutil/kubeadm.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 )
@@ -94,7 +93,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:            driver.MachineName(cc, n),
+		NodeName:            KubeNodeName(cc, n),
 		CRISocket:           r.SocketPath(),
 		ImageRepository:     k8s.ImageRepository,
 		ComponentOptions:    componentOpts,

pkg/minikube/bootstrapper/bsutil/kubelet.go

@@ -19,6 +19,7 @@ package bsutil
 
 import (
 	"bytes"
+	"os"
 	"path"
 
 	"github.com/pkg/errors"
@@ -60,8 +61,9 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	if nc.Name != "" {
-		extraOpts["hostname-override"] = driver.MachineName(mc, nc)
+	nodeName := KubeNodeName(mc, nc)
+	if nodeName != "" {
+		extraOpts["hostname-override"] = nodeName
 	}
 
 	pauseImage := images.Pause(version, k8s.ImageRepository)
@@ -116,3 +118,13 @@ func NewKubeletService(cfg config.KubernetesConfig) ([]byte, error) {
 	}
 	return b.Bytes(), nil
 }
+
+// KubeNodeName returns the node name registered in Kubernetes
+func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
+	if cc.Driver == driver.None {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+	return driver.MachineName(cc, n)
+}