From 0da027cdb2149242ee03433dadfc1e4afeed822d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 13 Mar 2020 12:01:28 -0700
Subject: [PATCH] refactor

---
 pkg/minikube/node/config.go | 24 +++++++++++++-----------
 pkg/provision/buildroot.go  |  5 -----
 pkg/provision/ubuntu.go     |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index e0183c9608..b1aed3dd6f 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -23,7 +23,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
-	"strings"
 
 	"github.com/blang/semver"
 	"github.com/docker/machine/libmachine"
@@ -154,28 +153,31 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 
 // apiServerURL returns a URL to end user can reach to the api server
 func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string, error) {
+	hostname := ""
+	port := n.Port
+	var err error
 	if driver.IsKIC(h.DriverName) {
-		p, err := oci.HostPortBinding(h.DriverName, h.Name, n.Port)
+		// for kic drivers we use 127.0.0.1 instead of node IP,
+		// because of Docker on MacOs limitations for reaching to container's IP.
+		hostname = oci.DefaultBindIPV4
+		port, err = oci.HostPortBinding(h.DriverName, h.Name, port)
 		if err != nil {
 			return "", errors.Wrap(err, "host port binding")
 		}
-		// for kic drivers we use 127.0.0.1 instead of node IP,
-		// because of Docker on MacOs limitations for reaching to container's IP.
-		addr := fmt.Sprintf("https://" + net.JoinHostPort(oci.DefaultBindIPV4, strconv.Itoa(p)))
 		if cc.KubernetesConfig.APIServerName != constants.APIServerName {
-			addr = strings.Replace(addr, oci.DefaultBindIPV4, cc.KubernetesConfig.APIServerName, -1)
+			hostname = cc.KubernetesConfig.APIServerName
 		}
-		return addr, nil
+		return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(port))), nil
 	}
-	ip, err := h.Driver.GetIP()
+
+	hostname, err = h.Driver.GetIP()
 	if err != nil {
 		return "", errors.Wrap(err, "get ip")
 	}
-	addr := fmt.Sprintf("https://" + net.JoinHostPort(ip, strconv.Itoa(n.Port)))
 	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
-		addr = strings.Replace(addr, n.IP, cc.KubernetesConfig.APIServerName, -1)
+		hostname = cc.KubernetesConfig.APIServerName
 	}
-	return addr, nil
+	return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(n.Port))), nil
 }
 
 // configureMounts configures any requested filesystem mounts
diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 56424b2a46..169c0e63d3 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -151,11 +151,6 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	// because currently we install docker differently in kic, it is harmless to do this step for VM too so the code by the same
-	if err := p.Service("", serviceaction.DaemonReload); err != nil {
-		return nil, err
-	}
-
 	if err := p.Service("docker", serviceaction.Enable); err != nil {
 		return nil, err
 	}
diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
index 122b33a46f..7cebe18dbb 100644
--- a/pkg/provision/ubuntu.go
+++ b/pkg/provision/ubuntu.go
@@ -155,7 +155,7 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	// because in kic base image we pre-install docker it already has a service file, it is harmless to double check with this step
+	// because in kic base image we pre-install docker it already has a service file. we need to daemon-reload for the new systemd file
 	if err := p.Service("", serviceaction.DaemonReload); err != nil {
 		return nil, err
 	}