diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 7739db3514..e8b5a85f60 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -260,7 +260,7 @@ func runStart(cmd *cobra.Command, args []string) { fmt.Println("Starting cluster components...") - if !exists { + if !exists || config.VMDriver == "none" { if err := k8sBootstrapper.StartCluster(kubernetesConfig); err != nil { glog.Errorln("Error starting cluster: ", err) cmdutil.MaybeReportErrorAndExit(err) diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go index 45e8767884..f2f7f0fd1d 100644 --- a/pkg/drivers/none/none.go +++ b/pkg/drivers/none/none.go @@ -25,6 +25,7 @@ import ( "github.com/docker/machine/libmachine/drivers" "github.com/docker/machine/libmachine/state" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/net" pkgdrivers "k8s.io/minikube/pkg/drivers" "k8s.io/minikube/pkg/minikube/constants" ) @@ -72,7 +73,11 @@ func (d *Driver) DriverName() string { } func (d *Driver) GetIP() (string, error) { - return "127.0.0.1", nil + ip, err := net.ChooseBindAddress(nil) + if err != nil { + return "", err + } + return ip.String(), nil } func (d *Driver) GetSSHHostname() (string, error) { @@ -84,7 +89,12 @@ func (d *Driver) GetSSHPort() (int, error) { } func (d *Driver) GetURL() (string, error) { - return "tcp://127.0.0.1:2376", nil + ip, err := d.GetIP() + if err != nil { + return "", err + } + + return fmt.Sprintf("tcp://%s:2376", ip), nil } func (d *Driver) GetState() (state.State, error) { diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go index ef1391a904..55b740d82e 100644 --- a/pkg/minikube/bootstrapper/kubeadm/versions.go +++ b/pkg/minikube/bootstrapper/kubeadm/versions.go @@ -174,6 +174,7 @@ var versionSpecificOpts = []VersionedExtraOption{ NewUnversionedOption(Kubelet, "kubeconfig", "/etc/kubernetes/kubelet.conf"), NewUnversionedOption(Kubelet, "bootstrap-kubeconfig", "/etc/kubernetes/bootstrap-kubelet.conf"), NewUnversionedOption(Kubelet, "require-kubeconfig", "true"), + NewUnversionedOption(Kubelet, "hostname-override", "minikube"), // System pods args NewUnversionedOption(Kubelet, "pod-manifest-path", "/etc/kubernetes/manifests"),