Merge branch 'master' into v1.1.0

cmd/minikube/cmd/start.go

@@ -238,7 +238,15 @@ func runStart(cmd *cobra.Command, args []string) {
 		exit.WithError("Failed to get command runner", err)
 	}
 
-	cr := configureRuntimes(runner, k8sVersion)
+	cr := configureRuntimes(runner)
+	version, _ := cr.Version()
+	console.OutStyle(cr.Name(), "Configuring environment for Kubernetes %s on %s %s", k8sVersion, cr.Name(), version)
+	for _, v := range dockerOpt {
+		console.OutStyle("option", "opt %s", v)
+	}
+	for _, v := range dockerEnv {
+		console.OutStyle("option", "env %s", v)
+	}
 
 	// prepareHostEnvironment uses the downloaded images, so we need to wait for background task completion.
 	waitCacheImages(&cacheGroup)
@@ -637,20 +645,12 @@ func updateKubeConfig(h *host.Host, c *cfg.Config) *pkgutil.KubeConfigSetup {
 }
 
 // configureRuntimes does what needs to happen to get a runtime going.
-func configureRuntimes(runner cruntime.CommandRunner, k8sVersion string) cruntime.Manager {
+func configureRuntimes(runner cruntime.CommandRunner) cruntime.Manager {
 	config := cruntime.Config{Type: viper.GetString(containerRuntime), Runner: runner}
 	cr, err := cruntime.New(config)
 	if err != nil {
 		exit.WithError(fmt.Sprintf("Failed runtime for %+v", config), err)
 	}
-	version, _ := cr.Version()
-	console.OutStyle(cr.Name(), "Configuring environment for Kubernetes %s on %s %s", k8sVersion, cr.Name(), version)
-	for _, v := range dockerOpt {
-		console.OutStyle("option", "opt %s", v)
-	}
-	for _, v := range dockerEnv {
-		console.OutStyle("option", "env %s", v)
-	}
 
 	err = cr.Enable()
 	if err != nil {

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

@@ -3,3 +3,5 @@ sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.
 sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz
 sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz
 sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.tar.gz
+sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.tar.gz
+sha256 1f6f72b1f89d4286b2d5b54a48f4d5ed4c0c01065d484635dcb343a706feb743 v1.14.1.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.13.1
+CRIO_BIN_VERSION = v1.14.1
+CRIO_BIN_COMMIT = b7644f67e6383cc862b3e37fb74fba334b0b2721
 CRIO_BIN_SITE = https://github.com/kubernetes-sigs/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme
@@ -28,7 +29,7 @@ endef
 
 define CRIO_BIN_BUILD_CMDS
 	mkdir -p $(@D)/bin
-	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr binaries
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries
 endef
 
 define CRIO_BIN_INSTALL_TARGET_CMDS

deploy/iso/minikube-iso/package/podman/podman.hash

@@ -3,3 +3,6 @@ sha256 004d2695cf3de1802b3a1fc70bb03115e33ffe943477c49558b682313cb4fca2 v0.6.1.t
 sha256 0b478f4918b984480b2f24ac5df1f45e31bca798dd8e2364bb56b2810b2ccff6 v0.7.4.tar.gz
 sha256 065d2ef4cbbbcb87a7be5e1b3adb36d932819bafae7ccc26ad80f653b4328692 v0.9.3.tar.gz
 sha256 f7a462563dd587208eff3c3c0689bc4d01071a8f7933bec2a13126be123f63a8 v1.0.0.tar.gz
+sha256 b4d6843e13c0f2f1557ab20b4364bb42ea9102442ee3f1be806c06128aa687d8 v1.2.0.tar.gz
+sha256 548a82b62ff183ca9e68f164779d6ded94fce07261242ceb96faa267fcecf56b v1.3.0.tar.gz
+sha256 7ccbfa80900cd438468986911038da4c38382ef507a2fa717217faefb738fbc4 v1.3.1.tar.gz

deploy/iso/minikube-iso/package/podman/podman.mk

-PODMAN_VERSION = v1.0.0
-PODMAN_COMMIT = 82e80110c3f2d8728745c47e340f3bee4d408846
+PODMAN_VERSION = v1.3.1
+PODMAN_COMMIT = 7210727e205c333af9a2d0ed0bb66adcf92a6369
 PODMAN_SITE = https://github.com/containers/libpod/archive
 PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz
 PODMAN_LICENSE = Apache-2.0

docs/README.md

@@ -26,6 +26,8 @@
 
 * **Reusing the Docker Daemon** ([reusing_the_docker_daemon.md](reusing_the_docker_daemon.md)): How to point your docker CLI to the docker daemon running inside minikube
 
+* **Building images within the VM** ([building_images_within_the_vm.md](building_images_within_the_vm.md)): How to build a container image within the minikube VM
+
 #### Storage
 
 * **Persistent Volumes** ([persistent_volumes.md](persistent_volumes.md)): Persistent Volumes in Minikube and persisted locations in the VM

docs/building_images_within_the_vm.md

+# Building images within the VM
+
+When using a single VM of Kubernetes it's really handy to build inside the VM; as this means you don't have to build on your host machine and push the image into a docker registry - you can just build inside the same machine as minikube which speeds up local experiments.
+
+## Docker (containerd)
+
+For Docker, you can either set up your host docker client to communicate by [reusing the docker daemon](reusing_the_docker_daemon.md).
+
+Or you can use `minikube ssh` to connect to the virtual machine, and run the `docker build` there:
+
+```shell
+docker build
+```
+
+For more information on the `docker build` command, read the [Docker documentation](https://docs.docker.com/engine/reference/commandline/build/) (docker.com).
+
+## Podman (cri-o)
+
+For Podman, there is no daemon running. The processes are started by the user, monitored by `conmon`.
+
+So you need to use `minikube ssh`, and you will also make sure to run the command as the root user:
+
+```shell
+sudo -E podman build
+```
+
+For more information on the `podman build` command, read the [Podman documentation](https://github.com/containers/libpod/blob/master/docs/podman-build.1.md) (podman.io).
+
+## Build context
+
+For the build context you can use any directory on the virtual machine, or any address on the network.

docs/drivers.md

-# Driver plugin installation
+# VM Driver plugin installation
 
 Minikube uses Docker Machine to manage the Kubernetes VM so it benefits from the
 driver plugin architecture that Docker Machine uses to provide a consistent way to
@@ -185,3 +185,19 @@ and run minikube as usual:
 ```shell
 minikube start
 ```
+
+# Troubleshooting
+
+minikube is currently unable to display the error message received back from the VM driver. Users can however reveal the error by passing `--alsologtostderr -v=8` to `minikube start`. For instance:
+
+```shell
+minikube start --vm-driver=kvm2 --alsologtostderr -v=8
+```
+
+Output:
+
+```
+Found binary path at /usr/local/bin/docker-machine-driver-kvm2
+Launching plugin server for driver kvm2
+Error starting plugin binary: fork/exec /usr/local/bin/docker-machine-driver-kvm2: exec format error   
+```

pkg/drivers/kvm/network.go

@@ -117,9 +117,11 @@ func (d *Driver) createNetwork() error {
 
 	// network: default
 	// It is assumed that the libvirt/kvm installation has already created this network
+	if _, err := conn.LookupNetworkByName(d.Network); err != nil {
+		return errors.Wrapf(err, "network %s doesn't exist", d.Network)
+	}
 
 	// network: private
-
 	// Only create the private network if it does not already exist
 	if _, err := conn.LookupNetworkByName(d.PrivateNetwork); err != nil {
 		// create the XML for the private network from our networkTmpl

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -73,24 +73,6 @@ var KubeadmExtraArgsWhitelist = map[int][]string{
 	},
 }
 
-// SkipPreflights are preflight checks we always skip.
-var SkipPreflights = []string{
-	// We use --ignore-preflight-errors=DirAvailable since we have our own custom addons
-	// that we also stick in /etc/kubernetes/manifests
-	"DirAvailable--etc-kubernetes-manifests",
-	"DirAvailable--data-minikube",
-	"Port-10250",
-	"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
-	"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
-	"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
-	"FileAvailable--etc-kubernetes-manifests-etcd.yaml",
-	// So that "none" driver users don't have to reconfigure their machine
-	"Swap",
-	// We use --ignore-preflight-errors=CRI since /var/run/dockershim.sock is not present.
-	// (because we start kubelet with an invalid config)
-	"CRI",
-}
-
 type pod struct {
 	// Human friendly name
 	name  string
@@ -221,30 +203,30 @@ func (k *Bootstrapper) StartCluster(k8s config.KubernetesConfig) error {
 	if err != nil {
 		return err
 	}
-	b := bytes.Buffer{}
-	preflights := SkipPreflights
-	preflights = append(preflights, SkipAdditionalPreflights[r.Name()]...)
-
-	templateContext := struct {
-		KubeadmConfigFile   string
-		SkipPreflightChecks bool
-		Preflights          []string
-		ExtraOptions        string
-	}{
-		KubeadmConfigFile: constants.KubeadmConfigFile,
-		SkipPreflightChecks: !VersionIsBetween(version,
-			semver.MustParse("1.9.0-alpha.0"),
-			semver.Version{}),
-		Preflights:   preflights,
-		ExtraOptions: extraFlags,
-	}
-	if err := kubeadmInitTemplate.Execute(&b, templateContext); err != nil {
-		return err
+
+	ignore := []string{
+		"DirAvailable--etc-kubernetes-manifests", // Addons are stored in /etc/kubernetes/manifests
+		"DirAvailable--data-minikube",
+		"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
+		"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
+		"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
+		"FileAvailable--etc-kubernetes-manifests-etcd.yaml",
+		"Port-10250", // For "none" users who already have a kubelet online
+		"Swap",       // For "none" users who have swap configured
+	}
+	ignore = append(ignore, SkipAdditionalPreflights[r.Name()]...)
+
+	// Allow older kubeadm versions to function with newer Docker releases.
+	if version.LT(semver.MustParse("1.13.0")) {
+		glog.Infof("Older Kubernetes release detected (%s), disabling SystemVerification check.", version)
+		ignore = append(ignore, "SystemVerification")
 	}
 
-	out, err := k.c.CombinedOutput(b.String())
+	cmd := fmt.Sprintf("sudo /usr/bin/kubeadm init --config %s %s --ignore-preflight-errors=%s",
+		constants.KubeadmConfigFile, extraFlags, strings.Join(ignore, ","))
+	out, err := k.c.CombinedOutput(cmd)
 	if err != nil {
-		return errors.Wrapf(err, "kubeadm init: %s\n%s\n", b.String(), out)
+		return errors.Wrapf(err, "cmd failed: %s\n%s\n", cmd, out)
 	}
 
 	if version.LT(semver.MustParse("1.10.0-alpha.0")) {

pkg/minikube/bootstrapper/kubeadm/templates.go

@@ -177,10 +177,6 @@ RestartSec=10
 WantedBy=multi-user.target
 `
 
-var kubeadmInitTemplate = template.Must(template.New("kubeadmInitTemplate").Parse(`
-sudo /usr/bin/kubeadm init --config {{.KubeadmConfigFile}} {{.ExtraOptions}} {{if .SkipPreflightChecks}}--skip-preflight-checks{{else}}{{range .Preflights}}--ignore-preflight-errors={{.}} {{end}}{{end}}
-`))
-
 // printMapInOrder sorts the keys and prints the map in order, combining key
 // value pairs with the separator character
 //

pkg/minikube/problem/err_map.go

@@ -93,8 +93,8 @@ var vmProblems = map[string]match{
 	},
 	"KVM2_START_NO_IP": {
 		Regexp: re(`Error in driver during machine creation: Machine didn't return an IP after 120 seconds`),
-		Advice: "The KVM driver is not providing an IP address to the VM. Try checking your libvirt configuration and/or opening an issue",
-		URL:    "https://fedoraproject.org/wiki/How_to_debug_Virtualization_problems#Networking",
+		Advice: "Install the latest kvm2 driver and run 'virt-host-validate'",
+		URL:    "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#kvm2-driver",
 		Issues: []int{4249, 3566},
 	},
 	"KVM2_NETWORK_DEFINE_XML": {
@@ -103,12 +103,27 @@ var vmProblems = map[string]match{
 		URL:    "https://forums.gentoo.org/viewtopic-t-981692-start-0.html",
 		Issues: []int{4195},
 	},
+	"KVM2_QEMU_MONITOR": {
+		Regexp: re(`qemu unexpectedly closed the monitor`),
+		Advice: "Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.",
+		Issues: []int{4277},
+	},
 	"KVM_UNAVAILABLE": {
 		Regexp: re(`invalid argument: could not find capabilities for domaintype=kvm`),
 		Advice: "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem",
 		URL:    "http://mikko.repolainen.fi/documents/virtualization-with-kvm",
 		Issues: []int{2991},
 	},
+	"DRIVER_CRASHED": {
+		Regexp: re(`Error attempting to get plugin server address for RPC`),
+		Advice: "The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error",
+		URL:    "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md",
+	},
+	"DRIVER_EXITED": {
+		Regexp: re(`Unable to start VM: create: creating: exit status 1`),
+		Advice: "Re-run 'minikube start' with --alsologtostderr -v=8 to see the VM driver error message",
+		URL:    "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#troubleshooting",
+	},
 	"VM_BOOT_FAILED_HYPERV_ENABLED": {
 		Regexp: re(`VirtualBox won't boot a 64bits VM when Hyper-V is activated`),
 		Advice: "Disable Hyper-V when you want to run VirtualBox to boot the VM",