From 6ff82c6246d2a7578df1fbe9425869e8fffae002 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sun, 22 Mar 2020 14:31:37 +0800
Subject: [PATCH] Make node name registered in K8s part of Node type

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go |  3 +--
 pkg/minikube/bootstrapper/bsutil/kubelet.go |  3 +--
 pkg/minikube/config/types.go                | 12 ++++++++++++
 pkg/minikube/driver/driver.go               | 10 ----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index bcc363c9da..55cec06303 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/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.KubeNodeName(cc, n),
+		NodeName:            n.InternalName(),
 		CRISocket:           r.SocketPath(),
 		ImageRepository:     k8s.ImageRepository,
 		ComponentOptions:    componentOpts,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 3f22f8fbc7..06e52d0ed2 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -60,7 +59,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := driver.KubeNodeName(mc, nc)
+	nodeName := nc.InternalName()
 	if nodeName != "" {
 		extraOpts["hostname-override"] = nodeName
 	}
diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index 97c2a13039..af1dc66773 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -18,6 +18,7 @@ package config
 
 import (
 	"net"
+	"os"
 
 	"github.com/blang/semver"
 )
@@ -102,6 +103,17 @@ type Node struct {
 	Worker            bool
 }
 
+// returns the name to be registered kubernetes
+func (n Node) InternalName() string {
+	if n.Name == "" {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+
+	return n.Name
+}
+
 // VersionedExtraOption holds information on flags to apply to a specific range
 // of versions
 type VersionedExtraOption struct {
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 54f379439b..b6106474d8 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -237,16 +237,6 @@ 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, "---") {