Use hostname as node name for 'none' driver

pkg/minikube/bootstrapper/bsutil/kubeadm.go

@@ -94,7 +94,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:         driver.KubeNodeName(cc, n),
 		CRISocket:        r.SocketPath(),
 		ImageRepository:  k8s.ImageRepository,
 		ComponentOptions: componentOpts,

pkg/minikube/bootstrapper/bsutil/kubelet.go

@@ -60,8 +60,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 := driver.KubeNodeName(mc, nc)
+	if nodeName != "" {
+		extraOpts["hostname-override"] = nodeName
 	}
 
 	pauseImage := images.Pause(version, k8s.ImageRepository)

pkg/minikube/driver/driver.go

@@ -237,6 +237,16 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
+// KubeNodeName returns the node name registered in Kubernetes
+func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
+	if cc.Driver == None {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+	return MachineName(cc, n)
+}
+
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {