Merge remote-tracking branch 'origin/master' into tunnel-dns

Author: ceason

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Minikube Release Notes
 
+# Version 0.32.0 - 12/21/2018
+
+* Make Kubernetes v1.12.4 the default [#3482](https://github.com/kubernetes/minikube/pull/3482)
+* Update kubeadm restart commands to support v1.13.x [#3483](https://github.com/kubernetes/minikube/pull/3483)
+* Make "stop" retry on failure. [#3479](https://github.com/kubernetes/minikube/pull/3479)
+* VirtualBox time cleanup: sync on boot, don't run timesyncd [#3476](https://github.com/kubernetes/minikube/pull/3476)
+* Stream cmd output to tests when -v is enabled, and stream SSH output to logs [#3475](https://github.com/kubernetes/minikube/pull/3475)
+* Document None driver docker compatibility [#3367](https://github.com/kubernetes/minikube/pull/3367)
+* Enable host DNS resolution in virtualbox driver by default [#3453](https://github.com/kubernetes/minikube/pull/3453)
+* Fix CRI socket in Kubernetes >= 1.12.0 kubeadmin config [#3452](https://github.com/kubernetes/minikube/pull/3452)
+* Bump dashboard version to v1.10.1 [#3466](https://github.com/kubernetes/minikube/pull/3466)
+* Hide KVM signature when using GPU passthrough to support more GPU models [#3459](https://github.com/kubernetes/minikube/pull/3459)
+* Allow ServiceCIDR to be configured via 'service-cluster-ip-range' flag. [#3463](https://github.com/kubernetes/minikube/pull/3463)
+* Save old cluster config in memory before overwriting [#3450](https://github.com/kubernetes/minikube/pull/3450)
+* Change restart policy on gvisor pod [#3445](https://github.com/kubernetes/minikube/pull/3445)
+
+Shout-out to the amazing members of the minikube community who made this release possible:
+
+- Alasdair Tran
+- Balint Pato
+- Charles-Henri de Boysson
+- Chris Eason
+- Cory Locklear
+- Jeffrey Sica
+- JoeWrightss
+- RA489
+- Thomas Strömberg
+
 # Version 0.31.0 - 12/08/2018
 
 * Enable gvisor addon in minikube [#3399](https://github.com/kubernetes/minikube/pull/3399)

MAINTAINERS

@@ -1,5 +1,6 @@
 Dan Lorenc <[email protected]> (@dlorenc)
 Lucas Käldström <[email protected]> (@luxas)
-Aaron Prindle <[email protected]> (@aaron-prindle)
 Jimmi Dyson <[email protected]> (@jimmidyson)
 Balint Pato <[email protected]> (@balopat)
+Priya Wadhwa <[email protected]> (@priyawadhwa)
+Thomas Stromberg <[email protected]> (@tstromberg)

Makefile

@@ -14,7 +14,7 @@
 
 # Bump these on release
 VERSION_MAJOR ?= 0
-VERSION_MINOR ?= 31
+VERSION_MINOR ?= 32
 VERSION_BUILD ?= 0
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
@@ -23,10 +23,11 @@ BUILDROOT_BRANCH ?= 2018.05
 REGISTRY?=gcr.io/k8s-minikube
 
 HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.10.x
-BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.10.1-1
+# NOTE: "latest" as of 2018-12-04. kube-cross images aren't updated as often as Kubernetes
+BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.11.1-1
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 
-ISO_VERSION ?= v0.31.0
+ISO_VERSION ?= v0.32.0
 ISO_BUCKET ?= minikube/iso
 
 MINIKUBE_VERSION ?= $(ISO_VERSION)

OWNERS

@@ -1,12 +1,12 @@
 reviewers:
   - dlorenc
-  - aaron-prindle
   - balopat
   - tstromberg
+  - priyawadhwa
 approvers:
   - dlorenc
   - luxas
-  - aaron-prindle
   - jimmidyson
   - balopat
   - tstromberg
+  - priyawadhwa

README.md

@@ -129,7 +129,7 @@ We also released a Debian package and Windows installer on our [releases page](h
     * [Hyperkit driver](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#hyperkit-driver), [xhyve driver](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#xhyve-driver), [VirtualBox](https://www.virtualbox.org/wiki/Downloads), or [VMware Fusion](https://www.vmware.com/products/fusion)
 * Linux
     * [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or [KVM](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#kvm-driver)
-    * **NOTE:** Minikube also supports a `--vm-driver=none` option that runs the Kubernetes components on the host and not in a VM. Docker is required to use this driver but no hypervisor. If you use `--vm-driver=none`, be sure to specify a [bridge network](https://docs.docker.com/network/bridge/#configure-the-default-bridge-network) for docker. Otherwise it might change between network restarts, causing loss of connectivity to your cluster.
+    * **NOTE:** Minikube also supports a `--vm-driver=none` option that runs the Kubernetes components on the host and not in a VM. Docker is required to use this driver but no hypervisor. If you use `--vm-driver=none`, be sure to specify a [bridge network](https://docs.docker.com/network/bridge/#configure-the-default-bridge-network) for docker. Otherwise it might change between network restarts, causing loss of connectivity to your cluster. None driver requires docker-ce 18.06 (18.09+ will be compatible from kubernetes version 1.13+, see [#3323](https://github.com/kubernetes/minikube/issues/3323)) .
 * Windows
     * [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or [Hyper-V](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#hyperV-driver)
 * VT-x/AMD-v virtualization must be enabled in BIOS

cmd/minikube/cmd/start.go

@@ -67,6 +67,7 @@ const (
 	featureGates          = "feature-gates"
 	apiServerName         = "apiserver-name"
 	dnsDomain             = "dns-domain"
+	serviceCIDR           = "service-cluster-ip-range"
 	mountString           = "mount-string"
 	disableDriverMounts   = "disable-driver-mounts"
 	cacheImages           = "cache-images"
@@ -234,7 +235,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		ContainerRuntime:       viper.GetString(containerRuntime),
 		CRISocket:              viper.GetString(criSocket),
 		NetworkPlugin:          viper.GetString(networkPlugin),
-		ServiceCIDR:            pkgutil.DefaultServiceCIDR,
+		ServiceCIDR:            viper.GetString(serviceCIDR),
 		ExtraOptions:           extraOptions,
 		ShouldLoadCachedImages: shouldCacheImages,
 	}
@@ -473,6 +474,7 @@ func init() {
 	startCmd.Flags().StringArrayVar(&apiServerNames, "apiserver-names", nil, "A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine")
 	startCmd.Flags().IPSliceVar(&apiServerIPs, "apiserver-ips", nil, "A set of apiserver IP Addresses which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine")
 	startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster")
+	startCmd.Flags().String(serviceCIDR, pkgutil.DefaultServiceCIDR, "The CIDR to be used for service cluster IPs.")
 	startCmd.Flags().StringSliceVar(&insecureRegistry, "insecure-registry", nil, "Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.")
 	startCmd.Flags().StringSliceVar(&registryMirror, "registry-mirror", nil, "Registry mirrors to pass to the Docker daemon")
 	startCmd.Flags().String(containerRuntime, "", "The container runtime to be used")

cmd/minikube/cmd/stop.go

@@ -19,11 +19,13 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/spf13/cobra"
 	cmdUtil "k8s.io/minikube/cmd/util"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/machine"
+	pkgutil "k8s.io/minikube/pkg/util"
 )
 
 // stopCmd represents the stop command
@@ -41,7 +43,10 @@ itself, leaving all files intact. The cluster can be started again with the "sta
 		}
 		defer api.Close()
 
-		if err = cluster.StopHost(api); err != nil {
+		stop := func() (err error) {
+			return cluster.StopHost(api)
+		}
+		if err := pkgutil.RetryAfter(5, stop, 1*time.Second); err != nil {
 			fmt.Println("Error stopping machine: ", err)
 			cmdUtil.MaybeReportErrorAndExit(err)
 		}

deploy/addons/dashboard/dashboard-dp.yaml

@@ -18,26 +18,26 @@ metadata:
   name: kubernetes-dashboard
   namespace: kube-system
   labels:
-    version: v1.10.0
+    version: v1.10.1
     addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: dashboard
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: kubernetes-dashboard
-      version: v1.10.0
+      version: v1.10.1
       addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: kubernetes-dashboard
-        version: v1.10.0
+        version: v1.10.1
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9090

deploy/iso/minikube-iso/configs/minikube_defconfig

@@ -59,3 +59,4 @@ BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"
 BR2_TARGET_SYSLINUX=y
 BR2_PACKAGE_HOST_E2TOOLS=y
+BR2_PACKAGE_SYSTEMD_TIMESYNCD=n

deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service

@@ -4,9 +4,14 @@ ConditionVirtualization=oracle
 
 [Service]
 ExecStartPre=-/usr/sbin/modprobe vboxguest
-ExecStartPre=-/usr/sbin/modprobe vboxvideo
+
+# Broken and probably unused: Unknown symbol ttm_bo_del_sub_from_lru
+# ExecStartPre=-/usr/sbin/modprobe vboxvideo
+
 ExecStartPre=-/usr/sbin/modprobe vboxsf
-ExecStart=/usr/sbin/VBoxService -f --disable-automount
+# Normally, VirtualBox only syncs every 20 minutes. This syncs on start, and
+# forces an immediate sync if VM time is over 5 seconds off.
+ExecStart=/usr/sbin/VBoxService -f --disable-automount --timesync-set-start --timesync-set-threshold 5000
 
 [Install]
 WantedBy=multi-user.target

deploy/minikube/releases.json

@@ -1,4 +1,12 @@
 [
+  {
+      "name": "v0.32.0",
+      "checksums": {
+          "darwin": "d5b21adacd4b6bad9006816e4bdb29f39318a60919e7a6bb5e388a6299fffd0f",
+          "linux": "3298d3183deacd9ddd3032dab113a64d863df7648d6d24693284ba4193e95b49",
+          "windows": "31668f64f6be25644b22d0465e0f72d745a027804b2c8685e040b8147bacfba1"
+      }
+  },
   {
       "name": "v0.31.0",
       "checksums": {

docs/contributors/releasing_minikube.md

@@ -65,7 +65,7 @@ This step uses the git tag to publish new binaries to GCS and create a github re
  * navigate to the minikube "Release" jenkins job
  * Ensure that you are logged in (top right)
  * `VERSION_MAJOR`, `VERSION_MINOR`, and `VERSION_BUILD` should reflect the values in your Makefile
- * For `ISO_SHA256`, run: `gsutil cat gs://minikube/iso/minikube-v<version>.iso.sha256
+ * For `ISO_SHA256`, run: `gsutil cat gs://minikube/iso/minikube-v<version>.iso.sha256`
  * Click *Build*
 
 ## Update releases.json
@@ -74,29 +74,14 @@ minikube-bot will send out a PR to update the release checksums at the top of `d
 
 This file is used for auto-update notifications, but is not active until releases.json is copied to GCS.
 
-## Upload releases.json to GCS
-
-This step makes the new release trigger update notifications in old versions of Minikube.
-Use this command from a clean git repo:
-
-```shell
-gsutil cp deploy/minikube/releases.json gs://minikube/releases.json
-```
-
-## Mark the release as `latest` in GCS:
-
-```shell
-gsutil cp -r 'gs://minikube/releases/$RELEASE/*' gs://minikube/releases/latest/
-```
-
 ## Package managers which include minikube
 
 These are downstream packages that are being maintained by others and how to upgrade them to make sure they have the latest versions
 
 | Package Manager | URL | TODO |
 | --- | --- | --- |
 | Arch Linux AUR | https://aur.archlinux.org/packages/minikube/ | "Flag as package out-of-date"
-| Brew Cask | https://github.com/Homebrew/homebrew-cask/blob/master/Casks/minikube.rb | Create a new PR in [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask) with an updated version and SHA256
+| Brew Cask | https://github.com/Homebrew/homebrew-cask/blob/master/Casks/minikube.rb | The release job creates a new PR in [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask) with an updated version and SHA256, double check that it's created.
 
 #### Updating the arch linux package
 The Arch Linux AUR is maintained at https://aur.archlinux.org/packages/minikube/.  The installer PKGBUILD is hosted in its own repository.  The public read-only repository is hosted here `https://aur.archlinux.org/minikube.git` and the private read-write repository is hosted here `ssh://[email protected]/minikube.git`

hack/jenkins/common.sh

@@ -197,7 +197,7 @@ echo ">> Starting ${E2E_BIN} at $(date)"
 ${SUDO_PREFIX}${E2E_BIN} \
   -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \
   -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" \
-  -test.v -test.timeout=30m -binary="${MINIKUBE_BIN}" && result=$? || result=$?
+  -test.v -test.timeout=50m -binary="${MINIKUBE_BIN}" && result=$? || result=$?
 echo ">> ${E2E_BIN} exited with ${result} at $(date)"
 echo ""
 

hack/jenkins/linux_integration_tests_none.sh

@@ -35,8 +35,9 @@ SUDO_PREFIX="sudo -E "
 export KUBECONFIG="/root/.kube/config"
 
 # "none" driver specific cleanup from previous runs.
-# kubeadm
-sudo kubeadm reset -f || true
+
+# Try without -f first, primarily because older kubeadm versions (v1.10) don't support it anyways.
+sudo kubeadm reset || sudo kubeadm reset -f || true
 # Cleanup data directory
 sudo rm -rf /data/*
 # Cleanup old Kubernetes configs

pkg/drivers/kvm/domain.go

@@ -36,6 +36,9 @@ const domainTmpl = `
     <acpi/>
     <apic/>
     <pae/>
+    <kvm>
+      <hidden state='on'/>
+    </kvm>
   </features>
   <cpu mode='host-passthrough'/>
   <os>

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -209,21 +209,31 @@ func addAddons(files *[]assets.CopyableFile) error {
 }
 
 func (k *KubeadmBootstrapper) RestartCluster(k8s config.KubernetesConfig) error {
-	opts := struct {
-		KubeadmConfigFile string
-	}{
-		KubeadmConfigFile: constants.KubeadmConfigFile,
+	version, err := ParseKubernetesVersion(k8s.KubernetesVersion)
+	if err != nil {
+		return errors.Wrap(err, "parsing kubernetes version")
 	}
 
-	b := bytes.Buffer{}
-	if err := kubeadmRestoreTemplate.Execute(&b, opts); err != nil {
-		return err
+	phase := "alpha"
+	controlPlane := "controlplane"
+	if version.GTE(semver.MustParse("1.13.0")) {
+		phase = "init"
+		controlPlane = "control-plane"
 	}
 
-	if err := k.c.Run(b.String()); err != nil {
-		return errors.Wrapf(err, "running cmd: %s", b.String())
+	cmds := []string{
+		fmt.Sprintf("sudo kubeadm %s phase certs all --config %s", phase, constants.KubeadmConfigFile),
+		fmt.Sprintf("sudo kubeadm %s phase kubeconfig all --config %s", phase, constants.KubeadmConfigFile),
+		fmt.Sprintf("sudo kubeadm %s phase %s all --config %s", phase, controlPlane, constants.KubeadmConfigFile),
+		fmt.Sprintf("sudo kubeadm %s phase etcd local --config %s", phase, constants.KubeadmConfigFile),
 	}
 
+	// Run commands one at a time so that it is easier to root cause failures.
+	for _, cmd := range cmds {
+		if err := k.c.Run(cmd); err != nil {
+			return errors.Wrapf(err, "running cmd: %s", cmd)
+		}
+	}
 	if err := restartKubeProxy(k8s); err != nil {
 		return errors.Wrap(err, "restarting kube-proxy")
 	}
@@ -438,6 +448,10 @@ func generateConfig(k8s config.KubernetesConfig) (string, error) {
 		NoTaintMaster:     false, // That does not work with k8s 1.12+
 	}
 
+	if k8s.ServiceCIDR != "" {
+		opts.ServiceCIDR = k8s.ServiceCIDR
+	}
+
 	if version.GTE(semver.MustParse("1.10.0-alpha.0")) {
 		opts.NoTaintMaster = true
 	}

pkg/minikube/bootstrapper/kubeadm/templates.go

@@ -60,7 +60,7 @@ bootstrapTokens:
   - authentication
 kind: InitConfiguration
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}}
   name: {{.NodeName}}
   taints: []
 ---
@@ -109,13 +109,6 @@ RestartSec=10
 WantedBy=multi-user.target
 `
 
-var kubeadmRestoreTemplate = template.Must(template.New("kubeadmRestoreTemplate").Parse(`
-sudo kubeadm alpha phase certs all --config {{.KubeadmConfigFile}} &&
-sudo /usr/bin/kubeadm alpha phase kubeconfig all --config {{.KubeadmConfigFile}} &&
-sudo /usr/bin/kubeadm alpha phase controlplane all --config {{.KubeadmConfigFile}} &&
-sudo /usr/bin/kubeadm alpha phase etcd local --config {{.KubeadmConfigFile}}
-`))
-
 var kubeadmInitTemplate = template.Must(template.New("kubeadmInitTemplate").Parse(`
 sudo /usr/bin/kubeadm init --config {{.KubeadmConfigFile}} {{if .SkipPreflightChecks}}--skip-preflight-checks{{else}}{{range .Preflights}}--ignore-preflight-errors={{.}} {{end}}{{end}}
 `))