Wait to add aliases to /etc/hosts before starting kubelet

pkg/drivers/kic/kic.go

@@ -295,7 +295,6 @@ func (d *Driver) Restart() error {
 		return fmt.Errorf("start during restart %v", err)
 	}
 	return nil
-
 }
 
 // Start an already created kic container

pkg/minikube/node/start.go

@@ -53,6 +53,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 	"k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/util/retry"
 )
@@ -180,12 +181,33 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 		}
 	}
 
+	if err := restartKubeletIfNeeded(starter); err != nil {
+		return nil, errors.Wrap(err, "restarting kubelet")
+	}
+
 	wg.Wait()
 
 	// Write enabled addons to the config before completion
 	return kcs, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
 }
 
+func restartKubeletIfNeeded(starter Starter) error {
+	if !starter.PreExists {
+		return nil
+	}
+	if !driver.IsKIC(starter.Host.DriverName) {
+		return nil
+	}
+	// on soft start and kic, we need to restart kubelet to ensure that it picks up the correct node ip
+	// there seems to be a race condition between when the ip is updated
+	// on node restarts and kubelet starting up
+	glog.Infof("Restarting kubelet...")
+	if err := sysinit.New(starter.Runner).Restart("kubelet"); err != nil {
+		return errors.Wrap(err, "restarting kubelet")
+	}
+	return nil
+}
+
 // Provision provisions the machine/container for the node
 func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool) (command.Runner, bool, libmachine.API, *host.Host, error) {
 

test/integration/start_stop_delete_test.go

@@ -71,6 +71,9 @@ func TestStartStop(t *testing.T) {
 				"--disable-driver-mounts",
 				"--extra-config=kubeadm.ignore-preflight-errors=SystemVerification",
 			}},
+			{"docker", constants.DefaultKubernetesVersion, []string{
+				"--container-runtime=docker",
+			}},
 			{"embed-certs", constants.DefaultKubernetesVersion, []string{
 				"--embed-certs",
 			}},