From 1c4c158327bef4f98f57ebdaf7a528845c5c29fa Mon Sep 17 00:00:00 2001
From: Alonyb <rubenbaez1995@gmail.com>
Date: Mon, 10 Feb 2020 22:57:30 -0500
Subject: [PATCH 001/668] add new validations to windows workflow

---
 Makefile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Makefile b/Makefile
index bfc0a8656e..0d88f76fc9 100755
--- a/Makefile
+++ b/Makefile
@@ -277,6 +277,18 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 endif
 	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
+ifeq ($(OS),Windows_NT)
+	echo "%cd%"
+	echo "$(GOPATH)"
+	dir
+	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin"
+	"$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/...
+	-gofmt -s -w $@
+	@#golint: Dns should be DNS (compat sed)
+	@sed -i -e 's/Dns/DNS/g' $@ && rm -f ./-e
+	@#golint: Html should be HTML (compat sed)
+	@sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e
+else
 	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg assets deploy/addons/...
 	-gofmt -s -w $@
 	@#golint: Dns should be DNS (compat sed)
@@ -284,15 +296,26 @@ endif
 	@#golint: Html should be HTML (compat sed)
 	@sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e
 
+endif
+
 pkg/minikube/translate/translations.go: $(shell find "translations/" -type f)
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 endif
+ifeq ($(OS),Windows_NT)
+	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
+	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin"
+	"$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg translate translations/...
+	-gofmt -s -w $@
+	@#golint: Json should be JSON (compat sed)
+	@sed -i -e 's/Json/JSON/' $@ && rm -f ./-e
+else
 	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
 	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg translate translations/...
 	-gofmt -s -w $@
 	@#golint: Json should be JSON (compat sed)
 	@sed -i -e 's/Json/JSON/' $@ && rm -f ./-e
+endif
 
 .PHONY: cross
 cross: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe ## Build minikube for all platform

From bcb71106b1ec553f82dfe0500b9b68de72ddadad Mon Sep 17 00:00:00 2001
From: Alonyb <rubenbaez1995@gmail.com>
Date: Mon, 10 Feb 2020 22:57:43 -0500
Subject: [PATCH 002/668] add windows base yml

---
 .github/workflows/main.yml | 271 ++++++++++++++++++++-----------------
 1 file changed, 150 insertions(+), 121 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ec7b9b32c..33e54c3319 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,139 +6,168 @@ jobs:
   docker_ubuntu_16_04:
     runs-on: ubuntu-16.04
     steps:
-    - uses: actions/checkout@v2
-    - name: build binaries
-      run : |
-        make minikube-linux-amd64
-        make e2e-linux-amd64
-        mkdir -p report
-    - name: install gopogh
-      run: |
-        cd /tmp
-        GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
-        cd -
-    - name: run integration test
-      run: |
-        mkdir -p /tmp/testhome
-        MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
-    - name: generate gopogh report
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
-    - uses: actions/upload-artifact@v1
-      with:
-        name: docker_on_ubuntu_16_04_report
-        path: report
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          make minikube-linux-amd64
+          make e2e-linux-amd64
+          mkdir -p report
+      - name: install gopogh
+        run: |
+          cd /tmp
+          GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
+          cd -
+      - name: run integration test
+        run: |
+          mkdir -p /tmp/testhome
+          MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+      - name: generate gopogh report
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
+      - uses: actions/upload-artifact@v1
+        with:
+          name: docker_on_ubuntu_16_04_report
+          path: report
   docker_ubuntu_18_04:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v2
-    - name: build binaries
-      run : |
-        make minikube-linux-amd64
-        make e2e-linux-amd64
-        mkdir -p report
-    - name: install gopogh
-      run: |
-        cd /tmp
-        GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
-        cd -
-    - name: run integration test
-      run: |
-        mkdir -p /tmp/testhome 
-        MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
-    - name: generate gopogh report
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
-    - uses: actions/upload-artifact@v1
-      with:
-        name: docker_on_ubuntu_18_04_report
-        path: report
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          make minikube-linux-amd64
+          make e2e-linux-amd64
+          mkdir -p report
+      - name: install gopogh
+        run: |
+          cd /tmp
+          GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
+          cd -
+      - name: run integration test
+        run: |
+          mkdir -p /tmp/testhome
+          MINIKUBE_HOME=/tmp/testhome ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+      - name: generate gopogh report
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
+      - uses: actions/upload-artifact@v1
+        with:
+          name: docker_on_ubuntu_18_04_report
+          path: report
   docker_macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: build binaries
-      run : |
-        make minikube-darwin-amd64
-        make e2e-darwin-amd64
-        mkdir -p report
-    - name: install docker
-      run: |
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          make minikube-darwin-amd64
+          make e2e-darwin-amd64
+          mkdir -p report
+      - name: install docker
+        run: |
           brew install docker-machine docker || true
           brew services start docker-machine || true
           docker version || true
-    - name: install gopogh
-      run: |
-        cd /tmp
-        GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
-        cd -
-    - name: run integration test
-      run: |
-        mkdir -p /tmp/testhome
-        MINIKUBE_HOME=/tmp/testhome ./out/e2e-darwin-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=./out/minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
-    - name: generate gopogh report
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        gopogh -in ./report/testout.json -out ./report/testout.html -name "docker macos" -repo github.com/kubernetes/minikube/  || true
-    - uses: actions/upload-artifact@v1
-      with:
-        name: docker_on_macos_report
-        path: ./report
+      - name: install gopogh
+        run: |
+          cd /tmp
+          GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
+          cd -
+      - name: run integration test
+        run: |
+          mkdir -p /tmp/testhome
+          MINIKUBE_HOME=/tmp/testhome ./out/e2e-darwin-amd64 -minikube-start-args=--vm-driver=docker -expected-default-driver= -test.timeout=70m -test.v -binary=./out/minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
+      - name: generate gopogh report
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker macos" -repo github.com/kubernetes/minikube/  || true
+      - uses: actions/upload-artifact@v1
+        with:
+          name: docker_on_macos_report
+          path: ./report
   none_ubuntu16_04:
     runs-on: ubuntu-16.04
     steps:
-    - uses: actions/checkout@v2
-    - name: build binaries
-      run : |
-        make minikube-linux-amd64
-        make e2e-linux-amd64
-        mkdir -p report
-    - name: install gopogh
-      run: |
-        cd /tmp
-        GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
-        cd -
-    - name: run integration test
-      run: |
-        mkdir -p /tmp/testhome
-        MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
-    - name: generate gopogh report
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
-    - uses: actions/upload-artifact@v1
-      with:
-        name: none_on_ubuntu_16_04
-        path: report
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          make minikube-linux-amd64
+          make e2e-linux-amd64
+          mkdir -p report
+      - name: install gopogh
+        run: |
+          cd /tmp
+          GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
+          cd -
+      - name: run integration test
+        run: |
+          mkdir -p /tmp/testhome
+          MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+      - name: generate gopogh report
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
+      - uses: actions/upload-artifact@v1
+        with:
+          name: none_on_ubuntu_16_04
+          path: report
   none_ubuntu_18_04:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v2
-    - name: build binaries
-      run : |
-        make minikube-linux-amd64
-        make e2e-linux-amd64
-    - name: install gopogh
-      run: |
-        cd /tmp
-        GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
-        cd -
-    - name: run integration test
-      run: |
-        mkdir -p /tmp/testhome
-        MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
-    - name: generate gopogh report
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
-    - uses: actions/upload-artifact@v1
-      with:
-        name: none_on_ubuntu_latest_report
-        path: report
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          make minikube-linux-amd64
+          make e2e-linux-amd64
+      - name: install gopogh
+        run: |
+          cd /tmp
+          GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true
+          cd -
+      - name: run integration test
+        run: |
+          mkdir -p /tmp/testhome
+          MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=none -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+      - name: generate gopogh report
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/  || true
+      - uses: actions/upload-artifact@v1
+        with:
+          name: none_on_ubuntu_latest_report
+          path: report
+
+  windows_amd_64:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: build binaries
+        run: |
+          echo "::add-path::$GOPATH\bin"
+          make minikube-windows-amd64.exe
+          make e2e-windows-amd64.exe
+      - name: install gopogh
+        run: |
+        #  go get github.com/medyagh/gopogh@v0.0.17
+        #  cd -
+        env:
+          GO111MODULE: on
+      - name: run integration test
+        run: |
+          out/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args="--vm-driver=hyperv --hyperv-virtual-switch=primary-virtual-switch" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=65m
+      - name: generate gopogh report
+        run: |
+          echo "{}" > ./report/testout.json
+          go tool test2json -t > ./report/testout.json
+          Get-Content ./report/testout.txt | ./report/testout.json
+          gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/
+      - uses: actions/upload-artifact@v1
+        with:
+          name: none_on_ubuntu_latest_report
+          path: report

From 5a72ca3ae7446687e2918327894e33d28f2ea396 Mon Sep 17 00:00:00 2001
From: Alonyb <rubenbaez1995@gmail.com>
Date: Tue, 11 Feb 2020 23:44:32 -0500
Subject: [PATCH 003/668] add new test line

---
 pkg/minikube/registry/drvs/hyperv/hyperv.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index 9f15d0c470..72c96f47d3 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -88,7 +88,8 @@ func status() registry.State {
 	// Allow no more than 2 seconds for querying state
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
-
+	
+	exec.CommandContext(ctx, path, "Enable-WindowsOptionalFeature",  "-Online", "-FeatureName", "Microsoft-Hyper-V -All")
 	cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online")
 	out, err := cmd.CombinedOutput()
 	if err != nil {

From 82bb6b1aa7c278561975f43e724ef28e45ff449c Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 13 Feb 2020 22:01:10 -0500
Subject: [PATCH 004/668] Update hyperv.go

---
 pkg/minikube/registry/drvs/hyperv/hyperv.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index 72c96f47d3..f17b9517fe 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -89,7 +89,6 @@ func status() registry.State {
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 	
-	exec.CommandContext(ctx, path, "Enable-WindowsOptionalFeature",  "-Online", "-FeatureName", "Microsoft-Hyper-V -All")
 	cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online")
 	out, err := cmd.CombinedOutput()
 	if err != nil {

From dbaa6a33251465d77df7dc55c6541ba05ba7aafa Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 22:52:11 -0500
Subject: [PATCH 005/668] add binaries, build stage

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c45087c0cd..5826b943d2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,6 +15,8 @@ jobs:
       run : |
         make minikube-linux-amd64
         make e2e-linux-amd64
+        make minikube-windows-amd64.exe
+        make e2e-windows-amd64.exe
         cp -r test/integration/testdata ./out
         whoami
         echo github ref $GITHUB_REF

From 85cf5154417056575687f8bcd90a670315769c4b Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 22:55:19 -0500
Subject: [PATCH 006/668] add windows stage

---
 .github/workflows/main.yml | 67 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5826b943d2..2e3cbd6783 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -177,6 +177,73 @@ jobs:
         echo "--------------------------------------------"
         numberOfFailures=$(echo $STAT | jq '.NumberOfFail')
         if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi
+  docker_windows_NT:
+    needs: [build_minikube]
+    env:
+      TIME_ELAPSED: time
+      JOB_NAME: "Docker_windows_NT"
+      COMMIT_STATUS: ""
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install gopogh
+      run: |
+        find ~/ -iname gopogh.exe
+        echo $GOPATH
+        echo $GITHUB_WORKSPACE
+        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe
+        ls
+        find ~/ -iname gopogh.exe
+        pwd
+      shell: bash
+    - name: Download binaries
+      uses: actions/download-artifact@v1
+      with:
+        name: minikube_binaries
+    - name: run integration test
+      continue-on-error: true
+      run: |
+        set +euo pipefail
+        mkdir -p report
+        mkdir -p testhome
+        chmod a+x e2e-*
+        chmod a+x minikube-*
+        START_TIME=$(date -u +%s)
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        END_TIME=$(date -u +%s)
+        TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
+        min=$((${TIME_ELAPSED}/60))
+        sec=$((${TIME_ELAPSED}%60))
+        TIME_ELAPSED="${min} min $sec seconds"
+        echo ::set-env name=TIME_ELAPSED::${TIME_ELAPSED}
+      shell: bash
+    - name: Generate html report
+      run: |
+        pwd
+        ls
+        echo $GITHUB_WORKSPACE
+        go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
+        STAT=$(${GITHUB_WORKSPACE}$(DIRSEP)gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}"  -details "${GITHUB_SHA}")  || true
+        echo status: ${STAT}
+        FailNum=$(echo $STAT | jq '.NumberOfFail')
+        TestsNum=$(echo $STAT | jq '.NumberOfTests')       
+        GOPOGH_RESULT="${JOB_NAME} : completed with ${FailNum} / ${TestsNum} failures in ${TIME_ELAPSED}"
+        echo ::set-env name=GOPOGH_RESULT::${GOPOGH_RESULT}
+        echo ::set-env name=STAT::${STAT}
+      shell: bash
+    - name: The End Result
+      run: |
+        echo ${GOPOGH_RESULT}
+        echo "--------------------------------------------"
+        echo $STAT | jq '.FailedTests' || true
+        echo "--------------------------------------------"
+        numberOfFailures=$(echo $STAT | jq '.NumberOfFail')
+        if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi
+      shell: bash
+    - uses: actions/upload-artifact@v1
+      with:
+        name: docker_windows_NT
+        path: minikube_binaries/report
   none_ubuntu16_04:
     needs: [build_minikube]
     env:

From 566eb23ccd1ca5549bf0e055b5c2ee362dcb4786 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 22:56:39 -0500
Subject: [PATCH 007/668] add windows report

---
 .github/workflows/main.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e3cbd6783..335deb5aa5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -463,6 +463,15 @@ jobs:
       run: |
         mkdir -p all_reports
         cp -r docker_ubuntu_18_04 ./all_reports/
+    - name: download results docker_windows_NT
+      uses: actions/download-artifact@v1
+      with:
+        name: docker_windows_NT
+    - name: cp to all_report
+      shell: bash
+      run: |
+        mkdir -p all_reports
+        cp -r docker_Windows_NT ./all_reports/
     - name: download results none_ubuntu16_04
       uses: actions/download-artifact@v1
       with:

From f784001468b3f8e8887dd5aa9b7fe3fb30b0ca26 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 22:57:59 -0500
Subject: [PATCH 008/668] giving some love to windows workflow

---
 .github/workflows/main.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 335deb5aa5..312058d4ef 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -186,15 +186,9 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Install gopogh
+    - name: Download gopogh
       run: |
-        find ~/ -iname gopogh.exe
-        echo $GOPATH
-        echo $GITHUB_WORKSPACE
         curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe
-        ls
-        find ~/ -iname gopogh.exe
-        pwd
       shell: bash
     - name: Download binaries
       uses: actions/download-artifact@v1

From bc619df5bf15c08d405d32358b1819ac7379247c Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 22:59:57 -0500
Subject: [PATCH 009/668] Delete linux stuff

---
 .github/workflows/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 312058d4ef..fd85349459 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -200,8 +200,6 @@ jobs:
         set +euo pipefail
         mkdir -p report
         mkdir -p testhome
-        chmod a+x e2e-*
-        chmod a+x minikube-*
         START_TIME=$(date -u +%s)
         KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)

From f3ee969dd1343cf7960cf6d9a66f56b8807c5226 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 23:01:40 -0500
Subject: [PATCH 010/668] it's almost done

---
 .github/workflows/main.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd85349459..373f6e0f13 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,11 +211,8 @@ jobs:
       shell: bash
     - name: Generate html report
       run: |
-        pwd
-        ls
-        echo $GITHUB_WORKSPACE
         go tool test2json -t < ./report/testout.txt > ./report/testout.json || true
-        STAT=$(${GITHUB_WORKSPACE}$(DIRSEP)gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}"  -details "${GITHUB_SHA}")  || true
+        STAT=$(${GITHUB_WORKSPACE}/gopogh.exe -in ./report/testout.json -out ./report/testout.html -name " $GITHUB_REF" -repo "${JOB_NAME} ${GITHUB_REF} ${GITHUB_REPOSITORY}"  -details "${GITHUB_SHA}")  || true
         echo status: ${STAT}
         FailNum=$(echo $STAT | jq '.NumberOfFail')
         TestsNum=$(echo $STAT | jq '.NumberOfTests')       

From bceb07159d4b04d1d5f2bb6ec6a268efeaa80ef6 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 23:03:24 -0500
Subject: [PATCH 011/668] perfect

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 373f6e0f13..9110594ed1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -460,7 +460,7 @@ jobs:
       shell: bash
       run: |
         mkdir -p all_reports
-        cp -r docker_Windows_NT ./all_reports/
+        cp -r docker_windows_NT ./all_reports/
     - name: download results none_ubuntu16_04
       uses: actions/download-artifact@v1
       with:

From 24fcd1521997020b323793ff4275f78a0db86ae7 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Sun, 16 Feb 2020 23:07:16 -0500
Subject: [PATCH 012/668] giving some love to makefile

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index c56aa28f09..2f831e01d0 100755
--- a/Makefile
+++ b/Makefile
@@ -281,9 +281,6 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 endif
 	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
 ifeq ($(OS),Windows_NT)
-	echo "%cd%"
-	echo "$(GOPATH)"
-	dir
 	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin"
 	"$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/...
 	-gofmt -s -w $@

From 9834408c68e23bb1f2a136b8b9dcdce7d6602179 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Mon, 17 Feb 2020 07:43:23 -0500
Subject: [PATCH 013/668] change the order of steps

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9110594ed1..86af8e60f5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -220,6 +220,10 @@ jobs:
         echo ::set-env name=GOPOGH_RESULT::${GOPOGH_RESULT}
         echo ::set-env name=STAT::${STAT}
       shell: bash
+    - uses: actions/upload-artifact@v1
+      with:
+        name: docker_windows_NT
+        path: minikube_binaries/report
     - name: The End Result
       run: |
         echo ${GOPOGH_RESULT}
@@ -229,10 +233,6 @@ jobs:
         numberOfFailures=$(echo $STAT | jq '.NumberOfFail')
         if [ "$numberOfFailures" -gt 0 ];then echo "*** $numberOfFailures Failed ***";exit 2;fi
       shell: bash
-    - uses: actions/upload-artifact@v1
-      with:
-        name: docker_windows_NT
-        path: minikube_binaries/report
   none_ubuntu16_04:
     needs: [build_minikube]
     env:

From 788402e4db4a82fb3a6b003bd7880464fecc00b7 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Mon, 17 Feb 2020 08:23:54 -0500
Subject: [PATCH 014/668] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86af8e60f5..fb26bd2596 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -223,7 +223,7 @@ jobs:
     - uses: actions/upload-artifact@v1
       with:
         name: docker_windows_NT
-        path: minikube_binaries/report
+        path: report
     - name: The End Result
       run: |
         echo ${GOPOGH_RESULT}

From a04239566948347360e3ac8373f87d0c2a0deb53 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Wed, 19 Feb 2020 07:22:57 -0500
Subject: [PATCH 015/668] Update Makefile

---
 Makefile | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/Makefile b/Makefile
index 2f831e01d0..28d5bc1147 100755
--- a/Makefile
+++ b/Makefile
@@ -280,15 +280,6 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 endif
 	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
-ifeq ($(OS),Windows_NT)
-	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin"
-	"$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg assets deploy/addons/...
-	-gofmt -s -w $@
-	@#golint: Dns should be DNS (compat sed)
-	@sed -i -e 's/Dns/DNS/g' $@ && rm -f ./-e
-	@#golint: Html should be HTML (compat sed)
-	@sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e
-else
 	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg assets deploy/addons/...
 	-gofmt -s -w $@
 	@#golint: Dns should be DNS (compat sed)
@@ -296,26 +287,15 @@ else
 	@#golint: Html should be HTML (compat sed)
 	@sed -i -e 's/Html/HTML/g' $@ && rm -f ./-e
 
-endif
-
 pkg/minikube/translate/translations.go: $(shell find "translations/" -type f)
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 endif
-ifeq ($(OS),Windows_NT)
-	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
-	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin"
-	"$(GOPATH)\bin\go-bindata.exe" -nomemcopy -o $@ -pkg translate translations/...
-	-gofmt -s -w $@
-	@#golint: Json should be JSON (compat sed)
-	@sed -i -e 's/Json/JSON/' $@ && rm -f ./-e
-else
 	which go-bindata || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
 	PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg translate translations/...
 	-gofmt -s -w $@
 	@#golint: Json should be JSON (compat sed)
 	@sed -i -e 's/Json/JSON/' $@ && rm -f ./-e
-endif
 
 .PHONY: cross
 cross: minikube-linux-amd64 minikube-linux-arm64 minikube-darwin-amd64 minikube-windows-amd64.exe ## Build minikube for all platform

From 8536fb76419d04bd2c75b47f2599792b6cef28a0 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 19 Feb 2020 12:53:59 -0800
Subject: [PATCH 016/668] changes and things

---
 cmd/minikube/cmd/config/set_test.go           |  2 +-
 cmd/minikube/cmd/logs.go                      |  2 +-
 cmd/minikube/cmd/start.go                     | 14 +++----
 cmd/minikube/cmd/start_test.go                |  6 +--
 pkg/addons/addons.go                          |  2 +-
 pkg/addons/addons_test.go                     |  2 +-
 pkg/addons/config.go                          |  2 +-
 pkg/minikube/bootstrapper/bootstrapper.go     |  7 ++--
 pkg/minikube/bootstrapper/bsutil/kubeadm.go   |  2 +-
 .../bootstrapper/bsutil/kubeadm_test.go       | 24 ++++++------
 pkg/minikube/bootstrapper/bsutil/kubelet.go   |  2 +-
 .../bootstrapper/bsutil/kubelet_test.go       | 12 +++---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  | 37 +++++++++++++++----
 pkg/minikube/cluster/cluster.go               |  4 +-
 pkg/minikube/cluster/iso.go                   |  2 +-
 pkg/minikube/config/config.go                 | 14 +++----
 pkg/minikube/config/node.go                   |  2 +-
 pkg/minikube/config/profile.go                |  6 +--
 pkg/minikube/config/profile_test.go           |  8 ++--
 .../.minikube2/profiles/p1/config.json        |  2 +-
 .../.minikube2/profiles/p2/config.json        |  2 +-
 .../profiles/p5_partial_config/config.json    |  2 +-
 .../.minikube/profiles/p1/config.json         |  2 +-
 .../p4_partial_profile_config/config.json     |  2 +-
 .../p5_missing_machine_config/config.json     |  2 +-
 .../p6_empty_machine_config/config.json       |  2 +-
 .../p7_invalid_machine_config/config.json     |  2 +-
 .../p8_partial_machine_config/config.json     |  2 +-
 .../.minikube/profiles/p1/config.json         |  2 +-
 .../p4_partial_profile_config/config.json     |  2 +-
 .../p5_missing_machine_config/config.json     |  2 +-
 .../p6_empty_machine_config/config.json       |  2 +-
 .../p7_invalid_machine_config/config.json     |  2 +-
 .../p8_partial_machine_config/config.json     |  2 +-
 pkg/minikube/config/types.go                  |  6 +--
 pkg/minikube/machine/cache_images.go          |  2 +-
 pkg/minikube/machine/cluster_test.go          | 34 ++++++++---------
 pkg/minikube/machine/fix.go                   |  2 +-
 pkg/minikube/machine/start.go                 | 10 ++---
 pkg/minikube/node/config.go                   |  4 +-
 pkg/minikube/node/machine.go                  |  4 +-
 pkg/minikube/node/node.go                     | 13 ++++---
 pkg/minikube/node/start.go                    |  2 +-
 pkg/minikube/registry/drvs/docker/docker.go   |  2 +-
 .../registry/drvs/hyperkit/hyperkit.go        |  2 +-
 pkg/minikube/registry/drvs/hyperv/hyperv.go   |  2 +-
 pkg/minikube/registry/drvs/kvm2/kvm2.go       |  2 +-
 pkg/minikube/registry/drvs/none/none.go       |  2 +-
 .../registry/drvs/parallels/parallels.go      |  2 +-
 pkg/minikube/registry/drvs/podman/podman.go   |  2 +-
 .../registry/drvs/virtualbox/virtualbox.go    |  2 +-
 pkg/minikube/registry/drvs/vmware/vmware.go   |  2 +-
 .../drvs/vmwarefusion/vmwarefusion.go         |  2 +-
 pkg/minikube/registry/registry.go             |  2 +-
 pkg/minikube/tunnel/cluster_inspector.go      |  4 +-
 pkg/minikube/tunnel/cluster_inspector_test.go |  6 +--
 pkg/minikube/tunnel/test_doubles.go           |  6 +--
 pkg/minikube/tunnel/tunnel_test.go            |  4 +-
 .../en/docs/Contributing/drivers.en.md        |  2 +-
 59 files changed, 162 insertions(+), 139 deletions(-)

diff --git a/cmd/minikube/cmd/config/set_test.go b/cmd/minikube/cmd/config/set_test.go
index f236445ffc..acd4db256b 100644
--- a/cmd/minikube/cmd/config/set_test.go
+++ b/cmd/minikube/cmd/config/set_test.go
@@ -80,7 +80,7 @@ func createTestProfile(t *testing.T) {
 	if err := os.MkdirAll(config.ProfileFolderPath(name), 0777); err != nil {
 		t.Fatalf("error creating temporary directory")
 	}
-	if err := config.DefaultLoader.WriteConfigToFile(name, &config.MachineConfig{}); err != nil {
+	if err := config.DefaultLoader.WriteConfigToFile(name, &config.ClusterConfig{}); err != nil {
 		t.Fatalf("error creating temporary profile config: %v", err)
 	}
 }
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index 4796ef54b4..934ca9c1b0 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -67,7 +67,7 @@ var logsCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("command runner", err)
 		}
-		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper))
+		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper), viper.GetString(config.MachineProfile))
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index de5002a4c9..72d83bd549 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -351,7 +351,7 @@ func updateDriver(driverName string) {
 	}
 }
 
-func cacheISO(cfg *config.MachineConfig, driverName string) {
+func cacheISO(cfg *config.ClusterConfig, driverName string) {
 	if !driver.BareMetal(driverName) && !driver.IsKIC(driverName) {
 		if err := cluster.CacheISO(*cfg); err != nil {
 			exit.WithError("Failed to cache ISO", err)
@@ -429,7 +429,7 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 	return nil
 }
 
-func selectDriver(existing *config.MachineConfig) registry.DriverState {
+func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
 
@@ -464,7 +464,7 @@ func selectDriver(existing *config.MachineConfig) registry.DriverState {
 }
 
 // validateDriver validates that the selected driver appears sane, exits if not
-func validateDriver(ds registry.DriverState, existing *config.MachineConfig) {
+func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 	name := ds.Name
 	glog.Infof("validating driver %q against %+v", name, existing)
 	if !driver.Supported(name) {
@@ -717,10 +717,10 @@ func validateRegistryMirror() {
 }
 
 // generateCfgFromFlags generates config.Config based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string) (config.MachineConfig, config.Node, error) {
+func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
 	r, err := cruntime.New(cruntime.Config{Type: viper.GetString(containerRuntime)})
 	if err != nil {
-		return config.MachineConfig{}, config.Node{}, err
+		return config.ClusterConfig{}, config.Node{}, err
 	}
 
 	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
@@ -775,7 +775,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 		Worker:            true,
 	}
 
-	cfg := config.MachineConfig{
+	cfg := config.ClusterConfig{
 		Name:                    viper.GetString(config.MachineProfile),
 		KeepContext:             viper.GetBool(keepContext),
 		EmbedCerts:              viper.GetBool(embedCerts),
@@ -881,7 +881,7 @@ func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 }
 
 // getKubernetesVersion ensures that the requested version is reasonable
-func getKubernetesVersion(old *config.MachineConfig) string {
+func getKubernetesVersion(old *config.ClusterConfig) string {
 	paramVersion := viper.GetString(kubernetesVersion)
 
 	if paramVersion == "" { // if the user did not specify any version then ...
diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go
index 1003292da2..b664e3486b 100644
--- a/cmd/minikube/cmd/start_test.go
+++ b/cmd/minikube/cmd/start_test.go
@@ -31,7 +31,7 @@ func TestGetKuberneterVersion(t *testing.T) {
 		description     string
 		expectedVersion string
 		paramVersion    string
-		cfg             *cfg.MachineConfig
+		cfg             *cfg.ClusterConfig
 	}{
 		{
 			description:     "kubernetes-version not given, no config",
@@ -42,7 +42,7 @@ func TestGetKuberneterVersion(t *testing.T) {
 			description:     "kubernetes-version not given, config available",
 			expectedVersion: "v1.15.0",
 			paramVersion:    "",
-			cfg:             &cfg.MachineConfig{KubernetesConfig: cfg.KubernetesConfig{KubernetesVersion: "v1.15.0"}},
+			cfg:             &cfg.ClusterConfig{KubernetesConfig: cfg.KubernetesConfig{KubernetesVersion: "v1.15.0"}},
 		},
 		{
 			description:     "kubernetes-version given, no config",
@@ -53,7 +53,7 @@ func TestGetKuberneterVersion(t *testing.T) {
 			description:     "kubernetes-version given, config available",
 			expectedVersion: "v1.16.0",
 			paramVersion:    "v1.16.0",
-			cfg:             &cfg.MachineConfig{KubernetesConfig: cfg.KubernetesConfig{KubernetesVersion: "v1.15.0"}},
+			cfg:             &cfg.ClusterConfig{KubernetesConfig: cfg.KubernetesConfig{KubernetesVersion: "v1.15.0"}},
 		},
 	}
 
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index c1042e45be..e1ca836c37 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -88,7 +88,7 @@ func run(name, value, profile string, fns []setFn) error {
 }
 
 // SetBool sets a bool value
-func SetBool(m *config.MachineConfig, name string, val string) error {
+func SetBool(m *config.ClusterConfig, name string, val string) error {
 	b, err := strconv.ParseBool(val)
 	if err != nil {
 		return err
diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go
index 14449917a2..559f5729e7 100644
--- a/pkg/addons/addons_test.go
+++ b/pkg/addons/addons_test.go
@@ -44,7 +44,7 @@ func createTestProfile(t *testing.T) string {
 	if err := os.MkdirAll(config.ProfileFolderPath(name), 0777); err != nil {
 		t.Fatalf("error creating temporary directory")
 	}
-	if err := config.DefaultLoader.WriteConfigToFile(name, &config.MachineConfig{}); err != nil {
+	if err := config.DefaultLoader.WriteConfigToFile(name, &config.ClusterConfig{}); err != nil {
 		t.Fatalf("error creating temporary profile config: %v", err)
 	}
 	return name
diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index 059ddf7929..46c713d69f 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -23,7 +23,7 @@ type setFn func(string, string, string) error
 // Addon represents an addon
 type Addon struct {
 	name        string
-	set         func(*config.MachineConfig, string, string) error
+	set         func(*config.ClusterConfig, string, string) error
 	validations []setFn
 	callbacks   []setFn
 }
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index 669a38fd57..eba5167179 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -35,10 +35,11 @@ type LogOptions struct {
 
 // Bootstrapper contains all the methods needed to bootstrap a kubernetes cluster
 type Bootstrapper interface {
-	StartCluster(config.MachineConfig) error
-	UpdateCluster(config.MachineConfig) error
+	StartCluster(config.ClusterConfig) error
+	UpdateCluster(config.ClusterConfig) error
 	DeleteCluster(config.KubernetesConfig) error
-	WaitForCluster(config.MachineConfig, time.Duration) error
+	WaitForCluster(config.ClusterConfig, time.Duration) error
+	JoinCluster(config.ClusterConfig, config.Node, string) error
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 602c9c17de..e5d926ee12 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -36,7 +36,7 @@ import (
 const remoteContainerRuntime = "remote"
 
 // GenerateKubeadmYAML generates the kubeadm.yaml file
-func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, error) {
+func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager) ([]byte, error) {
 	k8s := mc.KubernetesConfig
 	version, err := ParseKubernetesVersion(k8s.KubernetesVersion)
 	if err != nil {
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
index 6bf8f27951..922bf4b8b3 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
@@ -106,9 +106,9 @@ func TestGenerateKubeadmYAMLDNS(t *testing.T) {
 		name      string
 		runtime   string
 		shouldErr bool
-		cfg       config.MachineConfig
+		cfg       config.ClusterConfig
 	}{
-		{"dns", "docker", false, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
+		{"dns", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {
@@ -172,17 +172,17 @@ func TestGenerateKubeadmYAML(t *testing.T) {
 		name      string
 		runtime   string
 		shouldErr bool
-		cfg       config.MachineConfig
+		cfg       config.ClusterConfig
 	}{
-		{"default", "docker", false, config.MachineConfig{}},
-		{"containerd", "containerd", false, config.MachineConfig{}},
-		{"crio", "crio", false, config.MachineConfig{}},
-		{"options", "docker", false, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
-		{"crio-options-gates", "crio", false, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
-		{"unknown-component", "docker", true, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
-		{"containerd-api-port", "containerd", false, config.MachineConfig{Nodes: []config.Node{{Port: 12345}}}},
-		{"containerd-pod-network-cidr", "containerd", false, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
-		{"image-repository", "docker", false, config.MachineConfig{KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
+		{"default", "docker", false, config.ClusterConfig{}},
+		{"containerd", "containerd", false, config.ClusterConfig{}},
+		{"crio", "crio", false, config.ClusterConfig{}},
+		{"options", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
+		{"crio-options-gates", "crio", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
+		{"unknown-component", "docker", true, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
+		{"containerd-api-port", "containerd", false, config.ClusterConfig{Nodes: []config.Node{{Port: 12345}}}},
+		{"containerd-pod-network-cidr", "containerd", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
+		{"image-repository", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index f080a7eba7..a426cc409b 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -30,7 +30,7 @@ import (
 
 // NewKubeletConfig generates a new systemd unit containing a configured kubelet
 // based on the options present in the KubernetesConfig.
-func NewKubeletConfig(mc config.MachineConfig, nc config.Node, r cruntime.Manager) ([]byte, error) {
+func NewKubeletConfig(mc config.ClusterConfig, nc config.Node, r cruntime.Manager) ([]byte, error) {
 	k8s := mc.KubernetesConfig
 	version, err := ParseKubernetesVersion(k8s.KubernetesVersion)
 	if err != nil {
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
index 56dc23168b..b0908e870f 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
@@ -30,13 +30,13 @@ import (
 func TestGenerateKubeletConfig(t *testing.T) {
 	tests := []struct {
 		description string
-		cfg         config.MachineConfig
+		cfg         config.ClusterConfig
 		expected    string
 		shouldErr   bool
 	}{
 		{
 			description: "old docker",
-			cfg: config.MachineConfig{
+			cfg: config.ClusterConfig{
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.OldestKubernetesVersion,
 					ContainerRuntime:  "docker",
@@ -61,7 +61,7 @@ ExecStart=/var/lib/minikube/binaries/v1.11.10/kubelet --allow-privileged=true --
 		},
 		{
 			description: "newest cri runtime",
-			cfg: config.MachineConfig{
+			cfg: config.ClusterConfig{
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.NewestKubernetesVersion,
 					ContainerRuntime:  "cri-o",
@@ -86,7 +86,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo
 		},
 		{
 			description: "default containerd runtime",
-			cfg: config.MachineConfig{
+			cfg: config.ClusterConfig{
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "containerd",
@@ -111,7 +111,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo
 		},
 		{
 			description: "default containerd runtime with IP override",
-			cfg: config.MachineConfig{
+			cfg: config.ClusterConfig{
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "containerd",
@@ -143,7 +143,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo
 		},
 		{
 			description: "docker with custom image repository",
-			cfg: config.MachineConfig{
+			cfg: config.ClusterConfig{
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "docker",
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 9eb428d8fa..a136a9f8de 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -35,7 +35,6 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/drivers/kic"
@@ -64,8 +63,7 @@ type Bootstrapper struct {
 }
 
 // NewBootstrapper creates a new kubeadm.Bootstrapper
-func NewBootstrapper(api libmachine.API) (*Bootstrapper, error) {
-	name := viper.GetString(config.MachineProfile)
+func NewBootstrapper(api libmachine.API, name string) (*Bootstrapper, error) {
 	h, err := api.Load(name)
 	if err != nil {
 		return nil, errors.Wrap(err, "getting api client")
@@ -149,7 +147,7 @@ func (k *Bootstrapper) createCompatSymlinks() error {
 }
 
 // StartCluster starts the cluster
-func (k *Bootstrapper) StartCluster(cfg config.MachineConfig) error {
+func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	err := bsutil.ExistingConfig(k.c)
 	if err == nil { // if there is an existing cluster don't reconfigure it
 		return k.restartCluster(cfg)
@@ -262,7 +260,7 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 }
 
 // WaitForCluster blocks until the cluster appears to be healthy
-func (k *Bootstrapper) WaitForCluster(cfg config.MachineConfig, timeout time.Duration) error {
+func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Duration) error {
 	start := time.Now()
 	out.T(out.Waiting, "Waiting for cluster to come online ...")
 	cp, err := config.PrimaryControlPlane(cfg)
@@ -295,7 +293,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.MachineConfig, timeout time.Dur
 }
 
 // restartCluster restarts the Kubernetes cluster configured by kubeadm
-func (k *Bootstrapper) restartCluster(cfg config.MachineConfig) error {
+func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	glog.Infof("restartCluster start")
 
 	start := time.Now()
@@ -371,6 +369,29 @@ func (k *Bootstrapper) restartCluster(cfg config.MachineConfig) error {
 	return nil
 }
 
+// JoinCluster adds a node to an existing cluster
+func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinCmd string) error {
+	start := time.Now()
+	glog.Infof("JoinCluster: %+v", cc)
+	defer func() {
+		glog.Infof("JoinCluster complete in %s", time.Since(start))
+	}()
+
+	// Join the master by specifying its token
+	joinCmd = fmt.Sprintf("%s --v=10 --node-name=%s", joinCmd, n.Name)
+	fmt.Println(joinCmd)
+	out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
+	if err != nil {
+		return errors.Wrapf(err, "cmd failed: %s\n%s\n", joinCmd, out)
+	}
+
+	if _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", "sudo systemctl daemon-reload && sudo systemctl enable kubelet && sudo systemctl start kubelet")); err != nil {
+		return errors.Wrap(err, "starting kubelet")
+	}
+
+	return nil
+}
+
 // DeleteCluster removes the components that were started earlier
 func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
 	version, err := bsutil.ParseKubernetesVersion(k8s.KubernetesVersion)
@@ -396,7 +417,7 @@ func (k *Bootstrapper) SetupCerts(k8s config.KubernetesConfig, n config.Node) er
 }
 
 // UpdateCluster updates the cluster
-func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error {
+func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 	images, err := images.Kubeadm(cfg.KubernetesConfig.ImageRepository, cfg.KubernetesConfig.KubernetesVersion)
 	if err != nil {
 		return errors.Wrap(err, "kubeadm images")
@@ -469,7 +490,7 @@ func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error {
 }
 
 // applyKicOverlay applies the CNI plugin needed to make kic work
-func (k *Bootstrapper) applyKicOverlay(cfg config.MachineConfig) error {
+func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
 	cmd := exec.Command("sudo",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"-f", "-")
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index 481bbe3cc3..a2b9e06613 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -42,12 +42,12 @@ func init() {
 }
 
 // Bootstrapper returns a new bootstrapper for the cluster
-func Bootstrapper(api libmachine.API, bootstrapperName string) (bootstrapper.Bootstrapper, error) {
+func Bootstrapper(api libmachine.API, bootstrapperName string, machineName string) (bootstrapper.Bootstrapper, error) {
 	var b bootstrapper.Bootstrapper
 	var err error
 	switch bootstrapperName {
 	case bootstrapper.Kubeadm:
-		b, err = kubeadm.NewBootstrapper(api)
+		b, err = kubeadm.NewBootstrapper(api, machineName)
 		if err != nil {
 			return nil, errors.Wrap(err, "getting a new kubeadm bootstrapper")
 		}
diff --git a/pkg/minikube/cluster/iso.go b/pkg/minikube/cluster/iso.go
index 253acbd370..15c06b4a37 100644
--- a/pkg/minikube/cluster/iso.go
+++ b/pkg/minikube/cluster/iso.go
@@ -22,7 +22,7 @@ import (
 )
 
 // CacheISO downloads and caches ISO.
-func CacheISO(cfg config.MachineConfig) error {
+func CacheISO(cfg config.ClusterConfig) error {
 	if driver.BareMetal(cfg.Driver) {
 		return nil
 	}
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index 89e2852017..0f031716dc 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -141,19 +141,19 @@ func encode(w io.Writer, m MinikubeConfig) error {
 }
 
 // Load loads the kubernetes and machine config for the current machine
-func Load(profile string) (*MachineConfig, error) {
+func Load(profile string) (*ClusterConfig, error) {
 	return DefaultLoader.LoadConfigFromFile(profile)
 }
 
 // Write writes the kubernetes and machine config for the current machine
-func Write(profile string, cc *MachineConfig) error {
+func Write(profile string, cc *ClusterConfig) error {
 	return DefaultLoader.WriteConfigToFile(profile, cc)
 }
 
 // Loader loads the kubernetes and machine config based on the machine profile name
 type Loader interface {
-	LoadConfigFromFile(profile string, miniHome ...string) (*MachineConfig, error)
-	WriteConfigToFile(profileName string, cc *MachineConfig, miniHome ...string) error
+	LoadConfigFromFile(profile string, miniHome ...string) (*ClusterConfig, error)
+	WriteConfigToFile(profileName string, cc *ClusterConfig, miniHome ...string) error
 }
 
 type simpleConfigLoader struct{}
@@ -161,8 +161,8 @@ type simpleConfigLoader struct{}
 // DefaultLoader is the default config loader
 var DefaultLoader Loader = &simpleConfigLoader{}
 
-func (c *simpleConfigLoader) LoadConfigFromFile(profileName string, miniHome ...string) (*MachineConfig, error) {
-	var cc MachineConfig
+func (c *simpleConfigLoader) LoadConfigFromFile(profileName string, miniHome ...string) (*ClusterConfig, error) {
+	var cc ClusterConfig
 	// Move to profile package
 	path := profileFilePath(profileName, miniHome...)
 
@@ -184,7 +184,7 @@ func (c *simpleConfigLoader) LoadConfigFromFile(profileName string, miniHome ...
 	return &cc, nil
 }
 
-func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *MachineConfig, miniHome ...string) error {
+func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *ClusterConfig, miniHome ...string) error {
 	// Move to profile package
 	path := profileFilePath(profileName, miniHome...)
 	contents, err := json.MarshalIndent(cc, "", "	")
diff --git a/pkg/minikube/config/node.go b/pkg/minikube/config/node.go
index 219acb5e46..1c6f050159 100644
--- a/pkg/minikube/config/node.go
+++ b/pkg/minikube/config/node.go
@@ -17,7 +17,7 @@ limitations under the License.
 package config
 
 // AddNode adds a new node config to an existing cluster.
-func AddNode(cc *MachineConfig, name string, controlPlane bool, k8sVersion string, profileName string) error {
+func AddNode(cc *ClusterConfig, name string, controlPlane bool, k8sVersion string, profileName string) error {
 	node := Node{
 		Name:   name,
 		Worker: true,
diff --git a/pkg/minikube/config/profile.go b/pkg/minikube/config/profile.go
index c37eabac4e..5ad8572e13 100644
--- a/pkg/minikube/config/profile.go
+++ b/pkg/minikube/config/profile.go
@@ -52,7 +52,7 @@ func (p *Profile) IsValid() bool {
 }
 
 // PrimaryControlPlane gets the node specific config for the first created control plane
-func PrimaryControlPlane(cc MachineConfig) (Node, error) {
+func PrimaryControlPlane(cc ClusterConfig) (Node, error) {
 	for _, n := range cc.Nodes {
 		if n.ControlPlane {
 			return n, nil
@@ -86,12 +86,12 @@ func ProfileExists(name string, miniHome ...string) bool {
 
 // CreateEmptyProfile creates an empty profile and stores in $MINIKUBE_HOME/profiles/<profilename>/config.json
 func CreateEmptyProfile(name string, miniHome ...string) error {
-	cfg := &MachineConfig{}
+	cfg := &ClusterConfig{}
 	return SaveProfile(name, cfg, miniHome...)
 }
 
 // SaveProfile creates an profile out of the cfg and stores in $MINIKUBE_HOME/profiles/<profilename>/config.json
-func SaveProfile(name string, cfg *MachineConfig, miniHome ...string) error {
+func SaveProfile(name string, cfg *ClusterConfig, miniHome ...string) error {
 	data, err := json.MarshalIndent(cfg, "", "    ")
 	if err != nil {
 		return err
diff --git a/pkg/minikube/config/profile_test.go b/pkg/minikube/config/profile_test.go
index aecb4c2f81..06903d1808 100644
--- a/pkg/minikube/config/profile_test.go
+++ b/pkg/minikube/config/profile_test.go
@@ -164,13 +164,13 @@ func TestCreateProfile(t *testing.T) {
 
 	var testCases = []struct {
 		name      string
-		cfg       *MachineConfig
+		cfg       *ClusterConfig
 		expectErr bool
 	}{
-		{"p_empty_config", &MachineConfig{}, false},
-		{"p_partial_config", &MachineConfig{KubernetesConfig: KubernetesConfig{
+		{"p_empty_config", &ClusterConfig{}, false},
+		{"p_partial_config", &ClusterConfig{KubernetesConfig: KubernetesConfig{
 			ShouldLoadCachedImages: false}}, false},
-		{"p_partial_config2", &MachineConfig{
+		{"p_partial_config2", &ClusterConfig{
 			KeepContext: false, KubernetesConfig: KubernetesConfig{
 				ShouldLoadCachedImages: false}}, false},
 	}
diff --git a/pkg/minikube/config/testdata/.minikube2/profiles/p1/config.json b/pkg/minikube/config/testdata/.minikube2/profiles/p1/config.json
index 766e9c04c1..c4214bf442 100644
--- a/pkg/minikube/config/testdata/.minikube2/profiles/p1/config.json
+++ b/pkg/minikube/config/testdata/.minikube2/profiles/p1/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/.minikube2/profiles/p2/config.json b/pkg/minikube/config/testdata/.minikube2/profiles/p2/config.json
index 99e4b167a5..ab35410474 100644
--- a/pkg/minikube/config/testdata/.minikube2/profiles/p2/config.json
+++ b/pkg/minikube/config/testdata/.minikube2/profiles/p2/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/.minikube2/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/.minikube2/profiles/p5_partial_config/config.json
index 29f62c0149..a99c56efe8 100644
--- a/pkg/minikube/config/testdata/.minikube2/profiles/p5_partial_config/config.json
+++ b/pkg/minikube/config/testdata/.minikube2/profiles/p5_partial_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json
index b0e1b57105..6c826ebfc6 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json
index 29f62c0149..a99c56efe8 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json
index c1cf21b26f..6680e4b784 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json
index 667cbd7652..2bab758640 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json
index 7cbd2e409f..d56f53688d 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json
index 855b31af90..26324fc366 100644
--- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json
index b0e1b57105..6c826ebfc6 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json
index 29f62c0149..a99c56efe8 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json
index c1cf21b26f..6680e4b784 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json
index 667cbd7652..2bab758640 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json
index 7cbd2e409f..d56f53688d 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json
index 855b31af90..26324fc366 100644
--- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json
+++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json
@@ -1,5 +1,5 @@
 {
-    "MachineConfig": {
+    "ClusterConfig": {
         "KeepContext": false,
         "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso",
         "Memory": 2000,
diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index 6513efd2d9..868ad8842e 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -27,11 +27,11 @@ import (
 type Profile struct {
 	Name   string
 	Status string // running, stopped
-	Config *MachineConfig
+	Config *ClusterConfig
 }
 
-// MachineConfig contains the parameters used to start a cluster.
-type MachineConfig struct {
+// ClusterConfig contains the parameters used to start a cluster.
+type ClusterConfig struct {
 	Name                    string
 	KeepContext             bool // used by start and profile command to or not to switch kubectl's current context
 	EmbedCerts              bool // used by kubeconfig.Setup
diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
index 29d61b244f..301c3b02fd 100644
--- a/pkg/minikube/machine/cache_images.go
+++ b/pkg/minikube/machine/cache_images.go
@@ -61,7 +61,7 @@ func CacheImagesForBootstrapper(imageRepository string, version string, clusterB
 }
 
 // LoadImages loads previously cached images into the container runtime
-func LoadImages(cc *config.MachineConfig, runner command.Runner, images []string, cacheDir string) error {
+func LoadImages(cc *config.ClusterConfig, runner command.Runner, images []string, cacheDir string) error {
 	glog.Infof("LoadImages start: %s", images)
 	start := time.Now()
 
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index bf38656062..3b84c58842 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -41,7 +41,7 @@ type MockDownloader struct{}
 func (d MockDownloader) GetISOFileURI(isoURL string) string          { return "" }
 func (d MockDownloader) CacheMinikubeISOFromURL(isoURL string) error { return nil }
 
-func createMockDriverHost(c config.MachineConfig) (interface{}, error) {
+func createMockDriverHost(c config.ClusterConfig) (interface{}, error) {
 	return nil, nil
 }
 
@@ -60,7 +60,7 @@ func RegisterMockDriver(t *testing.T) {
 	}
 }
 
-var defaultMachineConfig = config.MachineConfig{
+var defaultClusterConfig = config.ClusterConfig{
 	Driver:      driver.Mock,
 	MinikubeISO: constants.DefaultISOURL,
 	Downloader:  MockDownloader{},
@@ -76,7 +76,7 @@ func TestCreateHost(t *testing.T) {
 		t.Fatal("Machine already exists.")
 	}
 
-	_, err := createHost(api, defaultMachineConfig)
+	_, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -114,7 +114,7 @@ func TestStartHostExists(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	// Create an initial host.
-	ih, err := createHost(api, defaultMachineConfig)
+	ih, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -128,7 +128,7 @@ func TestStartHostExists(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	mc := defaultMachineConfig
+	mc := defaultClusterConfig
 	mc.Name = ih.Name
 	// This should pass without calling Create because the host exists already.
 	h, err := StartHost(api, mc)
@@ -151,7 +151,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	api := tests.NewMockAPI(t)
 	// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
 	api.NotExistError = true
-	h, err := createHost(api, defaultMachineConfig)
+	h, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -159,7 +159,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	mc := defaultMachineConfig
+	mc := defaultClusterConfig
 	mc.Name = h.Name
 
 	// This should pass with creating host, while machine does not exist.
@@ -193,7 +193,7 @@ func TestStartStoppedHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	// Create an initial host.
-	h, err := createHost(api, defaultMachineConfig)
+	h, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -203,7 +203,7 @@ func TestStartStoppedHost(t *testing.T) {
 
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
-	mc := defaultMachineConfig
+	mc := defaultClusterConfig
 	mc.Name = h.Name
 	h, err = StartHost(api, mc)
 	if err != nil {
@@ -233,7 +233,7 @@ func TestStartHost(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	h, err := StartHost(api, defaultMachineConfig)
+	h, err := StartHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -261,7 +261,7 @@ func TestStartHostConfig(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	config := config.MachineConfig{
+	config := config.ClusterConfig{
 		Driver:     driver.Mock,
 		DockerEnv:  []string{"FOO=BAR"},
 		DockerOpt:  []string{"param=value"},
@@ -298,7 +298,7 @@ func TestStopHostError(t *testing.T) {
 func TestStopHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	h, err := createHost(api, defaultMachineConfig)
+	h, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -314,7 +314,7 @@ func TestStopHost(t *testing.T) {
 func TestDeleteHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	if _, err := createHost(api, defaultMachineConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
@@ -326,7 +326,7 @@ func TestDeleteHost(t *testing.T) {
 func TestDeleteHostErrorDeletingVM(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	h, err := createHost(api, defaultMachineConfig)
+	h, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -343,7 +343,7 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	api.RemoveError = true
-	if _, err := createHost(api, defaultMachineConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
@@ -357,7 +357,7 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) {
 	api := tests.NewMockAPI(t)
 	// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
 	api.NotExistError = true
-	_, err := createHost(api, defaultMachineConfig)
+	_, err := createHost(api, defaultClusterConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -383,7 +383,7 @@ func TestGetHostStatus(t *testing.T) {
 
 	checkState(state.None.String())
 
-	if _, err := createHost(api, defaultMachineConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 2a69a37472..86ec7e2d70 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -54,7 +54,7 @@ var (
 )
 
 // fixHost fixes up a previously configured VM so that it is ready to run Kubernetes
-func fixHost(api libmachine.API, mc config.MachineConfig) (*host.Host, error) {
+func fixHost(api libmachine.API, mc config.ClusterConfig) (*host.Host, error) {
 	out.T(out.Waiting, "Reconfiguring existing host ...")
 
 	start := time.Now()
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index 33687dc151..b043f58051 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -61,7 +61,7 @@ var (
 )
 
 // StartHost starts a host VM.
-func StartHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error) {
+func StartHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error) {
 	// Prevent machine-driver boot races, as well as our own certificate race
 	releaser, err := acquireMachinesLock(cfg.Name)
 	if err != nil {
@@ -85,7 +85,7 @@ func StartHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error)
 	return fixHost(api, cfg)
 }
 
-func engineOptions(cfg config.MachineConfig) *engine.Options {
+func engineOptions(cfg config.ClusterConfig) *engine.Options {
 	o := engine.Options{
 		Env:              cfg.DockerEnv,
 		InsecureRegistry: append([]string{constants.DefaultServiceCIDR}, cfg.InsecureRegistry...),
@@ -96,7 +96,7 @@ func engineOptions(cfg config.MachineConfig) *engine.Options {
 	return &o
 }
 
-func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error) {
+func createHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error) {
 	glog.Infof("createHost starting for %q (driver=%q)", cfg.Name, cfg.Driver)
 	start := time.Now()
 	defer func() {
@@ -152,7 +152,7 @@ func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error
 }
 
 // postStart are functions shared between startHost and fixHost
-func postStartSetup(h *host.Host, mc config.MachineConfig) error {
+func postStartSetup(h *host.Host, mc config.ClusterConfig) error {
 	glog.Infof("post-start starting for %q (driver=%q)", h.Name, h.DriverName)
 	start := time.Now()
 	defer func() {
@@ -225,7 +225,7 @@ func acquireMachinesLock(name string) (mutex.Releaser, error) {
 }
 
 // showHostInfo shows host information
-func showHostInfo(cfg config.MachineConfig) {
+func showHostInfo(cfg config.ClusterConfig) {
 	if driver.BareMetal(cfg.Driver) {
 		info, err := getHostInfo()
 		if err == nil {
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index ba4c7f5275..ce76ded6b4 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -81,7 +81,7 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 }
 
 // setupKubeAdm adds any requested files into the VM before Kubernetes is started
-func setupKubeAdm(mAPI libmachine.API, cfg config.MachineConfig, node config.Node) bootstrapper.Bootstrapper {
+func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, node config.Node) bootstrapper.Bootstrapper {
 	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper))
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
@@ -99,7 +99,7 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.MachineConfig, node config.Nod
 	return bs
 }
 
-func setupKubeconfig(h *host.Host, c *config.MachineConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
 	addr, err := h.Driver.GetURL()
 	if err != nil {
 		exit.WithError("Failed to get driver URL", err)
diff --git a/pkg/minikube/node/machine.go b/pkg/minikube/node/machine.go
index d66e61510e..d0c4021222 100644
--- a/pkg/minikube/node/machine.go
+++ b/pkg/minikube/node/machine.go
@@ -39,7 +39,7 @@ import (
 	"k8s.io/minikube/pkg/util/retry"
 )
 
-func startMachine(cfg *config.MachineConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
 	m, err := machine.NewAPIClient()
 	if err != nil {
 		exit.WithError("Failed to get machine client", err)
@@ -68,7 +68,7 @@ func startMachine(cfg *config.MachineConfig, node *config.Node) (runner command.
 }
 
 // startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.MachineConfig) (*host.Host, bool) {
+func startHost(api libmachine.API, mc config.ClusterConfig) (*host.Host, bool) {
 	exists, err := api.Exists(mc.Name)
 	if err != nil {
 		exit.WithError("Failed to check if machine exists", err)
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 19b51d1770..4e2f75b94b 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -38,18 +38,19 @@ const (
 )
 
 // Add adds a new node config to an existing cluster.
-func Add(cc *config.MachineConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) (*config.Node, error) {
+func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) (*config.Node, error) {
 	n := config.Node{
 		Name:   name,
 		Worker: true,
 	}
 
+	// TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here.
 	if controlPlane {
 		n.ControlPlane = true
 	}
 
-	if worker {
-		n.Worker = true
+	if !worker {
+		n.Worker = false
 	}
 
 	if k8sVersion != "" {
@@ -69,7 +70,7 @@ func Add(cc *config.MachineConfig, name string, controlPlane bool, worker bool,
 }
 
 // Delete stops and deletes the given node from the given cluster
-func Delete(cc config.MachineConfig, name string) error {
+func Delete(cc config.ClusterConfig, name string) error {
 	_, index, err := Retrieve(&cc, name)
 	if err != nil {
 		return err
@@ -95,7 +96,7 @@ func Delete(cc config.MachineConfig, name string) error {
 }
 
 // Retrieve finds the node by name in the given cluster
-func Retrieve(cc *config.MachineConfig, name string) (*config.Node, int, error) {
+func Retrieve(cc *config.ClusterConfig, name string) (*config.Node, int, error) {
 	for i, n := range cc.Nodes {
 		if n.Name == name {
 			return &n, i, nil
@@ -106,7 +107,7 @@ func Retrieve(cc *config.MachineConfig, name string) (*config.Node, int, error)
 }
 
 // Save saves a node to a cluster
-func Save(cfg *config.MachineConfig, node *config.Node) error {
+func Save(cfg *config.ClusterConfig, node *config.Node) error {
 	update := false
 	for i, n := range cfg.Nodes {
 		if n.Name == node.Name {
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 07d14d4525..1fe966e5ac 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -33,7 +33,7 @@ import (
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(mc config.MachineConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
 	var cacheGroup errgroup.Group
 	beginCacheRequiredImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 38cc95acb7..0b66dfdecb 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -43,7 +43,7 @@ func init() {
 	}
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
 		MachineName:   mc.Name,
 		StorePath:     localpath.MiniPath(),
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
index 50a4e5a408..47a3db9091 100644
--- a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
+++ b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -57,7 +57,7 @@ func init() {
 	}
 }
 
-func configure(config cfg.MachineConfig) (interface{}, error) {
+func configure(config cfg.ClusterConfig) (interface{}, error) {
 	u := config.UUID
 	if u == "" {
 		u = uuid.NewUUID().String()
diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index 9f15d0c470..89f63c93f3 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -52,7 +52,7 @@ func init() {
 	}
 }
 
-func configure(config cfg.MachineConfig) (interface{}, error) {
+func configure(config cfg.ClusterConfig) (interface{}, error) {
 	d := hyperv.NewDriver(config.Name, localpath.MiniPath())
 	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
 	d.VSwitch = config.HypervVirtualSwitch
diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go
index dedad73bfb..a3dbf67193 100644
--- a/pkg/minikube/registry/drvs/kvm2/kvm2.go
+++ b/pkg/minikube/registry/drvs/kvm2/kvm2.go
@@ -67,7 +67,7 @@ type kvmDriver struct {
 	ConnectionURI  string
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	name := mc.Name
 	return kvmDriver{
 		BaseDriver: &drivers.BaseDriver{
diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index aa8523cab6..4e1ae1a794 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -42,7 +42,7 @@ func init() {
 	}
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	return none.NewDriver(none.Config{
 		MachineName:      mc.Name,
 		StorePath:        localpath.MiniPath(),
diff --git a/pkg/minikube/registry/drvs/parallels/parallels.go b/pkg/minikube/registry/drvs/parallels/parallels.go
index de319ec8fb..79d0e9085e 100644
--- a/pkg/minikube/registry/drvs/parallels/parallels.go
+++ b/pkg/minikube/registry/drvs/parallels/parallels.go
@@ -44,7 +44,7 @@ func init() {
 
 }
 
-func configure(config cfg.MachineConfig) (interface{}, error) {
+func configure(config cfg.ClusterConfig) (interface{}, error) {
 	d := parallels.NewDriver(config.Name, localpath.MiniPath()).(*parallels.Driver)
 	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
 	d.Memory = config.Memory
diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go
index a8e19dbbc0..ec5d6013ac 100644
--- a/pkg/minikube/registry/drvs/podman/podman.go
+++ b/pkg/minikube/registry/drvs/podman/podman.go
@@ -49,7 +49,7 @@ func init() {
 	}
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
 		MachineName:   mc.Name,
 		StorePath:     localpath.MiniPath(),
diff --git a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
index bfba0e42db..c3888c3758 100644
--- a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
+++ b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
@@ -49,7 +49,7 @@ func init() {
 	}
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	d := virtualbox.NewDriver(mc.Name, localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
diff --git a/pkg/minikube/registry/drvs/vmware/vmware.go b/pkg/minikube/registry/drvs/vmware/vmware.go
index 885063cde2..0333dce541 100644
--- a/pkg/minikube/registry/drvs/vmware/vmware.go
+++ b/pkg/minikube/registry/drvs/vmware/vmware.go
@@ -39,7 +39,7 @@ func init() {
 	}
 }
 
-func configure(mc config.MachineConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig) (interface{}, error) {
 	d := vmwcfg.NewConfig(mc.Name, localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
diff --git a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
index bb5ed4196b..524e50f88c 100644
--- a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
+++ b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
@@ -44,7 +44,7 @@ func init() {
 	}
 }
 
-func configure(config cfg.MachineConfig) (interface{}, error) {
+func configure(config cfg.ClusterConfig) (interface{}, error) {
 	d := vmwarefusion.NewDriver(config.Name, localpath.MiniPath()).(*vmwarefusion.Driver)
 	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
 	d.Memory = config.Memory
diff --git a/pkg/minikube/registry/registry.go b/pkg/minikube/registry/registry.go
index 159c7a4568..e5fb98ce51 100644
--- a/pkg/minikube/registry/registry.go
+++ b/pkg/minikube/registry/registry.go
@@ -60,7 +60,7 @@ type Registry interface {
 }
 
 // Configurator emits a struct to be marshalled into JSON for Machine Driver
-type Configurator func(config.MachineConfig) (interface{}, error)
+type Configurator func(config.ClusterConfig) (interface{}, error)
 
 // Loader is a function that loads a byte stream and creates a driver.
 type Loader func() drivers.Driver
diff --git a/pkg/minikube/tunnel/cluster_inspector.go b/pkg/minikube/tunnel/cluster_inspector.go
index bb86db778a..8f9001e3db 100644
--- a/pkg/minikube/tunnel/cluster_inspector.go
+++ b/pkg/minikube/tunnel/cluster_inspector.go
@@ -64,7 +64,7 @@ func (m *clusterInspector) getStateAndRoute() (HostState, *Route, error) {
 	if err != nil {
 		return hostState, nil, err
 	}
-	var c *config.MachineConfig
+	var c *config.ClusterConfig
 	c, err = m.configLoader.LoadConfigFromFile(m.machineName)
 	if err != nil {
 		err = errors.Wrapf(err, "error loading config for %s", m.machineName)
@@ -80,7 +80,7 @@ func (m *clusterInspector) getStateAndRoute() (HostState, *Route, error) {
 	return hostState, route, nil
 }
 
-func getRoute(host *host.Host, clusterConfig config.MachineConfig) (*Route, error) {
+func getRoute(host *host.Host, clusterConfig config.ClusterConfig) (*Route, error) {
 	hostDriverIP, err := host.Driver.GetIP()
 	if err != nil {
 		return nil, errors.Wrapf(err, "error getting host IP for %s", host.Name)
diff --git a/pkg/minikube/tunnel/cluster_inspector_test.go b/pkg/minikube/tunnel/cluster_inspector_test.go
index c3be2e2483..834bd8241d 100644
--- a/pkg/minikube/tunnel/cluster_inspector_test.go
+++ b/pkg/minikube/tunnel/cluster_inspector_test.go
@@ -66,7 +66,7 @@ func TestMinikubeCheckReturnsHostInformation(t *testing.T) {
 	}
 
 	configLoader := &stubConfigLoader{
-		c: &config.MachineConfig{
+		c: &config.ClusterConfig{
 			KubernetesConfig: config.KubernetesConfig{
 				ServiceCIDR: "96.0.0.0/12",
 			},
@@ -104,7 +104,7 @@ func TestMinikubeCheckReturnsHostInformation(t *testing.T) {
 }
 
 func TestUnparseableCIDR(t *testing.T) {
-	cfg := config.MachineConfig{
+	cfg := config.ClusterConfig{
 		KubernetesConfig: config.KubernetesConfig{
 			ServiceCIDR: "bad.cidr.0.0/12",
 		}}
@@ -124,7 +124,7 @@ func TestUnparseableCIDR(t *testing.T) {
 func TestRouteIPDetection(t *testing.T) {
 	expectedTargetCIDR := "10.96.0.0/12"
 
-	cfg := config.MachineConfig{
+	cfg := config.ClusterConfig{
 		KubernetesConfig: config.KubernetesConfig{
 			ServiceCIDR: expectedTargetCIDR,
 		},
diff --git a/pkg/minikube/tunnel/test_doubles.go b/pkg/minikube/tunnel/test_doubles.go
index 5ac4874593..b8a8ae009f 100644
--- a/pkg/minikube/tunnel/test_doubles.go
+++ b/pkg/minikube/tunnel/test_doubles.go
@@ -82,14 +82,14 @@ func (r *fakeRouter) Inspect(route *Route) (exists bool, conflict string, overla
 }
 
 type stubConfigLoader struct {
-	c *config.MachineConfig
+	c *config.ClusterConfig
 	e error
 }
 
-func (l *stubConfigLoader) WriteConfigToFile(profileName string, cc *config.MachineConfig, miniHome ...string) error {
+func (l *stubConfigLoader) WriteConfigToFile(profileName string, cc *config.ClusterConfig, miniHome ...string) error {
 	return l.e
 }
 
-func (l *stubConfigLoader) LoadConfigFromFile(profile string, miniHome ...string) (*config.MachineConfig, error) {
+func (l *stubConfigLoader) LoadConfigFromFile(profile string, miniHome ...string) (*config.ClusterConfig, error) {
 	return l.c, l.e
 }
diff --git a/pkg/minikube/tunnel/tunnel_test.go b/pkg/minikube/tunnel/tunnel_test.go
index 20048f36d0..c017fd7aac 100644
--- a/pkg/minikube/tunnel/tunnel_test.go
+++ b/pkg/minikube/tunnel/tunnel_test.go
@@ -423,7 +423,7 @@ func TestTunnel(t *testing.T) {
 				},
 			}
 			configLoader := &stubConfigLoader{
-				c: &config.MachineConfig{
+				c: &config.ClusterConfig{
 					KubernetesConfig: config.KubernetesConfig{
 						ServiceCIDR: tc.serviceCIDR,
 					}},
@@ -478,7 +478,7 @@ func TestErrorCreatingTunnel(t *testing.T) {
 	}
 
 	configLoader := &stubConfigLoader{
-		c: &config.MachineConfig{
+		c: &config.ClusterConfig{
 			KubernetesConfig: config.KubernetesConfig{
 				ServiceCIDR: "10.96.0.0/12",
 			}},
diff --git a/site/content/en/docs/Contributing/drivers.en.md b/site/content/en/docs/Contributing/drivers.en.md
index aecd0e1179..6c3f4a74a8 100644
--- a/site/content/en/docs/Contributing/drivers.en.md
+++ b/site/content/en/docs/Contributing/drivers.en.md
@@ -85,7 +85,7 @@ func init() {
     })
 }
 
-func createVMwareFusionHost(config cfg.MachineConfig) interface{} {
+func createVMwareFusionHost(config cfg.ClusterConfig) interface{} {
     d := vmwarefusion.NewDriver(config.Name, localpath.MiniPath()).(*vmwarefusion.Driver)
     d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
     d.Memory = config.Memory

From 3bccafb66bb644e2a77aaa0da93f20df1cc557d3 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Wed, 19 Feb 2020 20:23:06 -0500
Subject: [PATCH 017/668] Update hyperv.go

---
 pkg/minikube/registry/drvs/hyperv/hyperv.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index f17b9517fe..9f15d0c470 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -88,7 +88,7 @@ func status() registry.State {
 	// Allow no more than 2 seconds for querying state
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
-	
+
 	cmd := exec.CommandContext(ctx, path, "Get-WindowsOptionalFeature", "-FeatureName", "Microsoft-Hyper-V-All", "-Online")
 	out, err := cmd.CombinedOutput()
 	if err != nil {

From ec191119dfebacf9ef385e745c4c1bde1982e542 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 21 Feb 2020 15:46:02 -0800
Subject: [PATCH 018/668] let's move some start code around

---
 cmd/minikube/cmd/delete.go                | 24 +++++----
 cmd/minikube/cmd/node_add.go              |  2 +-
 cmd/minikube/cmd/node_start.go            |  2 +-
 cmd/minikube/cmd/start.go                 |  8 +--
 pkg/minikube/bootstrapper/bootstrapper.go |  1 +
 pkg/minikube/cluster/cluster.go           |  3 ++
 pkg/minikube/node/config.go               | 63 ++---------------------
 pkg/minikube/node/machine.go              |  3 +-
 pkg/minikube/node/start.go                | 29 +++--------
 9 files changed, 36 insertions(+), 99 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index f58bd5440e..324d6d6403 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -191,14 +191,20 @@ func deleteProfile(profile *pkg_config.Profile) error {
 	}
 
 	if err == nil && driver.BareMetal(cc.Driver) {
-		if err := uninstallKubernetes(api, profile.Name, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
-			deletionError, ok := err.(DeletionError)
-			if ok {
-				delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
-				deletionError.Err = delErr
-				return deletionError
+		var e error
+		for _, n := range cc.Nodes {
+			if err := uninstallKubernetes(api, profile.Name, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper), n.Name); err != nil {
+				deletionError, ok := err.(DeletionError)
+				if ok {
+					delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
+					deletionError.Err = delErr
+					e = deletionError
+				}
+				e = err
 			}
-			return err
+		}
+		if e != nil {
+			return e
 		}
 	}
 
@@ -272,9 +278,9 @@ func profileDeletionErr(profileName string, additionalInfo string) error {
 	return fmt.Errorf("error deleting profile \"%s\": %s", profileName, additionalInfo)
 }
 
-func uninstallKubernetes(api libmachine.API, profile string, kc pkg_config.KubernetesConfig, bsName string) error {
+func uninstallKubernetes(api libmachine.API, profile string, kc pkg_config.KubernetesConfig, bsName string, nodeName string) error {
 	out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName})
-	clusterBootstrapper, err := cluster.Bootstrapper(api, bsName)
+	clusterBootstrapper, err := cluster.Bootstrapper(api, bsName, nodeName)
 	if err != nil {
 		return DeletionError{Err: fmt.Errorf("unable to get bootstrapper: %v", err), Errtype: Fatal}
 	}
diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 239c1df7ec..7d6b0841c6 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -54,7 +54,7 @@ var nodeAddCmd = &cobra.Command{
 			exit.WithError("Error adding node to cluster", err)
 		}
 
-		_, err = node.Start(*mc, *n, false, nil)
+		err = node.Start(*mc, *n, false, nil)
 		if err != nil {
 			exit.WithError("Error starting node", err)
 		}
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index d62cdf7ef1..c08c8b1037 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,7 +61,7 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		_, err = node.Start(*cc, *n, false, nil)
+		err = node.Start(*cc, *n, true, nil)
 		if err != nil {
 			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
 		}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 72d83bd549..3154c2370e 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -174,7 +174,7 @@ func initMinikubeFlags() {
 // initKubernetesFlags inits the commandline flags for kubernetes related options
 func initKubernetesFlags() {
 	startCmd.Flags().String(kubernetesVersion, "", "The kubernetes version that the minikube VM will use (ex: v1.2.3)")
-	startCmd.Flags().Var(&node.ExtraOptions, "extra-config",
+	startCmd.Flags().Var(&cluster.ExtraOptions, "extra-config",
 		`A set of key=value pairs that describe configuration that may be passed to different components.
 		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
 		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
@@ -688,7 +688,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 	validateCPUCount(driver.BareMetal(drvName))
 
 	// check that kubeadm extra args contain only whitelisted parameters
-	for param := range node.ExtraOptions.AsMap().Get(bsutil.Kubeadm) {
+	for param := range cluster.ExtraOptions.AsMap().Get(bsutil.Kubeadm) {
 		if !config.ContainsParam(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmCmdParam], param) &&
 			!config.ContainsParam(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmConfigParam], param) {
 			exit.UsageT("Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config", out.V{"parameter_name": param})
@@ -821,7 +821,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 			NetworkPlugin:          selectedNetworkPlugin,
 			ServiceCIDR:            viper.GetString(serviceCIDR),
 			ImageRepository:        repository,
-			ExtraOptions:           node.ExtraOptions,
+			ExtraOptions:           cluster.ExtraOptions,
 			ShouldLoadCachedImages: viper.GetBool(cacheImages),
 			EnableDefaultCNI:       selectedEnableDefaultCNI,
 		},
@@ -855,7 +855,7 @@ func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 	if !cmd.Flags().Changed("extra-config") && len(hints.ExtraOptions) > 0 {
 		for _, eo := range hints.ExtraOptions {
 			glog.Infof("auto setting extra-config to %q.", eo)
-			err = node.ExtraOptions.Set(eo)
+			err = cluster.ExtraOptions.Set(eo)
 			if err != nil {
 				err = errors.Wrapf(err, "setting extra option %s", eo)
 			}
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index eba5167179..d09bef5521 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -40,6 +40,7 @@ type Bootstrapper interface {
 	DeleteCluster(config.KubernetesConfig) error
 	WaitForCluster(config.ClusterConfig, time.Duration) error
 	JoinCluster(config.ClusterConfig, config.Node, string) error
+	UpdateNode(config.ClusterConfig)
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index a2b9e06613..baafe689a7 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -26,9 +26,12 @@ import (
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
 
+var ExtraOptions config.ExtraOptionSlice
+
 // This init function is used to set the logtostderr variable to false so that INFO level log info does not clutter the CLI
 // INFO lvl logging is displayed due to the kubernetes api calling flag.Set("logtostderr", "true") in its init()
 // see: https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/util/logs/logs.go#L32-L34
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index ce76ded6b4..eb1a61f68c 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -22,31 +22,23 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
-	"strings"
 
-	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
-	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/minikube/bootstrapper"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util/lock"
 )
 
 var (
-	DockerEnv    []string
-	DockerOpt    []string
-	ExtraOptions config.ExtraOptionSlice
-	AddonList    []string
+	DockerEnv []string
+	DockerOpt []string
+	AddonList []string
 )
 
 // configureRuntimes does what needs to happen to get a runtime going.
@@ -80,55 +72,6 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 	}
 }
 
-// setupKubeAdm adds any requested files into the VM before Kubernetes is started
-func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, node config.Node) bootstrapper.Bootstrapper {
-	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper))
-	if err != nil {
-		exit.WithError("Failed to get bootstrapper", err)
-	}
-	for _, eo := range ExtraOptions {
-		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
-	}
-	// Loads cached images, generates config files, download binaries
-	if err := bs.UpdateCluster(cfg); err != nil {
-		exit.WithError("Failed to update cluster", err)
-	}
-	if err := bs.SetupCerts(cfg.KubernetesConfig, node); err != nil {
-		exit.WithError("Failed to setup certs", err)
-	}
-	return bs
-}
-
-func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
-	addr, err := h.Driver.GetURL()
-	if err != nil {
-		exit.WithError("Failed to get driver URL", err)
-	}
-	if !driver.IsKIC(h.DriverName) {
-		addr = strings.Replace(addr, "tcp://", "https://", -1)
-		addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(n.Port), -1)
-	}
-
-	if c.KubernetesConfig.APIServerName != constants.APIServerName {
-		addr = strings.Replace(addr, n.IP, c.KubernetesConfig.APIServerName, -1)
-	}
-	kcs := &kubeconfig.Settings{
-		ClusterName:          clusterName,
-		ClusterServerAddress: addr,
-		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
-		ClientKey:            localpath.MakeMiniPath("client.key"),
-		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
-		KeepContext:          viper.GetBool(keepContext),
-		EmbedCerts:           viper.GetBool(embedCerts),
-	}
-
-	kcs.SetPath(kubeconfig.PathFromEnv())
-	if err := kubeconfig.Update(kcs); err != nil {
-		return kcs, err
-	}
-	return kcs, nil
-}
-
 // configureMounts configures any requested filesystem mounts
 func configureMounts() {
 	if !viper.GetBool(createMount) {
diff --git a/pkg/minikube/node/machine.go b/pkg/minikube/node/machine.go
index d0c4021222..279e233c2a 100644
--- a/pkg/minikube/node/machine.go
+++ b/pkg/minikube/node/machine.go
@@ -39,7 +39,8 @@ import (
 	"k8s.io/minikube/pkg/util/retry"
 )
 
-func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+// StartMachine starts a VM
+func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
 	m, err := machine.NewAPIClient()
 	if err != nil {
 		exit.WithError("Failed to get machine client", err)
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 1fe966e5ac..353c5ae4e9 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -22,18 +22,17 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/minikube/pkg/addons"
+	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util"
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+func Start(mc config.ClusterConfig, n config.Node, preExists bool, existingAddons map[string]bool) error {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
 	var cacheGroup errgroup.Group
 	beginCacheRequiredImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
@@ -44,33 +43,17 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
 		exit.WithError("Failed to save config", err)
 	}
 
+	bs, err := cluster.Bootstrapper()
+
 	k8sVersion := mc.KubernetesConfig.KubernetesVersion
 	driverName := mc.Driver
 	// exits here in case of --download-only option.
 	handleDownloadOnly(&cacheGroup, k8sVersion)
-	mRunner, preExists, machineAPI, host := startMachine(&mc, &n)
-	defer machineAPI.Close()
 	// configure the runtime (docker, containerd, crio)
 	cr := configureRuntimes(mRunner, driverName, mc.KubernetesConfig)
 	showVersionInfo(k8sVersion, cr)
 	waitCacheRequiredImages(&cacheGroup)
 
-	//TODO(sharifelgamal): Part out the cluster-wide operations, perhaps using the "primary" param
-
-	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
-	kubeconfig, err := setupKubeconfig(host, &mc, &n, mc.Name)
-	if err != nil {
-		exit.WithError("Failed to setup kubeconfig", err)
-	}
-
-	// setup kubeadm (must come after setupKubeconfig)
-	bs := setupKubeAdm(machineAPI, mc, n)
-
-	// pull images or restart cluster
-	out.T(out.Launch, "Launching Kubernetes ... ")
-	if err := bs.StartCluster(mc); err != nil {
-		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
-	}
 	configureMounts()
 
 	// enable addons, both old and new!
@@ -80,7 +63,7 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
 	}
 	addons.Start(viper.GetString(config.MachineProfile), ea, AddonList)
 
-	if err = CacheAndLoadImagesInConfig(); err != nil {
+	if err := CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 
@@ -96,7 +79,7 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
 		}
 	}
 
-	return kubeconfig, nil
+	return nil
 }
 
 // prepareNone prepares the user and host for the joy of the "none" driver

From 785338737d11f27ef5ad421714b0a1e37c42f2a2 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 21 Feb 2020 16:06:11 -0800
Subject: [PATCH 019/668] add new setup cluster file

---
 pkg/minikube/cluster/setup.go | 124 ++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 pkg/minikube/cluster/setup.go

diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
new file mode 100644
index 0000000000..9ce35bcf9c
--- /dev/null
+++ b/pkg/minikube/cluster/setup.go
@@ -0,0 +1,124 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cluster
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
+	"github.com/spf13/viper"
+	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+const (
+	waitTimeout      = "wait-timeout"
+	waitUntilHealthy = "wait"
+	embedCerts       = "embed-certs"
+	keepContext      = "keep-context"
+)
+
+// InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
+func InitialSetup(cc config.ClusterConfig, n config.Node, cr cruntime.Manager) (*kubeconfig.Settings, error) {
+	mRunner, preExists, machineAPI, host := StartMachine(&cc, &n)
+	defer machineAPI.Close()
+
+	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
+	kubeconfig, err := setupKubeconfig(host, &cc, &n, cc.Name)
+	if err != nil {
+		exit.WithError("Failed to setup kubeconfig", err)
+	}
+
+	// setup kubeadm (must come after setupKubeconfig)
+	bs := setupKubeAdm(machineAPI, cc, n)
+
+	// pull images or restart cluster
+	out.T(out.Launch, "Launching Kubernetes ... ")
+	if err := bs.StartCluster(cc); err != nil {
+		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+	}
+
+	// Skip pre-existing, because we already waited for health
+	if viper.GetBool(waitUntilHealthy) && !preExists {
+		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
+			exit.WithError("Wait failed", err)
+		}
+	}
+
+	return kubeconfig, nil
+
+}
+
+// setupKubeAdm adds any requested files into the VM before Kubernetes is started
+func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
+	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), n.Name)
+	if err != nil {
+		exit.WithError("Failed to get bootstrapper", err)
+	}
+	for _, eo := range ExtraOptions {
+		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
+	}
+	// Loads cached images, generates config files, download binaries
+	if err := bs.UpdateCluster(cfg); err != nil {
+		exit.WithError("Failed to update cluster", err)
+	}
+	if err := bs.SetupCerts(cfg.KubernetesConfig, n); err != nil {
+		exit.WithError("Failed to setup certs", err)
+	}
+	return bs
+}
+
+func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+	addr, err := h.Driver.GetURL()
+	if err != nil {
+		exit.WithError("Failed to get driver URL", err)
+	}
+	if !driver.IsKIC(h.DriverName) {
+		addr = strings.Replace(addr, "tcp://", "https://", -1)
+		addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(n.Port), -1)
+	}
+
+	if c.KubernetesConfig.APIServerName != constants.APIServerName {
+		addr = strings.Replace(addr, n.IP, c.KubernetesConfig.APIServerName, -1)
+	}
+	kcs := &kubeconfig.Settings{
+		ClusterName:          clusterName,
+		ClusterServerAddress: addr,
+		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
+		ClientKey:            localpath.MakeMiniPath("client.key"),
+		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
+		KeepContext:          viper.GetBool(keepContext),
+		EmbedCerts:           viper.GetBool(embedCerts),
+	}
+
+	kcs.SetPath(kubeconfig.PathFromEnv())
+	if err := kubeconfig.Update(kcs); err != nil {
+		return kcs, err
+	}
+	return kcs, nil
+}

From f22efd871aa7173f20ba41dc7e43735daa8dc051 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Sun, 23 Feb 2020 22:41:08 -0800
Subject: [PATCH 020/668] mostly moving code around and adding UpdateNode

---
 cmd/minikube/cmd/node_add.go                 |   7 +-
 cmd/minikube/cmd/node_start.go               |   2 +-
 cmd/minikube/cmd/start.go                    |  39 ++--
 pkg/minikube/bootstrapper/bootstrapper.go    |   4 +-
 pkg/minikube/bootstrapper/bsutil/ops.go      |   2 +-
 pkg/minikube/bootstrapper/certs.go           |   6 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  34 +++-
 pkg/minikube/cluster/cluster.go              |   3 -
 pkg/minikube/cluster/setup.go                | 177 +++++++++++++++++-
 pkg/minikube/config/node.go                  |  11 ++
 pkg/minikube/config/profile.go               |  18 ++
 pkg/minikube/machine/cluster_test.go         |  27 ++-
 pkg/minikube/machine/fix.go                  |   6 +-
 pkg/minikube/machine/start.go                |  12 +-
 pkg/minikube/node/config.go                  |  67 +------
 pkg/minikube/node/machine.go                 | 185 -------------------
 pkg/minikube/node/node.go                    |  10 +-
 pkg/minikube/node/start.go                   |  47 +++--
 18 files changed, 334 insertions(+), 323 deletions(-)
 delete mode 100644 pkg/minikube/node/machine.go

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 7d6b0841c6..cf3a1c626e 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -49,16 +49,11 @@ var nodeAddCmd = &cobra.Command{
 		}
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
-		n, err := node.Add(mc, name, cp, worker, "", profile)
+		err = node.Add(mc, name, cp, worker, "", profile)
 		if err != nil {
 			exit.WithError("Error adding node to cluster", err)
 		}
 
-		err = node.Start(*mc, *n, false, nil)
-		if err != nil {
-			exit.WithError("Error starting node", err)
-		}
-
 		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": profile})
 	},
 }
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index c08c8b1037..9d17ab1b7f 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,7 +61,7 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		err = node.Start(*cc, *n, true, nil)
+		err = node.Start(*cc, *n, nil)
 		if err != nil {
 			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
 		}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 1162429547..fbb30b7adb 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -118,6 +118,7 @@ const (
 	autoUpdate              = "auto-update-drivers"
 	hostOnlyNicType         = "host-only-nic-type"
 	natNicType              = "nat-nic-type"
+	nodes                   = "nodes"
 )
 
 var (
@@ -160,7 +161,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(containerRuntime, "docker", "The container runtime to be used (docker, crio, containerd).")
 	startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.")
 	startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.")
-	startCmd.Flags().StringArrayVar(&node.AddonList, "addons", nil, "Enable addons. see `minikube addons list` for a list of valid addon names.")
+	startCmd.Flags().StringArrayVar(&config.AddonList, "addons", nil, "Enable addons. see `minikube addons list` for a list of valid addon names.")
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
@@ -169,12 +170,13 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
 	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
+	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
 }
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
 func initKubernetesFlags() {
 	startCmd.Flags().String(kubernetesVersion, "", "The kubernetes version that the minikube VM will use (ex: v1.2.3)")
-	startCmd.Flags().Var(&cluster.ExtraOptions, "extra-config",
+	startCmd.Flags().Var(&config.ExtraOptions, "extra-config",
 		`A set of key=value pairs that describe configuration that may be passed to different components.
 		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
 		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
@@ -226,8 +228,8 @@ func initNetworkingFlags() {
 	startCmd.Flags().String(imageRepository, "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers")
 	startCmd.Flags().String(imageMirrorCountry, "", "Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.")
 	startCmd.Flags().String(serviceCIDR, constants.DefaultServiceCIDR, "The CIDR to be used for service cluster IPs.")
-	startCmd.Flags().StringArrayVar(&node.DockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
-	startCmd.Flags().StringArrayVar(&node.DockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
+	startCmd.Flags().StringArrayVar(&config.DockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
+	startCmd.Flags().StringArrayVar(&config.DockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
 }
 
 // startCmd represents the start command
@@ -335,7 +337,14 @@ func runStart(cmd *cobra.Command, args []string) {
 			existingAddons = existing.Addons
 		}
 	}
-	kubeconfig, err := node.Start(mc, n, true, existingAddons)
+
+	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
+	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
+	if err := config.SaveProfile(viper.GetString(config.MachineProfile), &mc); err != nil {
+		exit.WithError("Failed to save config", err)
+	}
+
+	kubeconfig, err := cluster.InitialSetup(mc, n, existingAddons)
 	if err != nil {
 		exit.WithError("Starting node", err)
 	}
@@ -343,6 +352,14 @@ func runStart(cmd *cobra.Command, args []string) {
 	if err := showKubectlInfo(kubeconfig, k8sVersion, mc.Name); err != nil {
 		glog.Errorf("kubectl info: %v", err)
 	}
+
+	numNodes := viper.GetInt(nodes)
+	if numNodes > 1 {
+		for i := 0; i < numNodes-1; i++ {
+			nodeName := fmt.Sprintf("%s%d", n.Name, i+1)
+			node.Add(&mc, nodeName, false, true, "", "")
+		}
+	}
 }
 
 func updateDriver(driverName string) {
@@ -691,7 +708,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 	validateCPUCount(driver.BareMetal(drvName))
 
 	// check that kubeadm extra args contain only whitelisted parameters
-	for param := range cluster.ExtraOptions.AsMap().Get(bsutil.Kubeadm) {
+	for param := range config.ExtraOptions.AsMap().Get(bsutil.Kubeadm) {
 		if !config.ContainsParam(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmCmdParam], param) &&
 			!config.ContainsParam(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmConfigParam], param) {
 			exit.UsageT("Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config", out.V{"parameter_name": param})
@@ -791,8 +808,8 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 		HyperkitVSockPorts:      viper.GetStringSlice(vsockPorts),
 		NFSShare:                viper.GetStringSlice(nfsShare),
 		NFSSharesRoot:           viper.GetString(nfsSharesRoot),
-		DockerEnv:               node.DockerEnv,
-		DockerOpt:               node.DockerOpt,
+		DockerEnv:               config.DockerEnv,
+		DockerOpt:               config.DockerOpt,
 		InsecureRegistry:        insecureRegistry,
 		RegistryMirror:          registryMirror,
 		HostOnlyCIDR:            viper.GetString(hostOnlyCIDR),
@@ -824,7 +841,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 			NetworkPlugin:          selectedNetworkPlugin,
 			ServiceCIDR:            viper.GetString(serviceCIDR),
 			ImageRepository:        repository,
-			ExtraOptions:           cluster.ExtraOptions,
+			ExtraOptions:           config.ExtraOptions,
 			ShouldLoadCachedImages: viper.GetBool(cacheImages),
 			EnableDefaultCNI:       selectedEnableDefaultCNI,
 		},
@@ -846,7 +863,7 @@ func setDockerProxy() {
 					continue
 				}
 			}
-			node.DockerEnv = append(node.DockerEnv, fmt.Sprintf("%s=%s", k, v))
+			config.DockerEnv = append(config.DockerEnv, fmt.Sprintf("%s=%s", k, v))
 		}
 	}
 }
@@ -858,7 +875,7 @@ func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 	if !cmd.Flags().Changed("extra-config") && len(hints.ExtraOptions) > 0 {
 		for _, eo := range hints.ExtraOptions {
 			glog.Infof("auto setting extra-config to %q.", eo)
-			err = cluster.ExtraOptions.Set(eo)
+			err = config.ExtraOptions.Set(eo)
 			if err != nil {
 				err = errors.Wrapf(err, "setting extra option %s", eo)
 			}
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index d09bef5521..6bb03fa986 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
 )
 
 // LogOptions are options to be passed to LogCommands
@@ -40,7 +41,8 @@ type Bootstrapper interface {
 	DeleteCluster(config.KubernetesConfig) error
 	WaitForCluster(config.ClusterConfig, time.Duration) error
 	JoinCluster(config.ClusterConfig, config.Node, string) error
-	UpdateNode(config.ClusterConfig)
+	UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error
+	GenerateToken(config.KubernetesConfig) (string, error)
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
diff --git a/pkg/minikube/bootstrapper/bsutil/ops.go b/pkg/minikube/bootstrapper/bsutil/ops.go
index bf855a9210..d364aa0748 100644
--- a/pkg/minikube/bootstrapper/bsutil/ops.go
+++ b/pkg/minikube/bootstrapper/bsutil/ops.go
@@ -47,7 +47,7 @@ func AdjustResourceLimits(c command.Runner) error {
 	return nil
 }
 
-// ExistingConfig checks if there are config files from possible previous kubernets cluster
+// ExistingConfig checks if there are config files from possible previous kubernetes cluster
 func ExistingConfig(c command.Runner) error {
 	args := append([]string{"ls"}, expectedRemoteArtifacts...)
 	_, err := c.RunCmd(exec.Command("sudo", args...))
diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index bb4bde2a38..7b634970a0 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -121,8 +121,10 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 		return errors.Wrap(err, "encoding kubeconfig")
 	}
 
-	kubeCfgFile := assets.NewMemoryAsset(data, vmpath.GuestPersistentDir, "kubeconfig", "0644")
-	copyableFiles = append(copyableFiles, kubeCfgFile)
+	if n.ControlPlane {
+		kubeCfgFile := assets.NewMemoryAsset(data, vmpath.GuestPersistentDir, "kubeconfig", "0644")
+		copyableFiles = append(copyableFiles, kubeCfgFile)
+	}
 
 	for _, f := range copyableFiles {
 		if err := cmd.Copy(f); err != nil {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 5af39eac9b..663e538f8c 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -381,6 +381,20 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 	return nil
 }
 
+// GenerateToken creates a token and returns the appropriate kubeadm join command to run
+func (k *Bootstrapper) GenerateToken(k8s config.KubernetesConfig) (string, error) {
+	tokenCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s token create --print-join-command --ttl=0", bsutil.InvokeKubeadm(k8s.KubernetesVersion)))
+	r, err := k.c.RunCmd(tokenCmd)
+	if err != nil {
+		return "", errors.Wrap(err, "generating bootstrap token")
+	}
+	joinCmd := r.Stdout.String()
+	joinCmd = strings.Replace(joinCmd, "kubeadm", bsutil.InvokeKubeadm(k8s.KubernetesVersion), 1)
+	joinCmd = fmt.Sprintf("%s --ignore-preflight-errors=all", strings.TrimSpace(joinCmd))
+
+	return joinCmd, nil
+}
+
 // DeleteCluster removes the components that were started earlier
 func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
 	version, err := bsutil.ParseKubernetesVersion(k8s.KubernetesVersion)
@@ -405,7 +419,7 @@ func (k *Bootstrapper) SetupCerts(k8s config.KubernetesConfig, n config.Node) er
 	return bootstrapper.SetupCerts(k.c, k8s, n)
 }
 
-// UpdateCluster updates the cluster
+// UpdateCluster updates the cluster.
 func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 	images, err := images.Kubeadm(cfg.KubernetesConfig.ImageRepository, cfg.KubernetesConfig.KubernetesVersion)
 	if err != nil {
@@ -423,14 +437,24 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "runtime")
 	}
 
-	// TODO: multiple nodes
-	kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, r, cfg.Nodes[0])
+	for _, n := range cfg.Nodes {
+		err := k.UpdateNode(cfg, n, r)
+		if err != nil {
+			return errors.Wrap(err, "updating node")
+		}
+	}
+
+	return nil
+}
+
+// UpdateNode updates a node.
+func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cruntime.Manager) error {
+	kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, r, n)
 	if err != nil {
 		return errors.Wrap(err, "generating kubeadm cfg")
 	}
 
-	// TODO: multiple nodes
-	kubeletCfg, err := bsutil.NewKubeletConfig(cfg, cfg.Nodes[0], r)
+	kubeletCfg, err := bsutil.NewKubeletConfig(cfg, n, r)
 	if err != nil {
 		return errors.Wrap(err, "generating kubelet config")
 	}
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index baafe689a7..a2b9e06613 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -26,12 +26,9 @@ import (
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
 
-var ExtraOptions config.ExtraOptionSlice
-
 // This init function is used to set the logtostderr variable to false so that INFO level log info does not clutter the CLI
 // INFO lvl logging is displayed due to the kubernetes api calling flag.Set("logtostderr", "true") in its init()
 // see: https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/util/logs/logs.go#L32-L34
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index 9ce35bcf9c..d786312820 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -17,23 +17,33 @@ limitations under the License.
 package cluster
 
 import (
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
+	"github.com/golang/glog"
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
+	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/proxy"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 const (
@@ -41,11 +51,13 @@ const (
 	waitUntilHealthy = "wait"
 	embedCerts       = "embed-certs"
 	keepContext      = "keep-context"
+	imageRepository  = "image-repository"
+	containerRuntime = "container-runtime"
 )
 
 // InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
-func InitialSetup(cc config.ClusterConfig, n config.Node, cr cruntime.Manager) (*kubeconfig.Settings, error) {
-	mRunner, preExists, machineAPI, host := StartMachine(&cc, &n)
+func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+	_, preExists, machineAPI, host := StartMachine(&cc, &n)
 	defer machineAPI.Close()
 
 	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
@@ -59,8 +71,17 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, cr cruntime.Manager) (
 
 	// pull images or restart cluster
 	out.T(out.Launch, "Launching Kubernetes ... ")
-	if err := bs.StartCluster(cc); err != nil {
-		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+	err = bs.StartCluster(cc)
+	if err != nil {
+		/*config := cruntime.Config{Type: viper.GetString(containerRuntime), Runner: mRunner, ImageRepository: cc.KubernetesConfig.ImageRepository, KubernetesVersion: cc.KubernetesConfig.KubernetesVersion}
+		cr, err := cruntime.New(config)
+		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))*/
+		exit.WithError("Error starting cluster", err)
+	}
+
+	// enable addons, both old and new!
+	if existingAddons != nil {
+		addons.Start(viper.GetString(config.MachineProfile), existingAddons, config.AddonList)
 	}
 
 	// Skip pre-existing, because we already waited for health
@@ -80,7 +101,7 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node)
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
 	}
-	for _, eo := range ExtraOptions {
+	for _, eo := range config.ExtraOptions {
 		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
 	}
 	// Loads cached images, generates config files, download binaries
@@ -122,3 +143,145 @@ func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clus
 	}
 	return kcs, nil
 }
+
+// StartMachine starts a VM
+func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+	m, err := machine.NewAPIClient()
+	if err != nil {
+		exit.WithError("Failed to get machine client", err)
+	}
+	host, preExists = startHost(m, *cfg, *node)
+	runner, err = machine.CommandRunner(host)
+	if err != nil {
+		exit.WithError("Failed to get command runner", err)
+	}
+
+	ip := validateNetwork(host, runner)
+
+	// Bypass proxy for minikube's vm host ip
+	err = proxy.ExcludeIP(ip)
+	if err != nil {
+		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
+	}
+
+	node.IP = ip
+	config.SaveNodeToProfile(cfg, node)
+
+	return runner, preExists, m, host
+}
+
+// startHost starts a new minikube host using a VM or None
+func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
+	exists, err := api.Exists(n.Name)
+	if err != nil {
+		exit.WithError("Failed to check if machine exists", err)
+	}
+
+	host, err := machine.StartHost(api, mc, n)
+	if err != nil {
+		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
+	}
+	return host, exists
+}
+
+// validateNetwork tries to catch network problems as soon as possible
+func validateNetwork(h *host.Host, r command.Runner) string {
+	ip, err := h.Driver.GetIP()
+	if err != nil {
+		exit.WithError("Unable to get VM IP address", err)
+	}
+
+	optSeen := false
+	warnedOnce := false
+	for _, k := range proxy.EnvVars {
+		if v := os.Getenv(k); v != "" {
+			if !optSeen {
+				out.T(out.Internet, "Found network options:")
+				optSeen = true
+			}
+			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
+			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
+			k = strings.ToUpper(k)               // for http_proxy & https_proxy
+			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
+				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
+				warnedOnce = true
+			}
+		}
+	}
+
+	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
+		trySSH(h, ip)
+	}
+
+	tryLookup(r)
+	tryRegistry(r)
+	return ip
+}
+
+func trySSH(h *host.Host, ip string) {
+	if viper.GetBool("force") {
+		return
+	}
+
+	sshAddr := net.JoinHostPort(ip, "22")
+
+	dial := func() (err error) {
+		d := net.Dialer{Timeout: 3 * time.Second}
+		conn, err := d.Dial("tcp", sshAddr)
+		if err != nil {
+			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
+			return err
+		}
+		_ = conn.Close()
+		return nil
+	}
+
+	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
+		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
+
+	This is likely due to one of two reasons:
+
+	- VPN or firewall interference
+	- {{.hypervisor}} network configuration issue
+
+	Suggested workarounds:
+
+	- Disable your local VPN or firewall software
+	- Configure your local VPN or firewall to allow access to {{.ip}}
+	- Restart or reinstall {{.hypervisor}}
+	- Use an alternative --vm-driver
+	- Use --force to override this connectivity check
+	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
+	}
+}
+
+func tryLookup(r command.Runner) {
+	// DNS check
+	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
+		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
+		// will try with without query type for ISOs with different busybox versions.
+		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
+			glog.Warningf("nslookup failed: %v", err)
+			out.WarningT("Node may be unable to resolve external DNS records")
+		}
+	}
+}
+func tryRegistry(r command.Runner) {
+	// Try an HTTPS connection to the image repository
+	proxy := os.Getenv("HTTPS_PROXY")
+	opts := []string{"-sS"}
+	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
+		opts = append([]string{"-x", proxy}, opts...)
+	}
+
+	repo := viper.GetString(imageRepository)
+	if repo == "" {
+		repo = images.DefaultKubernetesRepo
+	}
+
+	opts = append(opts, fmt.Sprintf("https://%s/", repo))
+	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
+		glog.Warningf("%s failed: %v", rr.Args, err)
+		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
+	}
+}
diff --git a/pkg/minikube/config/node.go b/pkg/minikube/config/node.go
index 1c6f050159..572a182553 100644
--- a/pkg/minikube/config/node.go
+++ b/pkg/minikube/config/node.go
@@ -16,6 +16,17 @@ limitations under the License.
 
 package config
 
+var (
+	// DockerEnv contains the environment variables
+	DockerEnv []string
+	// DockerOpt contains the option parameters
+	DockerOpt []string
+	// ExtraOptions contains extra options (if any)
+	ExtraOptions ExtraOptionSlice
+	// AddonList contains the list of addons
+	AddonList []string
+)
+
 // AddNode adds a new node config to an existing cluster.
 func AddNode(cc *ClusterConfig, name string, controlPlane bool, k8sVersion string, profileName string) error {
 	node := Node{
diff --git a/pkg/minikube/config/profile.go b/pkg/minikube/config/profile.go
index 5ad8572e13..0acfe1a8b4 100644
--- a/pkg/minikube/config/profile.go
+++ b/pkg/minikube/config/profile.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
+	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/util/lock"
@@ -90,6 +91,23 @@ func CreateEmptyProfile(name string, miniHome ...string) error {
 	return SaveProfile(name, cfg, miniHome...)
 }
 
+// SaveNodeToProfile saves a node to a cluster
+func SaveNodeToProfile(cfg *ClusterConfig, node *Node) error {
+	update := false
+	for i, n := range cfg.Nodes {
+		if n.Name == node.Name {
+			cfg.Nodes[i] = *node
+			update = true
+			break
+		}
+	}
+
+	if !update {
+		cfg.Nodes = append(cfg.Nodes, *node)
+	}
+	return SaveProfile(viper.GetString(MachineProfile), cfg)
+}
+
 // SaveProfile creates an profile out of the cfg and stores in $MINIKUBE_HOME/profiles/<profilename>/config.json
 func SaveProfile(name string, cfg *ClusterConfig, miniHome ...string) error {
 	data, err := json.MarshalIndent(cfg, "", "    ")
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 3b84c58842..ad326611c0 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -130,8 +130,10 @@ func TestStartHostExists(t *testing.T) {
 
 	mc := defaultClusterConfig
 	mc.Name = ih.Name
+
+	n := config.Node{Name: ih.Name}
 	// This should pass without calling Create because the host exists already.
-	h, err := StartHost(api, mc)
+	h, err := StartHost(api, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -162,8 +164,10 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	mc := defaultClusterConfig
 	mc.Name = h.Name
 
+	n := config.Node{Name: h.Name}
+
 	// This should pass with creating host, while machine does not exist.
-	h, err = StartHost(api, mc)
+	h, err = StartHost(api, mc, n)
 	if err != nil {
 		if err != ErrorMachineNotExist {
 			t.Fatalf("Error starting host: %v", err)
@@ -172,8 +176,10 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 
 	mc.Name = h.Name
 
+	n.Name = h.Name
+
 	// Second call. This should pass without calling Create because the host exists already.
-	h, err = StartHost(api, mc)
+	h, err = StartHost(api, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -205,7 +211,10 @@ func TestStartStoppedHost(t *testing.T) {
 	provision.SetDetector(md)
 	mc := defaultClusterConfig
 	mc.Name = h.Name
-	h, err = StartHost(api, mc)
+
+	n := config.Node{Name: h.Name}
+
+	h, err = StartHost(api, mc, n)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -233,7 +242,9 @@ func TestStartHost(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	h, err := StartHost(api, defaultClusterConfig)
+	n := config.Node{Name: viper.GetString("profile")}
+
+	h, err := StartHost(api, defaultClusterConfig, n)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -261,14 +272,16 @@ func TestStartHostConfig(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	config := config.ClusterConfig{
+	cfg := config.ClusterConfig{
 		Driver:     driver.Mock,
 		DockerEnv:  []string{"FOO=BAR"},
 		DockerOpt:  []string{"param=value"},
 		Downloader: MockDownloader{},
 	}
 
-	h, err := StartHost(api, config)
+	n := config.Node{Name: viper.GetString("profile")}
+
+	h, err := StartHost(api, cfg, n)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index a041e6a84f..8ea159a124 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -54,16 +54,16 @@ var (
 )
 
 // fixHost fixes up a previously configured VM so that it is ready to run Kubernetes
-func fixHost(api libmachine.API, mc config.ClusterConfig) (*host.Host, error) {
+func fixHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, error) {
 	out.T(out.Waiting, "Reconfiguring existing host ...")
 
 	start := time.Now()
-	glog.Infof("fixHost starting: %s", mc.Name)
+	glog.Infof("fixHost starting: %s", n.Name)
 	defer func() {
 		glog.Infof("fixHost completed within %s", time.Since(start))
 	}()
 
-	h, err := api.Load(mc.Name)
+	h, err := api.Load(n.Name)
 	if err != nil {
 		return h, errors.Wrap(err, "Error loading existing host. Please try running [minikube delete], then run [minikube start] again.")
 	}
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index c5cd2fa11f..4ae16dc005 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -61,9 +61,9 @@ var (
 )
 
 // StartHost starts a host VM.
-func StartHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error) {
+func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*host.Host, error) {
 	// Prevent machine-driver boot races, as well as our own certificate race
-	releaser, err := acquireMachinesLock(cfg.Name)
+	releaser, err := acquireMachinesLock(n.Name)
 	if err != nil {
 		return nil, errors.Wrap(err, "boot lock")
 	}
@@ -73,16 +73,16 @@ func StartHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error)
 		releaser.Release()
 	}()
 
-	exists, err := api.Exists(cfg.Name)
+	exists, err := api.Exists(n.Name)
 	if err != nil {
-		return nil, errors.Wrapf(err, "exists: %s", cfg.Name)
+		return nil, errors.Wrapf(err, "exists: %s", n.Name)
 	}
 	if !exists {
-		glog.Infof("Provisioning new machine with config: %+v", cfg)
+		glog.Infof("Provisioning new machine with config: %+v", n)
 		return createHost(api, cfg)
 	}
 	glog.Infoln("Skipping create...Using existing machine configuration")
-	return fixHost(api, cfg)
+	return fixHost(api, cfg, n)
 }
 
 func engineOptions(cfg config.ClusterConfig) *engine.Options {
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index 57ab7bf8fd..3448b29ce0 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -35,17 +35,6 @@ import (
 	"k8s.io/minikube/pkg/util/lock"
 )
 
-var (
-	// DockerEnv contains the environment variables
-	DockerEnv []string
-	// DockerOpt contains the option parameters
-	DockerOpt []string
-	// ExtraOptions contains extra options (if any)
-	ExtraOptions config.ExtraOptionSlice
-	// AddonList contains the list of addons
-	AddonList []string
-)
-
 // configureRuntimes does what needs to happen to get a runtime going.
 func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig) cruntime.Manager {
 	config := cruntime.Config{Type: viper.GetString(containerRuntime), Runner: runner, ImageRepository: k8s.ImageRepository, KubernetesVersion: k8s.KubernetesVersion}
@@ -69,66 +58,14 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 	version, _ := cr.Version()
 	out.T(cr.Style(), "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...", out.V{"k8sVersion": k8sVersion, "runtime": cr.Name(), "runtimeVersion": version})
-	for _, v := range DockerOpt {
+	for _, v := range config.DockerOpt {
 		out.T(out.Option, "opt {{.docker_option}}", out.V{"docker_option": v})
 	}
-	for _, v := range DockerEnv {
+	for _, v := range config.DockerEnv {
 		out.T(out.Option, "env {{.docker_env}}", out.V{"docker_env": v})
 	}
 }
 
-<<<<<<< HEAD
-=======
-// setupKubeAdm adds any requested files into the VM before Kubernetes is started
-func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, node config.Node) bootstrapper.Bootstrapper {
-	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper))
-	if err != nil {
-		exit.WithError("Failed to get bootstrapper", err)
-	}
-	for _, eo := range ExtraOptions {
-		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
-	}
-	// Loads cached images, generates config files, download binaries
-	if err := bs.UpdateCluster(cfg); err != nil {
-		exit.WithError("Failed to update cluster", err)
-	}
-	if err := bs.SetupCerts(cfg.KubernetesConfig, node); err != nil {
-		exit.WithError("Failed to setup certs", err)
-	}
-	return bs
-}
-
-func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
-	addr, err := h.Driver.GetURL()
-	if err != nil {
-		exit.WithError("Failed to get driver URL", err)
-	}
-	if !driver.IsKIC(h.DriverName) {
-		addr = strings.Replace(addr, "tcp://", "https://", -1)
-		addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(n.Port), -1)
-	}
-
-	if c.KubernetesConfig.APIServerName != constants.APIServerName {
-		addr = strings.Replace(addr, n.IP, c.KubernetesConfig.APIServerName, -1)
-	}
-	kcs := &kubeconfig.Settings{
-		ClusterName:          clusterName,
-		ClusterServerAddress: addr,
-		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
-		ClientKey:            localpath.MakeMiniPath("client.key"),
-		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
-		KeepContext:          viper.GetBool(keepContext),
-		EmbedCerts:           viper.GetBool(embedCerts),
-	}
-
-	kcs.SetPath(kubeconfig.PathFromEnv())
-	if err := kubeconfig.Update(kcs); err != nil {
-		return kcs, err
-	}
-	return kcs, nil
-}
-
->>>>>>> c4e2236e2b2966cb05fa11b3bdc8cf1d060a270c
 // configureMounts configures any requested filesystem mounts
 func configureMounts() {
 	if !viper.GetBool(createMount) {
diff --git a/pkg/minikube/node/machine.go b/pkg/minikube/node/machine.go
deleted file mode 100644
index 279e233c2a..0000000000
--- a/pkg/minikube/node/machine.go
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package node
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/host"
-	"github.com/golang/glog"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/minikube/proxy"
-	"k8s.io/minikube/pkg/util/retry"
-)
-
-// StartMachine starts a VM
-func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
-	m, err := machine.NewAPIClient()
-	if err != nil {
-		exit.WithError("Failed to get machine client", err)
-	}
-	host, preExists = startHost(m, *cfg)
-	runner, err = machine.CommandRunner(host)
-	if err != nil {
-		exit.WithError("Failed to get command runner", err)
-	}
-
-	ip := validateNetwork(host, runner)
-
-	// Bypass proxy for minikube's vm host ip
-	err = proxy.ExcludeIP(ip)
-	if err != nil {
-		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
-	}
-	// Save IP to configuration file for subsequent use
-	node.IP = ip
-
-	if err := Save(cfg, node); err != nil {
-		exit.WithError("Failed to save config", err)
-	}
-
-	return runner, preExists, m, host
-}
-
-// startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.ClusterConfig) (*host.Host, bool) {
-	exists, err := api.Exists(mc.Name)
-	if err != nil {
-		exit.WithError("Failed to check if machine exists", err)
-	}
-
-	host, err := machine.StartHost(api, mc)
-	if err != nil {
-		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
-	}
-	return host, exists
-}
-
-// validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner) string {
-	ip, err := h.Driver.GetIP()
-	if err != nil {
-		exit.WithError("Unable to get VM IP address", err)
-	}
-
-	optSeen := false
-	warnedOnce := false
-	for _, k := range proxy.EnvVars {
-		if v := os.Getenv(k); v != "" {
-			if !optSeen {
-				out.T(out.Internet, "Found network options:")
-				optSeen = true
-			}
-			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
-			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
-			k = strings.ToUpper(k)               // for http_proxy & https_proxy
-			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
-				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
-				warnedOnce = true
-			}
-		}
-	}
-
-	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
-		trySSH(h, ip)
-	}
-
-	tryLookup(r)
-	tryRegistry(r)
-	return ip
-}
-
-func trySSH(h *host.Host, ip string) {
-	if viper.GetBool("force") {
-		return
-	}
-
-	sshAddr := net.JoinHostPort(ip, "22")
-
-	dial := func() (err error) {
-		d := net.Dialer{Timeout: 3 * time.Second}
-		conn, err := d.Dial("tcp", sshAddr)
-		if err != nil {
-			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
-			return err
-		}
-		_ = conn.Close()
-		return nil
-	}
-
-	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
-		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
-
-	This is likely due to one of two reasons:
-
-	- VPN or firewall interference
-	- {{.hypervisor}} network configuration issue
-
-	Suggested workarounds:
-
-	- Disable your local VPN or firewall software
-	- Configure your local VPN or firewall to allow access to {{.ip}}
-	- Restart or reinstall {{.hypervisor}}
-	- Use an alternative --vm-driver
-	- Use --force to override this connectivity check
-	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
-	}
-}
-
-func tryLookup(r command.Runner) {
-	// DNS check
-	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
-		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
-		// will try with without query type for ISOs with different busybox versions.
-		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
-			glog.Warningf("nslookup failed: %v", err)
-			out.WarningT("Node may be unable to resolve external DNS records")
-		}
-	}
-}
-func tryRegistry(r command.Runner) {
-	// Try an HTTPS connection to the image repository
-	proxy := os.Getenv("HTTPS_PROXY")
-	opts := []string{"-sS"}
-	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
-		opts = append([]string{"-x", proxy}, opts...)
-	}
-
-	repo := viper.GetString(imageRepository)
-	if repo == "" {
-		repo = images.DefaultKubernetesRepo
-	}
-
-	opts = append(opts, fmt.Sprintf("https://%s/", repo))
-	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
-		glog.Warningf("%s failed: %v", rr.Args, err)
-		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
-	}
-}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 4e2f75b94b..ac247b0ce3 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -25,7 +25,6 @@ import (
 )
 
 const (
-	imageRepository     = "image-repository"
 	cacheImages         = "cache-images"
 	waitUntilHealthy    = "wait"
 	cacheImageConfigKey = "cache"
@@ -38,7 +37,7 @@ const (
 )
 
 // Add adds a new node config to an existing cluster.
-func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) (*config.Node, error) {
+func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) error {
 	n := config.Node{
 		Name:   name,
 		Worker: true,
@@ -62,11 +61,12 @@ func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool,
 	cc.Nodes = append(cc.Nodes, n)
 	err := config.SaveProfile(profileName, cc)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	_, err = Start(*cc, n, false, nil)
-	return &n, err
+	err = Start(*cc, n, nil)
+
+	return err
 }
 
 // Delete stops and deletes the given node from the given cluster
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 36f1155f2f..d43d9f455d 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
+	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -32,25 +33,25 @@ import (
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(mc config.ClusterConfig, n config.Node, preExists bool, existingAddons map[string]bool) error {
+func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) error {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
 	var cacheGroup errgroup.Group
-	beginCacheRequiredImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
+	beginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
 
-	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
-	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.MachineProfile), &mc); err != nil {
-		exit.WithError("Failed to save config", err)
+	runner, preExists, mAPI, _ := cluster.StartMachine(&cc, &n)
+	defer mAPI.Close()
+
+	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), n.Name)
+	if err != nil {
+		exit.WithError("Failed to get bootstrapper", err)
 	}
 
-	bs, err := cluster.Bootstrapper()
-
-	k8sVersion := mc.KubernetesConfig.KubernetesVersion
-	driverName := mc.Driver
+	k8sVersion := cc.KubernetesConfig.KubernetesVersion
+	driverName := cc.Driver
 	// exits here in case of --download-only option.
 	handleDownloadOnly(&cacheGroup, k8sVersion)
 	// configure the runtime (docker, containerd, crio)
-	cr := configureRuntimes(mRunner, driverName, mc.KubernetesConfig)
+	cr := configureRuntimes(runner, driverName, cc.KubernetesConfig)
 	showVersionInfo(k8sVersion, cr)
 	waitCacheRequiredImages(&cacheGroup)
 
@@ -58,7 +59,11 @@ func Start(mc config.ClusterConfig, n config.Node, preExists bool, existingAddon
 
 	// enable addons, both old and new!
 	if existingAddons != nil {
-		addons.Start(viper.GetString(config.MachineProfile), existingAddons, AddonList)
+		addons.Start(viper.GetString(config.MachineProfile), existingAddons, config.AddonList)
+	}
+
+	if err := bs.UpdateNode(cc, n, cr); err != nil {
+		exit.WithError("Failed to update node", err)
 	}
 
 	if err := CacheAndLoadImagesInConfig(); err != nil {
@@ -66,18 +71,30 @@ func Start(mc config.ClusterConfig, n config.Node, preExists bool, existingAddon
 	}
 
 	// special ops for none , like change minikube directory.
-	if driverName == driver.None {
+	// multinode super doesn't work on the none driver
+	if driverName == driver.None && len(cc.Nodes) == 1 {
 		prepareNone()
 	}
 
 	// Skip pre-existing, because we already waited for health
 	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForCluster(mc, viper.GetDuration(waitTimeout)); err != nil {
+		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
 			exit.WithError("Wait failed", err)
 		}
 	}
 
-	return nil
+	bs.SetupCerts(cc.KubernetesConfig, n)
+
+	cp, err := config.PrimaryControlPlane(cc)
+	if err != nil {
+		exit.WithError("Getting primary control plane", err)
+	}
+	cpBs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cp.Name)
+	if err != nil {
+		exit.WithError("Getting bootstrapper", err)
+	}
+	joinCmd, err := cpBs.GenerateToken(cc.KubernetesConfig)
+	return bs.JoinCluster(cc, n, joinCmd)
 }
 
 // prepareNone prepares the user and host for the joy of the "none" driver

From 9a3ecab61a67ef6fd179125c47d38dcb84573b0d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 15:09:04 -0800
Subject: [PATCH 021/668] fixed more stuff

---
 cmd/minikube/cmd/node.go                      |  7 ++-
 cmd/minikube/cmd/node_add.go                  |  4 ++
 cmd/minikube/cmd/node_delete.go               |  2 +-
 pkg/drivers/hyperkit/driver.go                |  4 +-
 pkg/minikube/config/config.go                 |  8 ++++
 pkg/minikube/config/node.go                   | 47 -------------------
 pkg/minikube/machine/cache_images.go          | 44 ++++++++---------
 pkg/minikube/machine/cluster_test.go          | 43 ++++++++++-------
 pkg/minikube/machine/fix.go                   |  2 +-
 pkg/minikube/machine/start.go                 | 12 ++---
 pkg/minikube/node/node.go                     | 21 +--------
 pkg/minikube/node/start.go                    |  5 ++
 pkg/minikube/registry/drvs/docker/docker.go   |  6 +--
 .../registry/drvs/hyperkit/hyperkit.go        | 27 ++++++-----
 .../registry/drvs/parallels/parallels.go      | 14 +++---
 pkg/minikube/registry/drvs/podman/podman.go   |  6 +--
 .../registry/drvs/virtualbox/virtualbox.go    |  4 +-
 pkg/minikube/registry/drvs/vmware/vmware.go   |  4 +-
 .../drvs/vmwarefusion/vmwarefusion.go         | 14 +++---
 pkg/minikube/registry/registry.go             |  2 +-
 20 files changed, 120 insertions(+), 156 deletions(-)
 delete mode 100644 pkg/minikube/config/node.go

diff --git a/cmd/minikube/cmd/node.go b/cmd/minikube/cmd/node.go
index 7b70780f74..39dbac6c7c 100644
--- a/cmd/minikube/cmd/node.go
+++ b/cmd/minikube/cmd/node.go
@@ -23,10 +23,9 @@ import (
 
 // nodeCmd represents the set of node subcommands
 var nodeCmd = &cobra.Command{
-	Use:    "node",
-	Short:  "Node operations",
-	Long:   "Operations on nodes",
-	Hidden: true, // This won't be fully functional and thus should not be documented yet
+	Use:   "node",
+	Short: "Node operations",
+	Long:  "Operations on nodes",
 	Run: func(cmd *cobra.Command, args []string) {
 		exit.UsageT("Usage: minikube node [add|start|stop|delete]")
 	},
diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index cf3a1c626e..fe5557258d 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -47,6 +47,10 @@ var nodeAddCmd = &cobra.Command{
 		if nodeName == "" {
 			name = profile + strconv.Itoa(len(mc.Nodes)+1)
 		}
+		_, _, err = node.Retrieve(mc, name)
+		if err == nil {
+			exit.WithCodeT(100, "{{.nodeName}} already exists in cluster {{.cluster}}. Choose a different name.", out.V{"nodeName": name, "cluster": mc.Name})
+		}
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
 		err = node.Add(mc, name, cp, worker, "", profile)
diff --git a/cmd/minikube/cmd/node_delete.go b/cmd/minikube/cmd/node_delete.go
index 92e5e5755d..33d6ca6660 100644
--- a/cmd/minikube/cmd/node_delete.go
+++ b/cmd/minikube/cmd/node_delete.go
@@ -46,7 +46,7 @@ var nodeDeleteCmd = &cobra.Command{
 
 		err = node.Delete(*cc, name)
 		if err != nil {
-			out.FatalT("Failed to delete node {{.name}}", out.V{"name": name})
+			exit.WithError("deleting node", err)
 		}
 
 		out.T(out.Deleted, "Node {{.name}} was successfully deleted.", out.V{"name": name})
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
index bf775240e6..9659237408 100644
--- a/pkg/drivers/hyperkit/driver.go
+++ b/pkg/drivers/hyperkit/driver.go
@@ -65,6 +65,7 @@ type Driver struct {
 	UUID           string
 	VpnKitSock     string
 	VSockPorts     []string
+	ClusterName    string
 }
 
 // NewDriver creates a new driver for a host
@@ -199,7 +200,7 @@ func (d *Driver) Restart() error {
 }
 
 func (d *Driver) createHost() (*hyperkit.HyperKit, error) {
-	stateDir := filepath.Join(d.StorePath, "machines", d.MachineName)
+	stateDir := filepath.Join(d.StorePath, "machines", d.ClusterName, d.MachineName)
 	h, err := hyperkit.New("", d.VpnKitSock, stateDir)
 	if err != nil {
 		return nil, errors.Wrap(err, "new-ing Hyperkit")
@@ -519,6 +520,7 @@ func (d *Driver) sendSignal(s os.Signal) error {
 func (d *Driver) getPid() int {
 	pidPath := d.ResolveStorePath(machineFileName)
 
+	log.Debugf("PIDPATH=%s", pidPath)
 	f, err := os.Open(pidPath)
 	if err != nil {
 		log.Warnf("Error reading pid file: %v", err)
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index 351d6a177d..bf7e0bdd28 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -52,6 +52,14 @@ const (
 var (
 	// ErrKeyNotFound is the error returned when a key doesn't exist in the config file
 	ErrKeyNotFound = errors.New("specified key could not be found in config")
+	// DockerEnv contains the environment variables
+	DockerEnv []string
+	// DockerOpt contains the option parameters
+	DockerOpt []string
+	// ExtraOptions contains extra options (if any)
+	ExtraOptions ExtraOptionSlice
+	// AddonList contains the list of addons
+	AddonList []string
 )
 
 // ErrNotExist is the error returned when a config does not exist
diff --git a/pkg/minikube/config/node.go b/pkg/minikube/config/node.go
deleted file mode 100644
index 572a182553..0000000000
--- a/pkg/minikube/config/node.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package config
-
-var (
-	// DockerEnv contains the environment variables
-	DockerEnv []string
-	// DockerOpt contains the option parameters
-	DockerOpt []string
-	// ExtraOptions contains extra options (if any)
-	ExtraOptions ExtraOptionSlice
-	// AddonList contains the list of addons
-	AddonList []string
-)
-
-// AddNode adds a new node config to an existing cluster.
-func AddNode(cc *ClusterConfig, name string, controlPlane bool, k8sVersion string, profileName string) error {
-	node := Node{
-		Name:   name,
-		Worker: true,
-	}
-
-	if controlPlane {
-		node.ControlPlane = true
-	}
-
-	if k8sVersion != "" {
-		node.KubernetesVersion = k8sVersion
-	}
-
-	cc.Nodes = append(cc.Nodes, node)
-	return SaveProfile(profileName, cc)
-}
diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
index 301c3b02fd..40e35a2c69 100644
--- a/pkg/minikube/machine/cache_images.go
+++ b/pkg/minikube/machine/cache_images.go
@@ -137,29 +137,31 @@ func CacheAndLoadImages(images []string) error {
 		return errors.Wrap(err, "list profiles")
 	}
 	for _, p := range profiles { // loading images to all running profiles
-		pName := p.Name // capture the loop variable
-		status, err := GetHostStatus(api, pName)
-		if err != nil {
-			glog.Warningf("skipping loading cache for profile %s", pName)
-			glog.Errorf("error getting status for %s: %v", pName, err)
-			continue // try next machine
-		}
-		if status == state.Running.String() { // the not running hosts will load on next start
-			h, err := api.Load(pName)
+		for _, n := range p.Config.Nodes {
+			pName := n.Name // capture the loop variable
+			status, err := GetHostStatus(api, pName)
 			if err != nil {
-				return err
+				glog.Warningf("skipping loading cache for profile %s", pName)
+				glog.Errorf("error getting status for %s: %v", pName, err)
+				continue // try next machine
 			}
-			cr, err := CommandRunner(h)
-			if err != nil {
-				return err
-			}
-			c, err := config.Load(pName)
-			if err != nil {
-				return err
-			}
-			err = LoadImages(c, cr, images, constants.ImageCacheDir)
-			if err != nil {
-				glog.Warningf("Failed to load cached images for profile %s. make sure the profile is running. %v", pName, err)
+			if status == state.Running.String() { // the not running hosts will load on next start
+				h, err := api.Load(pName)
+				if err != nil {
+					return err
+				}
+				cr, err := CommandRunner(h)
+				if err != nil {
+					return err
+				}
+				c, err := config.Load(pName)
+				if err != nil {
+					return err
+				}
+				err = LoadImages(c, cr, images, constants.ImageCacheDir)
+				if err != nil {
+					glog.Warningf("Failed to load cached images for profile %s. make sure the profile is running. %v", pName, err)
+				}
 			}
 		}
 	}
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index ad326611c0..2053320a75 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -41,7 +41,7 @@ type MockDownloader struct{}
 func (d MockDownloader) GetISOFileURI(isoURL string) string          { return "" }
 func (d MockDownloader) CacheMinikubeISOFromURL(isoURL string) error { return nil }
 
-func createMockDriverHost(c config.ClusterConfig) (interface{}, error) {
+func createMockDriverHost(c config.ClusterConfig, n config.Node) (interface{}, error) {
 	return nil, nil
 }
 
@@ -67,28 +67,35 @@ var defaultClusterConfig = config.ClusterConfig{
 	DockerEnv:   []string{"MOCK_MAKE_IT_PROVISION=true"},
 }
 
+var defaultNodeConfig = config.Node{
+	Name: viper.GetString("profile"),
+}
+
 func TestCreateHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 
-	exists, _ := api.Exists(viper.GetString("profile"))
+	profile := viper.GetString("profile")
+	exists, _ := api.Exists(profile)
 	if exists {
 		t.Fatal("Machine already exists.")
 	}
 
-	_, err := createHost(api, defaultClusterConfig)
+	n := config.Node{Name: profile}
+
+	_, err := createHost(api, defaultClusterConfig, n)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
-	exists, err = api.Exists(viper.GetString("profile"))
+	exists, err = api.Exists(profile)
 	if err != nil {
-		t.Fatalf("exists failed for %q: %v", viper.GetString("profile"), err)
+		t.Fatalf("exists failed for %q: %v", profile, err)
 	}
 	if !exists {
-		t.Fatalf("%q does not exist, but should.", viper.GetString("profile"))
+		t.Fatalf("%q does not exist, but should.", profile)
 	}
 
-	h, err := api.Load(viper.GetString("profile"))
+	h, err := api.Load(profile)
 	if err != nil {
 		t.Fatalf("Error loading machine: %v", err)
 	}
@@ -113,8 +120,9 @@ func TestCreateHost(t *testing.T) {
 func TestStartHostExists(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
+
 	// Create an initial host.
-	ih, err := createHost(api, defaultClusterConfig)
+	ih, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -131,9 +139,8 @@ func TestStartHostExists(t *testing.T) {
 	mc := defaultClusterConfig
 	mc.Name = ih.Name
 
-	n := config.Node{Name: ih.Name}
 	// This should pass without calling Create because the host exists already.
-	h, err := StartHost(api, mc, n)
+	h, err := StartHost(api, mc, defaultNodeConfig)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -153,7 +160,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	api := tests.NewMockAPI(t)
 	// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
 	api.NotExistError = true
-	h, err := createHost(api, defaultClusterConfig)
+	h, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -199,7 +206,7 @@ func TestStartStoppedHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	// Create an initial host.
-	h, err := createHost(api, defaultClusterConfig)
+	h, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
@@ -311,7 +318,7 @@ func TestStopHostError(t *testing.T) {
 func TestStopHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	h, err := createHost(api, defaultClusterConfig)
+	h, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -327,7 +334,7 @@ func TestStopHost(t *testing.T) {
 func TestDeleteHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	if _, err := createHost(api, defaultClusterConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig, defaultNodeConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
@@ -339,7 +346,7 @@ func TestDeleteHost(t *testing.T) {
 func TestDeleteHostErrorDeletingVM(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	h, err := createHost(api, defaultClusterConfig)
+	h, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -356,7 +363,7 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	api.RemoveError = true
-	if _, err := createHost(api, defaultClusterConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig, defaultNodeConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
@@ -370,7 +377,7 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) {
 	api := tests.NewMockAPI(t)
 	// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
 	api.NotExistError = true
-	_, err := createHost(api, defaultClusterConfig)
+	_, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
@@ -396,7 +403,7 @@ func TestGetHostStatus(t *testing.T) {
 
 	checkState(state.None.String())
 
-	if _, err := createHost(api, defaultClusterConfig); err != nil {
+	if _, err := createHost(api, defaultClusterConfig, defaultNodeConfig); err != nil {
 		t.Errorf("createHost failed: %v", err)
 	}
 
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 8ea159a124..3b465e5025 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -88,7 +88,7 @@ func fixHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.
 				}
 				// recreate virtual machine
 				out.T(out.Meh, "machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.", out.V{"name": mc.Name})
-				h, err = createHost(api, mc)
+				h, err = createHost(api, mc, n)
 				if err != nil {
 					return nil, errors.Wrap(err, "Error recreating VM")
 				}
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index 4ae16dc005..1d34f28070 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -69,7 +69,7 @@ func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*ho
 	}
 	start := time.Now()
 	defer func() {
-		glog.Infof("releasing machines lock for %q, held for %s", cfg.Name, time.Since(start))
+		glog.Infof("releasing machines lock for %q, held for %s", n.Name, time.Since(start))
 		releaser.Release()
 	}()
 
@@ -78,8 +78,8 @@ func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*ho
 		return nil, errors.Wrapf(err, "exists: %s", n.Name)
 	}
 	if !exists {
-		glog.Infof("Provisioning new machine with config: %+v", n)
-		return createHost(api, cfg)
+		glog.Infof("Provisioning new machine with config: %+v %+v", cfg, n)
+		return createHost(api, cfg, n)
 	}
 	glog.Infoln("Skipping create...Using existing machine configuration")
 	return fixHost(api, cfg, n)
@@ -96,8 +96,8 @@ func engineOptions(cfg config.ClusterConfig) *engine.Options {
 	return &o
 }
 
-func createHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error) {
-	glog.Infof("createHost starting for %q (driver=%q)", cfg.Name, cfg.Driver)
+func createHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*host.Host, error) {
+	glog.Infof("createHost starting for %q (driver=%q)", n.Name, cfg.Driver)
 	start := time.Now()
 	defer func() {
 		glog.Infof("createHost completed in %s", time.Since(start))
@@ -114,7 +114,7 @@ func createHost(api libmachine.API, cfg config.ClusterConfig) (*host.Host, error
 	if def.Empty() {
 		return nil, fmt.Errorf("unsupported/missing driver: %s", cfg.Driver)
 	}
-	dd, err := def.Config(cfg)
+	dd, err := def.Config(cfg, n)
 	if err != nil {
 		return nil, errors.Wrap(err, "config")
 	}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index ac247b0ce3..af9856d077 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -19,6 +19,7 @@ package node
 import (
 	"errors"
 
+	"github.com/golang/glog"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -76,10 +77,9 @@ func Delete(cc config.ClusterConfig, name string) error {
 		return err
 	}
 
-	/*err = Stop(cc, nd)
 	if err != nil {
 		glog.Warningf("Failed to stop node %s. Will still try to delete.", name)
-	}*/
+	}
 
 	api, err := machine.NewAPIClient()
 	if err != nil {
@@ -105,20 +105,3 @@ func Retrieve(cc *config.ClusterConfig, name string) (*config.Node, int, error)
 
 	return nil, -1, errors.New("Could not find node " + name)
 }
-
-// Save saves a node to a cluster
-func Save(cfg *config.ClusterConfig, node *config.Node) error {
-	update := false
-	for i, n := range cfg.Nodes {
-		if n.Name == node.Name {
-			cfg.Nodes[i] = *node
-			update = true
-			break
-		}
-	}
-
-	if !update {
-		cfg.Nodes = append(cfg.Nodes, *node)
-	}
-	return config.SaveProfile(viper.GetString(config.MachineProfile), cfg)
-}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index d43d9f455d..22dd8ac868 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -38,6 +38,11 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	var cacheGroup errgroup.Group
 	beginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
 
+	// Why do we need this?
+	if cc.Downloader == nil {
+		cc.Downloader = util.DefaultDownloader{}
+	}
+
 	runner, preExists, mAPI, _ := cluster.StartMachine(&cc, &n)
 	defer mAPI.Close()
 
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 0b66dfdecb..d5278a8f92 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -43,15 +43,15 @@ func init() {
 	}
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   mc.Name,
+		MachineName:   n.Name,
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   kic.BaseImage,
 		CPU:           mc.CPUs,
 		Memory:        mc.Memory,
 		OCIBinary:     oci.Docker,
-		APIServerPort: mc.Nodes[0].Port,
+		APIServerPort: n.Port,
 	}), nil
 }
 
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
index 47a3db9091..b9e4b4f09f 100644
--- a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
+++ b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pborman/uuid"
 
 	"k8s.io/minikube/pkg/drivers/hyperkit"
-	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/registry"
@@ -57,28 +57,29 @@ func init() {
 	}
 }
 
-func configure(config cfg.ClusterConfig) (interface{}, error) {
-	u := config.UUID
+func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
+	u := cfg.UUID
 	if u == "" {
 		u = uuid.NewUUID().String()
 	}
 
 	return &hyperkit.Driver{
 		BaseDriver: &drivers.BaseDriver{
-			MachineName: config.Name,
+			MachineName: cfg.Name,
 			StorePath:   localpath.MiniPath(),
 			SSHUser:     "docker",
 		},
-		Boot2DockerURL: config.Downloader.GetISOFileURI(config.MinikubeISO),
-		DiskSize:       config.DiskSize,
-		Memory:         config.Memory,
-		CPU:            config.CPUs,
-		NFSShares:      config.NFSShare,
-		NFSSharesRoot:  config.NFSSharesRoot,
+		ClusterName:    cfg.Name,
+		Boot2DockerURL: cfg.Downloader.GetISOFileURI(cfg.MinikubeISO),
+		DiskSize:       cfg.DiskSize,
+		Memory:         cfg.Memory,
+		CPU:            cfg.CPUs,
+		NFSShares:      cfg.NFSShare,
+		NFSSharesRoot:  cfg.NFSSharesRoot,
 		UUID:           u,
-		VpnKitSock:     config.HyperkitVpnKitSock,
-		VSockPorts:     config.HyperkitVSockPorts,
-		Cmdline:        "loglevel=3 console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes random.trust_cpu=on hw_rng_model=virtio base host=" + config.Name,
+		VpnKitSock:     cfg.HyperkitVpnKitSock,
+		VSockPorts:     cfg.HyperkitVSockPorts,
+		Cmdline:        "loglevel=3 console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes random.trust_cpu=on hw_rng_model=virtio base host=" + n.Name,
 	}, nil
 }
 
diff --git a/pkg/minikube/registry/drvs/parallels/parallels.go b/pkg/minikube/registry/drvs/parallels/parallels.go
index 79d0e9085e..29095a6226 100644
--- a/pkg/minikube/registry/drvs/parallels/parallels.go
+++ b/pkg/minikube/registry/drvs/parallels/parallels.go
@@ -24,7 +24,7 @@ import (
 
 	parallels "github.com/Parallels/docker-machine-parallels"
 	"github.com/docker/machine/libmachine/drivers"
-	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/registry"
@@ -44,12 +44,12 @@ func init() {
 
 }
 
-func configure(config cfg.ClusterConfig) (interface{}, error) {
-	d := parallels.NewDriver(config.Name, localpath.MiniPath()).(*parallels.Driver)
-	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
-	d.Memory = config.Memory
-	d.CPU = config.CPUs
-	d.DiskSize = config.DiskSize
+func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
+	d := parallels.NewDriver(n.Name, localpath.MiniPath()).(*parallels.Driver)
+	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
+	d.Memory = cfg.Memory
+	d.CPU = cfg.CPUs
+	d.DiskSize = cfg.DiskSize
 	return d, nil
 }
 
diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go
index ec5d6013ac..eab3200b83 100644
--- a/pkg/minikube/registry/drvs/podman/podman.go
+++ b/pkg/minikube/registry/drvs/podman/podman.go
@@ -49,15 +49,15 @@ func init() {
 	}
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   mc.Name,
+		MachineName:   n.Name,
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   strings.Split(kic.BaseImage, "@")[0], // for podman does not support docker images references with both a tag and digest.
 		CPU:           mc.CPUs,
 		Memory:        mc.Memory,
 		OCIBinary:     oci.Podman,
-		APIServerPort: mc.Nodes[0].Port,
+		APIServerPort: n.Port,
 	}), nil
 }
 
diff --git a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
index c3888c3758..7dd13af948 100644
--- a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
+++ b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
@@ -49,8 +49,8 @@ func init() {
 	}
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
-	d := virtualbox.NewDriver(mc.Name, localpath.MiniPath())
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
+	d := virtualbox.NewDriver(n.Name, localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmware/vmware.go b/pkg/minikube/registry/drvs/vmware/vmware.go
index 0333dce541..b6a90929c9 100644
--- a/pkg/minikube/registry/drvs/vmware/vmware.go
+++ b/pkg/minikube/registry/drvs/vmware/vmware.go
@@ -39,8 +39,8 @@ func init() {
 	}
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
-	d := vmwcfg.NewConfig(mc.Name, localpath.MiniPath())
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
+	d := vmwcfg.NewConfig(n.Name, localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
index 524e50f88c..adc50d70e8 100644
--- a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
+++ b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
@@ -26,7 +26,7 @@ import (
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/pkg/errors"
 
-	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/registry"
@@ -44,12 +44,12 @@ func init() {
 	}
 }
 
-func configure(config cfg.ClusterConfig) (interface{}, error) {
-	d := vmwarefusion.NewDriver(config.Name, localpath.MiniPath()).(*vmwarefusion.Driver)
-	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
-	d.Memory = config.Memory
-	d.CPU = config.CPUs
-	d.DiskSize = config.DiskSize
+func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
+	d := vmwarefusion.NewDriver(n.Name, localpath.MiniPath()).(*vmwarefusion.Driver)
+	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
+	d.Memory = cfg.Memory
+	d.CPU = cfg.CPUs
+	d.DiskSize = cfg.DiskSize
 
 	// TODO(philips): push these defaults upstream to fixup this driver
 	d.SSHPort = 22
diff --git a/pkg/minikube/registry/registry.go b/pkg/minikube/registry/registry.go
index e5fb98ce51..794dffc18a 100644
--- a/pkg/minikube/registry/registry.go
+++ b/pkg/minikube/registry/registry.go
@@ -60,7 +60,7 @@ type Registry interface {
 }
 
 // Configurator emits a struct to be marshalled into JSON for Machine Driver
-type Configurator func(config.ClusterConfig) (interface{}, error)
+type Configurator func(config.ClusterConfig, config.Node) (interface{}, error)
 
 // Loader is a function that loads a byte stream and creates a driver.
 type Loader func() drivers.Driver

From be9c5f476149bc8904924c24043568180b0db70c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 15:58:35 -0800
Subject: [PATCH 022/668] pass in the node object into add

---
 cmd/minikube/cmd/node_add.go | 10 +++++++++-
 cmd/minikube/cmd/start.go    |  8 +++++++-
 pkg/minikube/node/node.go    | 24 ++----------------------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index fe5557258d..8cb836edea 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -53,7 +53,15 @@ var nodeAddCmd = &cobra.Command{
 		}
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
-		err = node.Add(mc, name, cp, worker, "", profile)
+		// TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here.
+		n := config.Node{
+			Name:              name,
+			Worker:            worker,
+			ControlPlane:      cp,
+			KubernetesVersion: mc.KubernetesConfig.KubernetesVersion,
+		}
+
+		err = node.Add(mc, n)
 		if err != nil {
 			exit.WithError("Error adding node to cluster", err)
 		}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index fbb30b7adb..0aa5a8691a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -357,7 +357,13 @@ func runStart(cmd *cobra.Command, args []string) {
 	if numNodes > 1 {
 		for i := 0; i < numNodes-1; i++ {
 			nodeName := fmt.Sprintf("%s%d", n.Name, i+1)
-			node.Add(&mc, nodeName, false, true, "", "")
+			n := config.Node{
+				Name:              nodeName,
+				Worker:            true,
+				ControlPlane:      false,
+				KubernetesVersion: mc.KubernetesConfig.KubernetesVersion,
+			}
+			node.Add(&mc, n)
 		}
 	}
 }
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index af9856d077..86df75e021 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -38,29 +38,9 @@ const (
 )
 
 // Add adds a new node config to an existing cluster.
-func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) error {
-	n := config.Node{
-		Name:   name,
-		Worker: true,
-	}
-
-	// TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here.
-	if controlPlane {
-		n.ControlPlane = true
-	}
-
-	if !worker {
-		n.Worker = false
-	}
-
-	if k8sVersion != "" {
-		n.KubernetesVersion = k8sVersion
-	} else {
-		n.KubernetesVersion = cc.KubernetesConfig.KubernetesVersion
-	}
-
+func Add(cc *config.ClusterConfig, n config.Node) error {
 	cc.Nodes = append(cc.Nodes, n)
-	err := config.SaveProfile(profileName, cc)
+	err := config.SaveProfile(cc.Name, cc)
 	if err != nil {
 		return err
 	}

From f0ca34b0b549f267e60622cdb505a00e265ef615 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 16:17:29 -0800
Subject: [PATCH 023/668] fix unit tests

---
 pkg/minikube/machine/cluster_test.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 2053320a75..449acd729e 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -75,27 +75,26 @@ func TestCreateHost(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 
-	profile := viper.GetString("profile")
-	exists, _ := api.Exists(profile)
+	exists, _ := api.Exists(viper.GetString("profile"))
 	if exists {
 		t.Fatal("Machine already exists.")
 	}
 
-	n := config.Node{Name: profile}
+	n := config.Node{Name: viper.GetString("profile")}
 
 	_, err := createHost(api, defaultClusterConfig, n)
 	if err != nil {
 		t.Fatalf("Error creating host: %v", err)
 	}
-	exists, err = api.Exists(profile)
+	exists, err = api.Exists(viper.GetString("profile"))
 	if err != nil {
-		t.Fatalf("exists failed for %q: %v", profile, err)
+		t.Fatalf("exists failed for %q: %v", viper.GetString("profile"), err)
 	}
 	if !exists {
-		t.Fatalf("%q does not exist, but should.", profile)
+		t.Fatalf("%q does not exist, but should.", viper.GetString("profile"))
 	}
 
-	h, err := api.Load(profile)
+	h, err := api.Load(viper.GetString("profile"))
 	if err != nil {
 		t.Fatalf("Error loading machine: %v", err)
 	}
@@ -121,6 +120,8 @@ func TestStartHostExists(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 
+	n := defaultNodeConfig
+
 	// Create an initial host.
 	ih, err := createHost(api, defaultClusterConfig, defaultNodeConfig)
 	if err != nil {
@@ -139,8 +140,10 @@ func TestStartHostExists(t *testing.T) {
 	mc := defaultClusterConfig
 	mc.Name = ih.Name
 
+	n.Name = ih.Name
+
 	// This should pass without calling Create because the host exists already.
-	h, err := StartHost(api, mc, defaultNodeConfig)
+	h, err := StartHost(api, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -294,13 +297,13 @@ func TestStartHostConfig(t *testing.T) {
 	}
 
 	for i := range h.HostOptions.EngineOptions.Env {
-		if h.HostOptions.EngineOptions.Env[i] != config.DockerEnv[i] {
+		if h.HostOptions.EngineOptions.Env[i] != cfg.DockerEnv[i] {
 			t.Fatal("Docker env variables were not set!")
 		}
 	}
 
 	for i := range h.HostOptions.EngineOptions.ArbitraryFlags {
-		if h.HostOptions.EngineOptions.ArbitraryFlags[i] != config.DockerOpt[i] {
+		if h.HostOptions.EngineOptions.ArbitraryFlags[i] != cfg.DockerOpt[i] {
 			t.Fatal("Docker flags were not set!")
 		}
 	}

From b2ba874d560b1b2b613ffe7d8d837c7890918630 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 16:27:05 -0800
Subject: [PATCH 024/668] SaveNode is simpler yeah

---
 pkg/minikube/cluster/setup.go  | 2 +-
 pkg/minikube/config/profile.go | 4 ++--
 pkg/minikube/node/node.go      | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index d786312820..dc1f46a0cd 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -165,7 +165,7 @@ func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 	}
 
 	node.IP = ip
-	config.SaveNodeToProfile(cfg, node)
+	config.SaveNode(cfg, node)
 
 	return runner, preExists, m, host
 }
diff --git a/pkg/minikube/config/profile.go b/pkg/minikube/config/profile.go
index 0acfe1a8b4..78dee9a57e 100644
--- a/pkg/minikube/config/profile.go
+++ b/pkg/minikube/config/profile.go
@@ -91,8 +91,8 @@ func CreateEmptyProfile(name string, miniHome ...string) error {
 	return SaveProfile(name, cfg, miniHome...)
 }
 
-// SaveNodeToProfile saves a node to a cluster
-func SaveNodeToProfile(cfg *ClusterConfig, node *Node) error {
+// SaveNode saves a node to a cluster
+func SaveNode(cfg *ClusterConfig, node *Node) error {
 	update := false
 	for i, n := range cfg.Nodes {
 		if n.Name == node.Name {
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 86df75e021..b7c3cab1fd 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -39,14 +39,13 @@ const (
 
 // Add adds a new node config to an existing cluster.
 func Add(cc *config.ClusterConfig, n config.Node) error {
-	cc.Nodes = append(cc.Nodes, n)
-	err := config.SaveProfile(cc.Name, cc)
+
+	err := config.SaveNode(cc, &n)
 	if err != nil {
 		return err
 	}
 
 	err = Start(*cc, n, nil)
-
 	return err
 }
 

From f5bdba6088c272901bba9e6113492d7a006f9eb6 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 16:47:07 -0800
Subject: [PATCH 025/668] fix kvm2 configurator

---
 pkg/minikube/registry/drvs/kvm2/kvm2.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go
index a3dbf67193..5dd00c12c3 100644
--- a/pkg/minikube/registry/drvs/kvm2/kvm2.go
+++ b/pkg/minikube/registry/drvs/kvm2/kvm2.go
@@ -67,8 +67,8 @@ type kvmDriver struct {
 	ConnectionURI  string
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
-	name := mc.Name
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
+	name := n.Name
 	return kvmDriver{
 		BaseDriver: &drivers.BaseDriver{
 			MachineName: name,

From feaa9fc3b3549cc7ec358998a614da45e382a632 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 16:50:30 -0800
Subject: [PATCH 026/668] hyperv and none drivers needed fixing too

---
 pkg/minikube/registry/drvs/hyperv/hyperv.go | 22 ++++++++++-----------
 pkg/minikube/registry/drvs/none/none.go     |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index 89f63c93f3..841d38d540 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -29,7 +29,7 @@ import (
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/pkg/errors"
 
-	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/registry"
@@ -52,16 +52,16 @@ func init() {
 	}
 }
 
-func configure(config cfg.ClusterConfig) (interface{}, error) {
-	d := hyperv.NewDriver(config.Name, localpath.MiniPath())
-	d.Boot2DockerURL = config.Downloader.GetISOFileURI(config.MinikubeISO)
-	d.VSwitch = config.HypervVirtualSwitch
-	if d.VSwitch == "" && config.HypervUseExternalSwitch {
-		switchName, adapter, err := chooseSwitch(config.HypervExternalAdapter)
+func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
+	d := hyperv.NewDriver(n.Name, localpath.MiniPath())
+	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
+	d.VSwitch = cfg.HypervVirtualSwitch
+	if d.VSwitch == "" && cfg.HypervUseExternalSwitch {
+		switchName, adapter, err := chooseSwitch(cfg.HypervExternalAdapter)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to choose switch for Hyper-V driver")
 		}
-		if config.HypervExternalAdapter == "" && switchName == "" {
+		if cfg.HypervExternalAdapter == "" && switchName == "" {
 			// create a switch on the returned adapter
 			switchName = defaultExternalSwitchName
 			err := createVMSwitch(switchName, adapter)
@@ -71,9 +71,9 @@ func configure(config cfg.ClusterConfig) (interface{}, error) {
 		}
 		d.VSwitch = switchName
 	}
-	d.MemSize = config.Memory
-	d.CPU = config.CPUs
-	d.DiskSize = config.DiskSize
+	d.MemSize = cfg.Memory
+	d.CPU = cfg.CPUs
+	d.DiskSize = cfg.DiskSize
 	d.SSHUser = "docker"
 	d.DisableDynamicMemory = true // default to disable dynamic memory as minikube is unlikely to work properly with dynamic memory
 	return d, nil
diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index 4e1ae1a794..4bf39d6d7b 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -42,9 +42,9 @@ func init() {
 	}
 }
 
-func configure(mc config.ClusterConfig) (interface{}, error) {
+func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return none.NewDriver(none.Config{
-		MachineName:      mc.Name,
+		MachineName:      n.Name,
 		StorePath:        localpath.MiniPath(),
 		ContainerRuntime: mc.KubernetesConfig.ContainerRuntime,
 	}), nil

From 3d7215295384af1b6a72fa8aa04d2b757eadc2f6 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 17:28:10 -0800
Subject: [PATCH 027/668] fixing lint and other random incorrect stuff

---
 cmd/minikube/cmd/delete.go                   |  3 ++-
 cmd/minikube/cmd/start.go                    | 10 ++++++++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  2 +-
 pkg/minikube/cluster/setup.go                |  6 ++++--
 pkg/minikube/node/node.go                    |  2 --
 pkg/minikube/node/start.go                   |  8 +++++++-
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 9f43331c70..cc74e5b89e 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -229,8 +229,9 @@ func deleteProfile(profile *pkg_config.Profile) error {
 					delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
 					deletionError.Err = delErr
 					e = deletionError
+				} else {
+					e = err
 				}
-				e = err
 			}
 		}
 		if e != nil {
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0aa5a8691a..194c1c988a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -355,7 +355,10 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	numNodes := viper.GetInt(nodes)
 	if numNodes > 1 {
-		for i := 0; i < numNodes-1; i++ {
+		if driver.IsKIC(driverName) {
+			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
+		}
+		for i := 1; i < numNodes; i++ {
 			nodeName := fmt.Sprintf("%s%d", n.Name, i+1)
 			n := config.Node{
 				Name:              nodeName,
@@ -363,7 +366,10 @@ func runStart(cmd *cobra.Command, args []string) {
 				ControlPlane:      false,
 				KubernetesVersion: mc.KubernetesConfig.KubernetesVersion,
 			}
-			node.Add(&mc, n)
+			err := node.Add(&mc, n)
+			if err != nil {
+				exit.WithError("adding node", err)
+			}
 		}
 	}
 }
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 663e538f8c..6d1110c5de 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -371,7 +371,7 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 	fmt.Println(joinCmd)
 	out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
 	if err != nil {
-		return errors.Wrapf(err, "cmd failed: %s\n%s\n", joinCmd, out)
+		return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out)
 	}
 
 	if _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", "sudo systemctl daemon-reload && sudo systemctl enable kubelet && sudo systemctl start kubelet")); err != nil {
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index dc1f46a0cd..ab5bd09d45 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -52,7 +52,6 @@ const (
 	embedCerts       = "embed-certs"
 	keepContext      = "keep-context"
 	imageRepository  = "image-repository"
-	containerRuntime = "container-runtime"
 )
 
 // InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
@@ -165,7 +164,10 @@ func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 	}
 
 	node.IP = ip
-	config.SaveNode(cfg, node)
+	err = config.SaveNode(cfg, node)
+	if err != nil {
+		exit.WithError("saving node", err)
+	}
 
 	return runner, preExists, m, host
 }
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index b7c3cab1fd..1f2147cbc5 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -30,8 +30,6 @@ const (
 	waitUntilHealthy    = "wait"
 	cacheImageConfigKey = "cache"
 	containerRuntime    = "container-runtime"
-	embedCerts          = "embed-certs"
-	keepContext         = "keep-context"
 	mountString         = "mount-string"
 	createMount         = "mount"
 	waitTimeout         = "wait-timeout"
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 22dd8ac868..a57a48a150 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -88,7 +88,10 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 	}
 
-	bs.SetupCerts(cc.KubernetesConfig, n)
+	err = bs.SetupCerts(cc.KubernetesConfig, n)
+	if err != nil {
+		exit.WithError("setting up certs", err)
+	}
 
 	cp, err := config.PrimaryControlPlane(cc)
 	if err != nil {
@@ -99,6 +102,9 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		exit.WithError("Getting bootstrapper", err)
 	}
 	joinCmd, err := cpBs.GenerateToken(cc.KubernetesConfig)
+	if err != nil {
+		exit.WithError("generating join token", err)
+	}
 	return bs.JoinCluster(cc, n, joinCmd)
 }
 

From 39f03bc925a0d7057c4bc2d1a8d93cc92a3fb32d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 24 Feb 2020 17:39:41 -0800
Subject: [PATCH 028/668] prepareNone was in the wrong spot

---
 pkg/minikube/cluster/setup.go | 36 ++++++++++++++++++++++++++++++++
 pkg/minikube/node/start.go    | 39 -----------------------------------
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index ab5bd09d45..d8b5e3ed48 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -43,6 +43,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
+	"k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -83,6 +84,12 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 		addons.Start(viper.GetString(config.MachineProfile), existingAddons, config.AddonList)
 	}
 
+	// special ops for none , like change minikube directory.
+	// multinode super doesn't work on the none driver
+	if cc.Driver == driver.None && len(cc.Nodes) == 1 {
+		prepareNone()
+	}
+
 	// Skip pre-existing, because we already waited for health
 	if viper.GetBool(waitUntilHealthy) && !preExists {
 		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
@@ -287,3 +294,32 @@ func tryRegistry(r command.Runner) {
 		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
 	}
 }
+
+// prepareNone prepares the user and host for the joy of the "none" driver
+func prepareNone() {
+	out.T(out.StartingNone, "Configuring local host environment ...")
+	if viper.GetBool(config.WantNoneDriverWarning) {
+		out.T(out.Empty, "")
+		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
+		out.WarningT("For more information, see:")
+		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.T(out.Empty, "")
+	}
+
+	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
+		home := os.Getenv("HOME")
+		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
+		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
+
+		out.T(out.Empty, "")
+		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
+		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
+		out.T(out.Empty, "")
+
+		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
+	}
+
+	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {
+		exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
+	}
+}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index a57a48a150..b7ebb5f816 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -17,17 +17,13 @@ limitations under the License.
 package node
 
 import (
-	"os"
-
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util"
 )
@@ -75,12 +71,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 
-	// special ops for none , like change minikube directory.
-	// multinode super doesn't work on the none driver
-	if driverName == driver.None && len(cc.Nodes) == 1 {
-		prepareNone()
-	}
-
 	// Skip pre-existing, because we already waited for health
 	if viper.GetBool(waitUntilHealthy) && !preExists {
 		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
@@ -107,32 +97,3 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 	return bs.JoinCluster(cc, n, joinCmd)
 }
-
-// prepareNone prepares the user and host for the joy of the "none" driver
-func prepareNone() {
-	out.T(out.StartingNone, "Configuring local host environment ...")
-	if viper.GetBool(config.WantNoneDriverWarning) {
-		out.T(out.Empty, "")
-		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
-		out.WarningT("For more information, see:")
-		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
-		out.T(out.Empty, "")
-	}
-
-	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
-		home := os.Getenv("HOME")
-		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
-		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
-
-		out.T(out.Empty, "")
-		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
-		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
-		out.T(out.Empty, "")
-
-		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
-	}
-
-	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {
-		exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
-	}
-}

From 0fadf91d2cbd79da48549e35fcc256f5045a49f3 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 25 Feb 2020 16:36:53 -0800
Subject: [PATCH 029/668] i think it works?

---
 cmd/minikube/cmd/delete.go                    | 39 ++++-----
 cmd/minikube/cmd/logs.go                      |  2 +-
 cmd/minikube/cmd/status.go                    | 87 ++++++++++++-------
 pkg/drivers/hyperkit/driver.go                |  3 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  3 +-
 pkg/minikube/cluster/cluster.go               |  4 +-
 pkg/minikube/cluster/setup.go                 |  2 +-
 pkg/minikube/node/start.go                    |  4 +-
 pkg/minikube/registry/drvs/docker/docker.go   |  2 +-
 .../registry/drvs/hyperkit/hyperkit.go        |  3 +-
 pkg/minikube/registry/drvs/hyperv/hyperv.go   |  2 +-
 pkg/minikube/registry/drvs/kvm2/kvm2.go       |  2 +-
 .../registry/drvs/parallels/parallels.go      |  2 +-
 pkg/minikube/registry/drvs/podman/podman.go   |  2 +-
 .../registry/drvs/virtualbox/virtualbox.go    |  2 +-
 pkg/minikube/registry/drvs/vmware/vmware.go   |  2 +-
 .../drvs/vmwarefusion/vmwarefusion.go         |  2 +-
 pkg/provision/provision.go                    |  3 +-
 18 files changed, 94 insertions(+), 72 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index cc74e5b89e..8ed30668b4 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -221,21 +221,14 @@ func deleteProfile(profile *pkg_config.Profile) error {
 	}
 
 	if err == nil && driver.BareMetal(cc.Driver) {
-		var e error
-		for _, n := range cc.Nodes {
-			if err := uninstallKubernetes(api, profile.Name, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper), n.Name); err != nil {
-				deletionError, ok := err.(DeletionError)
-				if ok {
-					delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
-					deletionError.Err = delErr
-					e = deletionError
-				} else {
-					e = err
-				}
+		if err := uninstallKubernetes(api, profile.Name, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper), cc.Nodes[0].Name); err != nil {
+			deletionError, ok := err.(DeletionError)
+			if ok {
+				delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
+				deletionError.Err = delErr
+				return deletionError
 			}
-		}
-		if e != nil {
-			return e
+			return err
 		}
 	}
 
@@ -243,13 +236,15 @@ func deleteProfile(profile *pkg_config.Profile) error {
 		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	if err = machine.DeleteHost(api, profile.Name); err != nil {
-		switch errors.Cause(err).(type) {
-		case mcnerror.ErrHostDoesNotExist:
-			glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
-		default:
-			out.T(out.FailureType, "Failed to delete cluster: {{.error}}", out.V{"error": err})
-			out.T(out.Notice, `You may need to manually remove the "{{.name}}" VM from your hypervisor`, out.V{"name": profile.Name})
+	for _, n := range cc.Nodes {
+		if err = machine.DeleteHost(api, n.Name); err != nil {
+			switch errors.Cause(err).(type) {
+			case mcnerror.ErrHostDoesNotExist:
+				glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
+			default:
+				out.T(out.FailureType, "Failed to delete cluster: {{.error}}", out.V{"error": err})
+				out.T(out.Notice, `You may need to manually remove the "{{.name}}" VM from your hypervisor`, out.V{"name": profile.Name})
+			}
 		}
 	}
 
@@ -311,7 +306,7 @@ func profileDeletionErr(profileName string, additionalInfo string) error {
 
 func uninstallKubernetes(api libmachine.API, profile string, kc pkg_config.KubernetesConfig, bsName string, nodeName string) error {
 	out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName})
-	clusterBootstrapper, err := cluster.Bootstrapper(api, bsName, nodeName)
+	clusterBootstrapper, err := cluster.Bootstrapper(api, bsName, profile, nodeName)
 	if err != nil {
 		return DeletionError{Err: fmt.Errorf("unable to get bootstrapper: %v", err), Errtype: Fatal}
 	}
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index 934ca9c1b0..7b6ff5f757 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -67,7 +67,7 @@ var logsCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("command runner", err)
 		}
-		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper), viper.GetString(config.MachineProfile))
+		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper), viper.GetString(config.MachineProfile), viper.GetString(config.MachineProfile))
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 0fb1c79284..dfd62da6eb 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -55,10 +55,13 @@ const (
 
 	// Nonexistent means nonexistent
 	Nonexistent = "Nonexistent" // ~state.None
+	// Irrelevant is used for statuses that aren't meaningful for worker nodes
+	Irrelevant = "Irrelevant"
 )
 
 // Status holds string representations of component states
 type Status struct {
+	Name       string
 	Host       string
 	Kubelet    string
 	APIServer  string
@@ -69,7 +72,8 @@ const (
 	minikubeNotRunningStatusFlag = 1 << 0
 	clusterNotRunningStatusFlag  = 1 << 1
 	k8sNotRunningStatusFlag      = 1 << 2
-	defaultStatusFormat          = `host: {{.Host}}
+	defaultStatusFormat          = `{{.Name}}
+host: {{.Host}}
 kubelet: {{.Kubelet}}
 apiserver: {{.APIServer}}
 kubeconfig: {{.Kubeconfig}}
@@ -95,26 +99,35 @@ var statusCmd = &cobra.Command{
 		}
 		defer api.Close()
 
-		machineName := viper.GetString(config.MachineProfile)
-		st, err := status(api, machineName)
+		cluster := viper.GetString(config.MachineProfile)
+		cc, err := config.Load(cluster)
 		if err != nil {
-			glog.Errorf("status error: %v", err)
-		}
-		if st.Host == Nonexistent {
-			glog.Errorf("The %q cluster does not exist!", machineName)
+			exit.WithError("getting config", err)
 		}
 
-		switch strings.ToLower(output) {
-		case "text":
-			if err := statusText(st, os.Stdout); err != nil {
-				exit.WithError("status text failure", err)
+		var st *Status
+		for _, n := range cc.Nodes {
+			machineName := fmt.Sprintf("%s-%s", cluster, n.Name)
+			st, err = status(api, machineName, n.ControlPlane)
+			if err != nil {
+				glog.Errorf("status error: %v", err)
 			}
-		case "json":
-			if err := statusJSON(st, os.Stdout); err != nil {
-				exit.WithError("status json failure", err)
+			if st.Host == Nonexistent {
+				glog.Errorf("The %q host does not exist!", machineName)
+			}
+
+			switch strings.ToLower(output) {
+			case "text":
+				if err := statusText(st, os.Stdout); err != nil {
+					exit.WithError("status text failure", err)
+				}
+			case "json":
+				if err := statusJSON(st, os.Stdout); err != nil {
+					exit.WithError("status json failure", err)
+				}
+			default:
+				exit.WithCodeT(exit.BadUsage, fmt.Sprintf("invalid output format: %s. Valid values: 'text', 'json'", output))
 			}
-		default:
-			exit.WithCodeT(exit.BadUsage, fmt.Sprintf("invalid output format: %s. Valid values: 'text', 'json'", output))
 		}
 
 		os.Exit(exitCode(st))
@@ -126,17 +139,22 @@ func exitCode(st *Status) int {
 	if st.Host != state.Running.String() {
 		c |= minikubeNotRunningStatusFlag
 	}
-	if st.APIServer != state.Running.String() || st.Kubelet != state.Running.String() {
+	if (st.APIServer != state.Running.String() && st.APIServer != Irrelevant) || st.Kubelet != state.Running.String() {
 		c |= clusterNotRunningStatusFlag
 	}
-	if st.Kubeconfig != Configured {
+	if st.Kubeconfig != Configured && st.Kubeconfig != Irrelevant {
 		c |= k8sNotRunningStatusFlag
 	}
 	return c
 }
 
-func status(api libmachine.API, name string) (*Status, error) {
+func status(api libmachine.API, name string, controlPlane bool) (*Status, error) {
+
+	profile := strings.Split(name, "-")[0]
+	node := strings.Split(name, "-")[1]
+
 	st := &Status{
+		Name:       node,
 		Host:       Nonexistent,
 		APIServer:  Nonexistent,
 		Kubelet:    Nonexistent,
@@ -179,10 +197,17 @@ func status(api libmachine.API, name string) (*Status, error) {
 	}
 
 	st.Kubeconfig = Misconfigured
-	ok, err := kubeconfig.IsClusterInConfig(ip, name)
-	glog.Infof("%s is in kubeconfig at ip %s: %v (err=%v)", name, ip, ok, err)
-	if ok {
-		st.Kubeconfig = Configured
+	if !controlPlane {
+		st.Kubeconfig = Irrelevant
+		st.APIServer = Irrelevant
+	}
+
+	if st.Kubeconfig != Irrelevant {
+		ok, err := kubeconfig.IsClusterInConfig(ip, profile)
+		glog.Infof("%s is in kubeconfig at ip %s: %v (err=%v)", name, ip, ok, err)
+		if ok {
+			st.Kubeconfig = Configured
+		}
 	}
 
 	host, err := machine.CheckIfHostExistsAndLoad(api, name)
@@ -205,14 +230,16 @@ func status(api libmachine.API, name string) (*Status, error) {
 		st.Kubelet = stk.String()
 	}
 
-	sta, err := kverify.APIServerStatus(cr, ip, port)
-	glog.Infof("%s apiserver status = %s (err=%v)", name, stk, err)
+	if st.APIServer != Irrelevant {
+		sta, err := kverify.APIServerStatus(cr, ip, port)
+		glog.Infof("%s apiserver status = %s (err=%v)", name, stk, err)
 
-	if err != nil {
-		glog.Errorln("Error apiserver status:", err)
-		st.APIServer = state.Error.String()
-	} else {
-		st.APIServer = sta.String()
+		if err != nil {
+			glog.Errorln("Error apiserver status:", err)
+			st.APIServer = state.Error.String()
+		} else {
+			st.APIServer = sta.String()
+		}
 	}
 
 	return st, nil
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
index 9659237408..d3d1031629 100644
--- a/pkg/drivers/hyperkit/driver.go
+++ b/pkg/drivers/hyperkit/driver.go
@@ -65,7 +65,6 @@ type Driver struct {
 	UUID           string
 	VpnKitSock     string
 	VSockPorts     []string
-	ClusterName    string
 }
 
 // NewDriver creates a new driver for a host
@@ -200,7 +199,7 @@ func (d *Driver) Restart() error {
 }
 
 func (d *Driver) createHost() (*hyperkit.HyperKit, error) {
-	stateDir := filepath.Join(d.StorePath, "machines", d.ClusterName, d.MachineName)
+	stateDir := filepath.Join(d.StorePath, "machines", d.MachineName)
 	h, err := hyperkit.New("", d.VpnKitSock, stateDir)
 	if err != nil {
 		return nil, errors.Wrap(err, "new-ing Hyperkit")
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 6d1110c5de..5ae6c09033 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -36,6 +36,7 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"github.com/spf13/viper"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/drivers/kic"
@@ -73,7 +74,7 @@ func NewBootstrapper(api libmachine.API, name string) (*Bootstrapper, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "command runner")
 	}
-	return &Bootstrapper{c: runner, contextName: name, k8sClient: nil}, nil
+	return &Bootstrapper{c: runner, contextName: viper.GetString(config.MachineProfile), k8sClient: nil}, nil
 }
 
 // GetKubeletStatus returns the kubelet status
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index a2b9e06613..a38a4cf8b6 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -42,12 +42,12 @@ func init() {
 }
 
 // Bootstrapper returns a new bootstrapper for the cluster
-func Bootstrapper(api libmachine.API, bootstrapperName string, machineName string) (bootstrapper.Bootstrapper, error) {
+func Bootstrapper(api libmachine.API, bootstrapperName string, cluster string, nodeName string) (bootstrapper.Bootstrapper, error) {
 	var b bootstrapper.Bootstrapper
 	var err error
 	switch bootstrapperName {
 	case bootstrapper.Kubeadm:
-		b, err = kubeadm.NewBootstrapper(api, machineName)
+		b, err = kubeadm.NewBootstrapper(api, fmt.Sprintf("%s-%s", cluster, nodeName))
 		if err != nil {
 			return nil, errors.Wrap(err, "getting a new kubeadm bootstrapper")
 		}
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index d8b5e3ed48..b784cb01e9 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -103,7 +103,7 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 
 // setupKubeAdm adds any requested files into the VM before Kubernetes is started
 func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
-	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), n.Name)
+	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg.Name, n.Name)
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
 	}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index b7ebb5f816..6bf1aef74a 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -42,7 +42,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	runner, preExists, mAPI, _ := cluster.StartMachine(&cc, &n)
 	defer mAPI.Close()
 
-	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), n.Name)
+	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc.Name, n.Name)
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
 	}
@@ -87,7 +87,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	if err != nil {
 		exit.WithError("Getting primary control plane", err)
 	}
-	cpBs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cp.Name)
+	cpBs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc.Name, cp.Name)
 	if err != nil {
 		exit.WithError("Getting bootstrapper", err)
 	}
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index d5278a8f92..4f3acbad62 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -45,7 +45,7 @@ func init() {
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   n.Name,
+		MachineName:   fmt.Sprintf("%s-%s", mc.Name, n.Name),
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   kic.BaseImage,
 		CPU:           mc.CPUs,
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
index b9e4b4f09f..0f0609176e 100644
--- a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
+++ b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -65,11 +65,10 @@ func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
 
 	return &hyperkit.Driver{
 		BaseDriver: &drivers.BaseDriver{
-			MachineName: cfg.Name,
+			MachineName: fmt.Sprintf("%s-%s", cfg.Name, n.Name),
 			StorePath:   localpath.MiniPath(),
 			SSHUser:     "docker",
 		},
-		ClusterName:    cfg.Name,
 		Boot2DockerURL: cfg.Downloader.GetISOFileURI(cfg.MinikubeISO),
 		DiskSize:       cfg.DiskSize,
 		Memory:         cfg.Memory,
diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index 841d38d540..fccb1b9076 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -53,7 +53,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := hyperv.NewDriver(n.Name, localpath.MiniPath())
+	d := hyperv.NewDriver(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.VSwitch = cfg.HypervVirtualSwitch
 	if d.VSwitch == "" && cfg.HypervUseExternalSwitch {
diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go
index 5dd00c12c3..eb1e2d1773 100644
--- a/pkg/minikube/registry/drvs/kvm2/kvm2.go
+++ b/pkg/minikube/registry/drvs/kvm2/kvm2.go
@@ -68,7 +68,7 @@ type kvmDriver struct {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	name := n.Name
+	name := fmt.Sprintf("%s-%s", mc.Name, n.Name)
 	return kvmDriver{
 		BaseDriver: &drivers.BaseDriver{
 			MachineName: name,
diff --git a/pkg/minikube/registry/drvs/parallels/parallels.go b/pkg/minikube/registry/drvs/parallels/parallels.go
index 29095a6226..a2ae347949 100644
--- a/pkg/minikube/registry/drvs/parallels/parallels.go
+++ b/pkg/minikube/registry/drvs/parallels/parallels.go
@@ -45,7 +45,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := parallels.NewDriver(n.Name, localpath.MiniPath()).(*parallels.Driver)
+	d := parallels.NewDriver(fmt.Sprintf("%s-%s", cfg.Name, n.Name), localpath.MiniPath()).(*parallels.Driver)
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.Memory = cfg.Memory
 	d.CPU = cfg.CPUs
diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go
index eab3200b83..e05c6671f2 100644
--- a/pkg/minikube/registry/drvs/podman/podman.go
+++ b/pkg/minikube/registry/drvs/podman/podman.go
@@ -51,7 +51,7 @@ func init() {
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   n.Name,
+		MachineName:   fmt.Sprintf("%s-%s", mc.Name, n.Name),
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   strings.Split(kic.BaseImage, "@")[0], // for podman does not support docker images references with both a tag and digest.
 		CPU:           mc.CPUs,
diff --git a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
index 7dd13af948..fcbbcc9440 100644
--- a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
+++ b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
@@ -50,7 +50,7 @@ func init() {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := virtualbox.NewDriver(n.Name, localpath.MiniPath())
+	d := virtualbox.NewDriver(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmware/vmware.go b/pkg/minikube/registry/drvs/vmware/vmware.go
index b6a90929c9..33b3e7c586 100644
--- a/pkg/minikube/registry/drvs/vmware/vmware.go
+++ b/pkg/minikube/registry/drvs/vmware/vmware.go
@@ -40,7 +40,7 @@ func init() {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := vmwcfg.NewConfig(n.Name, localpath.MiniPath())
+	d := vmwcfg.NewConfig(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
index adc50d70e8..47047ffe3f 100644
--- a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
+++ b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
@@ -45,7 +45,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := vmwarefusion.NewDriver(n.Name, localpath.MiniPath()).(*vmwarefusion.Driver)
+	d := vmwarefusion.NewDriver(fmt.Sprintf("%s-%s", cfg.Name, n.Name), localpath.MiniPath()).(*vmwarefusion.Driver)
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.Memory = cfg.Memory
 	d.CPU = cfg.CPUs
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 52fb131960..ff5f08fef8 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -195,7 +195,8 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
 }
 
 func setContainerRuntimeOptions(name string, p miniProvisioner) error {
-	c, err := config.Load(name)
+	cluster := strings.Split(name, "-")[0]
+	c, err := config.Load(cluster)
 	if err != nil {
 		return errors.Wrap(err, "getting cluster config")
 	}

From e3826a5e4756714b69b305b4a0f4101fcf5b5b94 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 25 Feb 2020 17:18:25 -0800
Subject: [PATCH 030/668] fix ip command

---
 cmd/minikube/cmd/ip.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/ip.go b/cmd/minikube/cmd/ip.go
index 5d00182dde..e4ef171a1a 100644
--- a/cmd/minikube/cmd/ip.go
+++ b/cmd/minikube/cmd/ip.go
@@ -17,6 +17,8 @@ limitations under the License.
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/docker/machine/libmachine/mcnerror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -43,11 +45,12 @@ var ipCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		host, err := api.Load(cc.Name)
+		machineName := fmt.Sprintf("%s-%s", cc.Name, cc.Nodes[0].Name)
+		host, err := api.Load(machineName)
 		if err != nil {
 			switch err := errors.Cause(err).(type) {
 			case mcnerror.ErrHostDoesNotExist:
-				exit.WithCodeT(exit.NoInput, `"{{.profile_name}}" host does not exist, unable to show an IP`, out.V{"profile_name": cc.Name})
+				exit.WithCodeT(exit.NoInput, `"{{.profile_name}}" host does not exist, unable to show an IP`, out.V{"profile_name": machineName})
 			default:
 				exit.WithError("Error getting host", err)
 			}

From 676588f6b6f811e6941314d8cc40ef535743ff9b Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 25 Feb 2020 23:47:08 -0800
Subject: [PATCH 031/668] refactor machine name creation into a function

---
 cmd/minikube/cmd/ip.go                              |  5 ++---
 cmd/minikube/cmd/ssh.go                             | 13 +++++++++++--
 cmd/minikube/cmd/status.go                          |  3 ++-
 cmd/minikube/cmd/status_test.go                     | 12 ++++++------
 pkg/minikube/cluster/cluster.go                     |  3 ++-
 pkg/minikube/driver/driver.go                       |  5 +++++
 pkg/minikube/machine/cluster_test.go                | 11 +++++++----
 pkg/minikube/machine/machine.go                     |  5 +----
 pkg/minikube/registry/drvs/docker/docker.go         |  2 +-
 pkg/minikube/registry/drvs/hyperkit/hyperkit.go     |  2 +-
 pkg/minikube/registry/drvs/hyperv/hyperv.go         |  2 +-
 pkg/minikube/registry/drvs/kvm2/kvm2.go             |  2 +-
 pkg/minikube/registry/drvs/parallels/parallels.go   |  2 +-
 pkg/minikube/registry/drvs/podman/podman.go         |  2 +-
 pkg/minikube/registry/drvs/virtualbox/virtualbox.go |  2 +-
 pkg/minikube/registry/drvs/vmware/vmware.go         |  2 +-
 .../registry/drvs/vmwarefusion/vmwarefusion.go      |  2 +-
 17 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/cmd/minikube/cmd/ip.go b/cmd/minikube/cmd/ip.go
index e4ef171a1a..a6b607eb12 100644
--- a/cmd/minikube/cmd/ip.go
+++ b/cmd/minikube/cmd/ip.go
@@ -17,13 +17,12 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/docker/machine/libmachine/mcnerror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -45,7 +44,7 @@ var ipCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		machineName := fmt.Sprintf("%s-%s", cc.Name, cc.Nodes[0].Name)
+		machineName := driver.MachineName(cc.Name, cc.Nodes[0].Name)
 		host, err := api.Load(machineName)
 		if err != nil {
 			switch err := errors.Cause(err).(type) {
diff --git a/cmd/minikube/cmd/ssh.go b/cmd/minikube/cmd/ssh.go
index 84dead06e1..2ae2e5febd 100644
--- a/cmd/minikube/cmd/ssh.go
+++ b/cmd/minikube/cmd/ssh.go
@@ -45,7 +45,15 @@ var sshCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		host, err := machine.CheckIfHostExistsAndLoad(api, cc.Name)
+
+		if nodeName == "" {
+			cp, err := config.PrimaryControlPlane(*cc)
+			if err != nil {
+				exit.WithError("Getting primary control plane", err)
+			}
+			nodeName = cp.Name
+		}
+		host, err := machine.CheckIfHostExistsAndLoad(api, driver.MachineName(cc.Name, nodeName))
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}
@@ -58,7 +66,7 @@ var sshCmd = &cobra.Command{
 			ssh.SetDefaultClient(ssh.External)
 		}
 
-		err = machine.CreateSSHShell(api, args)
+		err = machine.CreateSSHShell(api, driver.MachineName(cc.Name, nodeName), args)
 		if err != nil {
 			// This is typically due to a non-zero exit code, so no need for flourish.
 			out.ErrLn("ssh: %v", err)
@@ -70,4 +78,5 @@ var sshCmd = &cobra.Command{
 
 func init() {
 	sshCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
+	sshCmd.Flags().StringVarP(&nodeName, "node", "n", "", "The node to ssh into. Defaults to the primary control plane.")
 }
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index dfd62da6eb..b7e3005c23 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -107,7 +108,7 @@ var statusCmd = &cobra.Command{
 
 		var st *Status
 		for _, n := range cc.Nodes {
-			machineName := fmt.Sprintf("%s-%s", cluster, n.Name)
+			machineName := driver.MachineName(cluster, n.Name)
 			st, err = status(api, machineName, n.ControlPlane)
 			if err != nil {
 				glog.Errorf("status error: %v", err)
diff --git a/cmd/minikube/cmd/status_test.go b/cmd/minikube/cmd/status_test.go
index ef414631f8..44f4133dfd 100644
--- a/cmd/minikube/cmd/status_test.go
+++ b/cmd/minikube/cmd/status_test.go
@@ -51,18 +51,18 @@ func TestStatusText(t *testing.T) {
 	}{
 		{
 			name:  "ok",
-			state: &Status{Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured},
-			want:  "host: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\n",
+			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured},
+			want:  "minikube\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\n",
 		},
 		{
 			name:  "paused",
-			state: &Status{Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured},
-			want:  "host: Running\nkubelet: Stopped\napiserver: Paused\nkubeconfig: Configured\n",
+			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured},
+			want:  "minikube\nhost: Running\nkubelet: Stopped\napiserver: Paused\nkubeconfig: Configured\n",
 		},
 		{
 			name:  "down",
-			state: &Status{Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured},
-			want:  "host: Stopped\nkubelet: Stopped\napiserver: Stopped\nkubeconfig: Misconfigured\n\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n",
+			state: &Status{Name: "minikube", Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured},
+			want:  "minikube\nhost: Stopped\nkubelet: Stopped\napiserver: Stopped\nkubeconfig: Misconfigured\n\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n",
 		},
 	}
 	for _, tc := range tests {
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index a38a4cf8b6..fd45d789aa 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -26,6 +26,7 @@ import (
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
 
@@ -47,7 +48,7 @@ func Bootstrapper(api libmachine.API, bootstrapperName string, cluster string, n
 	var err error
 	switch bootstrapperName {
 	case bootstrapper.Kubeadm:
-		b, err = kubeadm.NewBootstrapper(api, fmt.Sprintf("%s-%s", cluster, nodeName))
+		b, err = kubeadm.NewBootstrapper(api, driver.MachineName(cluster, nodeName))
 		if err != nil {
 			return nil, errors.Wrap(err, "getting a new kubeadm bootstrapper")
 		}
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index eb122f3f2f..21ebc7c432 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -108,6 +108,11 @@ func BareMetal(name string) bool {
 	return name == None || name == Mock
 }
 
+// MachineName return the name of the machine given proper config
+func MachineName(cluster string, node string) string {
+	return fmt.Sprintf("%s-%s", cluster, node)
+}
+
 // NeedsRoot returns true if driver needs to run with root privileges
 func NeedsRoot(name string) bool {
 	return name == None || name == Podman
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 449acd729e..2b26215c6c 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -427,19 +427,22 @@ func TestCreateSSHShell(t *testing.T) {
 		t.Fatalf("Error starting ssh server: %v", err)
 	}
 
+	m := viper.GetString("profile")
+
 	d := &tests.MockDriver{
 		Port:         port,
 		CurrentState: state.Running,
 		BaseDriver: drivers.BaseDriver{
-			IPAddress:  "127.0.0.1",
-			SSHKeyPath: "",
+			IPAddress:   "127.0.0.1",
+			SSHKeyPath:  "",
+			MachineName: m,
 		},
 		T: t,
 	}
-	api.Hosts[viper.GetString("profile")] = &host.Host{Driver: d}
+	api.Hosts[m] = &host.Host{Driver: d}
 
 	cliArgs := []string{"exit"}
-	if err := CreateSSHShell(api, cliArgs); err != nil {
+	if err := CreateSSHShell(api, m, cliArgs); err != nil {
 		t.Fatalf("Error running ssh command: %v", err)
 	}
 
diff --git a/pkg/minikube/machine/machine.go b/pkg/minikube/machine/machine.go
index 7295b33dab..5b65fd59d1 100644
--- a/pkg/minikube/machine/machine.go
+++ b/pkg/minikube/machine/machine.go
@@ -25,8 +25,6 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
 
@@ -124,8 +122,7 @@ func machineDirs(miniHome ...string) (dirs []string, err error) {
 }
 
 // CreateSSHShell creates a new SSH shell / client
-func CreateSSHShell(api libmachine.API, args []string) error {
-	machineName := viper.GetString(config.MachineProfile)
+func CreateSSHShell(api libmachine.API, machineName string, args []string) error {
 	host, err := CheckIfHostExistsAndLoad(api, machineName)
 	if err != nil {
 		return errors.Wrap(err, "host exists and load")
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 4f3acbad62..af8a8f27cd 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -45,7 +45,7 @@ func init() {
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   fmt.Sprintf("%s-%s", mc.Name, n.Name),
+		MachineName:   driver.MachineName(mc.Name, n.Name),
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   kic.BaseImage,
 		CPU:           mc.CPUs,
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
index 0f0609176e..5fe099b79f 100644
--- a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
+++ b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -65,7 +65,7 @@ func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
 
 	return &hyperkit.Driver{
 		BaseDriver: &drivers.BaseDriver{
-			MachineName: fmt.Sprintf("%s-%s", cfg.Name, n.Name),
+			MachineName: driver.MachineName(cfg.Name, n.Name),
 			StorePath:   localpath.MiniPath(),
 			SSHUser:     "docker",
 		},
diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
index fccb1b9076..55440fb711 100644
--- a/pkg/minikube/registry/drvs/hyperv/hyperv.go
+++ b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -53,7 +53,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := hyperv.NewDriver(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
+	d := hyperv.NewDriver(driver.MachineName(mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.VSwitch = cfg.HypervVirtualSwitch
 	if d.VSwitch == "" && cfg.HypervUseExternalSwitch {
diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go
index eb1e2d1773..90071e6bcf 100644
--- a/pkg/minikube/registry/drvs/kvm2/kvm2.go
+++ b/pkg/minikube/registry/drvs/kvm2/kvm2.go
@@ -68,7 +68,7 @@ type kvmDriver struct {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	name := fmt.Sprintf("%s-%s", mc.Name, n.Name)
+	name := driver.MachineName(mc.Name, n.Name)
 	return kvmDriver{
 		BaseDriver: &drivers.BaseDriver{
 			MachineName: name,
diff --git a/pkg/minikube/registry/drvs/parallels/parallels.go b/pkg/minikube/registry/drvs/parallels/parallels.go
index a2ae347949..8f892cb0b0 100644
--- a/pkg/minikube/registry/drvs/parallels/parallels.go
+++ b/pkg/minikube/registry/drvs/parallels/parallels.go
@@ -45,7 +45,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := parallels.NewDriver(fmt.Sprintf("%s-%s", cfg.Name, n.Name), localpath.MiniPath()).(*parallels.Driver)
+	d := parallels.NewDriver(driver.MachineName(cfg.Name, n.Name), localpath.MiniPath()).(*parallels.Driver)
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.Memory = cfg.Memory
 	d.CPU = cfg.CPUs
diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go
index e05c6671f2..f2c9a0329f 100644
--- a/pkg/minikube/registry/drvs/podman/podman.go
+++ b/pkg/minikube/registry/drvs/podman/podman.go
@@ -51,7 +51,7 @@ func init() {
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
 	return kic.NewDriver(kic.Config{
-		MachineName:   fmt.Sprintf("%s-%s", mc.Name, n.Name),
+		MachineName:   driver.MachineName(mc.Name, n.Name),
 		StorePath:     localpath.MiniPath(),
 		ImageDigest:   strings.Split(kic.BaseImage, "@")[0], // for podman does not support docker images references with both a tag and digest.
 		CPU:           mc.CPUs,
diff --git a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
index fcbbcc9440..04c084c249 100644
--- a/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
+++ b/pkg/minikube/registry/drvs/virtualbox/virtualbox.go
@@ -50,7 +50,7 @@ func init() {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := virtualbox.NewDriver(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
+	d := virtualbox.NewDriver(driver.MachineName(mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmware/vmware.go b/pkg/minikube/registry/drvs/vmware/vmware.go
index 33b3e7c586..65dceda11b 100644
--- a/pkg/minikube/registry/drvs/vmware/vmware.go
+++ b/pkg/minikube/registry/drvs/vmware/vmware.go
@@ -40,7 +40,7 @@ func init() {
 }
 
 func configure(mc config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := vmwcfg.NewConfig(fmt.Sprintf("%s-%s", mc.Name, n.Name), localpath.MiniPath())
+	d := vmwcfg.NewConfig(driver.MachineName(mc.Name, n.Name), localpath.MiniPath())
 	d.Boot2DockerURL = mc.Downloader.GetISOFileURI(mc.MinikubeISO)
 	d.Memory = mc.Memory
 	d.CPU = mc.CPUs
diff --git a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
index 47047ffe3f..5f73cb6949 100644
--- a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
+++ b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
@@ -45,7 +45,7 @@ func init() {
 }
 
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
-	d := vmwarefusion.NewDriver(fmt.Sprintf("%s-%s", cfg.Name, n.Name), localpath.MiniPath()).(*vmwarefusion.Driver)
+	d := vmwarefusion.NewDriver(driver.MachineName(cfg.Name, n.Name), localpath.MiniPath()).(*vmwarefusion.Driver)
 	d.Boot2DockerURL = cfg.Downloader.GetISOFileURI(cfg.MinikubeISO)
 	d.Memory = cfg.Memory
 	d.CPU = cfg.CPUs

From d7df027fb8a56b6daa93bf2d898e12ca9dc97043 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 26 Feb 2020 15:26:05 -0800
Subject: [PATCH 032/668] fix delete and stop

---
 cmd/minikube/cmd/delete.go                    |  7 ++-
 cmd/minikube/cmd/stop.go                      | 44 +++++++------------
 pkg/drivers/hyperkit/driver.go                |  1 -
 pkg/minikube/bootstrapper/bootstrapper.go     |  2 +-
 .../bootstrapper/bsutil/kverify/kverify.go    |  2 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  4 +-
 pkg/minikube/cluster/setup.go                 |  2 +-
 pkg/minikube/node/start.go                    |  2 +-
 8 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 8ed30668b4..9169a4fa71 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -142,10 +142,9 @@ func runDelete(cmd *cobra.Command, args []string) {
 			exit.UsageT("usage: minikube delete")
 		}
 
-		profileName := viper.GetString(pkg_config.MachineProfile)
-		profile, err := pkg_config.LoadProfile(profileName)
+		profile, err := pkg_config.LoadProfile(profileFlag)
 		if err != nil {
-			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": profileName})
+			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": profileFlag})
 		}
 
 		errs := DeleteProfiles([]*pkg_config.Profile{profile})
@@ -237,7 +236,7 @@ func deleteProfile(profile *pkg_config.Profile) error {
 	}
 
 	for _, n := range cc.Nodes {
-		if err = machine.DeleteHost(api, n.Name); err != nil {
+		if err = machine.DeleteHost(api, driver.MachineName(profile.Name, n.Name)); err != nil {
 			switch errors.Cause(err).(type) {
 			case mcnerror.ErrHostDoesNotExist:
 				glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 0c5ae89e71..a1bb3e782c 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -17,19 +17,15 @@ limitations under the License.
 package cmd
 
 import (
-	"time"
-
-	"github.com/docker/machine/libmachine/mcnerror"
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // stopCmd represents the stop command
@@ -50,31 +46,23 @@ func runStop(cmd *cobra.Command, args []string) {
 	}
 	defer api.Close()
 
-	nonexistent := false
-	stop := func() (err error) {
-		err = machine.StopHost(api, profile)
-		if err == nil {
-			return nil
-		}
-		glog.Warningf("stop host returned error: %v", err)
-
-		switch err := errors.Cause(err).(type) {
-		case mcnerror.ErrHostDoesNotExist:
-			out.T(out.Meh, `"{{.profile_name}}" does not exist, nothing to stop`, out.V{"profile_name": profile})
-			nonexistent = true
-			return nil
-		default:
-			return err
+	cc, err := config.Load(profile)
+	if err != nil {
+		exit.WithError("Error retrieving config", err)
+	}
+
+	// TODO replace this back with expo backoff
+	for _, n := range cc.Nodes {
+		err := machine.StopHost(api, driver.MachineName(profile, n.Name))
+		if err != nil {
+			exit.WithError("Unable to stop VM", err)
 		}
+		/*if err := retry.Expo(fn, 5*time.Second, 3*time.Minute, 5); err != nil {
+			exit.WithError("Unable to stop VM", err)
+		}*/
 	}
 
-	if err := retry.Expo(stop, 5*time.Second, 3*time.Minute, 5); err != nil {
-		exit.WithError("Unable to stop VM", err)
-	}
-
-	if !nonexistent {
-		out.T(out.Stopped, `"{{.profile_name}}" stopped.`, out.V{"profile_name": profile})
-	}
+	out.T(out.Stopped, `"{{.profile_name}}" stopped.`, out.V{"profile_name": profile})
 
 	if err := killMountProcess(); err != nil {
 		out.T(out.WarningType, "Unable to kill mount process: {{.error}}", out.V{"error": err})
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
index d3d1031629..bf775240e6 100644
--- a/pkg/drivers/hyperkit/driver.go
+++ b/pkg/drivers/hyperkit/driver.go
@@ -519,7 +519,6 @@ func (d *Driver) sendSignal(s os.Signal) error {
 func (d *Driver) getPid() int {
 	pidPath := d.ResolveStorePath(machineFileName)
 
-	log.Debugf("PIDPATH=%s", pidPath)
 	f, err := os.Open(pidPath)
 	if err != nil {
 		log.Warnf("Error reading pid file: %v", err)
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index 6bb03fa986..f250423833 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -39,7 +39,7 @@ type Bootstrapper interface {
 	StartCluster(config.ClusterConfig) error
 	UpdateCluster(config.ClusterConfig) error
 	DeleteCluster(config.KubernetesConfig) error
-	WaitForCluster(config.ClusterConfig, time.Duration) error
+	WaitForNode(config.ClusterConfig, config.Node, time.Duration) error
 	JoinCluster(config.ClusterConfig, config.Node, string) error
 	UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error
 	GenerateToken(config.KubernetesConfig) (string, error)
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index aa076cecb9..bc4f03e8b0 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -67,7 +67,7 @@ func apiServerPID(cr command.Runner) (int, error) {
 	return strconv.Atoi(s)
 }
 
-// SystemPods verifies essential pods for running kurnetes is running
+// SystemPods verifies essential pods for running kubernetes is running
 func SystemPods(client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
 	glog.Info("waiting for kube-system pods to appear ...")
 	pStart := time.Now()
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 5ae6c09033..7ccef6ee40 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -249,8 +249,8 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 	return c, err
 }
 
-// WaitForCluster blocks until the cluster appears to be healthy
-func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Duration) error {
+// WaitForCluster blocks until the node appears to be healthy
+func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, timeout time.Duration) error {
 	start := time.Now()
 	out.T(out.Waiting, "Waiting for cluster to come online ...")
 	cp, err := config.PrimaryControlPlane(cfg)
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index b784cb01e9..f09a8188c3 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -92,7 +92,7 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 
 	// Skip pre-existing, because we already waited for health
 	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
+		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 			exit.WithError("Wait failed", err)
 		}
 	}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 6bf1aef74a..efea8548fb 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -73,7 +73,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 	// Skip pre-existing, because we already waited for health
 	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForCluster(cc, viper.GetDuration(waitTimeout)); err != nil {
+		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 			exit.WithError("Wait failed", err)
 		}
 	}

From e7f8abc048a314a4cb254007c043aaae49095dd9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 26 Feb 2020 15:40:28 -0800
Subject: [PATCH 033/668] fix waitfornode

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 7ccef6ee40..1316612771 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -249,16 +249,19 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 	return c, err
 }
 
-// WaitForCluster blocks until the node appears to be healthy
+// WaitForNode blocks until the node appears to be healthy
 func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, timeout time.Duration) error {
 	start := time.Now()
-	out.T(out.Waiting, "Waiting for cluster to come online ...")
+	out.T(out.Waiting, "Waiting for node {{.name}} to come online ...", out.V{"name": n.Name})
 	cp, err := config.PrimaryControlPlane(cfg)
 	if err != nil {
 		return err
 	}
-	if err := kverify.APIServerProcess(k.c, start, timeout); err != nil {
-		return err
+
+	if n.ControlPlane {
+		if err := kverify.APIServerProcess(k.c, start, timeout); err != nil {
+			return err
+		}
 	}
 
 	ip := cp.IP
@@ -270,8 +273,10 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 		}
 	}
-	if err := kverify.APIServerIsRunning(start, ip, port, timeout); err != nil {
-		return err
+	if n.ControlPlane {
+		if err := kverify.APIServerIsRunning(start, ip, port, timeout); err != nil {
+			return err
+		}
 	}
 
 	c, err := k.client(ip, port)
@@ -369,7 +374,6 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 
 	// Join the master by specifying its token
 	joinCmd = fmt.Sprintf("%s --v=10 --node-name=%s", joinCmd, n.Name)
-	fmt.Println(joinCmd)
 	out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
 	if err != nil {
 		return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out)

From 9f82d6855b31936c80b1addff468da917db2c7a1 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 26 Feb 2020 15:51:14 -0800
Subject: [PATCH 034/668] actually cache images on cluster startup

---
 cmd/minikube/cmd/cache.go     |  4 ++--
 pkg/minikube/cluster/setup.go |  4 ++++
 pkg/minikube/config/config.go | 14 ++++++++++++++
 pkg/minikube/node/cache.go    | 13 -------------
 pkg/minikube/node/start.go    |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/cmd/minikube/cmd/cache.go b/cmd/minikube/cmd/cache.go
index eb91371984..f91f508b00 100644
--- a/cmd/minikube/cmd/cache.go
+++ b/cmd/minikube/cmd/cache.go
@@ -19,10 +19,10 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 	cmdConfig "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/image"
 	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/node"
 )
 
 // cacheImageConfigKey is the config field name used to store which images we have previously cached
@@ -75,7 +75,7 @@ var reloadCacheCmd = &cobra.Command{
 	Short: "reload cached images.",
 	Long:  "reloads images previously added using the 'cache add' subcommand",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := node.CacheAndLoadImagesInConfig()
+		err := config.CacheAndLoadImagesInConfig()
 		if err != nil {
 			exit.WithError("Failed to reload cached images", err)
 		}
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index f09a8188c3..1d194ca900 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -79,6 +79,10 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 		exit.WithError("Error starting cluster", err)
 	}
 
+	if err := config.CacheAndLoadImagesInConfig(); err != nil {
+		out.T(out.FailureType, "Unable to load cached images from config file.")
+	}
+
 	// enable addons, both old and new!
 	if existingAddons != nil {
 		addons.Start(viper.GetString(config.MachineProfile), existingAddons, config.AddonList)
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index bf7e0bdd28..c0ab5d0976 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -26,6 +26,7 @@ import (
 	"github.com/pkg/errors"
 
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/machine"
 )
 
 const (
@@ -201,3 +202,16 @@ func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *ClusterCo
 	}
 	return ioutil.WriteFile(path, contents, 0644)
 }
+
+// CacheAndLoadImagesInConfig loads the images currently in the config file
+// called by 'start' and 'cache reload' commands.
+func CacheAndLoadImagesInConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return machine.CacheAndLoadImages(images)
+}
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index 03b854a99e..41192d523f 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -116,16 +116,3 @@ func imagesInConfigFile() ([]string, error) {
 	}
 	return []string{}, nil
 }
-
-// CacheAndLoadImagesInConfig loads the images currently in the config file
-// called by 'start' and 'cache reload' commands.
-func CacheAndLoadImagesInConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return machine.CacheAndLoadImages(images)
-}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index efea8548fb..8ce658c836 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -67,7 +67,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		exit.WithError("Failed to update node", err)
 	}
 
-	if err := CacheAndLoadImagesInConfig(); err != nil {
+	if err := config.CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 

From 2bf3b9a9f93254fb1d46172992e70a757fcaebbf Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 27 Feb 2020 11:40:51 -0800
Subject: [PATCH 035/668] move caching code to cluster

---
 cmd/minikube/cmd/cache.go               |  4 +--
 cmd/minikube/cmd/kubectl.go             |  4 +--
 pkg/minikube/{node => cluster}/cache.go | 33 +++++++++++++++++++------
 pkg/minikube/cluster/setup.go           |  2 +-
 pkg/minikube/config/config.go           | 14 -----------
 pkg/minikube/node/node.go               | 13 +++++-----
 pkg/minikube/node/start.go              |  8 +++---
 7 files changed, 41 insertions(+), 37 deletions(-)
 rename pkg/minikube/{node => cluster}/cache.go (79%)

diff --git a/cmd/minikube/cmd/cache.go b/cmd/minikube/cmd/cache.go
index f91f508b00..ab1f075853 100644
--- a/cmd/minikube/cmd/cache.go
+++ b/cmd/minikube/cmd/cache.go
@@ -19,7 +19,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 	cmdConfig "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/image"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -75,7 +75,7 @@ var reloadCacheCmd = &cobra.Command{
 	Short: "reload cached images.",
 	Long:  "reloads images previously added using the 'cache add' subcommand",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := config.CacheAndLoadImagesInConfig()
+		err := cluster.CacheAndLoadImagesInConfig()
 		if err != nil {
 			exit.WithError("Failed to reload cached images", err)
 		}
diff --git a/cmd/minikube/cmd/kubectl.go b/cmd/minikube/cmd/kubectl.go
index ebceeb9468..342b9b283d 100644
--- a/cmd/minikube/cmd/kubectl.go
+++ b/cmd/minikube/cmd/kubectl.go
@@ -25,10 +25,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -59,7 +59,7 @@ minikube kubectl -- get pods --namespace kube-system`,
 			version = cc.KubernetesConfig.KubernetesVersion
 		}
 
-		path, err := node.CacheKubectlBinary(version)
+		path, err := cluster.CacheKubectlBinary(version)
 		if err != nil {
 			out.ErrLn("Error caching kubectl: %v", err)
 		}
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/cluster/cache.go
similarity index 79%
rename from pkg/minikube/node/cache.go
rename to pkg/minikube/cluster/cache.go
index 41192d523f..04e7c8b6c6 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/cluster/cache.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package node
+package cluster
 
 import (
 	"os"
@@ -33,8 +33,13 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
-// beginCacheRequiredImages caches images required for kubernetes version in the background
-func beginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVersion string) {
+const (
+	cacheImages         = "cache-images"
+	cacheImageConfigKey = "cache"
+)
+
+// BeginCacheRequiredImages caches images required for kubernetes version in the background
+func BeginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVersion string) {
 	if !viper.GetBool("cache-images") {
 		return
 	}
@@ -44,7 +49,8 @@ func beginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVers
 	})
 }
 
-func handleDownloadOnly(cacheGroup *errgroup.Group, k8sVersion string) {
+// HandleDownloadOnly handles the download-only parameter
+func HandleDownloadOnly(cacheGroup *errgroup.Group, k8sVersion string) {
 	// If --download-only, complete the remaining downloads and exit.
 	if !viper.GetBool("download-only") {
 		return
@@ -55,7 +61,7 @@ func handleDownloadOnly(cacheGroup *errgroup.Group, k8sVersion string) {
 	if _, err := CacheKubectlBinary(k8sVersion); err != nil {
 		exit.WithError("Failed to cache kubectl", err)
 	}
-	waitCacheRequiredImages(cacheGroup)
+	WaitCacheRequiredImages(cacheGroup)
 	if err := saveImagesToTarFromConfig(); err != nil {
 		exit.WithError("Failed to cache images to tar", err)
 	}
@@ -79,8 +85,8 @@ func doCacheBinaries(k8sVersion string) error {
 	return machine.CacheBinariesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
 }
 
-// waitCacheRequiredImages blocks until the required images are all cached.
-func waitCacheRequiredImages(g *errgroup.Group) {
+// WaitCacheRequiredImages blocks until the required images are all cached.
+func WaitCacheRequiredImages(g *errgroup.Group) {
 	if !viper.GetBool(cacheImages) {
 		return
 	}
@@ -102,6 +108,19 @@ func saveImagesToTarFromConfig() error {
 	return image.SaveToDir(images, constants.ImageCacheDir)
 }
 
+// CacheAndLoadImagesInConfig loads the images currently in the config file
+// called by 'start' and 'cache reload' commands.
+func CacheAndLoadImagesInConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return machine.CacheAndLoadImages(images)
+}
+
 func imagesInConfigFile() ([]string, error) {
 	configFile, err := config.ReadConfig(localpath.ConfigFile())
 	if err != nil {
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index 1d194ca900..931a21f812 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -79,7 +79,7 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 		exit.WithError("Error starting cluster", err)
 	}
 
-	if err := config.CacheAndLoadImagesInConfig(); err != nil {
+	if err := CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index c0ab5d0976..bf7e0bdd28 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -26,7 +26,6 @@ import (
 	"github.com/pkg/errors"
 
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
 )
 
 const (
@@ -202,16 +201,3 @@ func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *ClusterCo
 	}
 	return ioutil.WriteFile(path, contents, 0644)
 }
-
-// CacheAndLoadImagesInConfig loads the images currently in the config file
-// called by 'start' and 'cache reload' commands.
-func CacheAndLoadImagesInConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return machine.CacheAndLoadImages(images)
-}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 1f2147cbc5..940661bc95 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -25,14 +25,13 @@ import (
 	"k8s.io/minikube/pkg/minikube/machine"
 )
 
+// TODO: Share these between cluster and node packages
 const (
-	cacheImages         = "cache-images"
-	waitUntilHealthy    = "wait"
-	cacheImageConfigKey = "cache"
-	containerRuntime    = "container-runtime"
-	mountString         = "mount-string"
-	createMount         = "mount"
-	waitTimeout         = "wait-timeout"
+	waitUntilHealthy = "wait"
+	containerRuntime = "container-runtime"
+	mountString      = "mount-string"
+	createMount      = "mount"
+	waitTimeout      = "wait-timeout"
 )
 
 // Add adds a new node config to an existing cluster.
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 8ce658c836..f770b0c88d 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -32,7 +32,7 @@ import (
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) error {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
 	var cacheGroup errgroup.Group
-	beginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
+	cluster.BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
 
 	// Why do we need this?
 	if cc.Downloader == nil {
@@ -50,11 +50,11 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	k8sVersion := cc.KubernetesConfig.KubernetesVersion
 	driverName := cc.Driver
 	// exits here in case of --download-only option.
-	handleDownloadOnly(&cacheGroup, k8sVersion)
+	cluster.HandleDownloadOnly(&cacheGroup, k8sVersion)
 	// configure the runtime (docker, containerd, crio)
 	cr := configureRuntimes(runner, driverName, cc.KubernetesConfig)
 	showVersionInfo(k8sVersion, cr)
-	waitCacheRequiredImages(&cacheGroup)
+	cluster.WaitCacheRequiredImages(&cacheGroup)
 
 	configureMounts()
 
@@ -67,7 +67,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		exit.WithError("Failed to update node", err)
 	}
 
-	if err := config.CacheAndLoadImagesInConfig(); err != nil {
+	if err := cluster.CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 

From 0cc0a25c28e46037d523a258e7021ba6a66b509e Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 27 Feb 2020 14:37:15 -0800
Subject: [PATCH 036/668] passing correct machine name around

---
 cmd/minikube/cmd/delete.go                   | 18 ++++++++++--------
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  6 +++---
 pkg/minikube/cluster/setup.go                |  4 ++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 9169a4fa71..892a851c67 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -235,14 +235,16 @@ func deleteProfile(profile *pkg_config.Profile) error {
 		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	for _, n := range cc.Nodes {
-		if err = machine.DeleteHost(api, driver.MachineName(profile.Name, n.Name)); err != nil {
-			switch errors.Cause(err).(type) {
-			case mcnerror.ErrHostDoesNotExist:
-				glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
-			default:
-				out.T(out.FailureType, "Failed to delete cluster: {{.error}}", out.V{"error": err})
-				out.T(out.Notice, `You may need to manually remove the "{{.name}}" VM from your hypervisor`, out.V{"name": profile.Name})
+	if cc != nil {
+		for _, n := range cc.Nodes {
+			if err = machine.DeleteHost(api, driver.MachineName(profile.Name, n.Name)); err != nil {
+				switch errors.Cause(err).(type) {
+				case mcnerror.ErrHostDoesNotExist:
+					glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
+				default:
+					out.T(out.FailureType, "Failed to delete cluster: {{.error}}", out.V{"error": err})
+					out.T(out.Notice, `You may need to manually remove the "{{.name}}" VM from your hypervisor`, out.V{"name": profile.Name})
+				}
 			}
 		}
 	}
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 1316612771..14aed83c6c 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -268,7 +268,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 	port := cp.Port
 	if driver.IsKIC(cfg.Driver) {
 		ip = oci.DefaultBindIPV4
-		port, err = oci.HostPortBinding(cfg.Driver, cfg.Name, port)
+		port, err = oci.HostPortBinding(cfg.Driver, driver.MachineName(cfg.Name, n.Name), port)
 		if err != nil {
 			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 		}
@@ -338,9 +338,9 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		port := n.Port
 		if driver.IsKIC(cfg.Driver) {
 			ip = oci.DefaultBindIPV4
-			port, err = oci.HostPortBinding(cfg.Driver, cfg.Name, port)
+			port, err = oci.HostPortBinding(cfg.Driver, driver.MachineName(cfg.Name, n.Name), port)
 			if err != nil {
-				return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
+				return errors.Wrapf(err, "get host-bind port %d for container %s", port, driver.MachineName(cfg.Name, n.Name))
 			}
 		}
 		client, err := k.client(ip, port)
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index 931a21f812..62b57730b1 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -29,6 +29,7 @@ import (
 	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
+	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
@@ -57,6 +58,9 @@ const (
 
 // InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
 func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+	var cacheGroup errgroup.Group
+	BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
+
 	_, preExists, machineAPI, host := StartMachine(&cc, &n)
 	defer machineAPI.Close()
 

From a349b865d83f514e11499a8c410ba24e93a28350 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 27 Feb 2020 15:09:05 -0800
Subject: [PATCH 037/668] correct machine name for selectDriver

---
 cmd/minikube/cmd/start.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 194c1c988a..0db8d68826 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -534,7 +534,11 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 		return
 	}
 
-	machineName := viper.GetString(config.MachineProfile)
+	cp, err := config.PrimaryControlPlane(*existing)
+	if err != nil {
+		glog.Warningf("selectDriver PrimaryControlPlane: %v", err)
+	}
+	machineName := driver.MachineName(viper.GetString(config.MachineProfile), cp.Name)
 	h, err := api.Load(machineName)
 	if err != nil {
 		glog.Warningf("selectDriver api.Load: %v", err)

From 9f41fd42e1cd78a285383f494000bc6f95f94e1a Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Tue, 3 Mar 2020 22:23:52 -0800
Subject: [PATCH 038/668] populate target port in service list

---
 cmd/minikube/cmd/service_list.go | 3 ++-
 pkg/minikube/service/service.go  | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/service_list.go b/cmd/minikube/cmd/service_list.go
index 9d86d5a8b8..7dddcd826c 100644
--- a/cmd/minikube/cmd/service_list.go
+++ b/cmd/minikube/cmd/service_list.go
@@ -66,6 +66,7 @@ var serviceListCmd = &cobra.Command{
 			if len(serviceURL.URLs) == 0 {
 				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "No node port"})
 			} else {
+				servicePortNames := strings.Join(serviceURL.PortNames, "\n")
 				serviceURLs := strings.Join(serviceURL.URLs, "\n")
 
 				// if we are running Docker on OSX we empty the internal service URLs
@@ -73,7 +74,7 @@ var serviceListCmd = &cobra.Command{
 					serviceURLs = ""
 				}
 
-				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", serviceURLs})
+				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, servicePortNames, serviceURLs})
 			}
 		}
 
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index 3f3c159cd4..16579e31b3 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"text/template"
 	"time"
@@ -196,6 +197,13 @@ func printURLsForService(c typed_core.CoreV1Interface, ip, service, namespace st
 	urls := []string{}
 	portNames := []string{}
 	for _, port := range svc.Spec.Ports {
+
+		if port.Name != "" {
+			m[port.TargetPort.IntVal] = port.Name
+		} else {
+			m[port.TargetPort.IntVal] = strconv.Itoa(int(port.Port))
+		}
+
 		if port.NodePort > 0 {
 			var doc bytes.Buffer
 			err = t.Execute(&doc, struct {

From d19f27a3c293ca63b42ad550d39e9faa4f57abb4 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 4 Mar 2020 13:48:23 -0800
Subject: [PATCH 039/668] Add name/port instead of just the name for the target
 port

---
 pkg/minikube/service/service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index 16579e31b3..3cd16f79e7 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -199,7 +199,7 @@ func printURLsForService(c typed_core.CoreV1Interface, ip, service, namespace st
 	for _, port := range svc.Spec.Ports {
 
 		if port.Name != "" {
-			m[port.TargetPort.IntVal] = port.Name
+			m[port.TargetPort.IntVal] = fmt.Sprintf("%s/%d", port.Name, port.Port)
 		} else {
 			m[port.TargetPort.IntVal] = strconv.Itoa(int(port.Port))
 		}

From b7463fda7eda282d3b806c6a6c35b2ff2841301c Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 4 Mar 2020 22:38:37 -0800
Subject: [PATCH 040/668] fix minikube service tests

---
 pkg/minikube/service/service_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go
index 47fd341f42..59a32f8454 100644
--- a/pkg/minikube/service/service_test.go
+++ b/pkg/minikube/service/service_test.go
@@ -134,13 +134,17 @@ var defaultNamespaceServiceInterface = &MockServiceInterface{
 				Spec: core.ServiceSpec{
 					Ports: []core.ServicePort{
 						{
+							Name:     "port1",
 							NodePort: int32(1111),
+							Port:     int32(11111),
 							TargetPort: intstr.IntOrString{
 								IntVal: int32(11111),
 							},
 						},
 						{
+							Name:     "port2",
 							NodePort: int32(2222),
+							Port:     int32(22222),
 							TargetPort: intstr.IntOrString{
 								IntVal: int32(22222),
 							},
@@ -324,7 +328,7 @@ func TestPrintURLsForService(t *testing.T) {
 			serviceName:    "mock-dashboard",
 			namespace:      "default",
 			tmpl:           template.Must(template.New("svc-arbitrary-template").Parse("{{.Name}}={{.IP}}:{{.Port}}")),
-			expectedOutput: []string{"port1=127.0.0.1:1111", "port2=127.0.0.1:2222"},
+			expectedOutput: []string{"port1/11111=127.0.0.1:1111", "port2/22222=127.0.0.1:2222"},
 		},
 		{
 			description:    "empty slice for no node ports",
@@ -452,7 +456,7 @@ func TestGetServiceURLs(t *testing.T) {
 					Namespace: "default",
 					Name:      "mock-dashboard",
 					URLs:      []string{"http://127.0.0.1:1111", "http://127.0.0.1:2222"},
-					PortNames: []string{"port1", "port2"},
+					PortNames: []string{"port1/11111", "port2/22222"},
 				},
 				{
 					Namespace: "default",

From 5a32eb7c4ca0cee17327c0ba573988413f335496 Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Wed, 6 Nov 2019 16:52:23 +0530
Subject: [PATCH 041/668] Updated error handling when service or namespace
 doesn't exist

---
 cmd/minikube/cmd/service.go     | 2 +-
 pkg/minikube/service/service.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 19827913d9..612d45be4e 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -104,7 +104,7 @@ var serviceCmd = &cobra.Command{
 
 		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
-			exit.WithError("Error opening service", err)
+			exit.WithCodeT(exit.Data, fmt.Sprintf("Error opening service: %s", err))
 		}
 
 		openURLs(svc, urls)
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index 2d349d7a3b..b13157d538 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -276,7 +276,7 @@ func WaitForService(api libmachine.API, namespace string, service string, urlTem
 	chkSVC := func() error { return CheckService(namespace, service) }
 
 	if err := retry.Expo(chkSVC, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return urlList, errors.Wrapf(err, "Service %s was not found in %q namespace. You may select another namespace by using 'minikube service %s -n <namespace>", service, namespace, service)
+		return urlList, errors.Wrapf(err, "Service %s was not found in %q namespace. You may select another namespace by using 'minikube service %s -n <namespace>'. Or list out all the services using 'minikube service list'", service, namespace, service)
 	}
 
 	serviceURL, err := GetServiceURLsForService(api, namespace, service, urlTemplate)

From 061b15999193f0898cdcf97317502e86713f7c90 Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Thu, 7 Nov 2019 12:08:25 +0530
Subject: [PATCH 042/668] Formatted the error output

---
 cmd/minikube/cmd/service.go     | 2 +-
 pkg/minikube/service/service.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 612d45be4e..321b7ccbc9 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -104,7 +104,7 @@ var serviceCmd = &cobra.Command{
 
 		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
-			exit.WithCodeT(exit.Data, fmt.Sprintf("Error opening service: %s", err))
+			exit.WithCodeT(exit.Data, `Error opening service: {{.error}}`, out.V{"error": err})
 		}
 
 		openURLs(svc, urls)
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index b13157d538..6e9b6e97cf 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -276,7 +276,8 @@ func WaitForService(api libmachine.API, namespace string, service string, urlTem
 	chkSVC := func() error { return CheckService(namespace, service) }
 
 	if err := retry.Expo(chkSVC, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return urlList, errors.Wrapf(err, "Service %s was not found in %q namespace. You may select another namespace by using 'minikube service %s -n <namespace>'. Or list out all the services using 'minikube service list'", service, namespace, service)
+		return urlList, errors.Errorf(`Service %s was not found in %q namespace. 
+You may select another namespace by using 'minikube service %s -n <namespace>'. Or list out all the services using 'minikube service list'`, service, namespace, service)
 	}
 
 	serviceURL, err := GetServiceURLsForService(api, namespace, service, urlTemplate)

From 8b2289836a20972a6c8a9d86e030763483c61222 Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Wed, 18 Dec 2019 16:11:46 +0530
Subject: [PATCH 043/668] Modified the previous commit using Erros.New()
 function

---
 cmd/minikube/cmd/service.go     | 6 +++++-
 pkg/minikube/service/service.go | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 321b7ccbc9..d138c73af3 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -104,7 +104,11 @@ var serviceCmd = &cobra.Command{
 
 		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
-			exit.WithCodeT(exit.Data, `Error opening service: {{.error}}`, out.V{"error": err})
+			if err.Error() == "Service not found in namespace" {
+				exit.WithCodeT(exit.Data, `Service '{{.service}}' was not found in '{{.namespace}}' namespace.
+You may select another namespace by using 'minikube service {{.service}} -n <namespace>'. Or list out all the services using 'minikube service list'`, out.V{"service": svc, "namespace": namespace})
+			}
+			exit.WithError("Error opening service", err)
 		}
 
 		openURLs(svc, urls)
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index 6e9b6e97cf..d7ff77a37b 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -276,8 +276,7 @@ func WaitForService(api libmachine.API, namespace string, service string, urlTem
 	chkSVC := func() error { return CheckService(namespace, service) }
 
 	if err := retry.Expo(chkSVC, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return urlList, errors.Errorf(`Service %s was not found in %q namespace. 
-You may select another namespace by using 'minikube service %s -n <namespace>'. Or list out all the services using 'minikube service list'`, service, namespace, service)
+		return nil, errors.New("Service not found in namespace")
 	}
 
 	serviceURL, err := GetServiceURLsForService(api, namespace, service, urlTemplate)

From 40c1c80b42713118f441c0185983bffe3da576bf Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Tue, 14 Jan 2020 16:16:36 +0530
Subject: [PATCH 044/668] Created new error type & made corresponding changes

---
 cmd/minikube/cmd/service.go     | 12 +++++++++++-
 pkg/minikube/service/service.go | 23 +++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index d138c73af3..7a8f37cdc5 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -57,6 +58,14 @@ var (
 	interval           int
 )
 
+// type serviceNotFoundError struct {
+// 	Err error
+// }
+
+// func (t serviceNotFoundError) Error() string {
+// 	return "Service not found: " + t.Err.Error()
+// }
+
 // serviceCmd represents the service command
 var serviceCmd = &cobra.Command{
 	Use:   "service [flags] SERVICE",
@@ -104,7 +113,8 @@ var serviceCmd = &cobra.Command{
 
 		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
-			if err.Error() == "Service not found in namespace" {
+			var s *service.SVCNotFoundError
+			if errors.As(err, &s) {
 				exit.WithCodeT(exit.Data, `Service '{{.service}}' was not found in '{{.namespace}}' namespace.
 You may select another namespace by using 'minikube service {{.service}} -n <namespace>'. Or list out all the services using 'minikube service list'`, out.V{"service": svc, "namespace": namespace})
 			}
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index d7ff77a37b..e077f7f7be 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"sort"
 	"strings"
 	"text/template"
 	"time"
@@ -264,19 +265,37 @@ func PrintServiceList(writer io.Writer, data [][]string) {
 	table.Render()
 }
 
+// SVCNotFoundError error type handles 'service not found' scenarios
+type SVCNotFoundError struct {
+	Err error
+}
+
+// Error method for SVCNotFoundError type
+func (t SVCNotFoundError) Error() string {
+	return "Service not found"
+}
+
 // WaitForService waits for a service, and return the urls when available
 func WaitForService(api libmachine.API, namespace string, service string, urlTemplate *template.Template, urlMode bool, https bool,
 	wait int, interval int) ([]string, error) {
-
 	var urlList []string
 	// Convert "Amount of time to wait" and "interval of each check" to attempts
 	if interval == 0 {
 		interval = 1
 	}
+	services, err := GetServiceURLs(api, namespace, urlTemplate)
+	if err != nil {
+		return nil, err
+	}
+	searchServices := sort.Search(len(services), func(i int) bool { return services[i].Name == service })
+	if searchServices == len(services) {
+		return nil, &SVCNotFoundError{err}
+	}
+
 	chkSVC := func() error { return CheckService(namespace, service) }
 
 	if err := retry.Expo(chkSVC, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return nil, errors.New("Service not found in namespace")
+		return nil, &SVCNotFoundError{err}
 	}
 
 	serviceURL, err := GetServiceURLsForService(api, namespace, service, urlTemplate)

From 5d8d3f01b5e1b13226e07c3cff1226e25ace438f Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Wed, 5 Feb 2020 00:48:00 +0530
Subject: [PATCH 045/668] Modified 'checking if service exists before retry'
 logic

---
 pkg/minikube/service/service.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index e077f7f7be..26be52d267 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -22,7 +22,6 @@ import (
 	"io"
 	"net/url"
 	"os"
-	"sort"
 	"strings"
 	"text/template"
 	"time"
@@ -283,12 +282,9 @@ func WaitForService(api libmachine.API, namespace string, service string, urlTem
 	if interval == 0 {
 		interval = 1
 	}
-	services, err := GetServiceURLs(api, namespace, urlTemplate)
+
+	err := CheckService(namespace, service)
 	if err != nil {
-		return nil, err
-	}
-	searchServices := sort.Search(len(services), func(i int) bool { return services[i].Name == service })
-	if searchServices == len(services) {
 		return nil, &SVCNotFoundError{err}
 	}
 

From 3ffdaf3c1c6c674e439f3fc5ecebcc196da93d41 Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Fri, 7 Feb 2020 09:14:09 +0530
Subject: [PATCH 046/668] Deleted unnecessary comments

---
 cmd/minikube/cmd/service.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 7a8f37cdc5..736434dc0d 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -58,14 +58,6 @@ var (
 	interval           int
 )
 
-// type serviceNotFoundError struct {
-// 	Err error
-// }
-
-// func (t serviceNotFoundError) Error() string {
-// 	return "Service not found: " + t.Err.Error()
-// }
-
 // serviceCmd represents the service command
 var serviceCmd = &cobra.Command{
 	Use:   "service [flags] SERVICE",

From 70ca2de554b0c1474644f74e207c26fa63b22849 Mon Sep 17 00:00:00 2001
From: Kamesh Sampath <ksampath@redhat.com>
Date: Sun, 16 Feb 2020 19:18:45 +0530
Subject: [PATCH 047/668] (fix) Create addon to configure registry helper

- Service Account and binding to run the job
- Registry aliases ConfigMap
- Registry aliases daemonset to update the node etc/hosts

fixes: 4604

Signed-off-by: Kamesh Sampath <ksampath@redhat.com>
---
 .../node-etc-hosts-update.tmpl                | 51 +++++++++++++++++++
 .../registry-aliases/patch-coredns-job.tmpl   | 26 ++++++++++
 .../registry-aliases-config.tmpl              | 18 +++++++
 .../registry-aliases-sa-crb.tmpl              | 12 +++++
 .../registry-aliases/registry-aliases-sa.tmpl |  5 ++
 pkg/addons/config.go                          |  7 +++
 pkg/minikube/assets/addons.go                 | 32 ++++++++++++
 7 files changed, 151 insertions(+)
 create mode 100644 deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
 create mode 100644 deploy/addons/registry-aliases/patch-coredns-job.tmpl
 create mode 100644 deploy/addons/registry-aliases/registry-aliases-config.tmpl
 create mode 100644 deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl
 create mode 100644 deploy/addons/registry-aliases/registry-aliases-sa.tmpl

diff --git a/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl b/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
new file mode 100644
index 0000000000..0ef938876b
--- /dev/null
+++ b/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: registry-aliases-hosts-update
+  namespace: kube-system
+  labels:
+    kubernetes.io/minikube-addons: registry-aliases
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  selector:
+    matchLabels:
+      app: registry-aliases-hosts-update
+  template:
+    metadata:
+      labels:
+        app: registry-aliases-hosts-update
+    spec:
+      initContainers:
+        - name: update
+          image: registry.fedoraproject.org/fedora
+          volumeMounts:
+            - name: etchosts
+              mountPath: /host-etc/hosts
+              readOnly: false
+          env:
+            - name: REGISTRY_ALIASES
+              valueFrom:
+                configMapKeyRef:
+                  name: registry-aliases
+                  key: registryAliases
+          command:
+            - bash
+            - -ce
+            - |
+              NL=$'\n'
+              TAB=$'\t'
+              HOSTS="$(cat /host-etc/hosts)"
+              [ -z "$REGISTRY_SERVICE_HOST" ] && echo "Failed to get hosts entry for default registry" && exit 1;
+              for H in $REGISTRY_ALIASES; do                
+                echo "$HOSTS" | grep "$H"  || HOSTS="$HOSTS$NL$REGISTRY_SERVICE_HOST$TAB$H";
+              done;
+              echo "$HOSTS" | diff -u /host-etc/hosts - || echo "$HOSTS" > /host-etc/hosts
+              echo "Done."
+      containers:
+        - name: pause-for-update
+          image: gcr.io/google_containers/pause-amd64:3.1
+      terminationGracePeriodSeconds: 30
+      volumes:
+        - name: etchosts
+          hostPath:
+            path: /etc/hosts
diff --git a/deploy/addons/registry-aliases/patch-coredns-job.tmpl b/deploy/addons/registry-aliases/patch-coredns-job.tmpl
new file mode 100644
index 0000000000..cdda3bc7e5
--- /dev/null
+++ b/deploy/addons/registry-aliases/patch-coredns-job.tmpl
@@ -0,0 +1,26 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: registry-aliases-patch-core-dns
+  namespace: kube-system
+spec:
+  ttlSecondsAfterFinished: 100
+  template:
+    spec:
+      serviceAccountName: registry-aliases-sa
+      volumes:
+       - name: minikube
+         hostPath: 
+           path: /var/lib/minikube/binaries
+      containers:
+       - name: core-dns-patcher
+         image:  quay.io/rhdevelopers/core-dns-patcher
+         imagePullPolicy: IfNotPresent
+         # using the kubectl from the minikube instance
+         volumeMounts:
+           - mountPath: /var/lib/minikube/binaries
+             name: minikube
+             readOnly: true
+      restartPolicy: Never
+  backoffLimit: 4
\ No newline at end of file
diff --git a/deploy/addons/registry-aliases/registry-aliases-config.tmpl b/deploy/addons/registry-aliases/registry-aliases-config.tmpl
new file mode 100644
index 0000000000..0dacc4ed9c
--- /dev/null
+++ b/deploy/addons/registry-aliases/registry-aliases-config.tmpl
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: registry-aliases
+  namespace: kube-system
+  labels:
+    kubernetes.io/minikube-addons: registry-aliases
+    addonmanager.kubernetes.io/mode: Reconcile
+data:
+  # Add additonal hosts seperated by new-line
+  registryAliases: >-
+    example.org
+    example.com
+    test.com
+    test.org
+  # default registry address in minikube when enabled via minikube addons enable registry
+  registrySvc: registry.kube-system.svc.cluster.local
+
diff --git a/deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl b/deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl
new file mode 100644
index 0000000000..1ca1b60cc8
--- /dev/null
+++ b/deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: registry-aliases-crb
+subjects:
+- kind: ServiceAccount
+  name: registry-aliases-sa
+  namespace: kube-system
+roleRef:
+  kind: ClusterRole
+  name: cluster-admin
+  apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/deploy/addons/registry-aliases/registry-aliases-sa.tmpl b/deploy/addons/registry-aliases/registry-aliases-sa.tmpl
new file mode 100644
index 0000000000..a40fc37999
--- /dev/null
+++ b/deploy/addons/registry-aliases/registry-aliases-sa.tmpl
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+   name: registry-aliases-sa
+   namespace: kube-system
\ No newline at end of file
diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index 46c713d69f..f3ed918240 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -112,6 +112,13 @@ var Addons = []*Addon{
 		set:       SetBool,
 		callbacks: []setFn{enableOrDisableAddon},
 	},
+	{
+		name:      "registry-aliases",
+		set:       SetBool,
+		callbacks: []setFn{enableOrDisableAddon},
+		//TODO - add other settings
+		//TODO check if registry addon is enabled
+	},
 	{
 		name:      "storage-provisioner",
 		set:       SetBool,
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index b25446e8f6..4e20974058 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -246,6 +246,38 @@ var Addons = map[string]*Addon{
 			"0640",
 			false),
 	}, false, "registry-creds"),
+	"registry-aliases": NewAddon([]*BinAsset{
+		MustBinAsset(
+			"deploy/addons/registry-aliases/registry-aliases-sa.tmpl",
+			vmpath.GuestAddonsDir,
+			"registry-aliases-sa.yaml",
+			"0640",
+			false),
+		MustBinAsset(
+			"deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl",
+			vmpath.GuestAddonsDir,
+			"registry-aliases-sa-crb.yaml",
+			"0640",
+			false),
+		MustBinAsset(
+			"deploy/addons/registry-aliases/registry-aliases-config.tmpl",
+			vmpath.GuestAddonsDir,
+			"registry-aliases-config.yaml",
+			"0640",
+			false),
+		MustBinAsset(
+			"deploy/addons/registry-aliases/node-etc-hosts-update.tmpl",
+			vmpath.GuestAddonsDir,
+			"node-etc-hosts-update.yaml",
+			"0640",
+			false),
+		MustBinAsset(
+			"deploy/addons/registry-aliases/patch-coredns-job.tmpl",
+			vmpath.GuestAddonsDir,
+			"patch-coredns-job.yaml",
+			"0640",
+			false),
+	}, false, "registry-aliases"),
 	"freshpod": NewAddon([]*BinAsset{
 		MustBinAsset(
 			"deploy/addons/freshpod/freshpod-rc.yaml.tmpl",

From 28ffcb13a1e3e4dde9e6dd70d0af867bc04bd711 Mon Sep 17 00:00:00 2001
From: Kamesh Sampath <ksampath@redhat.com>
Date: Thu, 20 Feb 2020 19:32:19 +0530
Subject: [PATCH 048/668] updated readme with usage instructions

Signed-off-by: Kamesh Sampath <ksampath@redhat.com>
---
 deploy/addons/registry-aliases/README.md | 150 +++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 deploy/addons/registry-aliases/README.md

diff --git a/deploy/addons/registry-aliases/README.md b/deploy/addons/registry-aliases/README.md
new file mode 100644
index 0000000000..a111524bde
--- /dev/null
+++ b/deploy/addons/registry-aliases/README.md
@@ -0,0 +1,150 @@
+# Minikube Registry Aliases Addon
+
+An addon to minikube that can help push and pull from the minikube registry using custom domain names. The custom domain names will be made resolveable from with in cluster and at minikube node.
+
+## How to use ?
+
+### Start minikube
+
+```shell
+minikube profile demo
+minikube start -p demo
+```
+This addon depends on `registry` addon, it need to be enabled before the alias addon is installed:
+
+### Enable internal registry
+
+```shell
+minikube addons enable registry
+```
+
+Verifying the registry deployment
+
+```shell
+watch kubectl get pods -n kube-system
+```
+
+```shell
+NAME                           READY   STATUS    RESTARTS   AGE
+coredns-6955765f44-kpbzt       1/1     Running   0          16m
+coredns-6955765f44-lzlsv       1/1     Running   0          16m
+etcd-demo                      1/1     Running   0          16m
+kube-apiserver-demo            1/1     Running   0          16m
+kube-controller-manager-demo   1/1     Running   0          16m
+kube-proxy-q8rb9               1/1     Running   0          16m
+kube-scheduler-demo            1/1     Running   0          16m
+*registry-4k8zs*              1/1     Running   0          40s
+registry-proxy-vs8jt           1/1     Running   0          40s
+storage-provisioner            1/1     Running   0          16m
+```
+
+```shell
+kubectl get svc -n kube-system
+```
+
+```shell
+NAME       TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)                  AGE
+kube-dns   ClusterIP   10.96.0.10     <none>        53/UDP,53/TCP,9153/TCP   17m
+registry   ClusterIP   10.97.247.75   <none>        80/TCP                   94s
+```
+
+>
+> **NOTE:**
+> Please make a note of the CLUSTER-IP of `registry` service
+
+### Enable registry aliases addon
+
+```shell
+minikube addons enable registry-aliases
+🌟  The 'registry-aliases' addon is enabled
+```
+
+You can check the mikikube vm's `/etc/hosts` file for the registry aliases entries:
+
+```shell
+watch minikube ssh -- cat /etc/hosts
+```
+
+```shell
+127.0.0.1       localhost
+127.0.1.1 demo
+10.97.247.75    example.org
+10.97.247.75    example.com
+10.97.247.75    test.com
+10.97.247.75    test.org
+```
+
+The above output shows that the Daemonset has added the `registryAliases` from the ConfigMap pointing to the internal registry's __CLUSTER-IP__.
+
+### Update CoreDNS
+
+The coreDNS would have been automatically updated by the patch-coredns. A successful job run will have coredns ConfigMap updated like:
+
+```yaml
+apiVersion: v1
+data:
+  Corefile: |-
+    .:53 {
+        errors
+        health
+        rewrite name example.com registry.kube-system.svc.cluster.local
+        rewrite name example.org registry.kube-system.svc.cluster.local
+        rewrite name test.com registry.kube-system.svc.cluster.local
+        rewrite name test.org registry.kube-system.svc.cluster.local
+        kubernetes cluster.local in-addr.arpa ip6.arpa {
+           pods insecure
+           upstream
+           fallthrough in-addr.arpa ip6.arpa
+        }
+        prometheus :9153
+        proxy . /etc/resolv.conf
+        cache 30
+        loop
+        reload
+        loadbalance
+    }
+kind: ConfigMap
+metadata:
+  name: coredns
+```
+
+To verify it run the following command:
+
+```shell
+kubectl get cm -n kube-system coredns -o yaml
+```
+
+Once you have successfully patched you can now push and pull from the registry using suffix `example.com`, `example.org`,`test.com` and `test.org`.
+
+The successful run will show the following extra pods (Daemonset, Job) in `kube-system` namespace:
+
+```shell
+NAME                                    READY   STATUS      RESTARTS   AGE
+registry-aliases-hosts-update-995vx     1/1     Running     0          47s
+registry-aliases-patch-core-dns-zsxfc   0/1     Completed   0          47s
+```
+
+## Verify with sample application
+
+You can verify the deployment end to end using the example [application](https://github.com/kameshsampath/minikube-registry-aliases-demo).
+
+```shell
+git clone https://github.com/kameshsampath/minikube-registry-aliases-demo
+cd minikube-registry-aliases-demo
+```
+
+Make sure you set the docker context using `eval $(minikube -p demo docker-env)`
+
+Deploy the application using [Skaffold](https://skaffold.dev):
+
+```shell
+skaffold dev --port-forward
+```
+
+Once the application is running try doing `curl localhost:8080` to see the `Hello World` response
+
+You can also update [skaffold.yaml](./skaffold.yaml) and [app.yaml](.k8s/app.yaml), to use `test.org`, `test.com` or `example.org` as container registry urls, and see all the container image names resolves to internal registry, resulting in successful build and deployment.
+
+> **NOTE**:
+>
+> You can also update [skaffold.yaml](./skaffold.yaml) and [app. yaml](.k8s/app.yaml), to use `test.org`, `test.com` or > `example.org` as container registry urls, and see all the > container image names resolves to internal registry, resulting in successful build and deployment.

From db27b59e075180085b199948855889179707aa2c Mon Sep 17 00:00:00 2001
From: Kamesh Sampath <ksampath@redhat.com>
Date: Sun, 8 Mar 2020 09:36:21 +0530
Subject: [PATCH 049/668] (chore) fix README to use new profile format

---
 deploy/addons/registry-aliases/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/addons/registry-aliases/README.md b/deploy/addons/registry-aliases/README.md
index a111524bde..1cebc54759 100644
--- a/deploy/addons/registry-aliases/README.md
+++ b/deploy/addons/registry-aliases/README.md
@@ -7,7 +7,6 @@ An addon to minikube that can help push and pull from the minikube registry usin
 ### Start minikube
 
 ```shell
-minikube profile demo
 minikube start -p demo
 ```
 This addon depends on `registry` addon, it need to be enabled before the alias addon is installed:

From 05116abb1fedc501788a5cd80704d803329a05b8 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 9 Mar 2020 19:29:29 -0700
Subject: [PATCH 050/668] more fallout for the merge-pocalypse

---
 cmd/minikube/cmd/node_add.go  | 12 +++++++-----
 cmd/minikube/cmd/ssh.go       |  8 ++++++--
 cmd/minikube/cmd/start.go     |  2 +-
 pkg/minikube/cluster/cache.go |  3 ++-
 pkg/minikube/cluster/setup.go |  4 ++--
 pkg/minikube/node/start.go    | 12 +++---------
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 3995e7a6d7..9247d872ed 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -43,17 +43,19 @@ var nodeAddCmd = &cobra.Command{
 			exit.WithError("Error getting config", err)
 		}
 
-		//name := profile + strconv.Itoa(len(mc.Nodes)+1)
 		name := fmt.Sprintf("m%d", len(cc.Nodes)+1)
 
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
-		n, err := node.Add(cc, name, cp, worker, "", profile)
-		if err != nil {
-			exit.WithError("Error adding node to cluster", err)
+		// TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here.
+		n := config.Node{
+			Name:              name,
+			Worker:            worker,
+			ControlPlane:      cp,
+			KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
 		}
 
-		_, err = node.Start(*cc, *n, false, nil)
+		err = node.Add(cc, n)
 		if err != nil {
 			exit.WithError("Error adding node to cluster", err)
 		}
diff --git a/cmd/minikube/cmd/ssh.go b/cmd/minikube/cmd/ssh.go
index 9da3698ba9..9c41e8c275 100644
--- a/cmd/minikube/cmd/ssh.go
+++ b/cmd/minikube/cmd/ssh.go
@@ -58,7 +58,11 @@ var sshCmd = &cobra.Command{
 			}
 			n = &cp
 		} else {
-			n = node.Retrieve(cc, nodeName)
+			n, _, err = node.Retrieve(cc, nodeName)
+			if err != nil {
+				out.FailureT("Node {{.nodeName}} does not exist.", out.V{"nodeName": nodeName})
+				exit.WithError("", err)
+			}
 		}
 		host, err := machine.CheckIfHostExistsAndLoad(api, driver.MachineName(*cc, *n))
 		if err != nil {
@@ -73,7 +77,7 @@ var sshCmd = &cobra.Command{
 			ssh.SetDefaultClient(ssh.External)
 		}
 
-		err = machine.CreateSSHShell(api, *cc, cp, args)
+		err = machine.CreateSSHShell(api, *cc, *n, args)
 		if err != nil {
 			// This is typically due to a non-zero exit code, so no need for flourish.
 			out.ErrLn("ssh: %v", err)
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0fd8f1c0c0..ba0d393f46 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -348,7 +348,7 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
 	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.MachineProfile), &mc); err != nil {
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), &mc); err != nil {
 		exit.WithError("Failed to save config", err)
 	}
 
diff --git a/pkg/minikube/cluster/cache.go b/pkg/minikube/cluster/cache.go
index e918eb454e..37fb7ae7cd 100644
--- a/pkg/minikube/cluster/cache.go
+++ b/pkg/minikube/cluster/cache.go
@@ -51,7 +51,8 @@ func BeginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVers
 	})
 }
 
-func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string) {
+// HandleDownloadOnly caches appropariate binaries and images
+func HandleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string) {
 	// If --download-only, complete the remaining downloads and exit.
 	if !viper.GetBool("download-only") {
 		return
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index 62b57730b1..8b1af87a55 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -89,7 +89,7 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 
 	// enable addons, both old and new!
 	if existingAddons != nil {
-		addons.Start(viper.GetString(config.MachineProfile), existingAddons, config.AddonList)
+		addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList)
 	}
 
 	// special ops for none , like change minikube directory.
@@ -111,7 +111,7 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 
 // setupKubeAdm adds any requested files into the VM before Kubernetes is started
 func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
-	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg.Name, n.Name)
+	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg, n)
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
 	}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 3e88a23041..2c7eb18004 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -25,24 +25,18 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/util"
 )
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) error {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
-	var cacheGroup errgroup.Group
+	var cacheGroup, kicGroup errgroup.Group
 	cluster.BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
 
-	// Why do we need this?
-	if cc.Downloader == nil {
-		cc.Downloader = util.DefaultDownloader{}
-	}
-
 	runner, preExists, mAPI, _ := cluster.StartMachine(&cc, &n)
 	defer mAPI.Close()
 
-	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc.Name, n.Name)
+	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
 	if err != nil {
 		exit.WithError("Failed to get bootstrapper", err)
 	}
@@ -50,7 +44,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	k8sVersion := cc.KubernetesConfig.KubernetesVersion
 	driverName := cc.Driver
 	// exits here in case of --download-only option.
-	cluster.HandleDownloadOnly(&cacheGroup, k8sVersion)
+	cluster.HandleDownloadOnly(&cacheGroup, &kicGroup, k8sVersion)
 	// configure the runtime (docker, containerd, crio)
 	cr := configureRuntimes(runner, driverName, cc.KubernetesConfig)
 	showVersionInfo(k8sVersion, cr)

From ef93b291ca278d8654c29e7809098606ee441f7d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 10 Mar 2020 13:46:06 -0700
Subject: [PATCH 051/668] fix build failures

---
 pkg/minikube/machine/cluster_test.go | 2 --
 pkg/minikube/node/node.go            | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 2f7cd5b15b..e1f7d5a390 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -108,8 +108,6 @@ func TestStartHostExists(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 
-	n := defaultNodeConfig
-
 	// Create an initial host.
 	ih, err := createHost(api, defaultClusterConfig, config.Node{Name: "minikube"})
 	if err != nil {
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index fb12bfca75..1b86069ee9 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -32,6 +32,7 @@ const (
 	mountString      = "mount-string"
 	createMount      = "mount"
 	waitTimeout      = "wait-timeout"
+	imageRepository  = "image-repository"
 )
 
 // Add adds a new node config to an existing cluster.

From 63dc9385047355283daf9f3434b582b22395edd1 Mon Sep 17 00:00:00 2001
From: sayboras <sayboras@yahoo.com>
Date: Mon, 9 Mar 2020 18:32:27 +1100
Subject: [PATCH 052/668] Update KUBECONFIG for change non user test Install
 lz4 in ubuntu

---
 .github/workflows/main.yml    | 25 +++++++++++++++++++++++++
 test/integration/none_test.go |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3572ed151..a2daefe32d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,6 +88,11 @@ jobs:
         docker info || true
         docker version || true
         docker ps || true
+    - name: install lz4
+      shell: bash
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
     - name: Install gopogh
       shell: bash
       run: |
@@ -150,6 +155,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     needs: [build_minikube]
     steps:
+    - name: install lz4
+      shell: bash
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
     - name: Docker Info
       shell: bash
       run: |
@@ -218,6 +228,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
+    - name: install lz4
+      shell: bash
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
     - name: Install gopogh
       shell: bash
       run: |
@@ -280,6 +295,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
+    - name: install lz4
+      shell: bash
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
     - name: Install gopogh
       shell: bash
       run: |
@@ -342,6 +362,11 @@ jobs:
         SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
       runs-on: ubuntu-18.04
       steps:
+      - name: install lz4
+        shell: bash
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get -qq -y install liblz4-tool
       - name: install podman
         shell: bash
         run: |
diff --git a/test/integration/none_test.go b/test/integration/none_test.go
index e95468f86c..873465d5ef 100644
--- a/test/integration/none_test.go
+++ b/test/integration/none_test.go
@@ -77,7 +77,13 @@ func TestChangeNoneUser(t *testing.T) {
 		t.Errorf("Failed to convert uid to int: %v", err)
 	}
 
-	for _, p := range []string{localpath.MiniPath(), filepath.Join(u.HomeDir, ".kube/config")} {
+	// Retrieve the kube config from env
+	kubeConfig := os.Getenv("KUBECONFIG")
+	if kubeConfig == "" {
+		kubeConfig = filepath.Join(u.HomeDir, ".kube/config")
+	}
+
+	for _, p := range []string{localpath.MiniPath(), kubeConfig} {
 		info, err := os.Stat(p)
 		if err != nil {
 			t.Errorf("stat(%s): %v", p, err)

From f5de2ff7c05f5175af8b77ec926c4fde44afc579 Mon Sep 17 00:00:00 2001
From: RA489 <rohit.anand@india.nec.com>
Date: Wed, 19 Feb 2020 16:00:56 +0530
Subject: [PATCH 053/668] Improve docker performance if it is too slow

---
 site/content/en/docs/Reference/Drivers/docker.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index 164691d267..f44261fbad 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -28,3 +28,4 @@ As an experimental driver, not all commands are supported on all platforms. Nota
 ## Troubleshooting
 
 * Run `minikube start --alsologtostderr -v=1` to debug crashes
+* If your docker is too slow on mac os try [Improving docker performance](https://docs.docker.com/docker-for-mac/osxfs-caching/)

From 3ed818c48860e6777a559f14f30a8a029d5357a9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 12 Mar 2020 15:40:13 -0700
Subject: [PATCH 054/668] cosmetic fixes

---
 cmd/minikube/cmd/node_add.go                |  2 +-
 cmd/minikube/cmd/node_start.go              |  5 +----
 cmd/minikube/cmd/start.go                   | 16 +++++++-------
 cmd/minikube/cmd/status.go                  | 11 ++++++++--
 pkg/minikube/bootstrapper/bsutil/kubeadm.go | 16 +++++++++-----
 pkg/minikube/node/node.go                   |  4 ++--
 pkg/minikube/node/start.go                  | 23 ++++++++++++---------
 7 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 9247d872ed..a450684ec3 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -43,7 +43,7 @@ var nodeAddCmd = &cobra.Command{
 			exit.WithError("Error getting config", err)
 		}
 
-		name := fmt.Sprintf("m%d", len(cc.Nodes)+1)
+		name := fmt.Sprintf("m%02d", len(cc.Nodes)+1)
 
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 92f866f99e..658ee092bf 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,10 +61,7 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		err = node.Start(*cc, *n, nil)
-		if err != nil {
-			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
-		}
+		node.Start(*cc, *n, nil)
 	},
 }
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 5df3d73d88..9b87afbd94 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -315,7 +315,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	k8sVersion := getKubernetesVersion(existing)
-	mc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
+	cc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -331,7 +331,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		if err != nil {
 			exit.WithError("Failed to cache ISO", err)
 		}
-		mc.MinikubeISO = url
+		cc.MinikubeISO = url
 	}
 
 	if viper.GetBool(nativeSSH) {
@@ -350,16 +350,16 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
 	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.ProfileName), &mc); err != nil {
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
 		exit.WithError("Failed to save config", err)
 	}
 
-	kubeconfig, err := cluster.InitialSetup(mc, n, existingAddons)
+	kubeconfig, err := cluster.InitialSetup(cc, n, existingAddons)
 	if err != nil {
 		exit.WithError("Starting node", err)
 	}
 
-	if err := showKubectlInfo(kubeconfig, k8sVersion, mc.Name); err != nil {
+	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
 		glog.Errorf("kubectl info: %v", err)
 	}
 
@@ -369,14 +369,14 @@ func runStart(cmd *cobra.Command, args []string) {
 			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
 		}
 		for i := 1; i < numNodes; i++ {
-			nodeName := fmt.Sprintf("%s%d", n.Name, i+1)
+			nodeName := fmt.Sprintf("m%02d", i+1)
 			n := config.Node{
 				Name:              nodeName,
 				Worker:            true,
 				ControlPlane:      false,
-				KubernetesVersion: mc.KubernetesConfig.KubernetesVersion,
+				KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
 			}
-			err := node.Add(&mc, n)
+			err := node.Add(&cc, n)
 			if err != nil {
 				exit.WithError("adding node", err)
 			}
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 012db5a980..6342706bd8 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -150,8 +150,15 @@ func exitCode(st *Status) int {
 
 func status(api libmachine.API, name string, controlPlane bool) (*Status, error) {
 
-	profile := strings.Split(name, "-")[0]
-	node := strings.Split(name, "-")[1]
+	var profile, node string
+
+	if strings.Contains(name, "-") {
+		profile = strings.Split(name, "-")[0]
+		node = strings.Split(name, "-")[1]
+	} else {
+		profile = name
+		node = name
+	}
 
 	st := &Status{
 		Name:       node,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 0f37e5ae11..2b28ed6f99 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -36,8 +36,8 @@ import (
 const remoteContainerRuntime = "remote"
 
 // GenerateKubeadmYAML generates the kubeadm.yaml file
-func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.Node) ([]byte, error) {
-	k8s := mc.KubernetesConfig
+func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.Node) ([]byte, error) {
+	k8s := cc.KubernetesConfig
 	version, err := ParseKubernetesVersion(k8s.KubernetesVersion)
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing kubernetes version")
@@ -50,7 +50,7 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N
 	}
 
 	// In case of no port assigned, use default
-	cp, err := config.PrimaryControlPlane(&mc)
+	cp, err := config.PrimaryControlPlane(&cc)
 	if err != nil {
 		return nil, errors.Wrap(err, "getting control plane")
 	}
@@ -64,6 +64,11 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N
 		return nil, errors.Wrap(err, "generating extra component config for kubeadm")
 	}
 
+	controlPlaneEndpoint := cp.IP
+	if n.ControlPlane {
+		controlPlaneEndpoint = "localhost"
+	}
+
 	opts := struct {
 		CertDir             string
 		ServiceCIDR         string
@@ -91,7 +96,7 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N
 		KubernetesVersion: k8s.KubernetesVersion,
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       k8s.ClusterName,
-		NodeName:          cp.Name,
+		NodeName:          n.Name,
 		CRISocket:         r.SocketPath(),
 		ImageRepository:   k8s.ImageRepository,
 		ComponentOptions:  componentOpts,
@@ -101,7 +106,7 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N
 		NodeIP:            n.IP,
 		// NOTE: If set to an specific VM IP, things may break if the IP changes on host restart
 		// For multi-node, we may need to figure out an alternate strategy, like DNS or hosts files
-		ControlPlaneAddress: "localhost",
+		ControlPlaneAddress: controlPlaneEndpoint,
 	}
 
 	if k8s.ServiceCIDR != "" {
@@ -126,6 +131,7 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N
 	if err := configTmpl.Execute(&b, opts); err != nil {
 		return nil, err
 	}
+	fmt.Printf("%s OPTS=%+v\n", n.Name, opts)
 	glog.Infof("kubeadm config:\n%s\n", b.String())
 	return b.Bytes(), nil
 }
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 1b86069ee9..3dba42d1f0 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -43,8 +43,8 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		return err
 	}
 
-	err = Start(*cc, n, nil)
-	return err
+	Start(*cc, n, nil)
+	return nil
 }
 
 // Delete stops and deletes the given node from the given cluster
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 0b2d4d3708..80fc09a52c 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -28,12 +28,12 @@ import (
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) error {
+func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
 	var cacheGroup, kicGroup errgroup.Group
 	cluster.BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
 
-	runner, preExists, mAPI, _ := cluster.StartMachine(&cc, &n)
+	runner, _, mAPI, _ := cluster.StartMachine(&cc, &n)
 	defer mAPI.Close()
 
 	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
@@ -69,13 +69,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		out.T(out.FailureType, "Unable to load cached images from config file.")
 	}
 
-	// Skip pre-existing, because we already waited for health
-	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
-			exit.WithError("Wait failed", err)
-		}
-	}
-
 	err = bs.SetupCerts(cc.KubernetesConfig, n)
 	if err != nil {
 		exit.WithError("setting up certs", err)
@@ -93,5 +86,15 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	if err != nil {
 		exit.WithError("generating join token", err)
 	}
-	return bs.JoinCluster(cc, n, joinCmd)
+	err = bs.JoinCluster(cc, n, joinCmd)
+	if err != nil {
+		exit.WithError("joining cluster", err)
+	}
+
+	/*// Skip pre-existing, because we already waited for health
+	if viper.GetBool(waitUntilHealthy) && !preExists {
+		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
+			exit.WithError("Wait failed", err)
+		}
+	}*/
 }

From b6ab2931d69b789d1a07e0e8930dfd444a4248c4 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 13 Mar 2020 11:29:46 -0700
Subject: [PATCH 055/668] run all necessary steps on all nodes

---
 pkg/minikube/bootstrapper/bootstrapper.go    |  3 +-
 pkg/minikube/bootstrapper/bsutil/kubeadm.go  |  4 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 41 +++++++++++++-------
 pkg/minikube/node/start.go                   | 24 +++++-------
 4 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index f250423833..1dac315e80 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -42,7 +42,8 @@ type Bootstrapper interface {
 	WaitForNode(config.ClusterConfig, config.Node, time.Duration) error
 	JoinCluster(config.ClusterConfig, config.Node, string) error
 	UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error
-	GenerateToken(config.KubernetesConfig) (string, error)
+	SetupNode(config.ClusterConfig) error
+	GenerateToken(config.ClusterConfig) (string, error)
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 2b28ed6f99..dacce16d43 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -65,9 +65,9 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.N
 	}
 
 	controlPlaneEndpoint := cp.IP
-	if n.ControlPlane {
+	/*if n.ControlPlane {
 		controlPlaneEndpoint = "localhost"
-	}
+	}*/
 
 	opts := struct {
 		CertDir             string
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ca207f63d9..a5143a7587 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -200,22 +200,17 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
+	err = k.SetupNode(cfg)
+	if err != nil {
+		return errors.Wrap(err, "setting up node")
+	}
+
 	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
 	rr, err := k.c.RunCmd(c)
 	if err != nil {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
 	}
 
-	if cfg.Driver == driver.Docker {
-		if err := k.applyKicOverlay(cfg); err != nil {
-			return errors.Wrap(err, "apply kic overlay")
-		}
-	}
-
-	if err := k.applyNodeLabels(cfg); err != nil {
-		glog.Warningf("unable to apply node labels: %v", err)
-	}
-
 	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
 		glog.Warningf("unable to adjust resource limits: %v", err)
 	}
@@ -227,6 +222,20 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	return nil
 }
 
+func (k *Bootstrapper) SetupNode(cfg config.ClusterConfig) error {
+	if cfg.Driver == driver.Docker {
+		if err := k.applyKicOverlay(cfg); err != nil {
+			return errors.Wrap(err, "apply kic overlay")
+		}
+	}
+
+	if err := k.applyNodeLabels(cfg); err != nil {
+		glog.Warningf("unable to apply node labels: %v", err)
+	}
+
+	return nil
+}
+
 // client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver
 func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) {
 	if k.k8sClient != nil {
@@ -384,14 +393,20 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 }
 
 // GenerateToken creates a token and returns the appropriate kubeadm join command to run
-func (k *Bootstrapper) GenerateToken(k8s config.KubernetesConfig) (string, error) {
-	tokenCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s token create --print-join-command --ttl=0", bsutil.InvokeKubeadm(k8s.KubernetesVersion)))
+func (k *Bootstrapper) GenerateToken(cc config.ClusterConfig) (string, error) {
+	tokenCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s token create --print-join-command --ttl=0", bsutil.InvokeKubeadm(cc.KubernetesConfig.KubernetesVersion)))
 	r, err := k.c.RunCmd(tokenCmd)
 	if err != nil {
 		return "", errors.Wrap(err, "generating bootstrap token")
 	}
+
+	/*cp, err := config.PrimaryControlPlane(&cc)
+	if err != nil {
+		return "", errors.Wrap(err, "getting primary control plane")
+	}*/
 	joinCmd := r.Stdout.String()
-	joinCmd = strings.Replace(joinCmd, "kubeadm", bsutil.InvokeKubeadm(k8s.KubernetesVersion), 1)
+	joinCmd = strings.Replace(joinCmd, "kubeadm", bsutil.InvokeKubeadm(cc.KubernetesConfig.KubernetesVersion), 1)
+	//joinCmd = strings.ReplaceAll(joinCmd, "localhost", cp.IP)
 	joinCmd = fmt.Sprintf("%s --ignore-preflight-errors=all", strings.TrimSpace(joinCmd))
 
 	return joinCmd, nil
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 80fc09a52c..1550390771 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/out"
 )
 
 // Start spins up a guest and starts the kubernetes node.
@@ -66,14 +65,17 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 
 	if err := cluster.CacheAndLoadImagesInConfig(); err != nil {
-		out.T(out.FailureType, "Unable to load cached images from config file.")
+		exit.WithError("Unable to load cached images from config file.", err)
 	}
 
-	err = bs.SetupCerts(cc.KubernetesConfig, n)
-	if err != nil {
+	if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
 		exit.WithError("setting up certs", err)
 	}
 
+	if err = bs.SetupNode(cc); err != nil {
+		exit.WithError("Failed to setup node", err)
+	}
+
 	cp, err := config.PrimaryControlPlane(&cc)
 	if err != nil {
 		exit.WithError("Getting primary control plane", err)
@@ -82,19 +84,13 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	if err != nil {
 		exit.WithError("Getting bootstrapper", err)
 	}
-	joinCmd, err := cpBs.GenerateToken(cc.KubernetesConfig)
+
+	joinCmd, err := cpBs.GenerateToken(cc)
 	if err != nil {
 		exit.WithError("generating join token", err)
 	}
-	err = bs.JoinCluster(cc, n, joinCmd)
-	if err != nil {
+
+	if err = bs.JoinCluster(cc, n, joinCmd); err != nil {
 		exit.WithError("joining cluster", err)
 	}
-
-	/*// Skip pre-existing, because we already waited for health
-	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
-			exit.WithError("Wait failed", err)
-		}
-	}*/
 }

From a9b73b8ba3f539832f26ec2051d62791c391a097 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 13 Mar 2020 15:03:19 -0700
Subject: [PATCH 056/668] fixing up minikube start path

---
 cmd/minikube/cmd/start.go                    |   8 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  44 ++---
 pkg/minikube/cluster/cache.go                |   8 +-
 pkg/minikube/cluster/setup.go                |  19 +-
 pkg/minikube/machine/cluster_test.go         |  12 +-
 pkg/minikube/machine/start.go                |  20 +-
 pkg/minikube/node/machine.go                 | 187 -------------------
 pkg/minikube/node/start.go                   |  14 +-
 8 files changed, 71 insertions(+), 241 deletions(-)
 delete mode 100644 pkg/minikube/node/machine.go

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 9b87afbd94..af7e32b078 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -359,10 +359,6 @@ func runStart(cmd *cobra.Command, args []string) {
 		exit.WithError("Starting node", err)
 	}
 
-	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
-		glog.Errorf("kubectl info: %v", err)
-	}
-
 	numNodes := viper.GetInt(nodes)
 	if numNodes > 1 {
 		if driver.IsKIC(driverName) {
@@ -382,6 +378,10 @@ func runStart(cmd *cobra.Command, args []string) {
 			}
 		}
 	}
+
+	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
+		glog.Errorf("kubectl info: %v", err)
+	}
 }
 
 func updateDriver(driverName string) {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index a5143a7587..cb1d0d1058 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -222,6 +222,7 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	return nil
 }
 
+// SetupNode runs commands that need to be on all nodes
 func (k *Bootstrapper) SetupNode(cfg config.ClusterConfig) error {
 	if cfg.Driver == driver.Docker {
 		if err := k.applyKicOverlay(cfg); err != nil {
@@ -339,33 +340,32 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
-	for _, n := range cfg.Nodes {
-		ip := n.IP
-		port := n.Port
-		if driver.IsKIC(cfg.Driver) {
-			ip = oci.DefaultBindIPV4
-			port, err = oci.HostPortBinding(cfg.Driver, driver.MachineName(cfg, n), port)
-			if err != nil {
-				return errors.Wrapf(err, "get host-bind port %d for container %s", port, driver.MachineName(cfg, n))
-			}
-		}
-		client, err := k.client(ip, port)
+	cp, err := config.PrimaryControlPlane(&cfg)
+	ip := cp.IP
+	port := cp.Port
+	if driver.IsKIC(cfg.Driver) {
+		ip = oci.DefaultBindIPV4
+		port, err = oci.HostPortBinding(cfg.Driver, driver.MachineName(cfg, cp), port)
 		if err != nil {
-			return errors.Wrap(err, "getting k8s client")
+			return errors.Wrapf(err, "get host-bind port %d for container %s", port, driver.MachineName(cfg, cp))
 		}
+	}
+	client, err := k.client(ip, port)
+	if err != nil {
+		return errors.Wrap(err, "getting k8s client")
+	}
 
-		if err := kverify.SystemPods(client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
-			return errors.Wrap(err, "system pods")
-		}
+	if err := kverify.SystemPods(client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+		return errors.Wrap(err, "system pods")
+	}
 
-		// Explicitly re-enable kubeadm addons (proxy, coredns) so that they will check for IP or configuration changes.
-		if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, bsutil.KubeadmYamlPath))); err != nil {
-			return errors.Wrapf(err, fmt.Sprintf("addon phase cmd:%q", rr.Command()))
-		}
+	// Explicitly re-enable kubeadm addons (proxy, coredns) so that they will check for IP or configuration changes.
+	if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, bsutil.KubeadmYamlPath))); err != nil {
+		return errors.Wrapf(err, fmt.Sprintf("addon phase cmd:%q", rr.Command()))
+	}
 
-		if err := bsutil.AdjustResourceLimits(k.c); err != nil {
-			glog.Warningf("unable to adjust resource limits: %v", err)
-		}
+	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
+		glog.Warningf("unable to adjust resource limits: %v", err)
 	}
 	return nil
 }
diff --git a/pkg/minikube/cluster/cache.go b/pkg/minikube/cluster/cache.go
index 809e87580b..e7563d1d78 100644
--- a/pkg/minikube/cluster/cache.go
+++ b/pkg/minikube/cluster/cache.go
@@ -40,8 +40,8 @@ const (
 	cacheImageConfigKey = "cache"
 )
 
-// BeginCacheRequiredImages caches images required for kubernetes version in the background
-func BeginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVersion string, cRuntime string) {
+// BeginCacheKubernetesImages caches images required for kubernetes version in the background
+func BeginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVersion string, cRuntime string) {
 	if download.PreloadExists(k8sVersion, cRuntime) {
 		g.Go(func() error {
 			glog.Info("Caching tarball of preloaded images")
@@ -96,8 +96,8 @@ func doCacheBinaries(k8sVersion string) error {
 	return machine.CacheBinariesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
 }
 
-// beginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
-func beginDownloadKicArtifacts(g *errgroup.Group) {
+// BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
+func BeginDownloadKicArtifacts(g *errgroup.Group) {
 	glog.Info("Beginning downloading kic artifacts")
 	g.Go(func() error {
 		glog.Infof("Downloading %s to local daemon", kic.BaseImage)
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index ad2fc408ff..cd653bbdbd 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -71,7 +71,17 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 	bs := setupKubeAdm(machineAPI, cc, n)
 
 	var cacheGroup errgroup.Group
-	BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	if !driver.BareMetal(cc.Driver) {
+		BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	}
+
+	var kicGroup errgroup.Group
+	if driver.IsKIC(cc.Driver) {
+		BeginDownloadKicArtifacts(&kicGroup)
+	}
+
+	HandleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
+	WaitDownloadKicArtifacts(&kicGroup)
 
 	// pull images or restart cluster
 	out.T(out.Launch, "Launching Kubernetes ... ")
@@ -189,12 +199,7 @@ func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 
 // startHost starts a new minikube host using a VM or None
 func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
-	exists, err := api.Exists(n.Name)
-	if err != nil {
-		exit.WithError("Failed to check if machine exists", err)
-	}
-
-	host, err := machine.StartHost(api, mc, n)
+	host, exists, err := machine.StartHost(api, mc, n)
 	if err != nil {
 		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
 	}
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 32dcc0ec0f..c4c26d27c2 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -130,7 +130,7 @@ func TestStartHostExists(t *testing.T) {
 	n := config.Node{Name: ih.Name}
 
 	// This should pass without calling Create because the host exists already.
-	h, err := StartHost(api, mc, n)
+	h, _, err := StartHost(api, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -164,7 +164,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	n := config.Node{Name: h.Name}
 
 	// This should pass with creating host, while machine does not exist.
-	h, err = StartHost(api, mc, n)
+	h, _, err = StartHost(api, mc, n)
 	if err != nil {
 		if err != ErrorMachineNotExist {
 			t.Fatalf("Error starting host: %v", err)
@@ -177,7 +177,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	n.Name = h.Name
 
 	// Second call. This should pass without calling Create because the host exists already.
-	h, err = StartHost(api, mc, n)
+	h, _, err = StartHost(api, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -210,7 +210,7 @@ func TestStartStoppedHost(t *testing.T) {
 	mc := defaultClusterConfig
 	mc.Name = h.Name
 	n := config.Node{Name: h.Name}
-	h, err = StartHost(api, mc, n)
+	h, _, err = StartHost(api, mc, n)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -238,7 +238,7 @@ func TestStartHost(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	h, err := StartHost(api, defaultClusterConfig, config.Node{Name: "minikube"})
+	h, _, err := StartHost(api, defaultClusterConfig, config.Node{Name: "minikube"})
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -272,7 +272,7 @@ func TestStartHostConfig(t *testing.T) {
 		DockerOpt: []string{"param=value"},
 	}
 
-	h, err := StartHost(api, cfg, config.Node{Name: "minikube"})
+	h, _, err := StartHost(api, cfg, config.Node{Name: "minikube"})
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index 8f44a12b66..368af5b3af 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -62,28 +62,32 @@ var (
 )
 
 // StartHost starts a host VM.
-func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*host.Host, error) {
+func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*host.Host, bool, error) {
+	machineName := driver.MachineName(cfg, n)
+
 	// Prevent machine-driver boot races, as well as our own certificate race
-	releaser, err := acquireMachinesLock(n.Name)
+	releaser, err := acquireMachinesLock(machineName)
 	if err != nil {
-		return nil, errors.Wrap(err, "boot lock")
+		return nil, false, errors.Wrap(err, "boot lock")
 	}
 	start := time.Now()
 	defer func() {
-		glog.Infof("releasing machines lock for %q, held for %s", n.Name, time.Since(start))
+		glog.Infof("releasing machines lock for %q, held for %s", machineName, time.Since(start))
 		releaser.Release()
 	}()
 
-	exists, err := api.Exists(n.Name)
+	exists, err := api.Exists(machineName)
 	if err != nil {
-		return nil, errors.Wrapf(err, "exists: %s", n.Name)
+		return nil, false, errors.Wrapf(err, "exists: %s", machineName)
 	}
 	if !exists {
 		glog.Infof("Provisioning new machine with config: %+v %+v", cfg, n)
-		return createHost(api, cfg, n)
+		h, err := createHost(api, cfg, n)
+		return h, exists, err
 	}
 	glog.Infoln("Skipping create...Using existing machine configuration")
-	return fixHost(api, cfg, n)
+	h, err := fixHost(api, cfg, n)
+	return h, exists, err
 }
 
 func engineOptions(cfg config.ClusterConfig) *engine.Options {
diff --git a/pkg/minikube/node/machine.go b/pkg/minikube/node/machine.go
deleted file mode 100644
index 483131515a..0000000000
--- a/pkg/minikube/node/machine.go
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package node
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/host"
-	"github.com/golang/glog"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/minikube/proxy"
-	"k8s.io/minikube/pkg/util/retry"
-)
-
-func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
-	m, err := machine.NewAPIClient()
-	if err != nil {
-		exit.WithError("Failed to get machine client", err)
-	}
-	host, preExists = startHost(m, *cfg, *node)
-	runner, err = machine.CommandRunner(host)
-	if err != nil {
-		exit.WithError("Failed to get command runner", err)
-	}
-
-	ip := validateNetwork(host, runner)
-
-	// Bypass proxy for minikube's vm host ip
-	err = proxy.ExcludeIP(ip)
-	if err != nil {
-		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
-	}
-	// Save IP to configuration file for subsequent use
-	node.IP = ip
-
-	if err := Save(cfg, node); err != nil {
-		exit.WithError("Failed to save config", err)
-	}
-
-	return runner, preExists, m, host
-}
-
-// startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
-	exists, err := api.Exists(mc.Name)
-	if err != nil {
-		exit.WithError("Failed to check if machine exists", err)
-	}
-
-	host, err := machine.StartHost(api, mc, n)
-	if err != nil {
-		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
-	}
-	return host, exists
-}
-
-// validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner) string {
-	ip, err := h.Driver.GetIP()
-	if err != nil {
-		exit.WithError("Unable to get VM IP address", err)
-	}
-
-	optSeen := false
-	warnedOnce := false
-	for _, k := range proxy.EnvVars {
-		if v := os.Getenv(k); v != "" {
-			if !optSeen {
-				out.T(out.Internet, "Found network options:")
-				optSeen = true
-			}
-			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
-			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
-			k = strings.ToUpper(k)               // for http_proxy & https_proxy
-			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
-				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
-				warnedOnce = true
-			}
-		}
-	}
-
-	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
-		trySSH(h, ip)
-	}
-
-	tryLookup(r)
-	tryRegistry(r)
-	return ip
-}
-
-func trySSH(h *host.Host, ip string) {
-	if viper.GetBool("force") {
-		return
-	}
-
-	sshAddr := net.JoinHostPort(ip, "22")
-
-	dial := func() (err error) {
-		d := net.Dialer{Timeout: 3 * time.Second}
-		conn, err := d.Dial("tcp", sshAddr)
-		if err != nil {
-			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
-			return err
-		}
-		_ = conn.Close()
-		return nil
-	}
-
-	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
-		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
-
-	This is likely due to one of two reasons:
-
-	- VPN or firewall interference
-	- {{.hypervisor}} network configuration issue
-
-	Suggested workarounds:
-
-	- Disable your local VPN or firewall software
-	- Configure your local VPN or firewall to allow access to {{.ip}}
-	- Restart or reinstall {{.hypervisor}}
-	- Use an alternative --driver
-	- Use --force to override this connectivity check
-	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
-	}
-}
-
-func tryLookup(r command.Runner) {
-	// DNS check
-	if rr, err := r.RunCmd(exec.Command("nslookup", "-type=ns", "kubernetes.io")); err != nil {
-		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
-		// will try with without query type for ISOs with different busybox versions.
-		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
-			glog.Warningf("nslookup failed: %v", err)
-			// try with the older "host" command, instead of the newer "nslookup"
-			if _, err = r.RunCmd(exec.Command("host", "kubernetes.io")); err != nil {
-				out.WarningT("Node may be unable to resolve external DNS records")
-			}
-		}
-	}
-}
-func tryRegistry(r command.Runner) {
-	// Try an HTTPS connection to the image repository
-	proxy := os.Getenv("HTTPS_PROXY")
-	opts := []string{"-sS"}
-	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
-		opts = append([]string{"-x", proxy}, opts...)
-	}
-
-	repo := viper.GetString(imageRepository)
-	if repo == "" {
-		repo = images.DefaultKubernetesRepo
-	}
-
-	opts = append(opts, fmt.Sprintf("https://%s/", repo))
-	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
-		glog.Warningf("%s failed: %v", rr.Args, err)
-		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
-	}
-}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 1550390771..28c6509c49 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -23,14 +23,22 @@ import (
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) {
 	// Now that the ISO is downloaded, pull images in the background while the VM boots.
-	var cacheGroup, kicGroup errgroup.Group
-	cluster.BeginCacheRequiredImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	var cacheGroup errgroup.Group
+	if !driver.BareMetal(cc.Driver) {
+		cluster.BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	}
+
+	var kicGroup errgroup.Group
+	if driver.IsKIC(cc.Driver) {
+		cluster.BeginDownloadKicArtifacts(&kicGroup)
+	}
 
 	runner, _, mAPI, _ := cluster.StartMachine(&cc, &n)
 	defer mAPI.Close()
@@ -40,7 +48,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		exit.WithError("Failed to get bootstrapper", err)
 	}
 
-	k8sVersion := cc.KubernetesConfig.KubernetesVersion
+	k8sVersion := n.KubernetesVersion
 	driverName := cc.Driver
 	// exits here in case of --download-only option.
 	cluster.HandleDownloadOnly(&cacheGroup, &kicGroup, k8sVersion)

From d98ebcfb687b530b31b7a7c6d15bd461c48da1c9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 13 Mar 2020 15:32:14 -0700
Subject: [PATCH 057/668] lint

---
 cmd/minikube/cmd/stop.go                     | 34 ++++++++++++++------
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  3 ++
 pkg/minikube/node/node.go                    |  3 --
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index c3586b8492..005284a022 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -17,7 +17,12 @@ limitations under the License.
 package cmd
 
 import (
+	"time"
+
 	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/mcnerror"
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -27,6 +32,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 // stopCmd represents the stop command
@@ -72,16 +78,26 @@ func runStop(cmd *cobra.Command, args []string) {
 
 func stop(api libmachine.API, cluster config.ClusterConfig, n config.Node) bool {
 	nonexistent := false
-
-	// TODO replace this back with expo backoff
-	for _, n := range cluster.Nodes {
-		err := machine.StopHost(api, driver.MachineName(cluster, n))
-		if err != nil {
-			exit.WithError("Unable to stop VM", err)
+	stop := func() (err error) {
+		machineName := driver.MachineName(cluster, n)
+		err = machine.StopHost(api, machineName)
+		if err == nil {
+			return nil
 		}
-		/*if err := retry.Expo(fn, 5*time.Second, 3*time.Minute, 5); err != nil {
-			exit.WithError("Unable to stop VM", err)
-		}*/
+		glog.Warningf("stop host returned error: %v", err)
+
+		switch err := errors.Cause(err).(type) {
+		case mcnerror.ErrHostDoesNotExist:
+			out.T(out.Meh, `"{{.machineName}}" does not exist, nothing to stop`, out.V{"machineName": machineName})
+			nonexistent = true
+			return nil
+		default:
+			return err
+		}
+	}
+
+	if err := retry.Expo(stop, 5*time.Second, 3*time.Minute, 5); err != nil {
+		exit.WithError("Unable to stop VM", err)
 	}
 
 	return nonexistent
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 13d8f6e921..ed458c16b2 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -346,6 +346,9 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	}
 
 	cp, err := config.PrimaryControlPlane(&cfg)
+	if err != nil {
+		return errors.Wrap(err, "getting control plane")
+	}
 	ip := cp.IP
 	port := cp.Port
 	if driver.IsKIC(cfg.Driver) {
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 3dba42d1f0..41d518f3f2 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -27,12 +27,9 @@ import (
 
 // TODO: Share these between cluster and node packages
 const (
-	waitUntilHealthy = "wait"
 	containerRuntime = "container-runtime"
 	mountString      = "mount-string"
 	createMount      = "mount"
-	waitTimeout      = "wait-timeout"
-	imageRepository  = "image-repository"
 )
 
 // Add adds a new node config to an existing cluster.

From 9c8102dd58f7403e1a18737d2b38bdc1ef715ea0 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 13 Mar 2020 16:05:46 -0700
Subject: [PATCH 058/668] Refactor preload_images.go to generate and upload a
 preloaded tarball

This script is now responsible for making sure that the DefaultK8sVersion, NewestK8sVersion, and OldestK8sVersion supported by minikube have preloaded tarballs. It will be run on every PR as an automated release script for preloaded tarballs.
---
 Makefile                              |  10 +-
 hack/preload-images/generate.go       | 125 +++++++++++++++++++++
 hack/preload-images/preload_images.go | 151 ++++++--------------------
 hack/preload-images/upload.go         |  43 ++++++++
 4 files changed, 203 insertions(+), 126 deletions(-)
 create mode 100644 hack/preload-images/generate.go
 create mode 100644 hack/preload-images/upload.go

diff --git a/Makefile b/Makefile
index 9a4685affd..ac1787f480 100755
--- a/Makefile
+++ b/Makefile
@@ -526,14 +526,8 @@ kic-base-image: ## builds the base image used for kic.
 	docker build -f ./hack/images/kicbase.Dockerfile -t $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot  --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --target base .
 
 .PHONY: upload-preloaded-images-tar
-upload-preloaded-images-tar: generate-preloaded-images-tar # Upload the preloaded images tar to the GCS bucket. Specify a specific kubernetes version to build via `KUBERNETES_VERSION=vx.y.z make upload-preloaded-images-tar`.
-	gsutil cp out/preloaded-images-k8s-${PRELOADED_TARBALL_VERSION}-${KUBERNETES_VERSION}-docker-overlay2.tar.lz4 gs://${PRELOADED_VOLUMES_GCS_BUCKET}
-	gsutil acl ch -u AllUsers:R gs://${PRELOADED_VOLUMES_GCS_BUCKET}/preloaded-images-k8s-${PRELOADED_TARBALL_VERSION}-${KUBERNETES_VERSION}-docker-overlay2.tar.lz4 
-
-.PHONY: generate-preloaded-images-tar
-generate-preloaded-images-tar:
-	go run ./hack/preload-images/preload_images.go -kubernetes-version ${KUBERNETES_VERSION} -preloaded-tarball-version ${PRELOADED_TARBALL_VERSION}
-
+upload-preloaded-images-tar: out/minikube # Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
+	go run ./hack/preload-images/*.go 
 
 .PHONY: push-storage-provisioner-image
 push-storage-provisioner-image: storage-provisioner-image ## Push storage-provisioner docker image using gcloud
diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go
new file mode 100644
index 0000000000..a3160bc5a1
--- /dev/null
+++ b/hack/preload-images/generate.go
@@ -0,0 +1,125 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/drivers/kic"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/localpath"
+)
+
+func generateTarball(kubernetesVersion, tarballFilename string) error {
+	defer func() {
+		if err := deleteMinikube(); err != nil {
+			fmt.Println(err)
+		}
+	}()
+
+	driver := kic.NewDriver(kic.Config{
+		KubernetesVersion: kubernetesVersion,
+		ContainerRuntime:  driver.Docker,
+		OCIBinary:         oci.Docker,
+		MachineName:       profile,
+		ImageDigest:       kic.BaseImage,
+		StorePath:         localpath.MiniPath(),
+		CPU:               2,
+		Memory:            4000,
+		APIServerPort:     8080,
+	})
+
+	baseDir := filepath.Dir(driver.GetSSHKeyPath())
+	defer os.Remove(baseDir)
+
+	if err := os.MkdirAll(baseDir, 0755); err != nil {
+		return errors.Wrap(err, "mkdir")
+	}
+	if err := driver.Create(); err != nil {
+		return errors.Wrap(err, "creating kic driver")
+	}
+
+	// Now, get images to pull
+	imgs, err := images.Kubeadm("", kubernetesVersion)
+	if err != nil {
+		return errors.Wrap(err, "kubeadm images")
+	}
+
+	for _, img := range append(imgs, kic.OverlayImage) {
+		cmd := exec.Command("docker", "exec", profile, "docker", "pull", img)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			return errors.Wrapf(err, "downloading %s", img)
+		}
+	}
+
+	// Transfer in k8s binaries
+	kcfg := config.KubernetesConfig{
+		KubernetesVersion: kubernetesVersion,
+	}
+	runner := command.NewKICRunner(profile, driver.OCIBinary)
+	if err := bsutil.TransferBinaries(kcfg, runner); err != nil {
+		return errors.Wrap(err, "transferring k8s binaries")
+	}
+	// Create image tarball
+	if err := createImageTarball(tarballFilename); err != nil {
+		return errors.Wrap(err, "create tarball")
+	}
+	return copyTarballToHost(tarballFilename)
+}
+
+func createImageTarball(tarballFilename string) error {
+	dirs := []string{
+		fmt.Sprintf("./lib/docker/%s", dockerStorageDriver),
+		"./lib/docker/image",
+		"./lib/minikube/binaries",
+	}
+	args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename}
+	args = append(args, dirs...)
+	cmd := exec.Command("docker", args...)
+	cmd.Stdout = os.Stdout
+	if err := cmd.Run(); err != nil {
+		return errors.Wrapf(err, "tarball cmd: %s", cmd.Args)
+	}
+	return nil
+}
+
+func copyTarballToHost(tarballFilename string) error {
+	dest := filepath.Join("out/", tarballFilename)
+	cmd := exec.Command("docker", "cp", fmt.Sprintf("%s:/%s", profile, tarballFilename), dest)
+	cmd.Stdout = os.Stdout
+	if err := cmd.Run(); err != nil {
+		return errors.Wrapf(err, "cp cmd: %s", cmd.Args)
+	}
+	return nil
+}
+
+func deleteMinikube() error {
+	cmd := exec.Command(minikubePath, "delete", "-p", profile)
+	cmd.Stdout = os.Stdout
+	return cmd.Run()
+}
diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 1c6c858331..17a66806a9 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -18,22 +18,13 @@ package main
 
 import (
 	"bytes"
-	"flag"
 	"fmt"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/drivers/kic"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/download"
+	"k8s.io/minikube/pkg/minikube/exit"
 )
 
 const (
@@ -42,123 +33,47 @@ const (
 )
 
 var (
-	kubernetesVersion       = ""
-	tarballFilename         = ""
-	dockerStorageDriver     = ""
-	preloadedTarballVersion = ""
-	containerRuntime        = ""
+	dockerStorageDriver     = "overlay2"
+	preloadedTarballVersion = "v1"
+	containerRuntimes       = []string{"docker"}
+	kubernetesVersions      = []string{
+		constants.OldestKubernetesVersion,
+		constants.DefaultKubernetesVersion,
+		constants.NewestKubernetesVersion,
+	}
 )
 
-func init() {
-	flag.StringVar(&kubernetesVersion, "kubernetes-version", "", "desired kubernetes version, for example `v1.17.2`")
-	flag.StringVar(&dockerStorageDriver, "docker-storage-driver", "overlay2", "docker storage driver backend")
-	flag.StringVar(&preloadedTarballVersion, "preloaded-tarball-version", "", "preloaded tarball version")
-	flag.StringVar(&containerRuntime, "container-runtime", "docker", "container runtime")
-
-	flag.Parse()
-	tarballFilename = fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-%s.tar.lz4", preloadedTarballVersion, kubernetesVersion, containerRuntime, dockerStorageDriver)
-}
-
 func main() {
 	if err := verifyDockerStorage(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		exit.WithError("Docker storage type is incompatible: %v\n", err)
 	}
-	if err := executePreloadImages(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
-
-func executePreloadImages() error {
-	defer func() {
-		if err := deleteMinikube(); err != nil {
-			fmt.Println(err)
-		}
-	}()
-
-	driver := kic.NewDriver(kic.Config{
-		KubernetesVersion: kubernetesVersion,
-		ContainerRuntime:  driver.Docker,
-		OCIBinary:         oci.Docker,
-		MachineName:       profile,
-		ImageDigest:       kic.BaseImage,
-		StorePath:         localpath.MiniPath(),
-		CPU:               2,
-		Memory:            4000,
-		APIServerPort:     8080,
-	})
-
-	baseDir := filepath.Dir(driver.GetSSHKeyPath())
-	defer os.Remove(baseDir)
-
-	if err := os.MkdirAll(baseDir, 0755); err != nil {
-		return errors.Wrap(err, "mkdir")
-	}
-	if err := driver.Create(); err != nil {
-		return errors.Wrap(err, "creating kic driver")
-	}
-
-	// Now, get images to pull
-	imgs, err := images.Kubeadm("", kubernetesVersion)
-	if err != nil {
-		return errors.Wrap(err, "kubeadm images")
-	}
-
-	for _, img := range append(imgs, kic.OverlayImage) {
-		cmd := exec.Command("docker", "exec", profile, "docker", "pull", img)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			return errors.Wrapf(err, "downloading %s", img)
+	for _, kubernetesVersion := range kubernetesVersions {
+		for _, cr := range containerRuntimes {
+			tf := tarballFilename(kubernetesVersion, cr)
+			if tarballExists(tf) {
+				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kubernetesVersion)
+				continue
+			}
+			fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kubernetesVersion)
+			if err := generateTarball(kubernetesVersion, tf); err != nil {
+				exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kubernetesVersion, cr), err)
+			}
+			if err := uploadTarball(tf); err != nil {
+				exit.WithError(fmt.Sprintf("uploading tarball for k8s version %s with %s", kubernetesVersion, cr), err)
+			}
 		}
 	}
-
-	// Transfer in k8s binaries
-	kcfg := config.KubernetesConfig{
-		KubernetesVersion: kubernetesVersion,
-	}
-	runner := command.NewKICRunner(profile, driver.OCIBinary)
-	if err := bsutil.TransferBinaries(kcfg, runner); err != nil {
-		return errors.Wrap(err, "transferring k8s binaries")
-	}
-	// Create image tarball
-	if err := createImageTarball(); err != nil {
-		return errors.Wrap(err, "create tarball")
-	}
-	return copyTarballToHost()
 }
 
-func createImageTarball() error {
-	dirs := []string{
-		fmt.Sprintf("./lib/docker/%s", dockerStorageDriver),
-		"./lib/docker/image",
-		"./lib/minikube/binaries",
-	}
-	args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename}
-	args = append(args, dirs...)
-	cmd := exec.Command("docker", args...)
-	cmd.Stdout = os.Stdout
-	if err := cmd.Run(); err != nil {
-		return errors.Wrapf(err, "tarball cmd: %s", cmd.Args)
-	}
-	return nil
+func tarballFilename(kubernetesVersion string, containerRuntime string) string {
+	return fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-%s.tar.lz4", preloadedTarballVersion, kubernetesVersion, containerRuntime, dockerStorageDriver)
 }
 
-func copyTarballToHost() error {
-	dest := filepath.Join("out/", tarballFilename)
-	cmd := exec.Command("docker", "cp", fmt.Sprintf("%s:/%s", profile, tarballFilename), dest)
-	cmd.Stdout = os.Stdout
-	if err := cmd.Run(); err != nil {
-		return errors.Wrapf(err, "cp cmd: %s", cmd.Args)
-	}
-	return nil
-}
-
-func deleteMinikube() error {
-	cmd := exec.Command(minikubePath, "delete", "-p", profile)
-	cmd.Stdout = os.Stdout
-	return cmd.Run()
+func tarballExists(tarballFilename string) bool {
+	fmt.Println("Checking if tarball already exists...")
+	gcsPath := fmt.Sprintf("gs://%s/%s", download.PreloadBucket, tarballFilename)
+	cmd := exec.Command("gsutil", "stat", gcsPath)
+	return cmd.Run() == nil
 }
 
 func verifyDockerStorage() error {
diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go
new file mode 100644
index 0000000000..a2181294e6
--- /dev/null
+++ b/hack/preload-images/upload.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os/exec"
+	"path"
+
+	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/download"
+)
+
+func uploadTarball(tarballFilename string) error {
+	// Upload tarball to GCS
+	hostPath := path.Join("out/", tarballFilename)
+	gcsDest := fmt.Sprintf("gs://%s", download.PreloadBucket)
+	cmd := exec.Command("gsutil", "cp", hostPath, gcsDest)
+	if output, err := cmd.Output(); err != nil {
+		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
+	}
+	// Make tarball public to all users
+	gcsPath := fmt.Sprintf("%s/%s", gcsDest, tarballFilename)
+	cmd = exec.Command("gsutil", "acl", "ch", "-u", "AllUsers:R", gcsPath)
+	if output, err := cmd.Output(); err != nil {
+		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
+	}
+	return nil
+}

From a83478f2681f6a88f0ebd0ad24ff0896a7e330a6 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 13 Mar 2020 16:10:44 -0700
Subject: [PATCH 059/668] Add running preload release script to github actions

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3572ed151..0d01eef0bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,6 +19,7 @@ jobs:
       run : |
         make minikube-linux-amd64
         make e2e-linux-amd64
+        make upload-preloaded-images-tar
         cp -r test/integration/testdata ./out
         whoami
         echo github ref $GITHUB_REF

From 8b364befc0046e94325de5b19f731993292ddc99 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 13 Mar 2020 16:10:55 -0700
Subject: [PATCH 060/668] Remove unused variables from Makefile

---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index ac1787f480..8d46355ada 100755
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,6 @@ VERSION ?= v$(RAW_VERSION)
 
 KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/constants/constants.go | cut -d \" -f2)
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
-PRELOADED_TARBALL_VERSION ?= $(shell egrep "PreloadVersion =" pkg/minikube/download/preload.go | cut -d \" -f2)
-PRELOADED_VOLUMES_GCS_BUCKET ?= $(shell egrep "PreloadBucket =" pkg/minikube/download/preload.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
 ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0

From 89c6c72adb06d08946e9da9cf0ca41c39b5b2b96 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 13 Mar 2020 16:24:28 -0700
Subject: [PATCH 061/668] Skip preload if not running on amd64

Also make sure that preload is available before attempting to run preload.
---
 pkg/drivers/kic/kic.go           | 4 ++++
 pkg/minikube/download/preload.go | 5 +++++
 pkg/minikube/node/config.go      | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index dc9d2a5301..820748b5ee 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -119,6 +119,10 @@ func (d *Driver) Create() error {
 		return errors.Wrap(err, "prepare kic ssh")
 	}
 
+	// return now if no preload is available
+	if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) {
+		return nil
+	}
 	t := time.Now()
 	glog.Infof("Starting extracting preloaded images to volume")
 	// Extract preloaded images to container
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 62893edf1b..bd95377050 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -24,6 +24,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"runtime"
 
 	"cloud.google.com/go/storage"
 	"google.golang.org/api/option"
@@ -78,6 +79,10 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 		return false
 	}
 
+	if runtime.GOARCH != "amd64" {
+		return false
+	}
+
 	// Omit remote check if tarball exists locally
 	targetPath := TarballPath(k8sVersion)
 	if _, err := os.Stat(targetPath); err == nil {
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index 46e6f32b06..a327a0532f 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
@@ -75,7 +76,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 	}
 
 	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
-	if driver.IsVM(drvName) {
+	if driver.IsVM(drvName) && download.PreloadExists(k8s.KubernetesVersion, k8s.ContainerRuntime) {
 		if err := cr.Preload(k8s); err != nil {
 			switch err.(type) {
 			case *cruntime.ErrISOFeature:

From c3b56b646665455ff93a1e2309296850466ecd7e Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 13 Mar 2020 18:08:10 -0700
Subject: [PATCH 062/668] let's rearrange a bunch of code

---
 cmd/minikube/cmd/start.go                    | 10 +-
 pkg/minikube/bootstrapper/bsutil/kubeadm.go  |  7 +-
 pkg/minikube/bootstrapper/bsutil/kubelet.go  |  3 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  3 +-
 pkg/minikube/cluster/cache.go                |  2 +-
 pkg/minikube/cluster/setup.go                | 96 ++++++++++++++++----
 pkg/minikube/driver/driver.go                |  2 +-
 pkg/minikube/node/config.go                  | 45 ---------
 pkg/minikube/node/start.go                   |  2 +-
 9 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6dc808860c..8ad78ffc6e 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -326,7 +326,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	if !driver.BareMetal(driverName) && !driver.IsKIC(driverName) {
+	if driver.IsVM(driverName) {
 		url, err := download.ISO(viper.GetStringSlice(isoURL), cmd.Flags().Changed(isoURL))
 		if err != nil {
 			exit.WithError("Failed to cache ISO", err)
@@ -348,12 +348,6 @@ func runStart(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
-	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
-		exit.WithError("Failed to save config", err)
-	}
-
 	kubeconfig, err := cluster.InitialSetup(cc, n, existingAddons)
 	if err != nil {
 		exit.WithError("Starting node", err)
@@ -361,7 +355,7 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	numNodes := viper.GetInt(nodes)
 	if numNodes > 1 {
-		if driver.IsKIC(driverName) {
+		if driver.BareMetal(driverName) {
 			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
 		}
 		for i := 1; i < numNodes; i++ {
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 2f21d3563e..fa2e120acb 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -65,11 +65,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.N
 		return nil, errors.Wrap(err, "generating extra component config for kubeadm")
 	}
 
-	controlPlaneEndpoint := cp.IP
-	/*if n.ControlPlane {
-		controlPlaneEndpoint = "localhost"
-	}*/
-
 	opts := struct {
 		CertDir             string
 		ServiceCIDR         string
@@ -107,7 +102,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.N
 		NodeIP:            n.IP,
 		// NOTE: If set to an specific VM IP, things may break if the IP changes on host restart
 		// For multi-node, we may need to figure out an alternate strategy, like DNS or hosts files
-		ControlPlaneAddress: controlPlaneEndpoint,
+		ControlPlaneAddress: cp.IP,
 	}
 
 	if k8s.ServiceCIDR != "" {
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 8ec9d01fc6..ce161b41da 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -60,7 +61,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 		extraOpts["node-ip"] = cp.IP
 	}
 	if nc.Name != "" {
-		extraOpts["hostname-override"] = nc.Name
+		extraOpts["hostname-override"] = driver.MachineName(mc, nc)
 	}
 
 	pauseImage := images.Pause(version, k8s.ImageRepository)
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ed458c16b2..09d23e2703 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -202,8 +202,7 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	err = k.SetupNode(cfg)
-	if err != nil {
+	if err = k.SetupNode(cfg); err != nil {
 		return errors.Wrap(err, "setting up node")
 	}
 
diff --git a/pkg/minikube/cluster/cache.go b/pkg/minikube/cluster/cache.go
index 56a58a9246..6fcf303f27 100644
--- a/pkg/minikube/cluster/cache.go
+++ b/pkg/minikube/cluster/cache.go
@@ -52,7 +52,7 @@ func BeginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVe
 		glog.Warningf("Error downloading preloaded artifacts will continue without preload: %v", err)
 	}
 
-	if !viper.GetBool("cache-images") {
+	if !viper.GetBool(cacheImages) {
 		return
 	}
 
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index cd653bbdbd..e67a4e6ca3 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/blang/semver"
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
@@ -37,10 +38,12 @@ import (
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
@@ -54,13 +57,44 @@ const (
 	embedCerts       = "embed-certs"
 	keepContext      = "keep-context"
 	imageRepository  = "image-repository"
+	containerRuntime = "container-runtime"
 )
 
 // InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
 func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
-	_, preExists, machineAPI, host := StartMachine(&cc, &n)
+	var kicGroup errgroup.Group
+	if driver.IsKIC(cc.Driver) {
+		BeginDownloadKicArtifacts(&kicGroup)
+	}
+
+	var cacheGroup errgroup.Group
+	if !driver.BareMetal(cc.Driver) {
+		BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	}
+
+	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
+	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
+		exit.WithError("Failed to save config", err)
+	}
+
+	HandleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
+	WaitDownloadKicArtifacts(&kicGroup)
+
+	mRunner, preExists, machineAPI, host := StartMachine(&cc, &n)
 	defer machineAPI.Close()
 
+	// wait for preloaded tarball to finish downloading before configuring runtimes
+	WaitCacheRequiredImages(&cacheGroup)
+
+	sv, err := util.ParseKubernetesVersion(n.KubernetesVersion)
+	if err != nil {
+		return nil, err
+	}
+
+	// configure the runtime (docker, containerd, crio)
+	cr := ConfigureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
+
 	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
 	kubeconfig, err := setupKubeconfig(host, &cc, &n, cc.Name)
 	if err != nil {
@@ -70,28 +104,13 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 	// setup kubeadm (must come after setupKubeconfig)
 	bs := setupKubeAdm(machineAPI, cc, n)
 
-	var cacheGroup errgroup.Group
-	if !driver.BareMetal(cc.Driver) {
-		BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
-	}
-
-	var kicGroup errgroup.Group
-	if driver.IsKIC(cc.Driver) {
-		BeginDownloadKicArtifacts(&kicGroup)
-	}
-
-	HandleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
-	WaitDownloadKicArtifacts(&kicGroup)
-
 	// pull images or restart cluster
 	out.T(out.Launch, "Launching Kubernetes ... ")
 	err = bs.StartCluster(cc)
 	if err != nil {
-		/*config := cruntime.Config{Type: viper.GetString(containerRuntime), Runner: mRunner, ImageRepository: cc.KubernetesConfig.ImageRepository, KubernetesVersion: cc.KubernetesConfig.KubernetesVersion}
-		cr, err := cruntime.New(config)
-		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))*/
-		exit.WithError("Error starting cluster", err)
+		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
 	}
+	//configureMounts()
 
 	if err := CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")
@@ -119,6 +138,47 @@ func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[str
 
 }
 
+// ConfigureRuntimes does what needs to happen to get a runtime going.
+func ConfigureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
+	co := cruntime.Config{
+		Type:   viper.GetString(containerRuntime),
+		Runner: runner, ImageRepository: k8s.ImageRepository,
+		KubernetesVersion: kv,
+	}
+	cr, err := cruntime.New(co)
+	if err != nil {
+		exit.WithError("Failed runtime", err)
+	}
+
+	disableOthers := true
+	if driver.BareMetal(drvName) {
+		disableOthers = false
+	}
+
+	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
+	if driver.IsVM(drvName) {
+		if err := cr.Preload(k8s); err != nil {
+			switch err.(type) {
+			case *cruntime.ErrISOFeature:
+				out.T(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
+			default:
+				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
+			}
+
+			if err := machine.CacheImagesForBootstrapper(k8s.ImageRepository, k8s.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
+				exit.WithError("Failed to cache images", err)
+			}
+		}
+	}
+
+	err = cr.Enable(disableOthers)
+	if err != nil {
+		exit.WithError("Failed to enable container runtime", err)
+	}
+
+	return cr
+}
+
 // setupKubeAdm adds any requested files into the VM before Kubernetes is started
 func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
 	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg, n)
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 2dce6350cd..e064f70799 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -112,7 +112,7 @@ func IsMock(name string) bool {
 
 // IsVM checks if the driver is a VM
 func IsVM(name string) bool {
-	if IsKIC(name) || IsMock(name) || BareMetal(name) {
+	if IsKIC(name) || BareMetal(name) {
 		return false
 	}
 	return true
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index da74bce3db..ef0f66dc12 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -23,62 +23,17 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
-	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util/lock"
 )
 
-// configureRuntimes does what needs to happen to get a runtime going.
-func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
-	co := cruntime.Config{
-		Type:   viper.GetString(containerRuntime),
-		Runner: runner, ImageRepository: k8s.ImageRepository,
-		KubernetesVersion: kv,
-	}
-	cr, err := cruntime.New(co)
-	if err != nil {
-		exit.WithError("Failed runtime", err)
-	}
-
-	disableOthers := true
-	if driver.BareMetal(drvName) {
-		disableOthers = false
-	}
-
-	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
-	if driver.IsVM(drvName) {
-		if err := cr.Preload(k8s); err != nil {
-			switch err.(type) {
-			case *cruntime.ErrISOFeature:
-				out.T(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
-			default:
-				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
-			}
-
-			if err := machine.CacheImagesForBootstrapper(k8s.ImageRepository, k8s.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
-				exit.WithError("Failed to cache images", err)
-			}
-		}
-	}
-
-	err = cr.Enable(disableOthers)
-	if err != nil {
-		exit.WithError("Failed to enable container runtime", err)
-	}
-
-	return cr
-}
-
 func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 	version, _ := cr.Version()
 	out.T(cr.Style(), "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...", out.V{"k8sVersion": k8sVersion, "runtime": cr.Name(), "runtimeVersion": version})
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 599d4621aa..0a5e3fc095 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -64,7 +64,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 
 	// configure the runtime (docker, containerd, crio)
-	cr := configureRuntimes(runner, driverName, cc.KubernetesConfig, sv)
+	cr := cluster.ConfigureRuntimes(runner, driverName, cc.KubernetesConfig, sv)
 	showVersionInfo(k8sVersion, cr)
 
 	configureMounts()

From e7af223d72f67d8259a24ce1cd2f4c1063bc1a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 15 Mar 2020 12:31:14 +0100
Subject: [PATCH 063/668] Strip the version prefix before calling semver

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 44e3d3210c..8b55075e9f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -822,7 +822,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 	repository := viper.GetString(imageRepository)
 	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
 	if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
-		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(k8sVersion))
+		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
 		if err != nil {
 			exit.WithError("Failed to check main repository and mirrors for images for images", err)
 		}

From dc6b9bae2bc6dfc56908389d675ba85053753c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 15 Mar 2020 12:52:35 +0100
Subject: [PATCH 064/668] Add basic unit test for image mirror country

---
 cmd/minikube/cmd/start_test.go | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go
index 23675528b6..ef7e4b7403 100644
--- a/cmd/minikube/cmd/start_test.go
+++ b/cmd/minikube/cmd/start_test.go
@@ -70,6 +70,50 @@ func TestGetKuberneterVersion(t *testing.T) {
 	}
 }
 
+func TestMirrorCountry(t *testing.T) {
+	// Set default disk size value in lieu of flag init
+	viper.SetDefault(humanReadableDiskSize, defaultDiskSize)
+
+	k8sVersion := constants.DefaultKubernetesVersion
+	var tests = []struct {
+		description     string
+		k8sVersion      string
+		imageRepository string
+		mirrorCountry   string
+		cfg             *cfg.ClusterConfig
+	}{
+		{
+			description:     "image-repository none, image-mirror-country none",
+			imageRepository: "",
+			mirrorCountry:   "",
+		},
+		{
+			description:     "image-repository auto, image-mirror-country none",
+			imageRepository: "auto",
+			mirrorCountry:   "",
+		},
+		{
+			description:     "image-repository auto, image-mirror-country china",
+			imageRepository: "auto",
+			mirrorCountry:   "cn",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			cmd := &cobra.Command{}
+			viper.SetDefault(imageRepository, test.imageRepository)
+			viper.SetDefault(imageMirrorCountry, test.mirrorCountry)
+			config, _, err := generateCfgFromFlags(cmd, k8sVersion, "none")
+			if err != nil {
+				t.Fatalf("Got unexpected error %v during config generation", err)
+			}
+			// the result can still be "", but anyway
+			_ = config.KubernetesConfig.ImageRepository
+		})
+	}
+}
+
 func TestGenerateCfgFromFlagsHTTPProxyHandling(t *testing.T) {
 	// Set default disk size value in lieu of flag init
 	viper.SetDefault(humanReadableDiskSize, defaultDiskSize)

From 316eef44d1a67f0e140a0d04be079c9adcad6285 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 16 Mar 2020 10:44:01 -0700
Subject: [PATCH 065/668] Run preloaded images release script in jenkins

---
 .github/workflows/main.yml                      | 1 -
 hack/jenkins/minikube_cross_build_and_upload.sh | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0d01eef0bd..a3572ed151 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,6 @@ jobs:
       run : |
         make minikube-linux-amd64
         make e2e-linux-amd64
-        make upload-preloaded-images-tar
         cp -r test/integration/testdata ./out
         whoami
         echo github ref $GITHUB_REF
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 382adacea7..9738cc08eb 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -39,7 +39,11 @@ declare -rx TAG="${ghprbActualCommit}"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
-make -j 16 all && failed=$? || failed=$?
+make -j 16 all && failed=$? || failed=$?  
+
+echo "Running preloaded images release script..."
+make upload-preloaded-images-tar
+
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
 

From 577dfa339339d194f55a83b27bedee1ed0c46130 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 16 Mar 2020 11:53:07 -0700
Subject: [PATCH 066/668] it works again

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go   | 24 ++++++++++---------
 .../bootstrapper/bsutil/kubeadm_test.go       |  4 ++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index fa2e120acb..4004ac2e16 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 )
@@ -37,7 +38,7 @@ import (
 const remoteContainerRuntime = "remote"
 
 // GenerateKubeadmYAML generates the kubeadm.yaml file
-func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.Node) ([]byte, error) {
+func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Manager) ([]byte, error) {
 	k8s := cc.KubernetesConfig
 	version, err := util.ParseKubernetesVersion(k8s.KubernetesVersion)
 	if err != nil {
@@ -87,19 +88,20 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, r cruntime.Manager, n config.N
 		CertDir:           vmpath.GuestKubernetesCertsDir,
 		ServiceCIDR:       constants.DefaultServiceCIDR,
 		PodSubnet:         k8s.ExtraOptions.Get("pod-network-cidr", Kubeadm),
-		AdvertiseAddress:  cp.IP,
+		AdvertiseAddress:  n.IP,
 		APIServerPort:     nodePort,
 		KubernetesVersion: k8s.KubernetesVersion,
 		EtcdDataDir:       EtcdDataDir(),
-		ClusterName:       k8s.ClusterName,
-		NodeName:          n.Name,
-		CRISocket:         r.SocketPath(),
-		ImageRepository:   k8s.ImageRepository,
-		ComponentOptions:  componentOpts,
-		FeatureArgs:       kubeadmFeatureArgs,
-		NoTaintMaster:     false, // That does not work with k8s 1.12+
-		DNSDomain:         k8s.DNSDomain,
-		NodeIP:            n.IP,
+		ClusterName:       cc.Name,
+		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
+		NodeName:         driver.MachineName(cc, n),
+		CRISocket:        r.SocketPath(),
+		ImageRepository:  k8s.ImageRepository,
+		ComponentOptions: componentOpts,
+		FeatureArgs:      kubeadmFeatureArgs,
+		NoTaintMaster:    false, // That does not work with k8s 1.12+
+		DNSDomain:        k8s.DNSDomain,
+		NodeIP:           n.IP,
 		// NOTE: If set to an specific VM IP, things may break if the IP changes on host restart
 		// For multi-node, we may need to figure out an alternate strategy, like DNS or hosts files
 		ControlPlaneAddress: cp.IP,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
index 4c366bd96b..806359513a 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
@@ -129,7 +129,7 @@ func TestGenerateKubeadmYAMLDNS(t *testing.T) {
 				cfg.KubernetesConfig.KubernetesVersion = version + ".0"
 				cfg.KubernetesConfig.ClusterName = "kubernetes"
 
-				got, err := GenerateKubeadmYAML(cfg, runtime, cfg.Nodes[0])
+				got, err := GenerateKubeadmYAML(cfg, cfg.Nodes[0], runtime)
 				if err != nil && !tc.shouldErr {
 					t.Fatalf("got unexpected error generating config: %v", err)
 				}
@@ -210,7 +210,7 @@ func TestGenerateKubeadmYAML(t *testing.T) {
 				cfg.KubernetesConfig.KubernetesVersion = version + ".0"
 				cfg.KubernetesConfig.ClusterName = "kubernetes"
 
-				got, err := GenerateKubeadmYAML(cfg, runtime, cfg.Nodes[0])
+				got, err := GenerateKubeadmYAML(cfg, cfg.Nodes[0], runtime)
 				if err != nil && !tc.shouldErr {
 					t.Fatalf("got unexpected error generating config: %v", err)
 				}
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 73ec4e4ced..11b2e4d426 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -386,7 +386,7 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 	}()
 
 	// Join the master by specifying its token
-	joinCmd = fmt.Sprintf("%s --v=10 --node-name=%s", joinCmd, n.Name)
+	joinCmd = fmt.Sprintf("%s --v=10 --node-name=%s", joinCmd, driver.MachineName(cc, n))
 	out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
 	if err != nil {
 		return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out)
@@ -473,7 +473,7 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 
 // UpdateNode updates a node.
 func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cruntime.Manager) error {
-	kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, r, n)
+	kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, n, r)
 	if err != nil {
 		return errors.Wrap(err, "generating kubeadm cfg")
 	}

From c1c26538797f67a4437f8dd6a572260676a2a8e5 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 16 Mar 2020 12:25:59 -0700
Subject: [PATCH 067/668] fix unit tests

---
 .../bootstrapper/bsutil/ktmpl/v1beta2.go      |  2 +-
 pkg/minikube/bootstrapper/bsutil/kubeadm.go   |  1 -
 .../bootstrapper/bsutil/kubeadm_test.go       | 20 +++++++++----------
 .../testdata/v1.11/containerd-api-port.yaml   |  2 +-
 .../v1.11/containerd-pod-network-cidr.yaml    |  2 +-
 .../bsutil/testdata/v1.11/containerd.yaml     |  2 +-
 .../testdata/v1.11/crio-options-gates.yaml    |  2 +-
 .../bsutil/testdata/v1.11/crio.yaml           |  2 +-
 .../bsutil/testdata/v1.11/default.yaml        |  2 +-
 .../testdata/v1.11/image-repository.yaml      |  2 +-
 .../bsutil/testdata/v1.11/options.yaml        |  2 +-
 .../testdata/v1.12/containerd-api-port.yaml   |  4 ++--
 .../v1.12/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.12/containerd.yaml     |  4 ++--
 .../testdata/v1.12/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.12/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.12/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.12/dns.yaml            |  4 ++--
 .../testdata/v1.12/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.12/options.yaml        |  4 ++--
 .../testdata/v1.13/containerd-api-port.yaml   |  4 ++--
 .../v1.13/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.13/containerd.yaml     |  4 ++--
 .../testdata/v1.13/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.13/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.13/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.13/dns.yaml            |  4 ++--
 .../testdata/v1.13/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.13/options.yaml        |  4 ++--
 .../testdata/v1.14/containerd-api-port.yaml   |  4 ++--
 .../v1.14/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.14/containerd.yaml     |  4 ++--
 .../testdata/v1.14/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.14/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.14/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.14/dns.yaml            |  4 ++--
 .../testdata/v1.14/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.14/options.yaml        |  4 ++--
 .../testdata/v1.15/containerd-api-port.yaml   |  4 ++--
 .../v1.15/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.15/containerd.yaml     |  4 ++--
 .../testdata/v1.15/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.15/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.15/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.15/dns.yaml            |  4 ++--
 .../testdata/v1.15/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.15/options.yaml        |  4 ++--
 .../testdata/v1.16/containerd-api-port.yaml   |  4 ++--
 .../v1.16/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.16/containerd.yaml     |  4 ++--
 .../testdata/v1.16/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.16/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.16/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.16/dns.yaml            |  4 ++--
 .../testdata/v1.16/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.16/options.yaml        |  4 ++--
 .../testdata/v1.17/containerd-api-port.yaml   |  4 ++--
 .../v1.17/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.17/containerd.yaml     |  4 ++--
 .../testdata/v1.17/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.17/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.17/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.17/dns.yaml            |  4 ++--
 .../testdata/v1.17/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.17/options.yaml        |  4 ++--
 .../testdata/v1.18/containerd-api-port.yaml   |  4 ++--
 .../v1.18/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.18/containerd.yaml     |  4 ++--
 .../testdata/v1.18/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.18/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.18/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.18/dns.yaml            |  4 ++--
 .../testdata/v1.18/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.18/options.yaml        |  4 ++--
 .../testdata/v1.19/containerd-api-port.yaml   |  4 ++--
 .../v1.19/containerd-pod-network-cidr.yaml    |  4 ++--
 .../bsutil/testdata/v1.19/containerd.yaml     |  4 ++--
 .../testdata/v1.19/crio-options-gates.yaml    |  4 ++--
 .../bsutil/testdata/v1.19/crio.yaml           |  4 ++--
 .../bsutil/testdata/v1.19/default.yaml        |  4 ++--
 .../bsutil/testdata/v1.19/dns.yaml            |  4 ++--
 .../testdata/v1.19/image-repository.yaml      |  4 ++--
 .../bsutil/testdata/v1.19/options.yaml        |  4 ++--
 pkg/minikube/node/node.go                     |  5 ++---
 84 files changed, 165 insertions(+), 167 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index c4718f9c98..c00835e8e7 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -56,7 +56,7 @@ kind: ClusterConfiguration
 {{range $i, $val := .FeatureArgs}}{{$i}}: {{$val}}
 {{end -}}{{end -}}
 certificatesDir: {{.CertDir}}
-clusterName: kubernetes
+clusterName: mk
 controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
 controllerManager: {}
 dns:
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 4004ac2e16..8b675ae644 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -129,7 +129,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 	if err := configTmpl.Execute(&b, opts); err != nil {
 		return nil, err
 	}
-	fmt.Printf("%s OPTS=%+v\n", n.Name, opts)
 	glog.Infof("kubeadm config:\n%s\n", b.String())
 	return b.Bytes(), nil
 }
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
index 806359513a..a2b53c3ea1 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
@@ -108,7 +108,7 @@ func TestGenerateKubeadmYAMLDNS(t *testing.T) {
 		shouldErr bool
 		cfg       config.ClusterConfig
 	}{
-		{"dns", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
+		{"dns", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {
@@ -174,15 +174,15 @@ func TestGenerateKubeadmYAML(t *testing.T) {
 		shouldErr bool
 		cfg       config.ClusterConfig
 	}{
-		{"default", "docker", false, config.ClusterConfig{}},
-		{"containerd", "containerd", false, config.ClusterConfig{}},
-		{"crio", "crio", false, config.ClusterConfig{}},
-		{"options", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
-		{"crio-options-gates", "crio", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
-		{"unknown-component", "docker", true, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
-		{"containerd-api-port", "containerd", false, config.ClusterConfig{Nodes: []config.Node{{Port: 12345}}}},
-		{"containerd-pod-network-cidr", "containerd", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
-		{"image-repository", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
+		{"default", "docker", false, config.ClusterConfig{Name: "mk"}},
+		{"containerd", "containerd", false, config.ClusterConfig{Name: "mk"}},
+		{"crio", "crio", false, config.ClusterConfig{Name: "mk"}},
+		{"options", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
+		{"crio-options-gates", "crio", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
+		{"unknown-component", "docker", true, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
+		{"containerd-api-port", "containerd", false, config.ClusterConfig{Name: "mk", Nodes: []config.Node{{Port: 12345}}}},
+		{"containerd-pod-network-cidr", "containerd", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
+		{"image-repository", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml
index 7d94020c6f..ae79c8aa7a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 12345
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml
index f66eec734e..a8ce3c8dc7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml
index f66eec734e..a8ce3c8dc7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml
index 30b1986325..1a4d370e84 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml
index 4693643125..e179fbf4e3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml
index 5c2861101e..68429da7bc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml
index 7d383865f8..651706493c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml
index 26fbfead4b..5b192e1cfd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml
@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
index ba34af30df..adf230658d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
index 0d821692e5..300ee2825f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
index 8ac889649f..9866d944d9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
index 5fb536a9f5..c8e2fbb46a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
@@ -30,9 +30,9 @@ schedulerExtraArgs:
   feature-gates: "a=b"
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
index a2e258468b..834021df94 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
index 6db4345453..3c8b8b41a8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
index e0b60901ab..d6154f4ecd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
index 595bd0c94c..e9dd51d811 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
@@ -23,9 +23,9 @@ imageRepository: test/repo
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
index 04237f4db1..a49db3c29f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
@@ -27,9 +27,9 @@ controllerManagerExtraArgs:
 schedulerExtraArgs:
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
index e4e9c885b2..8d90c3e212 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
index ee58cf2201..1788a1adb8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
index a719307679..770f46cc0f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
index be69a16ec7..326912679e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
@@ -30,9 +30,9 @@ schedulerExtraArgs:
   feature-gates: "a=b"
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
index c195ffc2ba..08646f704f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
index f7fc9b5199..25d166e0dc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
index d9bb198b8f..eb057faf76 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
index 0a1e7bab7b..d828d72006 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
@@ -23,9 +23,9 @@ imageRepository: test/repo
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
index 3aa0b74754..5fe5d326bc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
@@ -27,9 +27,9 @@ controllerManagerExtraArgs:
 schedulerExtraArgs:
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
index 741ad12afb..64efcf3938 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
index 54abf05793..6ef28c1c8d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
index df4740aaeb..97b4065593 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
index 513e1f803a..cf8a3e4728 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
index 1053c5c42f..3ef27c9b9f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
index 117c9070bf..746eb9fb7d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
index 67c0df83a3..a4e2567756 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
index c720ebac42..aedd2a9047 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
index 35aa4982b2..81980c953d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
index 3048061426..4e6bbead95 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
index 3a180ccafe..9a9a5c60f6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
index 75a083a4ce..cacacc7e43 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
index 587faaf4de..c78edc0119 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
index 680b24fe8d..47db96b5c2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
index 4ac5254431..d68ef1b1f2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
index 2403f96063..1e79a74a1c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
index 9e3d3e5088..f11df32d8b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
index cf7d8c2964..d277ac59e6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
index 2f1d050a40..758f7b2f62 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
index ad749f03cc..15802a1859 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
index ddc2d7cf74..0876e3bdde 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
index adbc88e1d7..6ca53c67e9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
index d401b50e81..0b87277ba2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
index bf4ee2a96a..765a4b2398 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
index 9b464ae194..1105d6fc3c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
index 140db5ca32..5b78859ead 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
index c7623c0e0f..cb4d159683 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
index f10bad3678..240d23984b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
index a8b4286a19..0ce3766fdb 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
index 4eb28ddba9..c5ecd93bc5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
index 78f465b4ab..cae9608f04 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
index 179f18da35..d86d853915 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
index b223f2a7c5..eef9a6c7ae 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
index 5e8102e6ed..86f4d03bd9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
index 676e6de52b..7b215a01b7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
index 608569fb84..dba5ff15d2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
index af5af1f022..77acbb9ed7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
index b1f3d8214f..5abe34481e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
index 317e578be8..a53b109047 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
index 402ef57a02..0235b34b1f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
index 74a7bd1536..d2907dcbc3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
index 7caa19fa2b..c921f54cdf 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
index 80a20ba800..bd13212add 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
index 7c1b7989db..ef954470c0 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
index 6205c948bc..743cbb4e2d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
index ba8872e7ce..1f5a6f8df8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:12345
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
index 6b1a12c922..4cbe5b28d8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
index c92bd1a314..c2b2c89a2b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
index 405c3354d2..21f5c1080a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
index c1dd4916df..eb0abc25b0 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
index 9f76b719a7..692a5925a3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
index bc0db1cb07..e384cdda1f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
index 14cc7bb8b6..7b50680f2c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
index 7b60865e15..a134555f6a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
-controlPlaneEndpoint: localhost:8443
+clusterName: mk
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 41d518f3f2..7458ff80a3 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -27,9 +27,8 @@ import (
 
 // TODO: Share these between cluster and node packages
 const (
-	containerRuntime = "container-runtime"
-	mountString      = "mount-string"
-	createMount      = "mount"
+	mountString = "mount-string"
+	createMount = "mount"
 )
 
 // Add adds a new node config to an existing cluster.

From 376111bae8c98b5ced850ed8e4745143bcf3e7d9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 16 Mar 2020 12:38:59 -0700
Subject: [PATCH 068/668] fix unit tests pt 2

---
 pkg/minikube/bootstrapper/bsutil/kubelet_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
index 3019ee1f52..1af1dc525c 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
@@ -37,6 +37,7 @@ func TestGenerateKubeletConfig(t *testing.T) {
 		{
 			description: "old docker",
 			cfg: config.ClusterConfig{
+				Name: "minikube",
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.OldestKubernetesVersion,
 					ContainerRuntime:  "docker",
@@ -62,6 +63,7 @@ ExecStart=/var/lib/minikube/binaries/v1.11.10/kubelet --allow-privileged=true --
 		{
 			description: "newest cri runtime",
 			cfg: config.ClusterConfig{
+				Name: "minikube",
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.NewestKubernetesVersion,
 					ContainerRuntime:  "cri-o",
@@ -87,6 +89,7 @@ ExecStart=/var/lib/minikube/binaries/v1.18.0-beta.2/kubelet --authorization-mode
 		{
 			description: "default containerd runtime",
 			cfg: config.ClusterConfig{
+				Name: "minikube",
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "containerd",
@@ -112,6 +115,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.3/kubelet --authorization-mode=Webhoo
 		{
 			description: "default containerd runtime with IP override",
 			cfg: config.ClusterConfig{
+				Name: "minikube",
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "containerd",
@@ -144,6 +148,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.3/kubelet --authorization-mode=Webhoo
 		{
 			description: "docker with custom image repository",
 			cfg: config.ClusterConfig{
+				Name: "minikube",
 				KubernetesConfig: config.KubernetesConfig{
 					KubernetesVersion: constants.DefaultKubernetesVersion,
 					ContainerRuntime:  "docker",

From f99d335fed4755e512e22da115a80121b3c45fbe Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 16 Mar 2020 15:36:05 -0700
Subject: [PATCH 069/668] fix docker driver

---
 cmd/minikube/cmd/start.go     | 25 +++++++++++++------------
 pkg/minikube/driver/driver.go |  8 ++++++++
 pkg/provision/provision.go    |  3 ++-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 3cfdc19f39..6b063a88ba 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -357,18 +357,19 @@ func runStart(cmd *cobra.Command, args []string) {
 	if numNodes > 1 {
 		if driver.BareMetal(driverName) {
 			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
-		}
-		for i := 1; i < numNodes; i++ {
-			nodeName := fmt.Sprintf("m%02d", i+1)
-			n := config.Node{
-				Name:              nodeName,
-				Worker:            true,
-				ControlPlane:      false,
-				KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
-			}
-			err := node.Add(&cc, n)
-			if err != nil {
-				exit.WithError("adding node", err)
+		} else {
+			for i := 1; i < numNodes; i++ {
+				nodeName := fmt.Sprintf("m%02d", i+1)
+				n := config.Node{
+					Name:              nodeName,
+					Worker:            true,
+					ControlPlane:      false,
+					KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
+				}
+				err := node.Add(&cc, n)
+				if err != nil {
+					exit.WithError("adding node", err)
+				}
 			}
 		}
 	}
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index e064f70799..170b99e71a 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -236,3 +236,11 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	}
 	return fmt.Sprintf("%s-%s", cc.Name, n.Name)
 }
+
+// ClusterNameFromMachine retrieves the cluster name embedded in the machine name
+func ClusterNameFromMachine(name string) string {
+	if strings.Contains(name, "-") {
+		return strings.Split(name, "-")[0]
+	}
+	return name
+}
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index ff5f08fef8..fd84405266 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -39,6 +39,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/sshutil"
 )
 
@@ -195,7 +196,7 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
 }
 
 func setContainerRuntimeOptions(name string, p miniProvisioner) error {
-	cluster := strings.Split(name, "-")[0]
+	cluster := driver.ClusterNameFromMachine(name)
 	c, err := config.Load(cluster)
 	if err != nil {
 		return errors.Wrap(err, "getting cluster config")

From c9c597c2e1f23a1fedec6bb7a0cd93b1cbd8d112 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 16 Mar 2020 17:48:00 -0700
Subject: [PATCH 070/668] get last 30 releases of k8s from github

---
 go.mod                                        |  2 +
 go.sum                                        |  2 +
 .../minikube_cross_build_and_upload.sh        |  4 --
 hack/preload-images/kubernetes.go             | 40 +++++++++++++++++++
 hack/preload-images/preload_images.go         | 11 +++--
 5 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 hack/preload-images/kubernetes.go

diff --git a/go.mod b/go.mod
index 6777081f84..b1861de795 100644
--- a/go.mod
+++ b/go.mod
@@ -27,6 +27,8 @@ require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/go-cmp v0.3.1
 	github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2
+	github.com/google/go-github v17.0.0+incompatible
+	github.com/google/go-github/v29 v29.0.3 // indirect
 	github.com/googleapis/gnostic v0.3.0 // indirect
 	github.com/hashicorp/go-getter v1.4.0
 	github.com/hashicorp/go-retryablehttp v0.5.4
diff --git a/go.sum b/go.sum
index 0cd403ed47..112a60917c 100644
--- a/go.sum
+++ b/go.sum
@@ -335,6 +335,8 @@ github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2 h1:/z0
 github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2/go.mod h1:Wtl/v6YdQxv397EREtzwgd9+Ud7Q5D8XMbi3Zazgkrs=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
+github.com/google/go-github/v29 v29.0.3 h1:IktKCTwU//aFHnpA+2SLIi7Oo9uhAzgsdZNbcAqhgdc=
+github.com/google/go-github/v29 v29.0.3/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 9738cc08eb..ff9dc97092 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -41,10 +41,6 @@ docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
 make -j 16 all && failed=$? || failed=$?  
 
-echo "Running preloaded images release script..."
-make upload-preloaded-images-tar
-
-
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
 
 gsutil cp "gs://${bucket}/logs/index.html" \
diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go
new file mode 100644
index 0000000000..1114d39e12
--- /dev/null
+++ b/hack/preload-images/kubernetes.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"context"
+
+	"github.com/golang/glog"
+	"github.com/google/go-github/github"
+)
+
+// RecentK8sVersions returns the most recent k8s version, usually around 30
+func RecentK8sVersions() ([]string, error) {
+	client := github.NewClient(nil)
+	k8s := "kubernetes"
+	list, _, err := client.Repositories.ListReleases(context.Background(), k8s, k8s, &github.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+	var releases []string
+	for _, r := range list {
+		releases = append(releases, r.GetTagName())
+	}
+	glog.Infof("Got releases: %v", releases)
+	return releases, nil
+}
diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 17a66806a9..8f25e58040 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
@@ -36,17 +35,17 @@ var (
 	dockerStorageDriver     = "overlay2"
 	preloadedTarballVersion = "v1"
 	containerRuntimes       = []string{"docker"}
-	kubernetesVersions      = []string{
-		constants.OldestKubernetesVersion,
-		constants.DefaultKubernetesVersion,
-		constants.NewestKubernetesVersion,
-	}
 )
 
 func main() {
 	if err := verifyDockerStorage(); err != nil {
 		exit.WithError("Docker storage type is incompatible: %v\n", err)
 	}
+	kubernetesVersions, err := RecentK8sVersions()
+	if err != nil {
+		exit.WithError("Unable to get recent k8s versions: %v\n", err)
+	}
+
 	for _, kubernetesVersion := range kubernetesVersions {
 		for _, cr := range containerRuntimes {
 			tf := tarballFilename(kubernetesVersion, cr)

From 0acb06bd34bf7ccdee14724329cfddcc443b5f87 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 16 Mar 2020 17:51:41 -0700
Subject: [PATCH 071/668] add flag for kubernetes version

---
 go.sum                                |  5 ++++
 hack/preload-images/preload_images.go | 34 +++++++++++++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/go.sum b/go.sum
index 112a60917c..dfeb89780e 100644
--- a/go.sum
+++ b/go.sum
@@ -68,6 +68,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
 github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY=
@@ -93,6 +94,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
 github.com/blang/semver v3.5.0+incompatible h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/c4milo/gotoolkit v0.0.0-20170318115440-bcc06269efa9 h1:+ziP/wVJWuAORkjv7386TRidVKY57X0bXBZFMeFlW+U=
@@ -260,6 +262,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
+github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
@@ -393,7 +396,9 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
 github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible h1:ysqc8k973k1lLJ4BOOHAkx14K2nt4cLjsIm+hwWDZDE=
 github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=
+github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 h1:oJ/NLadJn5HoxvonA6VxG31lg0d6XOURNA09BTtM4fY=
 github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
 github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 h1:WgfvpuKg42WVLkxNwzfFraXkTXPK36bMqXvMFN67clI=
 github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214/go.mod h1:kj6hFWqfwSjFjLnYW5PK1DoxZ4O0uapwHRmd9jhln4E=
diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 8f25e58040..7a9956d9c0 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"bytes"
+	"flag"
 	"fmt"
 	"os/exec"
 	"strings"
@@ -35,30 +36,43 @@ var (
 	dockerStorageDriver     = "overlay2"
 	preloadedTarballVersion = "v1"
 	containerRuntimes       = []string{"docker"}
+	k8sVersion              string
+	k8sVersions             []string
 )
 
+func init() {
+	flag.StringVar(&k8sVersion, "kubernetes-version", "", "desired kubernetes version, for example `v1.17.2`")
+	flag.Parse()
+	if k8sVersion != "" {
+		k8sVersions = append(k8sVersions, k8sVersion)
+	}
+}
+
 func main() {
 	if err := verifyDockerStorage(); err != nil {
 		exit.WithError("Docker storage type is incompatible: %v\n", err)
 	}
-	kubernetesVersions, err := RecentK8sVersions()
-	if err != nil {
-		exit.WithError("Unable to get recent k8s versions: %v\n", err)
+	if k8sVersions == nil {
+		var err error
+		k8sVersions, err = RecentK8sVersions()
+		if err != nil {
+			exit.WithError("Unable to get recent k8s versions: %v\n", err)
+		}
 	}
 
-	for _, kubernetesVersion := range kubernetesVersions {
+	for _, kv := range k8sVersions {
 		for _, cr := range containerRuntimes {
-			tf := tarballFilename(kubernetesVersion, cr)
+			tf := tarballFilename(kv, cr)
 			if tarballExists(tf) {
-				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kubernetesVersion)
+				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kv)
 				continue
 			}
-			fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kubernetesVersion)
-			if err := generateTarball(kubernetesVersion, tf); err != nil {
-				exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kubernetesVersion, cr), err)
+			fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kv)
+			if err := generateTarball(kv, tf); err != nil {
+				exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kv, cr), err)
 			}
 			if err := uploadTarball(tf); err != nil {
-				exit.WithError(fmt.Sprintf("uploading tarball for k8s version %s with %s", kubernetesVersion, cr), err)
+				exit.WithError(fmt.Sprintf("uploading tarball for k8s version %s with %s", kv, cr), err)
 			}
 		}
 	}

From e053e4f235a7dfc88b0964372b9bc00b14447496 Mon Sep 17 00:00:00 2001
From: vikkyomkar <vikkyomkar@gmail.com>
Date: Tue, 17 Mar 2020 13:21:05 +0530
Subject: [PATCH 072/668] Add --vm flag for users who want to autoselect only
 VM's

---
 cmd/minikube/cmd/start.go          |  3 ++-
 pkg/minikube/driver/driver.go      | 27 ++++++++++++++++++++-------
 pkg/minikube/driver/driver_test.go |  2 +-
 pkg/minikube/registry/global.go    |  3 ---
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 44e3d3210c..fea525383b 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -194,6 +194,7 @@ func initDriverFlags() {
 	startCmd.Flags().String("driver", "", fmt.Sprintf("Driver is one of: %v (defaults to auto-detect)", driver.DisplaySupportedDrivers()))
 	startCmd.Flags().String("vm-driver", "", "DEPRECATED, use `driver` instead.")
 	startCmd.Flags().Bool(disableDriverMounts, false, "Disables the filesystem mounts provided by the hypervisors")
+	startCmd.Flags().Bool("vm", false, "Filter to use only VM Drivers")
 
 	// kvm2
 	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (kvm2 driver only)")
@@ -465,7 +466,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 		return ds
 	}
 
-	pick, alts := driver.Suggest(driver.Choices())
+	pick, alts := driver.Suggest(driver.Choices(viper.GetBool("vm")))
 	if pick.Name == "" {
 		exit.WithCodeT(exit.Config, "Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/")
 	}
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 2dce6350cd..e5ea05b00a 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -164,14 +164,27 @@ func FlagDefaults(name string) FlagHints {
 }
 
 // Choices returns a list of drivers which are possible on this system
-func Choices() []registry.DriverState {
+func Choices(vm bool) []registry.DriverState {
 	options := registry.Available()
-
-	// Descending priority for predictability and appearance
-	sort.Slice(options, func(i, j int) bool {
-		return options[i].Priority > options[j].Priority
-	})
-	return options
+	if vm {
+		var vmOptions []registry.DriverState 
+		for _, ds := range options {
+			if IsVM(ds.Name) {
+				vmOptions = append(vmOptions,ds)
+			}
+		}
+		// Descending priority for predictability and appearance
+                sort.Slice(vmOptions, func(i, j int) bool {
+                        return vmOptions[i].Priority > vmOptions[j].Priority
+		})
+		return vmOptions
+	}else {
+		// Descending priority for predictability and appearance
+		sort.Slice(options, func(i, j int) bool {
+			return options[i].Priority > options[j].Priority
+		})
+		return options
+	}
 }
 
 // Suggest returns a suggested driver from a set of options
diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go
index 8f9be829ad..5d0bfd4009 100644
--- a/pkg/minikube/driver/driver_test.go
+++ b/pkg/minikube/driver/driver_test.go
@@ -162,7 +162,7 @@ func TestSuggest(t *testing.T) {
 				}
 			}
 
-			got := Choices()
+			got := Choices(false)
 			gotNames := []string{}
 			for _, c := range got {
 				gotNames = append(gotNames, c.Name)
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
index 301f61cb9f..d53168b48d 100644
--- a/pkg/minikube/registry/global.go
+++ b/pkg/minikube/registry/global.go
@@ -1,12 +1,9 @@
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
     http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From 3216a03c00ee60b93f1102e5ad62a0cb31b1a150 Mon Sep 17 00:00:00 2001
From: vikkyomkar <vikkyomkar@gmail.com>
Date: Tue, 17 Mar 2020 13:22:24 +0530
Subject: [PATCH 073/668] Add --vm flag for users who want to autoselect only
 VM's

---
 pkg/minikube/registry/global.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
index d53168b48d..301f61cb9f 100644
--- a/pkg/minikube/registry/global.go
+++ b/pkg/minikube/registry/global.go
@@ -1,9 +1,12 @@
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From 84939da8e3c27407dbf6c518682d636f6d21db24 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 17 Mar 2020 00:58:46 -0700
Subject: [PATCH 074/668] fix docker driver again

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  8 ++--
 pkg/minikube/cluster/setup.go                | 42 +++++++++++++++-----
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 11b2e4d426..6bd2403b71 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -202,16 +202,16 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	if err = k.SetupNode(cfg); err != nil {
-		return errors.Wrap(err, "setting up node")
-	}
-
 	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
 	rr, err := k.c.RunCmd(c)
 	if err != nil {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
 	}
 
+	if err = k.SetupNode(cfg); err != nil {
+		return errors.Wrap(err, "setting up node")
+	}
+
 	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
 		glog.Warningf("unable to adjust resource limits: %v", err)
 	}
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
index e67a4e6ca3..513154ccce 100644
--- a/pkg/minikube/cluster/setup.go
+++ b/pkg/minikube/cluster/setup.go
@@ -29,10 +29,12 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -198,18 +200,14 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node)
 	return bs
 }
 
-func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
-	addr, err := h.Driver.GetURL()
+func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+	addr, err := apiServerURL(*h, *cc, *n)
 	if err != nil {
-		exit.WithError("Failed to get driver URL", err)
-	}
-	if !driver.IsKIC(h.DriverName) {
-		addr = strings.Replace(addr, "tcp://", "https://", -1)
-		addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(n.Port), -1)
+		exit.WithError("Failed to get API Server URL", err)
 	}
 
-	if c.KubernetesConfig.APIServerName != constants.APIServerName {
-		addr = strings.Replace(addr, n.IP, c.KubernetesConfig.APIServerName, -1)
+	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+		addr = strings.Replace(addr, n.IP, cc.KubernetesConfig.APIServerName, -1)
 	}
 	kcs := &kubeconfig.Settings{
 		ClusterName:          clusterName,
@@ -228,6 +226,31 @@ func setupKubeconfig(h *host.Host, c *config.ClusterConfig, n *config.Node, clus
 	return kcs, nil
 }
 
+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) {
+		// 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.ForwardedPort(h.DriverName, h.Name, port)
+		if err != nil {
+			return "", errors.Wrap(err, "host port binding")
+		}
+	} else {
+		hostname, err = h.Driver.GetIP()
+		if err != nil {
+			return "", errors.Wrap(err, "get ip")
+		}
+	}
+
+	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+		hostname = cc.KubernetesConfig.APIServerName
+	}
+	return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(port))), nil
+}
+
 // StartMachine starts a VM
 func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
 	m, err := machine.NewAPIClient()
@@ -248,6 +271,7 @@ func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
 	}
 
+	// Save IP to config file for subsequent use
 	node.IP = ip
 	err = config.SaveNode(cfg, node)
 	if err != nil {

From 37b23cfd6d02dd9f461f9c66054cc01d1759cebc Mon Sep 17 00:00:00 2001
From: vikkyomkar <vikkyomkar@gmail.com>
Date: Tue, 17 Mar 2020 13:49:22 +0530
Subject: [PATCH 075/668] Add --vm flag for users who want to autoselect only
 VM's

---
 pkg/minikube/driver/driver.go | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index e5ea05b00a..b790af5c9b 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -165,26 +165,22 @@ func FlagDefaults(name string) FlagHints {
 
 // Choices returns a list of drivers which are possible on this system
 func Choices(vm bool) []registry.DriverState {
+	var drivers []registry.DriverState
 	options := registry.Available()
 	if vm {
-		var vmOptions []registry.DriverState 
 		for _, ds := range options {
 			if IsVM(ds.Name) {
-				vmOptions = append(vmOptions,ds)
+				drivers = append(drivers, ds)
 			}
 		}
-		// Descending priority for predictability and appearance
-                sort.Slice(vmOptions, func(i, j int) bool {
-                        return vmOptions[i].Priority > vmOptions[j].Priority
-		})
-		return vmOptions
-	}else {
-		// Descending priority for predictability and appearance
-		sort.Slice(options, func(i, j int) bool {
-			return options[i].Priority > options[j].Priority
-		})
-		return options
+	} else {
+		drivers = options
 	}
+	// Descending priority for predictability and appearance
+	sort.Slice(options, func(i, j int) bool {
+		return options[i].Priority > options[j].Priority
+	})
+	return drivers
 }
 
 // Suggest returns a suggested driver from a set of options

From ce5bf6c0732fe546f3c5f1310cc6d65c343a8e9d Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 17 Mar 2020 12:10:02 -0700
Subject: [PATCH 076/668] Version bump to v1.9.0-beta.1

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bd54cff886..4732bc6763 100755
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,9 @@
 
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
-VERSION_MINOR ?= 8
-VERSION_BUILD ?= 2
-RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).${VERSION_BUILD}
+VERSION_MINOR ?= 9
+VERSION_BUILD ?= 0-beta.1
+RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 
 KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/constants/constants.go | cut -d \" -f2)
@@ -25,7 +25,7 @@ PRELOADED_TARBALL_VERSION ?= $(shell egrep "PreloadVersion =" pkg/minikube/downl
 PRELOADED_VOLUMES_GCS_BUCKET ?= $(shell egrep "PreloadBucket =" pkg/minikube/download/preload.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0
+ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 RPM_VERSION ?= $(DEB_VERSION)

From 14b03f1f75425502f0d965123f1c270be55d0ee8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 17 Mar 2020 12:13:16 -0700
Subject: [PATCH 077/668] Update to Kubernetes v1.18.0-rc.1 by default

---
 pkg/minikube/bootstrapper/bsutil/kubelet_test.go | 8 ++++----
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go     | 2 +-
 pkg/minikube/constants/constants.go              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
index 3019ee1f52..3902af1198 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
@@ -79,7 +79,7 @@ Wants=crio.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.18.0-beta.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -104,7 +104,7 @@ Wants=containerd.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.17.3/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -136,7 +136,7 @@ Wants=containerd.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.17.3/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -162,7 +162,7 @@ Wants=docker.socket
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.17.3/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests
+ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests
 
 [Install]
 `,
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 92f896e4ef..8188b5af5a 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -517,7 +517,7 @@ func (k *Bootstrapper) applyNodeLabels(cfg config.ClusterConfig) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	// example:
-	// sudo /var/lib/minikube/binaries/v1.17.3/kubectl label nodes minikube.k8s.io/version=v1.7.3 minikube.k8s.io/commit=aa91f39ffbcf27dcbb93c4ff3f457c54e585cf4a-dirty minikube.k8s.io/name=p1 minikube.k8s.io/updated_at=2020_02_20T12_05_35_0700 --all --overwrite --kubeconfig=/var/lib/minikube/kubeconfig
+	// sudo /var/lib/minikube/binaries/<version>/kubectl label nodes minikube.k8s.io/version=<version> minikube.k8s.io/commit=aa91f39ffbcf27dcbb93c4ff3f457c54e585cf4a-dirty minikube.k8s.io/name=p1 minikube.k8s.io/updated_at=2020_02_20T12_05_35_0700 --all --overwrite --kubeconfig=/var/lib/minikube/kubeconfig
 	cmd := exec.CommandContext(ctx, "sudo",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
 		"label", "nodes", verLbl, commitLbl, nameLbl, createdAtLbl, "--all", "--overwrite",
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 5caeeb7505..ecaa8cdb98 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -26,9 +26,9 @@ import (
 
 const (
 	// DefaultKubernetesVersion is the default kubernetes version
-	DefaultKubernetesVersion = "v1.17.3"
+	DefaultKubernetesVersion = "v1.18.0-rc.1"
 	// NewestKubernetesVersion is the newest Kubernetes version to test against
-	NewestKubernetesVersion = "v1.18.0-beta.2"
+	NewestKubernetesVersion = "v1.18.0-rc.1"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.11.10"
 	// DefaultClusterName is the default nane for the k8s cluster

From 66a6f4e9060b85d3e4f6ec92c8f33cb32472a70c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 17 Mar 2020 12:28:44 -0700
Subject: [PATCH 078/668] fix docker status

---
 cmd/minikube/cmd/node_add.go                 | 5 +++++
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index a450684ec3..1e28103142 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -23,6 +23,7 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -43,6 +44,10 @@ var nodeAddCmd = &cobra.Command{
 			exit.WithError("Error getting config", err)
 		}
 
+		if driver.BareMetal(cc.Driver) {
+			out.ErrT(out.FailureType, "none driver does not support multi-node clusters")
+		}
+
 		name := fmt.Sprintf("m%02d", len(cc.Nodes)+1)
 
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 6bd2403b71..0863688ea8 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -276,10 +276,11 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 	port := n.Port
 	if driver.IsKIC(cfg.Driver) {
 		ip = oci.DefaultBindIPV4
-		port, err := oci.ForwardedPort(cfg.Driver, driver.MachineName(cfg, n), port)
+		p, err := oci.ForwardedPort(cfg.Driver, driver.MachineName(cfg, n), port)
 		if err != nil {
 			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 		}
+		port = p
 	}
 	if n.ControlPlane {
 		if err := kverify.APIServerIsRunning(start, ip, port, timeout); err != nil {

From c38cc9debef88afe1c0504b699dd439c4ed7fe66 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 13:13:07 -0700
Subject: [PATCH 079/668] Add cloudbuild setup for preload generator image

---
 Makefile                       |  4 +++
 deploy/preload/Dockerfile      | 47 ++++++++++++++++++++++++++++++++++
 deploy/preload/cloudbuild.yaml |  2 ++
 3 files changed, 53 insertions(+)
 create mode 100644 deploy/preload/Dockerfile
 create mode 100644 deploy/preload/cloudbuild.yaml

diff --git a/Makefile b/Makefile
index 8d46355ada..ad1deba4f6 100755
--- a/Makefile
+++ b/Makefile
@@ -523,6 +523,10 @@ kic-base-image: ## builds the base image used for kic.
 	docker rmi -f $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot || true
 	docker build -f ./hack/images/kicbase.Dockerfile -t $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot  --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --target base .
 
+.PHONY: preload-generator-image
+preload-generator-image:
+	docker build -t gcr.io/k8s-minikube/preload-generator -f deploy/preload/Dockerfile deploy/preload
+
 .PHONY: upload-preloaded-images-tar
 upload-preloaded-images-tar: out/minikube # Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
 	go run ./hack/preload-images/*.go 
diff --git a/deploy/preload/Dockerfile b/deploy/preload/Dockerfile
new file mode 100644
index 0000000000..5159051106
--- /dev/null
+++ b/deploy/preload/Dockerfile
@@ -0,0 +1,47 @@
+# Copyright 2020 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Download gcloud
+FROM alpine:3.10 as download-gcloud
+ENV GCLOUD_VERSION 276.0.0
+ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
+RUN wget -O gcloud.tar.gz "${GCLOUD_URL}"
+RUN tar -zxf gcloud.tar.gz
+
+FROM gcr.io/gcp-runtimes/ubuntu_16_0_4
+
+# Install python and make
+RUN apt-get update && \
+    apt-get install --no-install-recommends --no-install-suggests -y \
+    python make && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install docker
+COPY --from=docker:18.09.6 /usr/local/bin/docker /usr/local/bin/
+
+# Install gcloud dependencies
+COPY --from=download-gcloud google-cloud-sdk/ /google-cloud-sdk/
+# Finish installation of gcloud
+RUN CLOUDSDK_PYTHON="python2.7" /google-cloud-sdk/install.sh \
+    --usage-reporting=false \
+    --bash-completion=false \
+    --disable-installation-options
+ENV PATH=$PATH:/google-cloud-sdk/bin
+RUN gcloud auth configure-docker
+
+# Install go
+COPY --from=golang:1.14 /usr/local/go /usr/local/go
+ENV PATH=$PATH:/usr/local/go/bin
+
+CMD make upload-preloaded-images-tar
diff --git a/deploy/preload/cloudbuild.yaml b/deploy/preload/cloudbuild.yaml
new file mode 100644
index 0000000000..7b53696447
--- /dev/null
+++ b/deploy/preload/cloudbuild.yaml
@@ -0,0 +1,2 @@
+steps:
+    - image: gcr.io/k8s-minikube/preload-generator

From 2778bd1c99b8550d538a3830cceb70a315e84385 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 13:14:38 -0700
Subject: [PATCH 080/668] Build preload generator image in cloudbuild

---
 deploy/preload/cloudbuild.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deploy/preload/cloudbuild.yaml b/deploy/preload/cloudbuild.yaml
index 7b53696447..750e8524d7 100644
--- a/deploy/preload/cloudbuild.yaml
+++ b/deploy/preload/cloudbuild.yaml
@@ -1,2 +1,4 @@
 steps:
-    - image: gcr.io/k8s-minikube/preload-generator
+    - image: gcr.io/cloud-builders/docker
+      args: ["build", "-t", "preload-generator", "-f", "deploy/preload/Dockerfile", "deploy/preload"]
+    - image: preload-generator

From 5659a1df6ea47ef37650d6fc153883b689d31ec2 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 13:52:38 -0700
Subject: [PATCH 081/668] Remove cloudbuild stuff, run preload generation in
 jenkins

---
 Makefile                                      |  4 --
 deploy/preload/Dockerfile                     | 47 -------------------
 deploy/preload/cloudbuild.yaml                |  4 --
 .../minikube_cross_build_and_upload.sh        |  2 +-
 hack/jenkins/preload_generation.sh            | 28 +++++++++++
 5 files changed, 29 insertions(+), 56 deletions(-)
 delete mode 100644 deploy/preload/Dockerfile
 delete mode 100644 deploy/preload/cloudbuild.yaml
 create mode 100644 hack/jenkins/preload_generation.sh

diff --git a/Makefile b/Makefile
index ad1deba4f6..8d46355ada 100755
--- a/Makefile
+++ b/Makefile
@@ -523,10 +523,6 @@ kic-base-image: ## builds the base image used for kic.
 	docker rmi -f $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot || true
 	docker build -f ./hack/images/kicbase.Dockerfile -t $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot  --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --target base .
 
-.PHONY: preload-generator-image
-preload-generator-image:
-	docker build -t gcr.io/k8s-minikube/preload-generator -f deploy/preload/Dockerfile deploy/preload
-
 .PHONY: upload-preloaded-images-tar
 upload-preloaded-images-tar: out/minikube # Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
 	go run ./hack/preload-images/*.go 
diff --git a/deploy/preload/Dockerfile b/deploy/preload/Dockerfile
deleted file mode 100644
index 5159051106..0000000000
--- a/deploy/preload/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Download gcloud
-FROM alpine:3.10 as download-gcloud
-ENV GCLOUD_VERSION 276.0.0
-ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
-RUN wget -O gcloud.tar.gz "${GCLOUD_URL}"
-RUN tar -zxf gcloud.tar.gz
-
-FROM gcr.io/gcp-runtimes/ubuntu_16_0_4
-
-# Install python and make
-RUN apt-get update && \
-    apt-get install --no-install-recommends --no-install-suggests -y \
-    python make && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install docker
-COPY --from=docker:18.09.6 /usr/local/bin/docker /usr/local/bin/
-
-# Install gcloud dependencies
-COPY --from=download-gcloud google-cloud-sdk/ /google-cloud-sdk/
-# Finish installation of gcloud
-RUN CLOUDSDK_PYTHON="python2.7" /google-cloud-sdk/install.sh \
-    --usage-reporting=false \
-    --bash-completion=false \
-    --disable-installation-options
-ENV PATH=$PATH:/google-cloud-sdk/bin
-RUN gcloud auth configure-docker
-
-# Install go
-COPY --from=golang:1.14 /usr/local/go /usr/local/go
-ENV PATH=$PATH:/usr/local/go/bin
-
-CMD make upload-preloaded-images-tar
diff --git a/deploy/preload/cloudbuild.yaml b/deploy/preload/cloudbuild.yaml
deleted file mode 100644
index 750e8524d7..0000000000
--- a/deploy/preload/cloudbuild.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-steps:
-    - image: gcr.io/cloud-builders/docker
-      args: ["build", "-t", "preload-generator", "-f", "deploy/preload/Dockerfile", "deploy/preload"]
-    - image: preload-generator
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index ff9dc97092..382adacea7 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -39,7 +39,7 @@ declare -rx TAG="${ghprbActualCommit}"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
-make -j 16 all && failed=$? || failed=$?  
+make -j 16 all && failed=$? || failed=$?
 
 "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
 
diff --git a/hack/jenkins/preload_generation.sh b/hack/jenkins/preload_generation.sh
new file mode 100644
index 0000000000..66e2ba1125
--- /dev/null
+++ b/hack/jenkins/preload_generation.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script builds all the minikube binary for all 3 platforms as well as Windows-installer and .deb
+# This is intended to be run on a new release tag in order to build/upload the required files for a release
+
+
+set -eux -o pipefail
+
+# Make sure the right golang version is installed based on Makefile
+WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
+./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
+
+make upload-preloaded-images-tar
+make clean

From 579ac4411cb26f0eb9089408e33732ffe10d46d5 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 13:58:03 -0700
Subject: [PATCH 082/668] Use one tarballName function for consistency and add
 amd64 to the name

---
 hack/preload-images/preload_images.go |  6 +-----
 pkg/minikube/download/preload.go      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 7a9956d9c0..ceb0e5021b 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -62,7 +62,7 @@ func main() {
 
 	for _, kv := range k8sVersions {
 		for _, cr := range containerRuntimes {
-			tf := tarballFilename(kv, cr)
+			tf := download.TarballName(kv)
 			if tarballExists(tf) {
 				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kv)
 				continue
@@ -78,10 +78,6 @@ func main() {
 	}
 }
 
-func tarballFilename(kubernetesVersion string, containerRuntime string) string {
-	return fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-%s.tar.lz4", preloadedTarballVersion, kubernetesVersion, containerRuntime, dockerStorageDriver)
-}
-
 func tarballExists(tarballFilename string) bool {
 	fmt.Println("Checking if tarball already exists...")
 	gcsPath := fmt.Sprintf("gs://%s/%s", download.PreloadBucket, tarballFilename)
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 62893edf1b..08f7e307c4 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -42,14 +42,14 @@ const (
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )
 
-// returns name of the tarball
-func tarballName(k8sVersion string) string {
-	return fmt.Sprintf("preloaded-images-k8s-%s-%s-docker-overlay2.tar.lz4", PreloadVersion, k8sVersion)
+// TarballName returns name of the tarball
+func TarballName(k8sVersion string) string {
+	return fmt.Sprintf("preloaded-images-k8s-%s-%s-docker-overlay2-amd64.tar.lz4", PreloadVersion, k8sVersion)
 }
 
 // returns the name of the checksum file
 func checksumName(k8sVersion string) string {
-	return fmt.Sprintf("%s.checksum", tarballName(k8sVersion))
+	return fmt.Sprintf("%s.checksum", TarballName(k8sVersion))
 }
 
 // returns target dir for all cached items related to preloading
@@ -64,12 +64,12 @@ func PreloadChecksumPath(k8sVersion string) string {
 
 // TarballPath returns the path to the preloaded tarball
 func TarballPath(k8sVersion string) string {
-	return path.Join(targetDir(), tarballName(k8sVersion))
+	return path.Join(targetDir(), TarballName(k8sVersion))
 }
 
 // remoteTarballURL returns the URL for the remote tarball in GCS
 func remoteTarballURL(k8sVersion string) string {
-	return fmt.Sprintf("https://storage.googleapis.com/%s/%s", PreloadBucket, tarballName(k8sVersion))
+	return fmt.Sprintf("https://storage.googleapis.com/%s/%s", PreloadBucket, TarballName(k8sVersion))
 }
 
 // PreloadExists returns true if there is a preloaded tarball that can be used
@@ -147,13 +147,13 @@ func Preload(k8sVersion, containerRuntime string) error {
 }
 
 func saveChecksumFile(k8sVersion string) error {
-	glog.Infof("saving checksum for %s ...", tarballName(k8sVersion))
+	glog.Infof("saving checksum for %s ...", TarballName(k8sVersion))
 	ctx := context.Background()
 	client, err := storage.NewClient(ctx, option.WithoutAuthentication())
 	if err != nil {
 		return errors.Wrap(err, "getting storage client")
 	}
-	attrs, err := client.Bucket(PreloadBucket).Object(tarballName(k8sVersion)).Attrs(ctx)
+	attrs, err := client.Bucket(PreloadBucket).Object(TarballName(k8sVersion)).Attrs(ctx)
 	if err != nil {
 		return errors.Wrap(err, "getting storage object")
 	}

From d5490a8fb80f67c821fec1c8d426f8d64cd77160 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 16:03:29 -0700
Subject: [PATCH 083/668] Move driver validation before driver selection

If a user passes in a driver via --vm-driver or --driver, then we should make sure it matches the preexisting cluster (if one exists) before we try and get information about the driver. This avoids confusing logs where we tell the user we're using the preexisting driver but then error out because they specified a different driver.
---
 cmd/minikube/cmd/start.go | 90 ++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 44e3d3210c..13ea4c891f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -294,6 +294,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		exit.WithCodeT(exit.Data, "Unable to load config: {{.error}}", out.V{"error": err})
 	}
 
+	validateSpecifiedDriver(existing)
 	ds := selectDriver(existing)
 	driverName := ds.Name
 	glog.Infof("selected driver: %s", driverName)
@@ -482,6 +483,55 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	return pick
 }
 
+// validateSpecifiedDriver makes sure that if a user has passed in a driver
+// it matches the existing cluster if there is one
+func validateSpecifiedDriver(existing *config.ClusterConfig) {
+	if existing == nil {
+		return
+	}
+	old := existing.Driver
+	var requested string
+	if d := viper.GetString("driver"); d != "" {
+		requested = d
+	} else if d := viper.GetString("vm-driver"); d != "" {
+		requested = d
+	}
+	if old == requested {
+		return
+	}
+
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		glog.Warningf("selectDriver NewAPIClient: %v", err)
+		return
+	}
+
+	cp, err := config.PrimaryControlPlane(existing)
+	if err != nil {
+		exit.WithError("Error getting primary cp", err)
+	}
+	machineName := driver.MachineName(*existing, cp)
+	h, err := api.Load(machineName)
+	if err != nil {
+		glog.Warningf("selectDriver api.Load: %v", err)
+		return
+	}
+
+	out.ErrT(out.Conflict, `The existing "{{.profile_name}}" VM was created using the "{{.old_driver}}" driver, and is incompatible with the "{{.driver}}" driver.`,
+		out.V{"profile_name": machineName, "driver": requested, "old_driver": h.Driver.DriverName()})
+
+	out.ErrT(out.Workaround, `To proceed, either:
+
+1) Delete the existing "{{.profile_name}}" cluster using: '{{.command}} delete'
+
+* or *
+
+2) Start the existing "{{.profile_name}}" cluster using: '{{.command}} start --driver={{.old_driver}}'
+`, out.V{"command": minikubeCmd(), "old_driver": h.Driver.DriverName(), "profile_name": machineName})
+
+	exit.WithCodeT(exit.Config, "Exiting.")
+}
+
 // validateDriver validates that the selected driver appears sane, exits if not
 func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 	name := ds.Name
@@ -510,46 +560,6 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 			exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed", out.V{"driver": name})
 		}
 	}
-
-	if existing == nil {
-		return
-	}
-
-	api, err := machine.NewAPIClient()
-	if err != nil {
-		glog.Warningf("selectDriver NewAPIClient: %v", err)
-		return
-	}
-
-	cp, err := config.PrimaryControlPlane(existing)
-	if err != nil {
-		exit.WithError("Error getting primary cp", err)
-	}
-
-	machineName := driver.MachineName(*existing, cp)
-	h, err := api.Load(machineName)
-	if err != nil {
-		glog.Warningf("selectDriver api.Load: %v", err)
-		return
-	}
-
-	if h.Driver.DriverName() == name {
-		return
-	}
-
-	out.ErrT(out.Conflict, `The existing "{{.profile_name}}" VM that was created using the "{{.old_driver}}" driver, and is incompatible with the "{{.driver}}" driver.`,
-		out.V{"profile_name": machineName, "driver": name, "old_driver": h.Driver.DriverName()})
-
-	out.ErrT(out.Workaround, `To proceed, either:
-
-    1) Delete the existing "{{.profile_name}}" cluster using: '{{.command}} delete'
-
-    * or *
-
-    2) Start the existing "{{.profile_name}}" cluster using: '{{.command}} start --driver={{.old_driver}}'
-	`, out.V{"command": minikubeCmd(), "old_driver": h.Driver.DriverName(), "profile_name": machineName})
-
-	exit.WithCodeT(exit.Config, "Exiting.")
 }
 
 func selectImageRepository(mirrorCountry string, v semver.Version) (bool, string, error) {

From dd707820fc85f36e4576720a7a4f132cf63b7871 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 18:07:48 -0700
Subject: [PATCH 084/668] If memory is specified in config, suggest that for
 memory allocation

---
 cmd/minikube/cmd/start.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 44e3d3210c..9fc5195950 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -666,6 +666,9 @@ func memoryLimits(drvName string) (int, int, error) {
 
 // suggestMemoryAllocation calculates the default memory footprint in MB
 func suggestMemoryAllocation(sysLimit int, containerLimit int) int {
+	if mem := viper.GetInt(memory); mem != 0 {
+		return mem
+	}
 	fallback := 2200
 	maximum := 6000
 

From 196eb6a8537f4d98af7cf19ae0fa592dfc2c332c Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 17 Mar 2020 18:38:32 -0700
Subject: [PATCH 085/668] Start adding doc for issue triage

---
 site/content/en/docs/Contributing/triage.md | 73 +++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 site/content/en/docs/Contributing/triage.md

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
new file mode 100644
index 0000000000..7ba7d66287
--- /dev/null
+++ b/site/content/en/docs/Contributing/triage.md
@@ -0,0 +1,73 @@
+---
+linkTitle: "Triage"
+title: "Triaging Minikube Issues"
+date: 2020-03-17
+weight: 10
+description: >
+  How to triage issues in the minikube repo
+---
+
+Triage is an important part of maintaining the health of the minikube repo.
+A well organized repo allows maintainers to prioritize feature requests, fix bugs, and respond to users facing difficulty with the tool as quickly as possible.
+
+Triage includes:
+- Labeling issues
+- Responding to issues
+- Closing issues (under certain circumstances!)
+
+If you're interested in helping out with minikube triage, this doc covers the basics of doing so.
+
+Additionally, if you'd be interested in participating in our weekly triage meeting, please fill out this [form](https://forms.gle/vNtWZSWXqeYaaNbU9) to express interest. Thank you! 
+
+# Labeling Issues
+
+
+
+
+
+# Responding to Issues
+
+Many issues in the minikube repo fall into one of the following categories:
+- Needs more information from the author to be actionable
+- Duplicate Issue
+
+
+## Closing with Care
+
+Issues typically need to be closed for the following reasons:
+
+- The issue has been addressed
+- The issue is a duplicate of an existing issue
+- There has been a lack of information over a long period of time
+
+In any of these situations, we aim to be kind when closing the issue, and offer the author action items should they need to reopen their issue or still require a solution.
+
+Samples responses for these situations include:
+
+### Issue has been addressed
+
+@author: I believe this issue is now addressed by minikube v1.4, as it <reason>. If you still see this issue with minikube v1.4 or higher, please reopen this issue by commenting with `/reopen`
+
+Thank you for reporting this issue!
+
+### Duplicate Issue
+
+
+This issue appears to be a duplicate of #X, do you mind if we move the conversation there?
+
+This way we can centralize the content relating to the issue. If you feel that this issue is not in fact a duplicate, please re-open it using `/reopen`. If you have additional information to share, please add it to the new issue.
+
+Thank you for reporting this!
+
+### Lack of Information
+
+Hey @author -- hopefully it's OK if I close this - there wasn't enough information to make it actionable, and some time has already passed. If you are able to provide additional details, you may reopen it at any point by adding /reopen to your comment.
+
+Here is additional information that may be helpful to us:
+
+* Whether the issue occurs with the latest minikube release
+*  The exact `minikube start` command line used
+*  The full output of the `minikube start` command, preferably with `--alsologtostderr -v=3` for extra logging.
+ * The full output of `minikube logs`
+
+Thank you for sharing your experience!

From e95e154fdd6d1b93da983ccba8999258fbec2d8e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 09:47:15 -0700
Subject: [PATCH 086/668] Add release notes for v1.9.0-beta.1

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6d0871151..68ff00fca6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Release Notes
 
+## Version 1.9.0-beta.1 - 2020-03-18
+
+New features
+
+* Use Kubernetes v1.18.0-rc.1 by default [#7076](https://github.com/kubernetes/minikube/pull/7076)
+* Upgrade Docker, from 19.03.7 to 19.03.8 [#7040](https://github.com/kubernetes/minikube/pull/7040)
+* Upgrade Docker, from 19.03.6 to 19.03.7 [#6939](https://github.com/kubernetes/minikube/pull/6939)
+* Updated French translation [#7055](https://github.com/kubernetes/minikube/pull/7055)
+
+Bugfixes
+
+* Strip the version prefix before calling semver [#7054](https://github.com/kubernetes/minikube/pull/7054)
+* Move some of the driver validation before driver selection [#7080](https://github.com/kubernetes/minikube/pull/7080)
+* Fix bug where global config memory was ignored [#7082](https://github.com/kubernetes/minikube/pull/7082)
+* Remove controllerManager from the kubeadm v1beta2 template [#7030](https://github.com/kubernetes/minikube/pull/7030)
+* Delete: output underlying status failure [#7043](https://github.com/kubernetes/minikube/pull/7043)
+* status: error properly if cluster does not exist [#7041](https://github.com/kubernetes/minikube/pull/7041)
+
+Huge thank you for this release towards our contributors:
+
+- Anders F Björklund
+- Medya Ghazizadeh
+- Priya Wadhwa
+- Richard Wall
+- Sharif Elgamal
+- Thomas Strömberg
+- Vikky Omkar
+- jumahmohammad
+- vikkyomkar
+
 ## Version 1.8.2 - 2020-03-13
 
 Shiny new improvements:

From bed70069702e8c122f4f3306298a861e1ce9f201 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 10:07:49 -0700
Subject: [PATCH 087/668] Upgrade Docker driver to preferred (Linux), default
 on other platforms

---
 pkg/minikube/registry/drvs/docker/docker.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 8549d35706..a9191a35d9 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
+	"runtime"
 	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -32,12 +33,21 @@ import (
 )
 
 func init() {
+	priority := registry.Default
+	// Staged rollout for preferred:
+	// - Linux
+	// - Windows (once "service" command works)
+	// - macOS
+	if runtime.GOOS == "linux" {
+		priority = registry.Preferred
+	}
+
 	if err := registry.Register(registry.DriverDef{
 		Name:     driver.Docker,
 		Config:   configure,
 		Init:     func() drivers.Driver { return kic.NewDriver(kic.Config{OCIBinary: oci.Docker}) },
 		Status:   status,
-		Priority: registry.Fallback,
+		Priority: priority,
 	}); err != nil {
 		panic(fmt.Sprintf("register failed: %v", err))
 	}

From 68baafccf0eade8940a0e4559b2f85c21dacd01e Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 18 Mar 2020 10:41:24 -0700
Subject: [PATCH 088/668] fix lint

---
 hack/preload-images/preload_images.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index ceb0e5021b..60b6bc9e2a 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -33,11 +33,10 @@ const (
 )
 
 var (
-	dockerStorageDriver     = "overlay2"
-	preloadedTarballVersion = "v1"
-	containerRuntimes       = []string{"docker"}
-	k8sVersion              string
-	k8sVersions             []string
+	dockerStorageDriver = "overlay2"
+	containerRuntimes   = []string{"docker"}
+	k8sVersion          string
+	k8sVersions         []string
 )
 
 func init() {

From 17a30cdd7a5dd36a5be020ec5349c97c00fbaf67 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 18 Mar 2020 11:03:30 -0700
Subject: [PATCH 089/668] Change download test to use unsupported preload
 version

So that we can still make sure that images are being pulled properly.

Also, remove the check for the kic base image. Right now, it isn't working, and I'm working on a fix in another PR.
---
 test/integration/aaa_download_only_test.go | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index e4ca5ebb26..057b636c9c 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -54,8 +54,7 @@ func TestDownloadOnly(t *testing.T) {
 	t.Run("group", func(t *testing.T) {
 		versions := []string{
 			constants.OldestKubernetesVersion,
-			constants.DefaultKubernetesVersion,
-			constants.NewestKubernetesVersion,
+			"v1.12.0",
 		}
 		for _, v := range versions {
 			t.Run(v, func(t *testing.T) {
@@ -197,15 +196,6 @@ func TestDownloadOnlyDocker(t *testing.T) {
 	if string(remoteChecksum) != string(checksum[:]) {
 		t.Errorf("checksum of %s does not match remote checksum (%s != %s)", tarball, string(remoteChecksum), string(checksum[:]))
 	}
-
-	// Make sure this image exists in the docker daemon
-	ref, err := name.ParseReference(kic.BaseImage)
-	if err != nil {
-		t.Errorf("parsing reference failed: %v", err)
-	}
-	if _, err := daemon.Image(ref); err != nil {
-		t.Errorf("expected image does not exist in local daemon: %v", err)
-	}
 }
 
 func runningDockerDriver(startArgs []string) bool {

From 2a38c7395ee9037c7e74012a819e76fe87a89f24 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 18 Mar 2020 11:49:09 -0700
Subject: [PATCH 090/668] fix lint

---
 go.mod                                     | 1 -
 go.sum                                     | 2 --
 test/integration/aaa_download_only_test.go | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/go.mod b/go.mod
index b1861de795..a703f57861 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,6 @@ require (
 	github.com/google/go-cmp v0.3.1
 	github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2
 	github.com/google/go-github v17.0.0+incompatible
-	github.com/google/go-github/v29 v29.0.3 // indirect
 	github.com/googleapis/gnostic v0.3.0 // indirect
 	github.com/hashicorp/go-getter v1.4.0
 	github.com/hashicorp/go-retryablehttp v0.5.4
diff --git a/go.sum b/go.sum
index dfeb89780e..d84ef83e6e 100644
--- a/go.sum
+++ b/go.sum
@@ -338,8 +338,6 @@ github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2 h1:/z0
 github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2/go.mod h1:Wtl/v6YdQxv397EREtzwgd9+Ud7Q5D8XMbi3Zazgkrs=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-github/v29 v29.0.3 h1:IktKCTwU//aFHnpA+2SLIi7Oo9uhAzgsdZNbcAqhgdc=
-github.com/google/go-github/v29 v29.0.3/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 057b636c9c..2c2210b590 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -32,9 +32,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/name"
-	"github.com/google/go-containerregistry/pkg/v1/daemon"
-	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"

From ff8ae7311cd8c3e71c303b0d45386b9a5aa73b0c Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 18 Mar 2020 12:27:17 -0700
Subject: [PATCH 091/668] If user doesn't specify driver, don't validate
 against existing cluster

---
 cmd/minikube/cmd/start.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index be41c2b560..6227dfa16a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -496,6 +496,10 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 	} else if d := viper.GetString("vm-driver"); d != "" {
 		requested = d
 	}
+	// Neither --vm-driver or --driver was specified
+	if requested == "" {
+		return
+	}
 	if old == requested {
 		return
 	}

From 53da7250303b84113c8e870b07a06b030fd58249 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 12:27:41 -0700
Subject: [PATCH 092/668] Dashboard upgrade to rc6

---
 deploy/addons/dashboard/dashboard-dp.yaml        |  2 +-
 pkg/minikube/bootstrapper/images/images.go       |  2 +-
 pkg/minikube/bootstrapper/images/images_test.go  |  4 ++--
 pkg/minikube/bootstrapper/images/kubeadm_test.go | 14 +++++++-------
 pkg/minikube/download/preload.go                 |  4 +++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/deploy/addons/dashboard/dashboard-dp.yaml b/deploy/addons/dashboard/dashboard-dp.yaml
index 98ac68e359..8af7003de4 100644
--- a/deploy/addons/dashboard/dashboard-dp.yaml
+++ b/deploy/addons/dashboard/dashboard-dp.yaml
@@ -90,7 +90,7 @@ spec:
       containers:
         - name: kubernetes-dashboard
           # WARNING: This must match pkg/minikube/bootstrapper/images/images.go
-          image: kubernetesui/dashboard:v2.0.0-beta8
+          image: kubernetesui/dashboard:v2.0.0-rc6
           ports:
             - containerPort: 9090
               protocol: TCP
diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go
index 1029e94007..4b619359b9 100644
--- a/pkg/minikube/bootstrapper/images/images.go
+++ b/pkg/minikube/bootstrapper/images/images.go
@@ -135,7 +135,7 @@ func dashboardFrontend(repo string) string {
 		repo = "kubernetesui"
 	}
 	// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
-	return path.Join(repo, "dashboard:v2.0.0-beta8")
+	return path.Join(repo, "dashboard:v2.0.0-rc6")
 }
 
 // dashboardMetrics returns the image used for the dashboard metrics scraper
diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go
index 6a2edc5da2..e623a9002b 100644
--- a/pkg/minikube/bootstrapper/images/images_test.go
+++ b/pkg/minikube/bootstrapper/images/images_test.go
@@ -25,7 +25,7 @@ import (
 func TestAuxiliary(t *testing.T) {
 	want := []string{
 		"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-		"kubernetesui/dashboard:v2.0.0-beta8",
+		"kubernetesui/dashboard:v2.0.0-rc6",
 		"kubernetesui/metrics-scraper:v1.0.2",
 	}
 	got := auxiliary("")
@@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) {
 func TestAuxiliaryMirror(t *testing.T) {
 	want := []string{
 		"test.mirror/storage-provisioner:v1.8.1",
-		"test.mirror/dashboard:v2.0.0-beta8",
+		"test.mirror/dashboard:v2.0.0-rc6",
 		"test.mirror/metrics-scraper:v1.0.2",
 	}
 	got := auxiliary("test.mirror")
diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go
index 1819254f23..d705b5e74c 100644
--- a/pkg/minikube/bootstrapper/images/kubeadm_test.go
+++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go
@@ -38,7 +38,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.4.3-0",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.16.1", "mirror.k8s.io", []string{
@@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) {
 			"mirror.k8s.io/etcd:3.3.15-0",
 			"mirror.k8s.io/pause:3.1",
 			"mirror.k8s.io/storage-provisioner:v1.8.1",
-			"mirror.k8s.io/dashboard:v2.0.0-beta8",
+			"mirror.k8s.io/dashboard:v2.0.0-rc6",
 			"mirror.k8s.io/metrics-scraper:v1.0.2",
 		}},
 		{"v1.15.0", "", []string{
@@ -62,7 +62,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.14.0", "", []string{
@@ -74,7 +74,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.13.0", "", []string{
@@ -86,7 +86,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.12.0", "", []string{
@@ -98,7 +98,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.11.10", "", []string{
@@ -110,7 +110,7 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd-amd64:3.2.18",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.0-beta8",
+			"kubernetesui/dashboard:v2.0.0-rc6",
 			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 	}
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 62893edf1b..d97845065e 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -37,7 +37,9 @@ import (
 
 const (
 	// PreloadVersion is the current version of the preloaded tarball
-	PreloadVersion = "v1"
+	//
+	// NOTE: You may need to bump this version up when upgrading auxiliary docker images
+	PreloadVersion = "v2"
 	// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )

From 426b77680901c1b5fb04bd8e4068b987b53b0591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Wed, 18 Mar 2020 20:48:31 +0100
Subject: [PATCH 093/668] Upgrade crio to 1.17.1

---
 deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 +
 deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
index 28f2852b75..d0f12d3d77 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -11,3 +11,4 @@ sha256 70d4c746fe207422c78420dc4239768f485eea639a38c993c02872ec6305dd1d v1.15.2.
 sha256 05f9614c4d5970b4662499b84c270b0ab953596ee863dcd09c9dc7a2d2f09789 v1.16.0.tar.gz
 sha256 57e1ee990ef2d5af8b32c33a21b4998682608e3556dcf1d3349666f55e7d95b9 v1.16.1.tar.gz
 sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.tar.gz
+sha256 7967e9218fdfb59d6005a9e19c1668469bc5566c2a35927cffe7de8656bb22c7 v1.17.1.tar.gz
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
index 0ddf03aeba..f1a58a31b7 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.17.0
-CRIO_BIN_COMMIT = 6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3
+CRIO_BIN_VERSION = v1.17.1
+CRIO_BIN_COMMIT = ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme

From f71b44689e341f92ee0f8a6772ef483f38b1b06f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 13:20:07 -0700
Subject: [PATCH 094/668] Add last minute v1.8.0-beta.1 additions to changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68ff00fca6..835ccf9552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,16 @@
 New features
 
 * Use Kubernetes v1.18.0-rc.1 by default [#7076](https://github.com/kubernetes/minikube/pull/7076)
+* Upgrade Docker driver to preferred (Linux), default on other platforms [#7090](https://github.com/kubernetes/minikube/pull/7090)
 * Upgrade Docker, from 19.03.7 to 19.03.8 [#7040](https://github.com/kubernetes/minikube/pull/7040)
 * Upgrade Docker, from 19.03.6 to 19.03.7 [#6939](https://github.com/kubernetes/minikube/pull/6939)
+* Upgrade dashboard to v2.0.0-rc6 [#7098](https://github.com/kubernetes/minikube/pull/7098)
+* Upgrade crio to 1.17.1 [#7099](https://github.com/kubernetes/minikube/pull/7099)
 * Updated French translation [#7055](https://github.com/kubernetes/minikube/pull/7055)
 
 Bugfixes
 
+* If user doesn't specify driver, don't validate against existing cluster [#7096](https://github.com/kubernetes/minikube/pull/7096)
 * Strip the version prefix before calling semver [#7054](https://github.com/kubernetes/minikube/pull/7054)
 * Move some of the driver validation before driver selection [#7080](https://github.com/kubernetes/minikube/pull/7080)
 * Fix bug where global config memory was ignored [#7082](https://github.com/kubernetes/minikube/pull/7082)
@@ -23,12 +27,12 @@ Huge thank you for this release towards our contributors:
 - Anders F Björklund
 - Medya Ghazizadeh
 - Priya Wadhwa
+- RA489
 - Richard Wall
 - Sharif Elgamal
 - Thomas Strömberg
 - Vikky Omkar
 - jumahmohammad
-- vikkyomkar
 
 ## Version 1.8.2 - 2020-03-13
 

From 1cebb31557b5ead8132b5b8a522bd3b6ad792945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Wed, 18 Mar 2020 21:24:41 +0100
Subject: [PATCH 095/668] Upgrade buildroot minor version

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6a3b3face8..f1256f8eb5 100755
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION)
 GO_VERSION ?= 1.13.8
 
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
-BUILDROOT_BRANCH ?= 2019.02.9
+BUILDROOT_BRANCH ?= 2019.02.10
 REGISTRY?=gcr.io/k8s-minikube
 
 # Get git commit id
@@ -52,7 +52,7 @@ MINIKUBE_BUCKET ?= minikube/releases
 MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
 MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 
-KERNEL_VERSION ?= 4.19.94
+KERNEL_VERSION ?= 4.19.107
 # latest from https://github.com/golangci/golangci-lint/releases
 GOLINT_VERSION ?= v1.23.6
 # Limit number of default jobs, to avoid the CI builds running out of memory

From 3dfb0ae98d22d69ef2295a890f3a5c28dad45719 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 18 Mar 2020 13:50:24 -0700
Subject: [PATCH 096/668] check if preloaded tarball was downloaded if preload
 exists

---
 test/integration/aaa_download_only_test.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 2c2210b590..3eda60e8cf 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -51,7 +51,8 @@ func TestDownloadOnly(t *testing.T) {
 	t.Run("group", func(t *testing.T) {
 		versions := []string{
 			constants.OldestKubernetesVersion,
-			"v1.12.0",
+			constants.DefaultKubernetesVersion,
+			constants.NewestKubernetesVersion,
 		}
 		for _, v := range versions {
 			t.Run(v, func(t *testing.T) {
@@ -70,6 +71,14 @@ func TestDownloadOnly(t *testing.T) {
 					t.Errorf("%s failed: %v", args, err)
 				}
 
+				if download.PreloadExists(v, "docker") {
+					// Just make sure the tarball path exists
+					if _, err := os.Stat(download.TarballPath(v)); err != nil {
+						t.Errorf("preloaded tarball path doesn't exist: %v", err)
+					}
+					return
+				}
+
 				imgs, err := images.Kubeadm("", v)
 				if err != nil {
 					t.Errorf("kubeadm images: %v %+v", v, err)

From c13d7bafebf9c379f7f4debde164908d2cbf6779 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 14:51:54 -0700
Subject: [PATCH 097/668] Detect AnonymousAuth issues, show the error log on
 console

---
 .../bootstrapper/bsutil/kverify/kverify.go    | 23 +++++++++++++++++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  8 ++++++-
 pkg/minikube/logs/logs.go                     |  2 +-
 pkg/minikube/logs/logs_test.go                |  1 +
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index aa076cecb9..54f17565e1 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -34,7 +34,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/logs"
 )
 
 // APIServerProcess waits for api server to be healthy returns error if it doesn't
@@ -94,15 +97,27 @@ func SystemPods(client *kubernetes.Clientset, start time.Time, timeout time.Dura
 	return nil
 }
 
-// APIServerIsRunning waits for api server status to be running
-func APIServerIsRunning(start time.Time, ip string, port int, timeout time.Duration) error {
+// WaitForHealthyAPIServer waits for api server status to be running
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
+
+	minLogTime := kconst.APICallRetryInterval * 10
 	healthz := func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during healthz check")
 		}
 
+		// We're probably not going to recover, so show problems and slow polling
+		if time.Since(start) > minLogTime {
+			problems := logs.FindProblems(r, bs, cr)
+			if len(problems) > 0 {
+				logs.OutputProblems(problems, 5)
+				time.Sleep(kconst.APICallRetryInterval * 15)
+			}
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
 		status, err := apiServerHealthz(net.ParseIP(ip), port)
 		if err != nil {
 			glog.Warningf("status: %v", err)
@@ -175,6 +190,10 @@ func apiServerHealthz(ip net.IP, port int) (state.State, error) {
 	if err != nil {
 		return state.Stopped, nil
 	}
+	if resp.StatusCode == http.StatusUnauthorized {
+		glog.Errorf("%s returned code %d (unauthorized). Please ensure that your apiserver authorization settings make sense!", url, resp.StatusCode)
+		return state.Error, nil
+	}
 	if resp.StatusCode != http.StatusOK {
 		glog.Warningf("%s response: %v %+v", url, err, resp)
 		return state.Error, nil
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 8188b5af5a..d8be5c4d52 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -273,7 +273,13 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 		}
 	}
-	if err := kverify.APIServerIsRunning(start, ip, port, timeout); err != nil {
+
+	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
+	if err != nil {
+		return err
+	}
+
+	if err := kverify.WaitForHealthyAPIServer(cr, k, k.c, start, ip, port, timeout); err != nil {
 		return err
 	}
 
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index ef26e9d7d7..fb833bca2b 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -36,7 +36,7 @@ import (
 )
 
 // rootCauseRe is a regular expression that matches known failure root causes
-var rootCauseRe = regexp.MustCompile(`^error: |eviction manager: pods.* evicted|unknown flag: --|forbidden.*no providers available|eviction manager:.*evicted|tls: bad certificate|kubelet.*no API client|kubelet.*No api server|STDIN.*127.0.0.1:8080|failed to create listener|address already in use|unable to evict any pods|eviction manager: unexpected error`)
+var rootCauseRe = regexp.MustCompile(`^error: |eviction manager: pods.* evicted|unknown flag: --|forbidden.*no providers available|eviction manager:.*evicted|tls: bad certificate|kubelet.*no API client|kubelet.*No api server|STDIN.*127.0.0.1:8080|failed to create listener|address already in use|unable to evict any pods|eviction manager: unexpected error|Resetting AnonymousAuth to false`)
 
 // ignoreCauseRe is a regular expression that matches spurious errors to not surface
 var ignoreCauseRe = regexp.MustCompile("error: no objects passed to apply")
diff --git a/pkg/minikube/logs/logs_test.go b/pkg/minikube/logs/logs_test.go
index bfb8b14b55..8af8612e27 100644
--- a/pkg/minikube/logs/logs_test.go
+++ b/pkg/minikube/logs/logs_test.go
@@ -36,6 +36,7 @@ func TestIsProblem(t *testing.T) {
 		{"no-objects-passed-to-apply #4010", false, "error: no objects passed to apply"},
 		{"bad-certificate #4251", true, "log.go:172] http: TLS handshake error from 127.0.0.1:49200: remote error: tls: bad certificate"},
 		{"ephemeral-eviction #5355", true, " eviction_manager.go:419] eviction manager: unexpected error when attempting to reduce ephemeral-storage pressure: wanted to free 9223372036854775807 bytes, but freed 0 bytes space with errors in image deletion"},
+		{"anonymous-auth", true, "AnonymousAuth is not allowed with the AlwaysAllow authorizer. Resetting AnonymousAuth to false. You should use a different authorizer"},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {

From a24aa5dff72fcff3dfe4be0a5620d8131d96fd88 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 18 Mar 2020 15:04:56 -0700
Subject: [PATCH 098/668] dramatically simplify start code path

---
 cmd/minikube/cmd/cache.go                    |   4 +-
 cmd/minikube/cmd/kubectl.go                  |   4 +-
 cmd/minikube/cmd/node_start.go               |   2 +-
 cmd/minikube/cmd/start.go                    |   6 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |   8 +-
 pkg/minikube/cluster/cache.go                | 168 -------
 pkg/minikube/cluster/setup.go                | 422 ------------------
 pkg/minikube/node/node.go                    |   2 +-
 pkg/minikube/node/start.go                   | 443 +++++++++++++++++--
 9 files changed, 409 insertions(+), 650 deletions(-)
 delete mode 100644 pkg/minikube/cluster/cache.go
 delete mode 100644 pkg/minikube/cluster/setup.go

diff --git a/cmd/minikube/cmd/cache.go b/cmd/minikube/cmd/cache.go
index ab1f075853..eb91371984 100644
--- a/cmd/minikube/cmd/cache.go
+++ b/cmd/minikube/cmd/cache.go
@@ -19,10 +19,10 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 	cmdConfig "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/image"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 )
 
 // cacheImageConfigKey is the config field name used to store which images we have previously cached
@@ -75,7 +75,7 @@ var reloadCacheCmd = &cobra.Command{
 	Short: "reload cached images.",
 	Long:  "reloads images previously added using the 'cache add' subcommand",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := cluster.CacheAndLoadImagesInConfig()
+		err := node.CacheAndLoadImagesInConfig()
 		if err != nil {
 			exit.WithError("Failed to reload cached images", err)
 		}
diff --git a/cmd/minikube/cmd/kubectl.go b/cmd/minikube/cmd/kubectl.go
index e5520d8153..e24943a7d4 100644
--- a/cmd/minikube/cmd/kubectl.go
+++ b/cmd/minikube/cmd/kubectl.go
@@ -25,10 +25,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -59,7 +59,7 @@ minikube kubectl -- get pods --namespace kube-system`,
 			version = cc.KubernetesConfig.KubernetesVersion
 		}
 
-		path, err := cluster.CacheKubectlBinary(version)
+		path, err := node.CacheKubectlBinary(version)
 		if err != nil {
 			out.ErrLn("Error caching kubectl: %v", err)
 		}
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 758b60b7a3..17e3da8694 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,7 +61,7 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		node.Start(*cc, *n, nil)
+		node.Start(*cc, *n, nil, false)
 	},
 }
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6b063a88ba..9ab8a0e730 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -45,7 +45,6 @@ import (
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
@@ -348,10 +347,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	kubeconfig, err := cluster.InitialSetup(cc, n, existingAddons)
-	if err != nil {
-		exit.WithError("Starting node", err)
-	}
+	kubeconfig := node.Start(cc, n, existingAddons, true)
 
 	numNodes := viper.GetInt(nodes)
 	if numNodes > 1 {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 0863688ea8..db8d9c3718 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -212,6 +212,10 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "setting up node")
 	}
 
+	if err := k.applyNodeLabels(cfg); err != nil {
+		glog.Warningf("unable to apply node labels: %v", err)
+	}
+
 	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
 		glog.Warningf("unable to adjust resource limits: %v", err)
 	}
@@ -231,10 +235,6 @@ func (k *Bootstrapper) SetupNode(cfg config.ClusterConfig) error {
 		}
 	}
 
-	if err := k.applyNodeLabels(cfg); err != nil {
-		glog.Warningf("unable to apply node labels: %v", err)
-	}
-
 	return nil
 }
 
diff --git a/pkg/minikube/cluster/cache.go b/pkg/minikube/cluster/cache.go
deleted file mode 100644
index 6fcf303f27..0000000000
--- a/pkg/minikube/cluster/cache.go
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cluster
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/golang/glog"
-	"github.com/spf13/viper"
-	"golang.org/x/sync/errgroup"
-	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/drivers/kic"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/download"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/image"
-	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/out"
-)
-
-const (
-	cacheImages         = "cache-images"
-	cacheImageConfigKey = "cache"
-)
-
-// BeginCacheKubernetesImages caches images required for kubernetes version in the background
-func BeginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVersion string, cRuntime string) {
-	if download.PreloadExists(k8sVersion, cRuntime) {
-		glog.Info("Caching tarball of preloaded images")
-		err := download.Preload(k8sVersion, cRuntime)
-		if err == nil {
-			glog.Infof("Finished downloading the preloaded tar for %s on %s", k8sVersion, cRuntime)
-			return // don't cache individual images if preload is successful.
-		}
-		glog.Warningf("Error downloading preloaded artifacts will continue without preload: %v", err)
-	}
-
-	if !viper.GetBool(cacheImages) {
-		return
-	}
-
-	g.Go(func() error {
-		return machine.CacheImagesForBootstrapper(imageRepository, k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
-	})
-}
-
-// HandleDownloadOnly caches appropariate binaries and images
-func HandleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string) {
-	// If --download-only, complete the remaining downloads and exit.
-	if !viper.GetBool("download-only") {
-		return
-	}
-	if err := doCacheBinaries(k8sVersion); err != nil {
-		exit.WithError("Failed to cache binaries", err)
-	}
-	if _, err := CacheKubectlBinary(k8sVersion); err != nil {
-		exit.WithError("Failed to cache kubectl", err)
-	}
-	WaitCacheRequiredImages(cacheGroup)
-	WaitDownloadKicArtifacts(kicGroup)
-	if err := saveImagesToTarFromConfig(); err != nil {
-		exit.WithError("Failed to cache images to tar", err)
-	}
-	out.T(out.Check, "Download complete!")
-	os.Exit(0)
-
-}
-
-// CacheKubectlBinary caches the kubectl binary
-func CacheKubectlBinary(k8sVerison string) (string, error) {
-	binary := "kubectl"
-	if runtime.GOOS == "windows" {
-		binary = "kubectl.exe"
-	}
-
-	return download.Binary(binary, k8sVerison, runtime.GOOS, runtime.GOARCH)
-}
-
-// doCacheBinaries caches Kubernetes binaries in the foreground
-func doCacheBinaries(k8sVersion string) error {
-	return machine.CacheBinariesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
-}
-
-// BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
-func BeginDownloadKicArtifacts(g *errgroup.Group) {
-	glog.Info("Beginning downloading kic artifacts")
-	g.Go(func() error {
-		glog.Infof("Downloading %s to local daemon", kic.BaseImage)
-		return image.WriteImageToDaemon(kic.BaseImage)
-	})
-}
-
-// WaitDownloadKicArtifacts blocks until the required artifacts for KIC are downloaded.
-func WaitDownloadKicArtifacts(g *errgroup.Group) {
-	if err := g.Wait(); err != nil {
-		glog.Errorln("Error downloading kic artifacts: ", err)
-		return
-	}
-	glog.Info("Successfully downloaded all kic artifacts")
-}
-
-// WaitCacheRequiredImages blocks until the required images are all cached.
-func WaitCacheRequiredImages(g *errgroup.Group) {
-	if !viper.GetBool(cacheImages) {
-		return
-	}
-	if err := g.Wait(); err != nil {
-		glog.Errorln("Error caching images: ", err)
-	}
-}
-
-// saveImagesToTarFromConfig saves images to tar in cache which specified in config file.
-// currently only used by download-only option
-func saveImagesToTarFromConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return image.SaveToDir(images, constants.ImageCacheDir)
-}
-
-// CacheAndLoadImagesInConfig loads the images currently in the config file
-// called by 'start' and 'cache reload' commands.
-func CacheAndLoadImagesInConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return machine.CacheAndLoadImages(images)
-}
-
-func imagesInConfigFile() ([]string, error) {
-	configFile, err := config.ReadConfig(localpath.ConfigFile())
-	if err != nil {
-		return nil, err
-	}
-	if values, ok := configFile[cacheImageConfigKey]; ok {
-		var images []string
-		for key := range values.(map[string]interface{}) {
-			images = append(images, key)
-		}
-		return images, nil
-	}
-	return []string{}, nil
-}
diff --git a/pkg/minikube/cluster/setup.go b/pkg/minikube/cluster/setup.go
deleted file mode 100644
index 513154ccce..0000000000
--- a/pkg/minikube/cluster/setup.go
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cluster
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/blang/semver"
-	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/host"
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
-	"github.com/spf13/viper"
-	"golang.org/x/sync/errgroup"
-	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/addons"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/bootstrapper"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/kubeconfig"
-	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/logs"
-	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/minikube/proxy"
-	"k8s.io/minikube/pkg/util"
-	"k8s.io/minikube/pkg/util/retry"
-)
-
-const (
-	waitTimeout      = "wait-timeout"
-	waitUntilHealthy = "wait"
-	embedCerts       = "embed-certs"
-	keepContext      = "keep-context"
-	imageRepository  = "image-repository"
-	containerRuntime = "container-runtime"
-)
-
-// InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
-func InitialSetup(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
-	var kicGroup errgroup.Group
-	if driver.IsKIC(cc.Driver) {
-		BeginDownloadKicArtifacts(&kicGroup)
-	}
-
-	var cacheGroup errgroup.Group
-	if !driver.BareMetal(cc.Driver) {
-		BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
-	}
-
-	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
-	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
-		exit.WithError("Failed to save config", err)
-	}
-
-	HandleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
-	WaitDownloadKicArtifacts(&kicGroup)
-
-	mRunner, preExists, machineAPI, host := StartMachine(&cc, &n)
-	defer machineAPI.Close()
-
-	// wait for preloaded tarball to finish downloading before configuring runtimes
-	WaitCacheRequiredImages(&cacheGroup)
-
-	sv, err := util.ParseKubernetesVersion(n.KubernetesVersion)
-	if err != nil {
-		return nil, err
-	}
-
-	// configure the runtime (docker, containerd, crio)
-	cr := ConfigureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
-
-	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
-	kubeconfig, err := setupKubeconfig(host, &cc, &n, cc.Name)
-	if err != nil {
-		exit.WithError("Failed to setup kubeconfig", err)
-	}
-
-	// setup kubeadm (must come after setupKubeconfig)
-	bs := setupKubeAdm(machineAPI, cc, n)
-
-	// pull images or restart cluster
-	out.T(out.Launch, "Launching Kubernetes ... ")
-	err = bs.StartCluster(cc)
-	if err != nil {
-		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
-	}
-	//configureMounts()
-
-	if err := CacheAndLoadImagesInConfig(); err != nil {
-		out.T(out.FailureType, "Unable to load cached images from config file.")
-	}
-
-	// enable addons, both old and new!
-	if existingAddons != nil {
-		addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList)
-	}
-
-	// special ops for none , like change minikube directory.
-	// multinode super doesn't work on the none driver
-	if cc.Driver == driver.None && len(cc.Nodes) == 1 {
-		prepareNone()
-	}
-
-	// Skip pre-existing, because we already waited for health
-	if viper.GetBool(waitUntilHealthy) && !preExists {
-		if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
-			exit.WithError("Wait failed", err)
-		}
-	}
-
-	return kubeconfig, nil
-
-}
-
-// ConfigureRuntimes does what needs to happen to get a runtime going.
-func ConfigureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
-	co := cruntime.Config{
-		Type:   viper.GetString(containerRuntime),
-		Runner: runner, ImageRepository: k8s.ImageRepository,
-		KubernetesVersion: kv,
-	}
-	cr, err := cruntime.New(co)
-	if err != nil {
-		exit.WithError("Failed runtime", err)
-	}
-
-	disableOthers := true
-	if driver.BareMetal(drvName) {
-		disableOthers = false
-	}
-
-	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
-	if driver.IsVM(drvName) {
-		if err := cr.Preload(k8s); err != nil {
-			switch err.(type) {
-			case *cruntime.ErrISOFeature:
-				out.T(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
-			default:
-				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
-			}
-
-			if err := machine.CacheImagesForBootstrapper(k8s.ImageRepository, k8s.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
-				exit.WithError("Failed to cache images", err)
-			}
-		}
-	}
-
-	err = cr.Enable(disableOthers)
-	if err != nil {
-		exit.WithError("Failed to enable container runtime", err)
-	}
-
-	return cr
-}
-
-// setupKubeAdm adds any requested files into the VM before Kubernetes is started
-func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
-	bs, err := Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg, n)
-	if err != nil {
-		exit.WithError("Failed to get bootstrapper", err)
-	}
-	for _, eo := range config.ExtraOptions {
-		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
-	}
-	// Loads cached images, generates config files, download binaries
-	if err := bs.UpdateCluster(cfg); err != nil {
-		exit.WithError("Failed to update cluster", err)
-	}
-	if err := bs.SetupCerts(cfg.KubernetesConfig, n); err != nil {
-		exit.WithError("Failed to setup certs", err)
-	}
-	return bs
-}
-
-func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
-	addr, err := apiServerURL(*h, *cc, *n)
-	if err != nil {
-		exit.WithError("Failed to get API Server URL", err)
-	}
-
-	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
-		addr = strings.Replace(addr, n.IP, cc.KubernetesConfig.APIServerName, -1)
-	}
-	kcs := &kubeconfig.Settings{
-		ClusterName:          clusterName,
-		ClusterServerAddress: addr,
-		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
-		ClientKey:            localpath.MakeMiniPath("client.key"),
-		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
-		KeepContext:          viper.GetBool(keepContext),
-		EmbedCerts:           viper.GetBool(embedCerts),
-	}
-
-	kcs.SetPath(kubeconfig.PathFromEnv())
-	if err := kubeconfig.Update(kcs); err != nil {
-		return kcs, err
-	}
-	return kcs, nil
-}
-
-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) {
-		// 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.ForwardedPort(h.DriverName, h.Name, port)
-		if err != nil {
-			return "", errors.Wrap(err, "host port binding")
-		}
-	} else {
-		hostname, err = h.Driver.GetIP()
-		if err != nil {
-			return "", errors.Wrap(err, "get ip")
-		}
-	}
-
-	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
-		hostname = cc.KubernetesConfig.APIServerName
-	}
-	return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(port))), nil
-}
-
-// StartMachine starts a VM
-func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
-	m, err := machine.NewAPIClient()
-	if err != nil {
-		exit.WithError("Failed to get machine client", err)
-	}
-	host, preExists = startHost(m, *cfg, *node)
-	runner, err = machine.CommandRunner(host)
-	if err != nil {
-		exit.WithError("Failed to get command runner", err)
-	}
-
-	ip := validateNetwork(host, runner)
-
-	// Bypass proxy for minikube's vm host ip
-	err = proxy.ExcludeIP(ip)
-	if err != nil {
-		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
-	}
-
-	// Save IP to config file for subsequent use
-	node.IP = ip
-	err = config.SaveNode(cfg, node)
-	if err != nil {
-		exit.WithError("saving node", err)
-	}
-
-	return runner, preExists, m, host
-}
-
-// startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
-	host, exists, err := machine.StartHost(api, mc, n)
-	if err != nil {
-		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
-	}
-	return host, exists
-}
-
-// validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner) string {
-	ip, err := h.Driver.GetIP()
-	if err != nil {
-		exit.WithError("Unable to get VM IP address", err)
-	}
-
-	optSeen := false
-	warnedOnce := false
-	for _, k := range proxy.EnvVars {
-		if v := os.Getenv(k); v != "" {
-			if !optSeen {
-				out.T(out.Internet, "Found network options:")
-				optSeen = true
-			}
-			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
-			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
-			k = strings.ToUpper(k)               // for http_proxy & https_proxy
-			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
-				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
-				warnedOnce = true
-			}
-		}
-	}
-
-	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
-		trySSH(h, ip)
-	}
-
-	tryLookup(r)
-	tryRegistry(r)
-	return ip
-}
-
-func trySSH(h *host.Host, ip string) {
-	if viper.GetBool("force") {
-		return
-	}
-
-	sshAddr := net.JoinHostPort(ip, "22")
-
-	dial := func() (err error) {
-		d := net.Dialer{Timeout: 3 * time.Second}
-		conn, err := d.Dial("tcp", sshAddr)
-		if err != nil {
-			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
-			return err
-		}
-		_ = conn.Close()
-		return nil
-	}
-
-	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
-		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
-
-	This is likely due to one of two reasons:
-
-	- VPN or firewall interference
-	- {{.hypervisor}} network configuration issue
-
-	Suggested workarounds:
-
-	- Disable your local VPN or firewall software
-	- Configure your local VPN or firewall to allow access to {{.ip}}
-	- Restart or reinstall {{.hypervisor}}
-	- Use an alternative --vm-driver
-	- Use --force to override this connectivity check
-	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
-	}
-}
-
-func tryLookup(r command.Runner) {
-	// DNS check
-	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
-		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
-		// will try with without query type for ISOs with different busybox versions.
-		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
-			glog.Warningf("nslookup failed: %v", err)
-			out.WarningT("Node may be unable to resolve external DNS records")
-		}
-	}
-}
-func tryRegistry(r command.Runner) {
-	// Try an HTTPS connection to the image repository
-	proxy := os.Getenv("HTTPS_PROXY")
-	opts := []string{"-sS"}
-	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
-		opts = append([]string{"-x", proxy}, opts...)
-	}
-
-	repo := viper.GetString(imageRepository)
-	if repo == "" {
-		repo = images.DefaultKubernetesRepo
-	}
-
-	opts = append(opts, fmt.Sprintf("https://%s/", repo))
-	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
-		glog.Warningf("%s failed: %v", rr.Args, err)
-		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
-	}
-}
-
-// prepareNone prepares the user and host for the joy of the "none" driver
-func prepareNone() {
-	out.T(out.StartingNone, "Configuring local host environment ...")
-	if viper.GetBool(config.WantNoneDriverWarning) {
-		out.T(out.Empty, "")
-		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
-		out.WarningT("For more information, see:")
-		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
-		out.T(out.Empty, "")
-	}
-
-	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
-		home := os.Getenv("HOME")
-		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
-		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
-
-		out.T(out.Empty, "")
-		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
-		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
-		out.T(out.Empty, "")
-
-		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
-	}
-
-	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {
-		exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
-	}
-}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 7458ff80a3..55b2fdf298 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -39,7 +39,7 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		return err
 	}
 
-	Start(*cc, n, nil)
+	Start(*cc, n, nil, false)
 	return nil
 }
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 0a5e3fc095..6f9b441366 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -17,94 +17,447 @@ limitations under the License.
 package node
 
 import (
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/blang/semver"
+	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/util"
+	"k8s.io/minikube/pkg/util/retry"
+)
+
+const (
+	waitTimeout      = "wait-timeout"
+	waitUntilHealthy = "wait"
+	embedCerts       = "embed-certs"
+	keepContext      = "keep-context"
+	imageRepository  = "image-repository"
+	containerRuntime = "container-runtime"
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool) {
-	// Now that the ISO is downloaded, pull images in the background while the VM boots.
-	var cacheGroup errgroup.Group
-	if !driver.BareMetal(cc.Driver) {
-		cluster.BeginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
-	}
-
+func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) *kubeconfig.Settings {
 	var kicGroup errgroup.Group
 	if driver.IsKIC(cc.Driver) {
-		cluster.BeginDownloadKicArtifacts(&kicGroup)
+		beginDownloadKicArtifacts(&kicGroup)
 	}
 
-	runner, _, mAPI, _ := cluster.StartMachine(&cc, &n)
-	defer mAPI.Close()
-
-	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
-	if err != nil {
-		exit.WithError("Failed to get bootstrapper", err)
+	var cacheGroup errgroup.Group
+	if !driver.BareMetal(cc.Driver) {
+		beginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
 	}
 
-	k8sVersion := n.KubernetesVersion
-	driverName := cc.Driver
-	// exits here in case of --download-only option.
-	cluster.HandleDownloadOnly(&cacheGroup, &kicGroup, k8sVersion)
-	cluster.WaitDownloadKicArtifacts(&kicGroup)
+	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
+	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
+		exit.WithError("Failed to save config", err)
+	}
+
+	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
+	waitDownloadKicArtifacts(&kicGroup)
+
+	mRunner, preExists, machineAPI, host := startMachine(&cc, &n)
+	defer machineAPI.Close()
 
 	// wait for preloaded tarball to finish downloading before configuring runtimes
-	cluster.WaitCacheRequiredImages(&cacheGroup)
+	waitCacheRequiredImages(&cacheGroup)
 
-	sv, err := util.ParseKubernetesVersion(cc.KubernetesConfig.KubernetesVersion)
+	sv, err := util.ParseKubernetesVersion(n.KubernetesVersion)
 	if err != nil {
 		exit.WithError("Failed to parse kubernetes version", err)
 	}
 
 	// configure the runtime (docker, containerd, crio)
-	cr := cluster.ConfigureRuntimes(runner, driverName, cc.KubernetesConfig, sv)
-	showVersionInfo(k8sVersion, cr)
+	cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
+	showVersionInfo(n.KubernetesVersion, cr)
+
+	var bs bootstrapper.Bootstrapper
+	var kubeconfig *kubeconfig.Settings
+	if apiServer {
+		// Must be written before bootstrap, otherwise health checks may flake due to stale IP
+		kubeconfig, err = setupKubeconfig(host, &cc, &n, cc.Name)
+		if err != nil {
+			exit.WithError("Failed to setup kubeconfig", err)
+		}
+
+		// setup kubeadm (must come after setupKubeconfig)
+		bs = setupKubeAdm(machineAPI, cc, n)
+		err = bs.StartCluster(cc)
+		if err != nil {
+			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+		}
+	} else {
+		bs, err = cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
+		if err != nil {
+			exit.WithError("Failed to get bootstrapper", err)
+		}
+
+		if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
+			exit.WithError("setting up certs", err)
+		}
+
+		if err = bs.SetupNode(cc); err != nil {
+			exit.WithError("Failed to setup node", err)
+		}
+	}
 
 	configureMounts()
 
+	if err := CacheAndLoadImagesInConfig(); err != nil {
+		out.T(out.FailureType, "Unable to load cached images from config file.")
+	}
+
 	// enable addons, both old and new!
 	if existingAddons != nil {
 		addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList)
 	}
 
-	if err := bs.UpdateNode(cc, n, cr); err != nil {
-		exit.WithError("Failed to update node", err)
+	if apiServer {
+		// special ops for none , like change minikube directory.
+		// multinode super doesn't work on the none driver
+		if cc.Driver == driver.None && len(cc.Nodes) == 1 {
+			prepareNone()
+		}
+
+		// Skip pre-existing, because we already waited for health
+		if viper.GetBool(waitUntilHealthy) && !preExists {
+			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
+				exit.WithError("Wait failed", err)
+			}
+		}
+	} else {
+		if err := bs.UpdateNode(cc, n, cr); err != nil {
+			exit.WithError("Updating node", err)
+		}
+
+		cp, err := config.PrimaryControlPlane(&cc)
+		if err != nil {
+			exit.WithError("Getting primary control plane", err)
+		}
+		cpBs, err := cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, cp)
+		if err != nil {
+			exit.WithError("Getting bootstrapper", err)
+		}
+
+		joinCmd, err := cpBs.GenerateToken(cc)
+		if err != nil {
+			exit.WithError("generating join token", err)
+		}
+
+		if err = bs.JoinCluster(cc, n, joinCmd); err != nil {
+			exit.WithError("joining cluster", err)
+		}
 	}
 
-	if err := cluster.CacheAndLoadImagesInConfig(); err != nil {
-		exit.WithError("Unable to load cached images from config file.", err)
-	}
+	return kubeconfig
 
-	if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
-		exit.WithError("setting up certs", err)
-	}
+}
 
-	if err = bs.SetupNode(cc); err != nil {
-		exit.WithError("Failed to setup node", err)
+// ConfigureRuntimes does what needs to happen to get a runtime going.
+func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
+	co := cruntime.Config{
+		Type:   viper.GetString(containerRuntime),
+		Runner: runner, ImageRepository: k8s.ImageRepository,
+		KubernetesVersion: kv,
 	}
-
-	cp, err := config.PrimaryControlPlane(&cc)
+	cr, err := cruntime.New(co)
 	if err != nil {
-		exit.WithError("Getting primary control plane", err)
-	}
-	cpBs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cc, cp)
-	if err != nil {
-		exit.WithError("Getting bootstrapper", err)
+		exit.WithError("Failed runtime", err)
 	}
 
-	joinCmd, err := cpBs.GenerateToken(cc)
-	if err != nil {
-		exit.WithError("generating join token", err)
+	disableOthers := true
+	if driver.BareMetal(drvName) {
+		disableOthers = false
 	}
 
-	if err = bs.JoinCluster(cc, n, joinCmd); err != nil {
-		exit.WithError("joining cluster", err)
+	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
+	if driver.IsVM(drvName) {
+		if err := cr.Preload(k8s); err != nil {
+			switch err.(type) {
+			case *cruntime.ErrISOFeature:
+				out.T(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
+			default:
+				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
+			}
+
+			if err := machine.CacheImagesForBootstrapper(k8s.ImageRepository, k8s.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
+				exit.WithError("Failed to cache images", err)
+			}
+		}
+	}
+
+	err = cr.Enable(disableOthers)
+	if err != nil {
+		exit.WithError("Failed to enable container runtime", err)
+	}
+
+	return cr
+}
+
+// setupKubeAdm adds any requested files into the VM before Kubernetes is started
+func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node) bootstrapper.Bootstrapper {
+	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper), cfg, n)
+	if err != nil {
+		exit.WithError("Failed to get bootstrapper", err)
+	}
+	for _, eo := range config.ExtraOptions {
+		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
+	}
+	// Loads cached images, generates config files, download binaries
+	if err := bs.UpdateCluster(cfg); err != nil {
+		exit.WithError("Failed to update cluster", err)
+	}
+	if err := bs.SetupCerts(cfg.KubernetesConfig, n); err != nil {
+		exit.WithError("Failed to setup certs", err)
+	}
+	return bs
+}
+
+func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+	addr, err := apiServerURL(*h, *cc, *n)
+	if err != nil {
+		exit.WithError("Failed to get API Server URL", err)
+	}
+
+	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+		addr = strings.Replace(addr, n.IP, cc.KubernetesConfig.APIServerName, -1)
+	}
+	kcs := &kubeconfig.Settings{
+		ClusterName:          clusterName,
+		ClusterServerAddress: addr,
+		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
+		ClientKey:            localpath.MakeMiniPath("client.key"),
+		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
+		KeepContext:          viper.GetBool(keepContext),
+		EmbedCerts:           viper.GetBool(embedCerts),
+	}
+
+	kcs.SetPath(kubeconfig.PathFromEnv())
+	if err := kubeconfig.Update(kcs); err != nil {
+		return kcs, err
+	}
+	return kcs, nil
+}
+
+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) {
+		// 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.ForwardedPort(h.DriverName, h.Name, port)
+		if err != nil {
+			return "", errors.Wrap(err, "host port binding")
+		}
+	} else {
+		hostname, err = h.Driver.GetIP()
+		if err != nil {
+			return "", errors.Wrap(err, "get ip")
+		}
+	}
+
+	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+		hostname = cc.KubernetesConfig.APIServerName
+	}
+	return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(port))), nil
+}
+
+// StartMachine starts a VM
+func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+	m, err := machine.NewAPIClient()
+	if err != nil {
+		exit.WithError("Failed to get machine client", err)
+	}
+	host, preExists = startHost(m, *cfg, *node)
+	runner, err = machine.CommandRunner(host)
+	if err != nil {
+		exit.WithError("Failed to get command runner", err)
+	}
+
+	ip := validateNetwork(host, runner)
+
+	// Bypass proxy for minikube's vm host ip
+	err = proxy.ExcludeIP(ip)
+	if err != nil {
+		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
+	}
+
+	// Save IP to config file for subsequent use
+	node.IP = ip
+	err = config.SaveNode(cfg, node)
+	if err != nil {
+		exit.WithError("saving node", err)
+	}
+
+	return runner, preExists, m, host
+}
+
+// startHost starts a new minikube host using a VM or None
+func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
+	host, exists, err := machine.StartHost(api, mc, n)
+	if err != nil {
+		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
+	}
+	return host, exists
+}
+
+// validateNetwork tries to catch network problems as soon as possible
+func validateNetwork(h *host.Host, r command.Runner) string {
+	ip, err := h.Driver.GetIP()
+	if err != nil {
+		exit.WithError("Unable to get VM IP address", err)
+	}
+
+	optSeen := false
+	warnedOnce := false
+	for _, k := range proxy.EnvVars {
+		if v := os.Getenv(k); v != "" {
+			if !optSeen {
+				out.T(out.Internet, "Found network options:")
+				optSeen = true
+			}
+			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
+			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
+			k = strings.ToUpper(k)               // for http_proxy & https_proxy
+			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
+				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
+				warnedOnce = true
+			}
+		}
+	}
+
+	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
+		trySSH(h, ip)
+	}
+
+	tryLookup(r)
+	tryRegistry(r)
+	return ip
+}
+
+func trySSH(h *host.Host, ip string) {
+	if viper.GetBool("force") {
+		return
+	}
+
+	sshAddr := net.JoinHostPort(ip, "22")
+
+	dial := func() (err error) {
+		d := net.Dialer{Timeout: 3 * time.Second}
+		conn, err := d.Dial("tcp", sshAddr)
+		if err != nil {
+			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
+			return err
+		}
+		_ = conn.Close()
+		return nil
+	}
+
+	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
+		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
+
+	This is likely due to one of two reasons:
+
+	- VPN or firewall interference
+	- {{.hypervisor}} network configuration issue
+
+	Suggested workarounds:
+
+	- Disable your local VPN or firewall software
+	- Configure your local VPN or firewall to allow access to {{.ip}}
+	- Restart or reinstall {{.hypervisor}}
+	- Use an alternative --vm-driver
+	- Use --force to override this connectivity check
+	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
+	}
+}
+
+func tryLookup(r command.Runner) {
+	// DNS check
+	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
+		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
+		// will try with without query type for ISOs with different busybox versions.
+		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
+			glog.Warningf("nslookup failed: %v", err)
+			out.WarningT("Node may be unable to resolve external DNS records")
+		}
+	}
+}
+func tryRegistry(r command.Runner) {
+	// Try an HTTPS connection to the image repository
+	proxy := os.Getenv("HTTPS_PROXY")
+	opts := []string{"-sS"}
+	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
+		opts = append([]string{"-x", proxy}, opts...)
+	}
+
+	repo := viper.GetString(imageRepository)
+	if repo == "" {
+		repo = images.DefaultKubernetesRepo
+	}
+
+	opts = append(opts, fmt.Sprintf("https://%s/", repo))
+	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
+		glog.Warningf("%s failed: %v", rr.Args, err)
+		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
+	}
+}
+
+// prepareNone prepares the user and host for the joy of the "none" driver
+func prepareNone() {
+	out.T(out.StartingNone, "Configuring local host environment ...")
+	if viper.GetBool(config.WantNoneDriverWarning) {
+		out.T(out.Empty, "")
+		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
+		out.WarningT("For more information, see:")
+		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.T(out.Empty, "")
+	}
+
+	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
+		home := os.Getenv("HOME")
+		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
+		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
+
+		out.T(out.Empty, "")
+		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
+		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
+		out.T(out.Empty, "")
+
+		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
+	}
+
+	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {
+		exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
 	}
 }

From add1c8f953fd6e45f8d937a54c1be198b565b92b Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 18 Mar 2020 15:10:34 -0700
Subject: [PATCH 099/668] missing file

---
 pkg/minikube/node/cache.go | 168 +++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 pkg/minikube/node/cache.go

diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
new file mode 100644
index 0000000000..f1b3ac8f32
--- /dev/null
+++ b/pkg/minikube/node/cache.go
@@ -0,0 +1,168 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"os"
+	"runtime"
+
+	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	"golang.org/x/sync/errgroup"
+	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/drivers/kic"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/download"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/image"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+const (
+	cacheImages         = "cache-images"
+	cacheImageConfigKey = "cache"
+)
+
+// BeginCacheKubernetesImages caches images required for kubernetes version in the background
+func beginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVersion string, cRuntime string) {
+	if download.PreloadExists(k8sVersion, cRuntime) {
+		glog.Info("Caching tarball of preloaded images")
+		err := download.Preload(k8sVersion, cRuntime)
+		if err == nil {
+			glog.Infof("Finished downloading the preloaded tar for %s on %s", k8sVersion, cRuntime)
+			return // don't cache individual images if preload is successful.
+		}
+		glog.Warningf("Error downloading preloaded artifacts will continue without preload: %v", err)
+	}
+
+	if !viper.GetBool(cacheImages) {
+		return
+	}
+
+	g.Go(func() error {
+		return machine.CacheImagesForBootstrapper(imageRepository, k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
+	})
+}
+
+// HandleDownloadOnly caches appropariate binaries and images
+func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string) {
+	// If --download-only, complete the remaining downloads and exit.
+	if !viper.GetBool("download-only") {
+		return
+	}
+	if err := doCacheBinaries(k8sVersion); err != nil {
+		exit.WithError("Failed to cache binaries", err)
+	}
+	if _, err := CacheKubectlBinary(k8sVersion); err != nil {
+		exit.WithError("Failed to cache kubectl", err)
+	}
+	waitCacheRequiredImages(cacheGroup)
+	waitDownloadKicArtifacts(kicGroup)
+	if err := saveImagesToTarFromConfig(); err != nil {
+		exit.WithError("Failed to cache images to tar", err)
+	}
+	out.T(out.Check, "Download complete!")
+	os.Exit(0)
+
+}
+
+// CacheKubectlBinary caches the kubectl binary
+func CacheKubectlBinary(k8sVerison string) (string, error) {
+	binary := "kubectl"
+	if runtime.GOOS == "windows" {
+		binary = "kubectl.exe"
+	}
+
+	return download.Binary(binary, k8sVerison, runtime.GOOS, runtime.GOARCH)
+}
+
+// doCacheBinaries caches Kubernetes binaries in the foreground
+func doCacheBinaries(k8sVersion string) error {
+	return machine.CacheBinariesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
+}
+
+// BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
+func beginDownloadKicArtifacts(g *errgroup.Group) {
+	glog.Info("Beginning downloading kic artifacts")
+	g.Go(func() error {
+		glog.Infof("Downloading %s to local daemon", kic.BaseImage)
+		return image.WriteImageToDaemon(kic.BaseImage)
+	})
+}
+
+// WaitDownloadKicArtifacts blocks until the required artifacts for KIC are downloaded.
+func waitDownloadKicArtifacts(g *errgroup.Group) {
+	if err := g.Wait(); err != nil {
+		glog.Errorln("Error downloading kic artifacts: ", err)
+		return
+	}
+	glog.Info("Successfully downloaded all kic artifacts")
+}
+
+// WaitCacheRequiredImages blocks until the required images are all cached.
+func waitCacheRequiredImages(g *errgroup.Group) {
+	if !viper.GetBool(cacheImages) {
+		return
+	}
+	if err := g.Wait(); err != nil {
+		glog.Errorln("Error caching images: ", err)
+	}
+}
+
+// saveImagesToTarFromConfig saves images to tar in cache which specified in config file.
+// currently only used by download-only option
+func saveImagesToTarFromConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return image.SaveToDir(images, constants.ImageCacheDir)
+}
+
+// CacheAndLoadImagesInConfig loads the images currently in the config file
+// called by 'start' and 'cache reload' commands.
+func CacheAndLoadImagesInConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return machine.CacheAndLoadImages(images)
+}
+
+func imagesInConfigFile() ([]string, error) {
+	configFile, err := config.ReadConfig(localpath.ConfigFile())
+	if err != nil {
+		return nil, err
+	}
+	if values, ok := configFile[cacheImageConfigKey]; ok {
+		var images []string
+		for key := range values.(map[string]interface{}) {
+			images = append(images, key)
+		}
+		return images, nil
+	}
+	return []string{}, nil
+}

From 5d3816f64043ef36dc4ae483230c592189db7c52 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 15:47:46 -0700
Subject: [PATCH 100/668] Allow problems to be announced at all stages, add
 more regexes

---
 .../bootstrapper/bsutil/kverify/kverify.go    | 40 ++++++++++++++-----
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  | 23 ++++++-----
 pkg/minikube/logs/logs.go                     | 28 ++++++++++++-
 pkg/minikube/logs/logs_test.go                |  7 ++++
 4 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 54f17565e1..e420307c65 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -40,15 +40,22 @@ import (
 	"k8s.io/minikube/pkg/minikube/logs"
 )
 
-// APIServerProcess waits for api server to be healthy returns error if it doesn't
-func APIServerProcess(runner command.Runner, start time.Time, timeout time.Duration) error {
+// WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
+func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, start time.Time, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver process to appear ...")
+	minLogTime := kconst.APICallRetryInterval * 10
+
 	err := wait.PollImmediate(time.Millisecond*500, timeout, func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during process check")
 		}
 
-		if _, ierr := apiServerPID(runner); ierr != nil {
+		if time.Since(start) > minLogTime {
+			announceProblems(r, bs, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
+		if _, ierr := apiServerPID(cr); ierr != nil {
 			return false, nil
 		}
 		return true, nil
@@ -70,14 +77,21 @@ func apiServerPID(cr command.Runner) (int, error) {
 	return strconv.Atoi(s)
 }
 
-// SystemPods verifies essential pods for running kurnetes is running
-func SystemPods(client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
+// WaitForSystemPods verifies essential pods for running kurnetes is running
+func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
 	glog.Info("waiting for kube-system pods to appear ...")
 	pStart := time.Now()
+	minLogTime := kconst.APICallRetryInterval * 10
+
 	podList := func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during pod check")
 		}
+		if time.Since(start) > minLogTime {
+			announceProblems(r, bs, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
 		// Wait for any system pod, as waiting for apiserver may block until etcd
 		pods, err := client.CoreV1().Pods("kube-system").List(meta.ListOptions{})
 		if err != nil {
@@ -108,13 +122,8 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 			return false, fmt.Errorf("cluster wait timed out during healthz check")
 		}
 
-		// We're probably not going to recover, so show problems and slow polling
 		if time.Since(start) > minLogTime {
-			problems := logs.FindProblems(r, bs, cr)
-			if len(problems) > 0 {
-				logs.OutputProblems(problems, 5)
-				time.Sleep(kconst.APICallRetryInterval * 15)
-			}
+			announceProblems(r, bs, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
 
@@ -136,6 +145,15 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	return nil
 }
 
+// announceProblems checks for problems, and slows polling down if any are found
+func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner) {
+	problems := logs.FindProblems(r, bs, cr)
+	if len(problems) > 0 {
+		logs.OutputProblems(problems, 5)
+		time.Sleep(kconst.APICallRetryInterval * 15)
+	}
+}
+
 // APIServerStatus returns apiserver status in libmachine style state.State
 func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
 	glog.Infof("Checking apiserver status ...")
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index d8be5c4d52..39618cf8a2 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -260,7 +260,12 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 	if err != nil {
 		return err
 	}
-	if err := kverify.APIServerProcess(k.c, start, timeout); err != nil {
+	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
+	if err != nil {
+		return err
+	}
+
+	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, start, timeout); err != nil {
 		return err
 	}
 
@@ -274,11 +279,6 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		}
 	}
 
-	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
-	if err != nil {
-		return err
-	}
-
 	if err := kverify.WaitForHealthyAPIServer(cr, k, k.c, start, ip, port, timeout); err != nil {
 		return err
 	}
@@ -288,7 +288,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		return errors.Wrap(err, "get k8s client")
 	}
 
-	if err := kverify.SystemPods(c, start, timeout); err != nil {
+	if err := kverify.WaitForSystemPods(cr, k, k.c, c, start, timeout); err != nil {
 		return errors.Wrap(err, "waiting for system pods")
 	}
 	return nil
@@ -335,8 +335,13 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		}
 	}
 
+	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
+	if err != nil {
+		return err
+	}
+
 	// We must ensure that the apiserver is healthy before proceeding
-	if err := kverify.APIServerProcess(k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
@@ -355,7 +360,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 			return errors.Wrap(err, "getting k8s client")
 		}
 
-		if err := kverify.SystemPods(client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+		if err := kverify.WaitForSystemPods(cr, k, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 			return errors.Wrap(err, "system pods")
 		}
 
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index fb833bca2b..2ad54e3ef9 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -35,8 +35,31 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
-// rootCauseRe is a regular expression that matches known failure root causes
-var rootCauseRe = regexp.MustCompile(`^error: |eviction manager: pods.* evicted|unknown flag: --|forbidden.*no providers available|eviction manager:.*evicted|tls: bad certificate|kubelet.*no API client|kubelet.*No api server|STDIN.*127.0.0.1:8080|failed to create listener|address already in use|unable to evict any pods|eviction manager: unexpected error|Resetting AnonymousAuth to false`)
+// rootCauses are regular expressions that match known failures
+var rootCauses = []string{
+	`^error: `,
+	`eviction manager: pods.* evicted`,
+	`unknown flag: --`,
+	`forbidden.*no providers available`,
+	`eviction manager:.*evicted`,
+	`tls: bad certificate`,
+	`kubelet.*no API client`,
+	`kubelet.*No api server`,
+	`STDIN.*127.0.0.1:8080`,
+	`failed to create listener`,
+	`address already in use`,
+	`unable to evict any pods`,
+	`eviction manager: unexpected error`,
+	`Resetting AnonymousAuth to false`,
+	`CrashLoopBackOff`,
+	`Unable to register node.*forbidden`,
+	`Failed to initialize CSINodeInfo.*forbidden`,
+	`Failed to admit pod`,
+	`failed to "StartContainer"`,
+}
+
+// rootCauseRe combines rootCauses into a single regex
+var rootCauseRe = regexp.MustCompile(strings.Join(rootCauses, "|"))
 
 // ignoreCauseRe is a regular expression that matches spurious errors to not surface
 var ignoreCauseRe = regexp.MustCompile("error: no objects passed to apply")
@@ -44,6 +67,7 @@ var ignoreCauseRe = regexp.MustCompile("error: no objects passed to apply")
 // importantPods are a list of pods to retrieve logs for, in addition to the bootstrapper logs.
 var importantPods = []string{
 	"kube-apiserver",
+	"etcd",
 	"coredns",
 	"kube-scheduler",
 	"kube-proxy",
diff --git a/pkg/minikube/logs/logs_test.go b/pkg/minikube/logs/logs_test.go
index 8af8612e27..4d14ed857c 100644
--- a/pkg/minikube/logs/logs_test.go
+++ b/pkg/minikube/logs/logs_test.go
@@ -37,6 +37,13 @@ func TestIsProblem(t *testing.T) {
 		{"bad-certificate #4251", true, "log.go:172] http: TLS handshake error from 127.0.0.1:49200: remote error: tls: bad certificate"},
 		{"ephemeral-eviction #5355", true, " eviction_manager.go:419] eviction manager: unexpected error when attempting to reduce ephemeral-storage pressure: wanted to free 9223372036854775807 bytes, but freed 0 bytes space with errors in image deletion"},
 		{"anonymous-auth", true, "AnonymousAuth is not allowed with the AlwaysAllow authorizer. Resetting AnonymousAuth to false. You should use a different authorizer"},
+		{"disk-pressure #7073", true, "eviction_manager.go:159] Failed to admit pod kindnet-jpzzf_kube-system(b63b1ee0-0fc6-428f-8e67-e357464f579c) - node has conditions: [DiskPressure]"},
+		{"csi timeout", true, `Failed to initialize CSINodeInfo: error updating CSINode annotation: timed out waiting for the condition; caused by: csinodes.storage.k8s.io "m01" is forbidden: User "system:node:m01" cannot get resource "csinodes" in API group "storage.k8s.io" at the cluster scope`},
+		{"node registration permissions", true, `Unable to register node "m01" with API server: nodes is forbidden: User "system:node:m01" cannot create resource "nodes" in API group "" at the cluster scope`},
+		{"regular kubelet refused", false, `kubelet_node_status.go:92] Unable to register node "m01" with API server: Post https://localhost:8443/api/v1/nodes: dial tcp 127.0.0.1:8443: connect: connection refused`},
+		{"regular csi refused", false, `Failed to initialize CSINodeInfo: error updating CSINode annotation: timed out waiting for the condition; caused by: Get https://localhost:8443/apis/storage.k8s.io/v1/csinodes/m01: dial tcp 127.0.0.1:8443: connect: connection refused`},
+		{"apiserver crashloop", true, `pod_workers.go:191] Error syncing pod 9f8ee739bd14e8733f807eb2be99768f ("kube-apiserver-m01_kube-system(9f8ee739bd14e8733f807eb2be99768f)"), skipping: failed to "StartContainer" for "kube-apiserver" with CrashLoopBackOff: "back-off 10s restarting failed container=kube-apiserver pod=kube-apiserver-m01_kube-system(9f8ee739bd14e8733f807eb2be99768f)`},
+		{"kubelet node timeout", false, `failed to ensure node lease exists, will retry in 6.4s, error: Get https://localhost:8443/apis/coordination.k8s.io/v1/namespaces/kube-node-lease/leases/m01?timeout=10s: dial tcp 127.0.0.1:8443: connect: connection refused`},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {

From 9420a941f9c23bf79d375f67273e131fcd3841eb Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 18 Mar 2020 16:22:23 -0700
Subject: [PATCH 101/668] Remove false positives

---
 cmd/minikube/cmd/logs.go       | 2 +-
 pkg/minikube/logs/logs.go      | 2 ++
 pkg/minikube/logs/logs_test.go | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index cf36b52cb2..a1856d7bc4 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -32,7 +32,7 @@ import (
 
 const (
 	// number of problems per log to output
-	numberOfProblems = 5
+	numberOfProblems = 10
 )
 
 var (
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index 2ad54e3ef9..e4ec4a9047 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -56,6 +56,8 @@ var rootCauses = []string{
 	`Failed to initialize CSINodeInfo.*forbidden`,
 	`Failed to admit pod`,
 	`failed to "StartContainer"`,
+	`kubelet.*forbidden.*cannot \w+ resource`,
+	`leases.*forbidden.*cannot \w+ resource`,
 }
 
 // rootCauseRe combines rootCauses into a single regex
diff --git a/pkg/minikube/logs/logs_test.go b/pkg/minikube/logs/logs_test.go
index 4d14ed857c..918ba60cfb 100644
--- a/pkg/minikube/logs/logs_test.go
+++ b/pkg/minikube/logs/logs_test.go
@@ -44,6 +44,11 @@ func TestIsProblem(t *testing.T) {
 		{"regular csi refused", false, `Failed to initialize CSINodeInfo: error updating CSINode annotation: timed out waiting for the condition; caused by: Get https://localhost:8443/apis/storage.k8s.io/v1/csinodes/m01: dial tcp 127.0.0.1:8443: connect: connection refused`},
 		{"apiserver crashloop", true, `pod_workers.go:191] Error syncing pod 9f8ee739bd14e8733f807eb2be99768f ("kube-apiserver-m01_kube-system(9f8ee739bd14e8733f807eb2be99768f)"), skipping: failed to "StartContainer" for "kube-apiserver" with CrashLoopBackOff: "back-off 10s restarting failed container=kube-apiserver pod=kube-apiserver-m01_kube-system(9f8ee739bd14e8733f807eb2be99768f)`},
 		{"kubelet node timeout", false, `failed to ensure node lease exists, will retry in 6.4s, error: Get https://localhost:8443/apis/coordination.k8s.io/v1/namespaces/kube-node-lease/leases/m01?timeout=10s: dial tcp 127.0.0.1:8443: connect: connection refused`},
+		{"rbac misconfiguration", true, `leases.coordination.k8s.io "m01" is forbidden: User "system:node:m01" cannot get resource "leases" in API group "coordination.k8s.io" in the namespace "kube-node-lease"`},
+		{"regular controller init", false, `error retrieving resource lock kube-system/kube-controller-manager: endpoints "kube-controller-manager" is forbidden: User "system:kube-controller-manager" cannot get resource "endpoints" in API group "" in the namespace "kube-system"`},
+		{"regular scheduler services init", false, ` k8s.io/client-go/informers/factory.go:135: Failed to list *v1.Service: services is forbidden: User "system:kube-scheduler" cannot list resource "services" in API group "" at the cluster scope`},
+		{"regular scheduler nodes init", false, `k8s.io/client-go/informers/factory.go:135: Failed to list *v1.Node: nodes is forbidden: User "system:kube-scheduler" cannot list resource "nodes" in API group "" at the cluster scope`},
+		{"kubelet rbac fail", true, `k8s.io/kubernetes/pkg/kubelet/kubelet.go:526: Failed to list *v1.Node: nodes "m01" is forbidden: User "system:node:m01" cannot list resource "nodes" in API group "" at the cluster scope`},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {

From 68f973c193111bb79cbf79cb8578333ab0c77d71 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 18 Mar 2020 16:26:42 -0700
Subject: [PATCH 102/668] Add describe nodes to minikube logs

---
 pkg/minikube/logs/logs.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index ef26e9d7d7..350eacc8f7 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -23,16 +23,20 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path"
 	"regexp"
 	"sort"
 	"strings"
 
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
 // rootCauseRe is a regular expression that matches known failure root causes
@@ -186,5 +190,15 @@ func logCommands(r cruntime.Manager, bs bootstrapper.Bootstrapper, length int, f
 	}
 	cmds[r.Name()] = r.SystemLogCmd(length)
 	cmds["container status"] = cruntime.ContainerStatusCommand()
+
+	cfg, err := config.Load(viper.GetString(config.ProfileName))
+	if err != nil && !config.IsNotExist(err) {
+		out.ErrLn("Error loading profile config: %v", err)
+	}
+
+	cmds["describe nodes"] = fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
+		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
+		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
+
 	return cmds
 }

From efac79eb26e060f1daf68c4002fcb08ddd41e457 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 18 Mar 2020 17:00:29 -0700
Subject: [PATCH 103/668] account for hyphens in profile name

---
 pkg/minikube/driver/driver.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 170b99e71a..b7fd18b0c2 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -240,7 +240,8 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) string {
 	if strings.Contains(name, "-") {
-		return strings.Split(name, "-")[0]
+		a := strings.Split(name, "-")
+		return strings.Join(a[0:len(a)-2], "-")
 	}
 	return name
 }

From fa97a5bf0d0f7a0b4a67512b490a8caf418d9fdd Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 18 Mar 2020 18:59:15 -0700
Subject: [PATCH 104/668] fix machine name creation

---
 pkg/minikube/driver/driver.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b7fd18b0c2..ebee96ffca 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -234,14 +234,13 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	if len(cc.Nodes) == 1 || n.ControlPlane {
 		return cc.Name
 	}
-	return fmt.Sprintf("%s-%s", cc.Name, n.Name)
+	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) string {
-	if strings.Contains(name, "-") {
-		a := strings.Split(name, "-")
-		return strings.Join(a[0:len(a)-2], "-")
+	if strings.Contains(name, "---") {
+		return strings.Split(name, "---")[0]
 	}
 	return name
 }

From f9b38dc04ea6b339b1b783a6a801b773c010b505 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 18 Mar 2020 21:28:03 -0700
Subject: [PATCH 105/668] clean up status output and have multinode survive
 cluster restarts

---
 cmd/minikube/cmd/start.go       |  3 +++
 cmd/minikube/cmd/status.go      | 21 ++++++++++++---------
 cmd/minikube/cmd/status_test.go |  6 +++---
 pkg/minikube/driver/driver.go   |  6 +++---
 pkg/provision/provision.go      |  2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 9ab8a0e730..44e01cf7a9 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -350,6 +350,9 @@ func runStart(cmd *cobra.Command, args []string) {
 	kubeconfig := node.Start(cc, n, existingAddons, true)
 
 	numNodes := viper.GetInt(nodes)
+	if numNodes == 1 && existing != nil {
+		numNodes = len(existing.Nodes)
+	}
 	if numNodes > 1 {
 		if driver.BareMetal(driverName) {
 			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index a153a7b932..44b96bc8e2 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -67,6 +67,7 @@ type Status struct {
 	Kubelet    string
 	APIServer  string
 	Kubeconfig string
+	Worker     bool
 }
 
 const (
@@ -78,6 +79,12 @@ host: {{.Host}}
 kubelet: {{.Kubelet}}
 apiserver: {{.APIServer}}
 kubeconfig: {{.Kubeconfig}}
+
+`
+	workerStatusFormat = `{{.Name}}
+host: {{.Host}}
+kubelet: {{.Kubelet}}
+
 `
 )
 
@@ -153,15 +160,7 @@ func exitCode(st *Status) int {
 
 func status(api libmachine.API, name string, controlPlane bool) (*Status, error) {
 
-	var profile, node string
-
-	if strings.Contains(name, "-") {
-		profile = strings.Split(name, "-")[0]
-		node = strings.Split(name, "-")[1]
-	} else {
-		profile = name
-		node = name
-	}
+	profile, node := driver.ClusterNameFromMachine(name)
 
 	st := &Status{
 		Name:       node,
@@ -169,6 +168,7 @@ func status(api libmachine.API, name string, controlPlane bool) (*Status, error)
 		APIServer:  Nonexistent,
 		Kubelet:    Nonexistent,
 		Kubeconfig: Nonexistent,
+		Worker:     !controlPlane,
 	}
 
 	hs, err := machine.Status(api, name)
@@ -265,6 +265,9 @@ For the list accessible variables for the template, see the struct values here:
 
 func statusText(st *Status, w io.Writer) error {
 	tmpl, err := template.New("status").Parse(statusFormat)
+	if st.Worker && statusFormat == defaultStatusFormat {
+		tmpl, err = template.New("worker-status").Parse(workerStatusFormat)
+	}
 	if err != nil {
 		return err
 	}
diff --git a/cmd/minikube/cmd/status_test.go b/cmd/minikube/cmd/status_test.go
index 44f4133dfd..b11e549a6d 100644
--- a/cmd/minikube/cmd/status_test.go
+++ b/cmd/minikube/cmd/status_test.go
@@ -52,17 +52,17 @@ func TestStatusText(t *testing.T) {
 		{
 			name:  "ok",
 			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured},
-			want:  "minikube\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\n",
+			want:  "minikube\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\n\n",
 		},
 		{
 			name:  "paused",
 			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured},
-			want:  "minikube\nhost: Running\nkubelet: Stopped\napiserver: Paused\nkubeconfig: Configured\n",
+			want:  "minikube\nhost: Running\nkubelet: Stopped\napiserver: Paused\nkubeconfig: Configured\n\n",
 		},
 		{
 			name:  "down",
 			state: &Status{Name: "minikube", Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured},
-			want:  "minikube\nhost: Stopped\nkubelet: Stopped\napiserver: Stopped\nkubeconfig: Misconfigured\n\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n",
+			want:  "minikube\nhost: Stopped\nkubelet: Stopped\napiserver: Stopped\nkubeconfig: Misconfigured\n\n\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n",
 		},
 	}
 	for _, tc := range tests {
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index ebee96ffca..b6106474d8 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -238,9 +238,9 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 }
 
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
-func ClusterNameFromMachine(name string) string {
+func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {
-		return strings.Split(name, "---")[0]
+		return strings.Split(name, "---")[0], strings.Split(name, "---")[1]
 	}
-	return name
+	return name, name
 }
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index fd84405266..acad46c3ac 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -196,7 +196,7 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
 }
 
 func setContainerRuntimeOptions(name string, p miniProvisioner) error {
-	cluster := driver.ClusterNameFromMachine(name)
+	cluster, _ := driver.ClusterNameFromMachine(name)
 	c, err := config.Load(cluster)
 	if err != nil {
 		return errors.Wrap(err, "getting cluster config")

From b5e8c20e0f4fb96596a97b0ba888b077c06bdfb5 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 10:49:43 -0700
Subject: [PATCH 106/668] add in daily triage section

---
 site/content/en/docs/Contributing/triage.md | 65 ++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index 7ba7d66287..efb76ef1ad 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -19,9 +19,72 @@ If you're interested in helping out with minikube triage, this doc covers the ba
 
 Additionally, if you'd be interested in participating in our weekly triage meeting, please fill out this [form](https://forms.gle/vNtWZSWXqeYaaNbU9) to express interest. Thank you! 
 
-# Labeling Issues
+# Daily Triage
+Daily triage has two goals:
 
+1. Responsiveness for new issues
+1. Responsiveness when explicitly requested information was provided
 
+The list of outstanding items are at https://teaparty-tts3vkcpgq-uc.a.run.app/s/daily-triage - it covers:
+
+1. Issues without a `kind/` or `triage/` label
+1. Issues without a `priority/` label
+1. `triage/needs-information` issues which the user has followed up on
+
+## Categorization
+
+The most important level of categorizing the issue is defining what type it is.
+We typically want at least one of the following labels on every issue, and some issues may fall into multiple categories:
+
+- `triage/support`   - The default for most incoming issues
+- `kind/bug` - When it’s a bug or we aren’t delivering the best user experience
+
+Other possibilities: 
+- `kind/feature`- Identify new feature requests
+- `kind/flake` - Used for flaky integration or unit tests
+- `kind/cleanup` - Cleaning up/refactoring the codebase
+- `kind/documentation` - Updates or additions to minikube documentation
+- `kind/ux` - Issues that involve improving user experience
+- `kind/security` - When there's a security vulnerability in minikube
+
+If the issue is specific to an operating system, hypervisor, container, addon, or Kubernetes component:
+
+os/<operating system> - When the issue appears specific to an operating system
+  - `os/linux`
+  - `os/macos`
+  - `os/windows`
+co/<driver> - When the issue appears specific to a driver
+  - `co/hyperkit`
+  - `co/hyperv`
+  - `co/kvm2`
+  - `co/none-driver`
+  - `co/docker-driver`
+  - `co/virtualbox`
+co/<kubernetes component> - When the issue appears specific to a k8s component
+  - `co/apiserver`
+  - `co/etcd`
+  - `co/coredns`
+  - `co/dashboard`
+  - `co/kube-proxy`
+  - `co/kubeadm`
+  - `co/kubelet`
+  - `co/kubeconfig`
+ 
+
+Other useful tags:
+
+Did an **Event** occur that we can dedup similar issues against?
+- `ev/CrashLoopBackoff`
+- `ev/Panic`
+- `ev/Pending`
+- `ev/kubeadm-exit-1`
+Suspected **Root cause**:
+- `cause/vm-environment`
+- `cause/invalid-kubelet-options`
+
+**Help wanted?**
+`Good First Issue` - bug has a proposed solution, can be implemented w/o further discussion.
+`Help wanted` - if the bug could use help from a contributor
 
 
 

From eaa54a28d10ee666357ff66f8d5b497e52e828a6 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 10:51:10 -0700
Subject: [PATCH 107/668] Add prioritization

---
 site/content/en/docs/Contributing/triage.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index efb76ef1ad..b1ad150f1b 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -87,6 +87,19 @@ Suspected **Root cause**:
 `Help wanted` - if the bug could use help from a contributor
 
 
+## Prioritization
+If the issue is not `triage/support`, it needs a [priority label](https://github.com/kubernetes/community/blob/master/contributors/guide/issue-triage.md#define-priority):
+
+`priority/critical-urgent` - someones top priority ASAP, such as security issue, user-visible bug, or build breakage. Rarely used.
+
+`priority/important-soon`: in time for the next two releases (8 weeks)
+
+`priority/important-longterm`: 2-4 releases from now
+
+`priority/backlog`: agreed that this would be good to have, but no one is available at the moment. Consider tagging as `help wanted`
+
+`priority/awaiting-more-evidence`: may be more useful, but there is not yet enough support.
+
 
 # Responding to Issues
 

From 9a76c2b33c06895081dd80c2cf8341f4890b2587 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 11:01:24 -0700
Subject: [PATCH 108/668] add weekly and post-release triage

---
 site/content/en/docs/Contributing/triage.md | 71 +++++++++++++++++++--
 1 file changed, 65 insertions(+), 6 deletions(-)

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index b1ad150f1b..ab0dec23c9 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -101,11 +101,59 @@ If the issue is not `triage/support`, it needs a [priority label](https://github
 `priority/awaiting-more-evidence`: may be more useful, but there is not yet enough support.
 
 
-# Responding to Issues
+# Weekly Triage
 
-Many issues in the minikube repo fall into one of the following categories:
-- Needs more information from the author to be actionable
-- Duplicate Issue
+Weekly triage has three goals:
+
+1. Catching up on unresponded issues
+1. Reviewing and closing PR’s
+1. Closing stale issues
+
+The list of outstanding items can be found at https://teaparty-tts3vkcpgq-uc.a.run.app/s/weekly-triage.
+
+## Post-Release Triage
+
+Post-release triage occurs after a major release (around every 4-6 weeks).
+It focuses on:
+
+1. Closing bugs that have been resolved by the release
+1. Reprioritizing bugs that have not been resolved by the release
+1. Letting users know if we believe that there is still an issue
+
+This includes reviewing:
+
+1. Every issue that hasn’t been touched in the last 2 days
+1. Re-evaluation of long-term issues
+1. Re-evaluation of short-term issues
+
+
+## Responding to Issues
+
+### Needs More Information
+A sample response to ask for more info:
+
+```
+I don’t yet have a clear way to replicate this issue. Do you mind adding some additional details? Here is additional information that would be helpful:
+
+*  The exact `minikube start` command line used
+*  The full output of the `minikube start` command, preferably with `--alsologtostderr -v=4` for extra logging.
+ * The full output of `minikube logs`
+* The full output of `kubectl get po -A`
+
+
+Thank you for sharing your experience!
+```
+
+Then: Label with `triage/needs-information`.
+
+### Issue might be resolved
+If you think a release may have resolved an issue, ask the author to see if their issue has been resolved:
+
+```
+Could you please check to see if minikube <x> addresses this issue? We've made some changes with how this is handled, and improved the minikube logs output to help us debug tricky cases like this.
+```
+
+Then: Label with `triage/needs-information`.
 
 
 ## Closing with Care
@@ -121,22 +169,30 @@ In any of these situations, we aim to be kind when closing the issue, and offer
 Samples responses for these situations include:
 
 ### Issue has been addressed
-
+```
 @author: I believe this issue is now addressed by minikube v1.4, as it <reason>. If you still see this issue with minikube v1.4 or higher, please reopen this issue by commenting with `/reopen`
 
 Thank you for reporting this issue!
+```
+
+Then: Close the issue
 
 ### Duplicate Issue
 
-
+```
 This issue appears to be a duplicate of #X, do you mind if we move the conversation there?
 
 This way we can centralize the content relating to the issue. If you feel that this issue is not in fact a duplicate, please re-open it using `/reopen`. If you have additional information to share, please add it to the new issue.
 
 Thank you for reporting this!
+```
+
+Then: Label with `triage/duplicate` and close the issue.
 
 ### Lack of Information
+If an issue hasn't been active for more than four weeks, and the author has been pinged at least once, then the issue can be closed.
 
+```
 Hey @author -- hopefully it's OK if I close this - there wasn't enough information to make it actionable, and some time has already passed. If you are able to provide additional details, you may reopen it at any point by adding /reopen to your comment.
 
 Here is additional information that may be helpful to us:
@@ -147,3 +203,6 @@ Here is additional information that may be helpful to us:
  * The full output of `minikube logs`
 
 Thank you for sharing your experience!
+```
+
+Then: Close the issue.

From 0e0ddbcfb37f9862b88af2ff7f59803a26ea401f Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 11:16:34 -0700
Subject: [PATCH 109/668] Polish

---
 site/content/en/docs/Contributing/triage.md | 92 ++++++++++++---------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index ab0dec23c9..5fb1e24ab7 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -13,7 +13,7 @@ A well organized repo allows maintainers to prioritize feature requests, fix bug
 Triage includes:
 - Labeling issues
 - Responding to issues
-- Closing issues (under certain circumstances!)
+- Closing issues
 
 If you're interested in helping out with minikube triage, this doc covers the basics of doing so.
 
@@ -29,7 +29,7 @@ The list of outstanding items are at https://teaparty-tts3vkcpgq-uc.a.run.app/s/
 
 1. Issues without a `kind/` or `triage/` label
 1. Issues without a `priority/` label
-1. `triage/needs-information` issues which the user has followed up on
+1. `triage/needs-information` issues which the user has followed up on, and now require a response.
 
 ## Categorization
 
@@ -49,18 +49,23 @@ Other possibilities:
 
 If the issue is specific to an operating system, hypervisor, container, addon, or Kubernetes component:
 
-os/<operating system> - When the issue appears specific to an operating system
+**os/[operating system]** - When the issue appears specific to an operating system
+
   - `os/linux`
   - `os/macos`
   - `os/windows`
-co/<driver> - When the issue appears specific to a driver
+
+**co/[driver]**  - When the issue appears specific to a driver
+
   - `co/hyperkit`
   - `co/hyperv`
   - `co/kvm2`
   - `co/none-driver`
   - `co/docker-driver`
   - `co/virtualbox`
-co/<kubernetes component> - When the issue appears specific to a k8s component
+
+**co/[kubernetes component]**  - When the issue appears specific to a k8s component
+
   - `co/apiserver`
   - `co/etcd`
   - `co/coredns`
@@ -74,16 +79,21 @@ co/<kubernetes component> - When the issue appears specific to a k8s component
 Other useful tags:
 
 Did an **Event** occur that we can dedup similar issues against?
+
 - `ev/CrashLoopBackoff`
 - `ev/Panic`
 - `ev/Pending`
 - `ev/kubeadm-exit-1`
+
 Suspected **Root cause**:
+
 - `cause/vm-environment`
 - `cause/invalid-kubelet-options`
 
 **Help wanted?**
+
 `Good First Issue` - bug has a proposed solution, can be implemented w/o further discussion.
+
 `Help wanted` - if the bug could use help from a contributor
 
 
@@ -132,26 +142,27 @@ This includes reviewing:
 ### Needs More Information
 A sample response to ask for more info:
 
-```
-I don’t yet have a clear way to replicate this issue. Do you mind adding some additional details? Here is additional information that would be helpful:
+> I don’t yet have a clear way to replicate this issue. Do you mind adding some additional details. Here is additional information that would be helpful:
+>
+> \*  The exact `minikube start` command line used
+>
+> \*  The full output of the `minikube start` command, preferably with `--alsologtostderr -v=4` for extra logging.
+>
+> \* The full output of `minikube logs`
+>
+> \* The full output of `kubectl get po -A`
+>
+>
+>
+> Thank you for sharing your experience!
 
-*  The exact `minikube start` command line used
-*  The full output of the `minikube start` command, preferably with `--alsologtostderr -v=4` for extra logging.
- * The full output of `minikube logs`
-* The full output of `kubectl get po -A`
-
-
-Thank you for sharing your experience!
-```
 
 Then: Label with `triage/needs-information`.
 
 ### Issue might be resolved
 If you think a release may have resolved an issue, ask the author to see if their issue has been resolved:
 
-```
-Could you please check to see if minikube <x> addresses this issue? We've made some changes with how this is handled, and improved the minikube logs output to help us debug tricky cases like this.
-```
+> Could you please check to see if minikube <x> addresses this issue? We've made some changes with how this is handled, and improved the minikube logs output to help us debug tricky cases like this.
 
 Then: Label with `triage/needs-information`.
 
@@ -169,40 +180,39 @@ In any of these situations, we aim to be kind when closing the issue, and offer
 Samples responses for these situations include:
 
 ### Issue has been addressed
-```
-@author: I believe this issue is now addressed by minikube v1.4, as it <reason>. If you still see this issue with minikube v1.4 or higher, please reopen this issue by commenting with `/reopen`
 
-Thank you for reporting this issue!
-```
+>@author: I believe this issue is now addressed by minikube v1.4, as it <reason>. If you still see this issue with minikube v1.4 or higher, please reopen this issue by commenting with `/reopen`
+>
+>Thank you for reporting this issue!
 
 Then: Close the issue
 
 ### Duplicate Issue
 
-```
-This issue appears to be a duplicate of #X, do you mind if we move the conversation there?
-
-This way we can centralize the content relating to the issue. If you feel that this issue is not in fact a duplicate, please re-open it using `/reopen`. If you have additional information to share, please add it to the new issue.
-
-Thank you for reporting this!
-```
+>This issue appears to be a duplicate of #X, do you mind if we move the conversation there?
+>
+>This way we can centralize the content relating to the issue. If you feel that this issue is not in fact a duplicate, please re-open it using `/reopen`. If you have additional information to share, please add it to the new issue.
+>
+>Thank you for reporting this!
 
 Then: Label with `triage/duplicate` and close the issue.
 
 ### Lack of Information
 If an issue hasn't been active for more than four weeks, and the author has been pinged at least once, then the issue can be closed.
 
-```
-Hey @author -- hopefully it's OK if I close this - there wasn't enough information to make it actionable, and some time has already passed. If you are able to provide additional details, you may reopen it at any point by adding /reopen to your comment.
-
-Here is additional information that may be helpful to us:
-
-* Whether the issue occurs with the latest minikube release
-*  The exact `minikube start` command line used
-*  The full output of the `minikube start` command, preferably with `--alsologtostderr -v=3` for extra logging.
- * The full output of `minikube logs`
-
-Thank you for sharing your experience!
-```
+>Hey @author -- hopefully it's OK if I close this - there wasn't enough information to make it actionable, and some time has already passed. If you are able to provide additional details, you may reopen it at any point by adding /reopen to your comment.
+> 
+>Here is additional information that may be helpful to us:
+>
+>\* Whether the issue occurs with the latest minikube release
+>
+>\* The exact `minikube start` command line used
+>
+>\* The full output of the `minikube start` command, preferably with `--alsologtostderr -v=3` for extra logging.
+>
+>\* The full output of `minikube logs`
+>
+>
+>Thank you for sharing your experience!
 
 Then: Close the issue.

From 39b5c534abb1ae3b6903345f15a1eafafb8c6dca Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 12:08:34 -0700
Subject: [PATCH 110/668] Add warning if both vm-driver and driver are
 specified

---
 cmd/minikube/cmd/start.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6227dfa16a..c9018c09d6 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -453,8 +453,18 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	}
 
 	// Default to looking at the new driver parameter
-	if viper.GetString("driver") != "" {
-		ds := driver.Status(viper.GetString("driver"))
+	if d := viper.GetString("driver"); d != "" {
+		if vmd := viper.GetString("vm-driver"); vmd != "" {
+			// Output a warning
+			warning := `Both driver={{.driver}} and vm-driver={{.vmd}} have been set.
+			
+    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.
+
+    If vm-driver is set in the global config, please run "minikube config unset vm-driver" to resolve this warning.			
+			`
+			out.T(out.Warning, warning, out.V{"driver": d, "vmd": vmd})
+		}
+		ds := driver.Status(d)
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
 		return ds
 	}

From ca6799194744339245f0bb99af5efdb6396b5529 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 19 Mar 2020 12:52:30 -0700
Subject: [PATCH 111/668] Only deleteHosts if running a VM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If minikube is started with the docker driver, all containers and volumes will be deleted in the call to `deleteProfileContainersAndVolumes`. If we then try to call `deleteHosts` on it, we get this warning:

```
❗  Unable to get host status for "minikube": state: docker inspect -f {{.State.Status}} minikube: Error: No such object: minikube: exit status 1
```

which will always happen because we've already deleted the container.
---
 cmd/minikube/cmd/delete.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 253f48128a..89f1eed4e6 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -239,7 +239,9 @@ func deleteProfile(profile *config.Profile) error {
 		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	deleteHosts(api, cc)
+	if driver.IsVM(cc.Driver) {
+		deleteHosts(api, cc)
+	}
 
 	// In case DeleteHost didn't complete the job.
 	deleteProfileDirectory(profile.Name)

From dadf4bd35d0450f67b0207f7375a3baac471d37f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 19 Mar 2020 14:04:40 -0700
Subject: [PATCH 112/668] Improve error message when docker-env is used with an
 incompatible runtime

---
 cmd/minikube/cmd/docker-env.go | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index bf554f151c..138c2f0282 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -122,13 +122,18 @@ func isDockerActive(d drivers.Driver) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	output, err := client.Output("sudo systemctl is-active docker")
-	if err != nil {
-		return false, err
-	}
-	// systemd returns error code on inactive
+	cmd := "sudo systemctl is-active docker"
+
+	output, err := client.Output(cmd)
 	s := strings.TrimSpace(output)
-	return err == nil && s == "active", nil
+
+	if err != nil {
+		return false, fmt.Errorf("%s failed: %v\noutput: %q", cmd, err, s)
+	}
+	if s != "active" {
+		return false, fmt.Errorf("%s returned %q", cmd, s)
+	}
+	return true, nil
 }
 
 // dockerEnvCmd represents the docker-env command
@@ -165,9 +170,15 @@ var dockerEnvCmd = &cobra.Command{
 			if hostSt != state.Running.String() {
 				exit.WithCodeT(exit.Unavailable, `'{{.profile}}' is not running`, out.V{"profile": profile})
 			}
+
+			if cc.KubernetesConfig.ContainerRuntime != "docker" {
+				exit.WithCodeT(exit.BadUsage, `The docker-env command is only compatible with the "docker" runtime, but this cluster was configured to use the "{{.runtime}}" runtime.`,
+					out.V{"runtime": cc.KubernetesConfig.ContainerRuntime})
+			}
+
 			ok, err := isDockerActive(host.Driver)
 			if err != nil {
-				exit.WithError("Error getting service status", err)
+				exit.WithError("Docker runtime check failed", err)
 			}
 
 			if !ok {

From 8d48c68aece27b6bef66ce989bcb3fe8e3fb63b3 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Thu, 19 Mar 2020 14:52:52 -0700
Subject: [PATCH 113/668] minor update based on review feedback

---
 pkg/minikube/logs/logs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index 350eacc8f7..a44a9b6073 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -192,7 +192,7 @@ func logCommands(r cruntime.Manager, bs bootstrapper.Bootstrapper, length int, f
 	cmds["container status"] = cruntime.ContainerStatusCommand()
 
 	cfg, err := config.Load(viper.GetString(config.ProfileName))
-	if err != nil && !config.IsNotExist(err) {
+	if err != nil {
 		out.ErrLn("Error loading profile config: %v", err)
 	}
 

From e437e1c44090fc1141b2d28677a19f6e92ce7cda Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 19 Mar 2020 17:29:58 -0700
Subject: [PATCH 114/668] Use -f to remove up to 6s of of delay disabling
 containerd.

---
 pkg/minikube/cruntime/containerd.go | 2 +-
 pkg/minikube/cruntime/crio.go       | 2 +-
 pkg/minikube/cruntime/docker.go     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go
index d817dd7de0..67beb710a7 100644
--- a/pkg/minikube/cruntime/containerd.go
+++ b/pkg/minikube/cruntime/containerd.go
@@ -217,7 +217,7 @@ func (r *Containerd) Enable(disOthers bool) error {
 
 // Disable idempotently disables containerd on a host
 func (r *Containerd) Disable() error {
-	c := exec.Command("sudo", "systemctl", "stop", "containerd")
+	c := exec.Command("sudo", "systemctl", "stop", "-f", "containerd")
 	if _, err := r.Runner.RunCmd(c); err != nil {
 		return errors.Wrapf(err, "stop containerd")
 	}
diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go
index 804e4989ba..fff4a8c270 100644
--- a/pkg/minikube/cruntime/crio.go
+++ b/pkg/minikube/cruntime/crio.go
@@ -133,7 +133,7 @@ func (r *CRIO) Enable(disOthers bool) error {
 
 // Disable idempotently disables CRIO on a host
 func (r *CRIO) Disable() error {
-	if _, err := r.Runner.RunCmd(exec.Command("sudo", "systemctl", "stop", "crio")); err != nil {
+	if _, err := r.Runner.RunCmd(exec.Command("sudo", "systemctl", "stop", "-f", "crio")); err != nil {
 		return errors.Wrapf(err, "disable crio.")
 	}
 	return nil
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 8b203badec..8641092573 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -127,7 +127,7 @@ func (r *Docker) Restart() error {
 
 // Disable idempotently disables Docker on a host
 func (r *Docker) Disable() error {
-	c := exec.Command("sudo", "systemctl", "stop", "docker", "docker.socket")
+	c := exec.Command("sudo", "systemctl", "stop", "-f", "docker", "docker.socket")
 	if _, err := r.Runner.RunCmd(c); err != nil {
 		return errors.Wrap(err, "disable docker")
 	}

From 8fa96e29257fc8bf1fb116aacf482b336bd30948 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 19 Mar 2020 17:37:29 -0700
Subject: [PATCH 115/668] Make exec_runner and kic_runner logging behave like
 ssh_runner.

---
 pkg/minikube/command/exec_runner.go | 2 ++
 pkg/minikube/command/kic_runner.go  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkg/minikube/command/exec_runner.go b/pkg/minikube/command/exec_runner.go
index 5dc5b81a64..e25346c990 100644
--- a/pkg/minikube/command/exec_runner.go
+++ b/pkg/minikube/command/exec_runner.go
@@ -46,6 +46,8 @@ func NewExecRunner() Runner {
 // RunCmd implements the Command Runner interface to run a exec.Cmd object
 func (*execRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 	rr := &RunResult{Args: cmd.Args}
+	glog.Infof("Run: %v", rr.Command())
+
 	var outb, errb io.Writer
 	if cmd.Stdout == nil {
 		var so bytes.Buffer
diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go
index 2d00a15251..754fc64b18 100644
--- a/pkg/minikube/command/kic_runner.go
+++ b/pkg/minikube/command/kic_runner.go
@@ -88,6 +88,7 @@ func (k *kicRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 	oc.Env = cmd.Env
 
 	rr := &RunResult{Args: cmd.Args}
+	glog.Infof("Run: %v", rr.Command())
 
 	var outb, errb io.Writer
 	if oc.Stdout == nil {

From ea6d6832e5653b7f4cc4bdc87afc5fda346422d1 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 19 Mar 2020 17:40:02 -0700
Subject: [PATCH 116/668] Only restart docker service if unit file has updated

---
 pkg/provision/buildroot.go | 47 +++++++++++--------------------------
 pkg/provision/provision.go | 40 +++++++++++++++++++++++++------
 pkg/provision/ubuntu.go    | 48 +++++++++++---------------------------
 3 files changed, 60 insertions(+), 75 deletions(-)

diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 193478f215..913d8b34d0 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -19,18 +19,16 @@ package provision
 import (
 	"bytes"
 	"fmt"
-	"path"
 	"text/template"
 	"time"
 
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/engine"
-	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/provision/pkgaction"
-	"github.com/docker/machine/libmachine/provision/serviceaction"
 	"github.com/docker/machine/libmachine/swarm"
+	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -42,7 +40,7 @@ type BuildrootProvisioner struct {
 // NewBuildrootProvisioner creates a new BuildrootProvisioner
 func NewBuildrootProvisioner(d drivers.Driver) provision.Provisioner {
 	return &BuildrootProvisioner{
-		provision.NewSystemdProvisioner("buildroot", d),
+		NewSystemdProvisioner("buildroot", d),
 	}
 }
 
@@ -65,7 +63,7 @@ func (p *BuildrootProvisioner) GenerateDockerOptions(dockerPort int) (*provision
 	noPivot := true
 	// Using pivot_root is not supported on fstype rootfs
 	if fstype, err := rootFileSystemType(p); err == nil {
-		log.Debugf("root file system type: %s", fstype)
+		glog.Infof("root file system type: %s", fstype)
 		noPivot = fstype == "rootfs"
 	}
 
@@ -79,7 +77,7 @@ Requires= minikube-automount.service docker.socket
 Type=notify
 `
 	if noPivot {
-		log.Warn("Using fundamentally insecure --no-pivot option")
+		glog.Warning("Using fundamentally insecure --no-pivot option")
 		engineConfigTmpl += `
 # DOCKER_RAMDISK disables pivot_root in Docker, using MS_MOVE instead.
 Environment=DOCKER_RAMDISK=yes
@@ -140,30 +138,11 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	dockerCfg := &provision.DockerOptions{
+	do := &provision.DockerOptions{
 		EngineOptions:     engineCfg.String(),
 		EngineOptionsPath: "/lib/systemd/system/docker.service",
 	}
-
-	log.Info("Setting Docker configuration on the remote daemon...")
-
-	if _, err = p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | sudo tee %s", path.Dir(dockerCfg.EngineOptionsPath), dockerCfg.EngineOptions, dockerCfg.EngineOptionsPath)); err != nil {
-		return nil, err
-	}
-
-	// To make sure if there is a already-installed docker on the ISO to pick up the new systemd file
-	if err := p.Service("", serviceaction.DaemonReload); err != nil {
-		return nil, err
-	}
-
-	if err := p.Service("docker", serviceaction.Enable); err != nil {
-		return nil, err
-	}
-
-	if err := p.Service("docker", serviceaction.Restart); err != nil {
-		return nil, err
-	}
-	return dockerCfg, nil
+	return do, updateUnit(p, "docker", do.EngineOptions, do.EngineOptionsPath)
 }
 
 // Package installs a package
@@ -177,18 +156,18 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
 	p.AuthOptions = authOptions
 	p.EngineOptions = engineOptions
 
-	log.Infof("provisioning hostname %q", p.Driver.GetMachineName())
+	glog.Infof("provisioning hostname %q", p.Driver.GetMachineName())
 	if err := p.SetHostname(p.Driver.GetMachineName()); err != nil {
 		return err
 	}
 
 	p.AuthOptions = setRemoteAuthOptions(p)
-	log.Debugf("set auth options %+v", p.AuthOptions)
+	glog.Infof("set auth options %+v", p.AuthOptions)
 
-	log.Debugf("setting up certificates")
+	glog.Infof("setting up certificates")
 	configAuth := func() error {
 		if err := configureAuth(p); err != nil {
-			log.Warnf("configureAuth failed: %v", err)
+			glog.Warningf("configureAuth failed: %v", err)
 			return &retry.RetriableError{Err: err}
 		}
 		return nil
@@ -196,13 +175,13 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
 
 	err := retry.Expo(configAuth, time.Second, 2*time.Minute)
 	if err != nil {
-		log.Debugf("Error configuring auth during provisioning %v", err)
+		glog.Infof("Error configuring auth during provisioning %v", err)
 		return err
 	}
 
-	log.Debugf("setting minikube options for container-runtime")
+	glog.Infof("setting minikube options for container-runtime")
 	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p); err != nil {
-		log.Debugf("Error setting container-runtime options during provisioning %v", err)
+		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}
 
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 52fb131960..ceb4a18464 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -31,10 +31,10 @@ import (
 	"github.com/docker/machine/libmachine/cert"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/engine"
-	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnutils"
 	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/swarm"
+	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -66,11 +66,24 @@ func init() {
 
 }
 
+// NewSystemdProvisioner is our fork of the same name in the upstream provision library, without the packages
+func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.SystemdProvisioner {
+	return provision.SystemdProvisioner{
+		provision.GenericProvisioner{
+			SSHCommander:      provision.GenericSSHCommander{Driver: d},
+			DockerOptionsDir:  "/etc/docker",
+			DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
+			OsReleaseID:       osReleaseID,
+			Driver:            d,
+		},
+	}
+}
+
 func configureAuth(p miniProvisioner) error {
-	log.Infof("configureAuth start")
+	glog.Infof("configureAuth start")
 	start := time.Now()
 	defer func() {
-		log.Infof("configureAuth took %s", time.Since(start))
+		glog.Infof("configureAuth took %s", time.Since(start))
 	}()
 
 	driver := p.GetDriver()
@@ -90,7 +103,7 @@ func configureAuth(p miniProvisioner) error {
 
 	// The Host IP is always added to the certificate's SANs list
 	hosts := append(authOptions.ServerCertSANs, ip, "localhost", "127.0.0.1")
-	log.Debugf("generating server cert: %s ca-key=%s private-key=%s org=%s san=%s",
+	glog.Infof("generating server cert: %s ca-key=%s private-key=%s org=%s san=%s",
 		authOptions.ServerCertPath,
 		authOptions.CaCertPath,
 		authOptions.CaPrivateKeyPath,
@@ -116,11 +129,11 @@ func configureAuth(p miniProvisioner) error {
 }
 
 func copyHostCerts(authOptions auth.Options) error {
-	log.Infof("copyHostCerts")
+	glog.Infof("copyHostCerts")
 
 	err := os.MkdirAll(authOptions.StorePath, 0700)
 	if err != nil {
-		log.Errorf("mkdir failed: %v", err)
+		glog.Errorf("mkdir failed: %v", err)
 	}
 
 	hostCerts := map[string]string{
@@ -144,7 +157,7 @@ func copyHostCerts(authOptions auth.Options) error {
 }
 
 func copyRemoteCerts(authOptions auth.Options, driver drivers.Driver) error {
-	log.Infof("copyRemoteCerts")
+	glog.Infof("copyRemoteCerts")
 
 	remoteCerts := map[string]string{
 		authOptions.CaCertPath:     authOptions.CaCertRemotePath,
@@ -276,3 +289,16 @@ func concatStrings(src []string, prefix string, postfix string) []string {
 	}
 	return ret
 }
+
+// updateUnit efficiently updates a systemd unit file
+func updateUnit(p provision.SSHCommander, name string, content string, dst string) error {
+	glog.Infof("Updating %s ...", dst)
+
+	if _, err := p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | sudo tee %s.new", path.Dir(dst), content, dst)); err != nil {
+		return err
+	}
+	if _, err := p.SSHCommand(fmt.Sprintf("sudo diff -u %s %s.new || { sudo mv %s.new %s; sudo systemctl -f daemon-reload && sudo sudo systemctl -f restart docker; }", dst, dst, dst, dst)); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
index 7cebe18dbb..9d2b272bd2 100644
--- a/pkg/provision/ubuntu.go
+++ b/pkg/provision/ubuntu.go
@@ -19,18 +19,16 @@ package provision
 import (
 	"bytes"
 	"fmt"
-	"path"
 	"text/template"
 	"time"
 
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/engine"
-	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/provision/pkgaction"
-	"github.com/docker/machine/libmachine/provision/serviceaction"
 	"github.com/docker/machine/libmachine/swarm"
+	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -43,7 +41,7 @@ type UbuntuProvisioner struct {
 func NewUbuntuProvisioner(d drivers.Driver) provision.Provisioner {
 	return &UbuntuProvisioner{
 		BuildrootProvisioner{
-			provision.NewSystemdProvisioner("ubuntu", d),
+			NewSystemdProvisioner("ubuntu", d),
 		},
 	}
 }
@@ -67,7 +65,7 @@ func (p *UbuntuProvisioner) GenerateDockerOptions(dockerPort int) (*provision.Do
 	noPivot := true
 	// Using pivot_root is not supported on fstype rootfs
 	if fstype, err := rootFileSystemType(p); err == nil {
-		log.Debugf("root file system type: %s", fstype)
+		glog.Infof("root file system type: %s", fstype)
 		noPivot = fstype == "rootfs"
 	}
 
@@ -83,7 +81,7 @@ Requires=docker.socket
 Type=notify
 `
 	if noPivot {
-		log.Warn("Using fundamentally insecure --no-pivot option")
+		glog.Warning("Using fundamentally insecure --no-pivot option")
 		engineConfigTmpl += `
 # DOCKER_RAMDISK disables pivot_root in Docker, using MS_MOVE instead.
 Environment=DOCKER_RAMDISK=yes
@@ -144,30 +142,11 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	dockerCfg := &provision.DockerOptions{
+	do := &provision.DockerOptions{
 		EngineOptions:     engineCfg.String(),
 		EngineOptionsPath: "/lib/systemd/system/docker.service",
 	}
-
-	log.Info("Setting Docker configuration on the remote daemon...")
-
-	if _, err = p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | sudo tee %s", path.Dir(dockerCfg.EngineOptionsPath), dockerCfg.EngineOptions, dockerCfg.EngineOptionsPath)); err != nil {
-		return nil, err
-	}
-
-	// 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
-	}
-
-	if err := p.Service("docker", serviceaction.Enable); err != nil {
-		return nil, err
-	}
-
-	if err := p.Service("docker", serviceaction.Restart); err != nil {
-		return nil, err
-	}
-	return dockerCfg, nil
+	return do, updateUnit(p, "docker", do.EngineOptions, do.EngineOptionsPath)
 }
 
 // Package installs a package
@@ -181,32 +160,33 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
 	p.AuthOptions = authOptions
 	p.EngineOptions = engineOptions
 
-	log.Infof("provisioning hostname %q", p.Driver.GetMachineName())
+	glog.Infof("provisioning hostname %q", p.Driver.GetMachineName())
 	if err := p.SetHostname(p.Driver.GetMachineName()); err != nil {
 		return err
 	}
 
 	p.AuthOptions = setRemoteAuthOptions(p)
-	log.Debugf("set auth options %+v", p.AuthOptions)
+	glog.Infof("set auth options %+v", p.AuthOptions)
 
-	log.Debugf("setting up certificates")
+	glog.Infof("setting up certificates")
 	configAuth := func() error {
 		if err := configureAuth(p); err != nil {
-			log.Warnf("configureAuth failed: %v", err)
+			glog.Warningf("configureAuth failed: %v", err)
 			return &retry.RetriableError{Err: err}
 		}
 		return nil
 	}
 
 	err := retry.Expo(configAuth, time.Second, 2*time.Minute)
+
 	if err != nil {
-		log.Debugf("Error configuring auth during provisioning %v", err)
+		glog.Infof("Error configuring auth during provisioning %v", err)
 		return err
 	}
 
-	log.Debugf("setting minikube options for container-runtime")
+	glog.Infof("setting minikube options for container-runtime")
 	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p); err != nil {
-		log.Debugf("Error setting container-runtime options during provisioning %v", err)
+		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}
 

From 5cd7660d1e49089155bb3c2b59ae25430e7eb7b5 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 19 Mar 2020 17:44:21 -0700
Subject: [PATCH 117/668] fixHost: only reprovision if necessary, and only once

---
 cmd/minikube/cmd/node_add.go         |  2 +-
 cmd/minikube/cmd/node_start.go       |  2 +-
 cmd/minikube/cmd/start.go            | 18 +++++++++++-------
 go.sum                               |  3 +++
 pkg/minikube/machine/cluster_test.go | 12 ++++++------
 pkg/minikube/machine/fix.go          | 23 ++++++++++-------------
 pkg/minikube/machine/start.go        |  4 ++--
 pkg/minikube/node/config.go          |  8 ++++++++
 pkg/minikube/node/machine.go         |  8 ++++----
 pkg/minikube/node/node.go            |  2 +-
 pkg/minikube/node/start.go           |  4 ++--
 11 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 9ee9e39f1e..f450d20540 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -53,7 +53,7 @@ var nodeAddCmd = &cobra.Command{
 			exit.WithError("Error adding node to cluster", err)
 		}
 
-		_, err = node.Start(*cc, *n, false, nil)
+		_, err = node.Start(*cc, config.ClusterConfig{}, *n, false, nil)
 		if err != nil {
 			exit.WithError("Error starting node", err)
 		}
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index c0090b6287..ede4130c87 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,7 +61,7 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		_, err = node.Start(*cc, *n, false, nil)
+		_, err = node.Start(*cc, *cc, *n, false, nil)
 		if err != nil {
 			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
 		}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6227dfa16a..35019c76ec 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -313,7 +313,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	k8sVersion := getKubernetesVersion(existing)
-	mc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
+	cc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -329,7 +329,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		if err != nil {
 			exit.WithError("Failed to cache ISO", err)
 		}
-		mc.MinikubeISO = url
+		cc.MinikubeISO = url
 	}
 
 	if viper.GetBool(nativeSSH) {
@@ -338,12 +338,12 @@ func runStart(cmd *cobra.Command, args []string) {
 		ssh.SetDefaultClient(ssh.External)
 	}
 
-	kubeconfig, err := startNode(existing, mc, n)
+	kubeconfig, err := startNode(existing, cc, n)
 	if err != nil {
 		exit.WithError("Starting node", err)
 	}
 
-	if err := showKubectlInfo(kubeconfig, k8sVersion, mc.Name); err != nil {
+	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
 		glog.Errorf("kubectl info: %v", err)
 	}
 }
@@ -383,7 +383,7 @@ func displayEnviron(env []string) {
 	}
 }
 
-func startNode(existing *config.ClusterConfig, mc config.ClusterConfig, n config.Node) (*kubeconfig.Settings, error) {
+func startNode(existing *config.ClusterConfig, cc config.ClusterConfig, n config.Node) (*kubeconfig.Settings, error) {
 	var existingAddons map[string]bool
 	if viper.GetBool(installAddons) {
 		existingAddons = map[string]bool{}
@@ -391,7 +391,11 @@ func startNode(existing *config.ClusterConfig, mc config.ClusterConfig, n config
 			existingAddons = existing.Addons
 		}
 	}
-	return node.Start(mc, n, true, existingAddons)
+
+	if existing == nil {
+		existing = &config.ClusterConfig{}
+	}
+	return node.Start(cc, *existing, n, true, existingAddons)
 }
 
 func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName string) error {
@@ -814,7 +818,7 @@ func validateRegistryMirror() {
 	}
 }
 
-// generateCfgFromFlags generates config.Config based on flags and supplied arguments
+// generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
 func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
 	r, err := cruntime.New(cruntime.Config{Type: viper.GetString(containerRuntime)})
 	if err != nil {
diff --git a/go.sum b/go.sum
index d84ef83e6e..8a4fe67c98 100644
--- a/go.sum
+++ b/go.sum
@@ -61,7 +61,9 @@ github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmx
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c h1:18gEt7qzn7CW7qMkfPTFyyotlPbvPQo9o4IDV8jZqP4=
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
@@ -972,6 +974,7 @@ google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 0c32c8642a..fbb0066691 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -129,7 +129,7 @@ func TestStartHostExists(t *testing.T) {
 	n := config.Node{Name: ih.Name}
 
 	// This should pass without calling Create because the host exists already.
-	h, err := StartHost(api, mc, n)
+	h, err := StartHost(api, mc, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -163,7 +163,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	n := config.Node{Name: h.Name}
 
 	// This should pass with creating host, while machine does not exist.
-	h, err = StartHost(api, mc, n)
+	h, err = StartHost(api, mc, mc, n)
 	if err != nil {
 		if err != ErrorMachineNotExist {
 			t.Fatalf("Error starting host: %v", err)
@@ -174,7 +174,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	n.Name = h.Name
 
 	// Second call. This should pass without calling Create because the host exists already.
-	h, err = StartHost(api, mc, n)
+	h, err = StartHost(api, mc, mc, n)
 	if err != nil {
 		t.Fatalf("Error starting host: %v", err)
 	}
@@ -207,7 +207,7 @@ func TestStartStoppedHost(t *testing.T) {
 	mc := defaultClusterConfig
 	mc.Name = h.Name
 	n := config.Node{Name: h.Name}
-	h, err = StartHost(api, mc, n)
+	h, err = StartHost(api, mc, mc, n)
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -235,7 +235,7 @@ func TestStartHost(t *testing.T) {
 	md := &tests.MockDetector{Provisioner: &tests.MockProvisioner{}}
 	provision.SetDetector(md)
 
-	h, err := StartHost(api, defaultClusterConfig, config.Node{Name: "minikube"})
+	h, err := StartHost(api, defaultClusterConfig, defaultClusterConfig, config.Node{Name: "minikube"})
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
@@ -269,7 +269,7 @@ func TestStartHostConfig(t *testing.T) {
 		DockerOpt: []string{"param=value"},
 	}
 
-	h, err := StartHost(api, cfg, config.Node{Name: "minikube"})
+	h, err := StartHost(api, cfg, cfg, config.Node{Name: "minikube"})
 	if err != nil {
 		t.Fatal("Error starting host.")
 	}
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 25f921cd5a..c8fcee801e 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"math"
 	"os"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -28,7 +29,6 @@ import (
 
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
-	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
@@ -36,7 +36,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/util/retry"
+	"k8s.io/minikube/pkg/provision"
 )
 
 // hostRunner is a minimal host.Host based interface for running commands
@@ -56,7 +56,7 @@ var (
 )
 
 // fixHost fixes up a previously configured VM so that it is ready to run Kubernetes
-func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, error) {
+func fixHost(api libmachine.API, cc config.ClusterConfig, existing config.ClusterConfig, n config.Node) (*host.Host, error) {
 	out.T(out.Waiting, "Reconfiguring existing host ...")
 
 	start := time.Now()
@@ -78,15 +78,16 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 		return h, err
 	}
 
+	old := engineOptions(existing)
 	e := engineOptions(cc)
-	if len(e.Env) > 0 {
+	if !reflect.DeepEqual(old, e) {
+		glog.Infof("docker config changed, updating provisioner: %+v", e)
 		h.HostOptions.EngineOptions.Env = e.Env
-		glog.Infof("Detecting provisioner ...")
-		provisioner, err := provision.DetectProvisioner(h.Driver)
-		if err != nil {
-			return h, errors.Wrap(err, "detecting provisioner")
+		p := provision.NewBuildrootProvisioner(h.Driver)
+		if driver.IsKIC(h.Driver.DriverName()) {
+			p = provision.NewUbuntuProvisioner(h.Driver)
 		}
-		if err := provisioner.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
+		if err := p.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
 			return h, errors.Wrap(err, "provision")
 		}
 	}
@@ -104,10 +105,6 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 		return h, nil
 	}
 
-	glog.Infof("Configuring auth for driver %s ...", h.Driver.DriverName())
-	if err := h.ConfigureAuth(); err != nil {
-		return h, &retry.RetriableError{Err: errors.Wrap(err, "Error configuring auth on host")}
-	}
 	return h, ensureSyncedGuestClock(h, cc.Driver)
 }
 
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index 73c982fa80..a885b0476e 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -62,7 +62,7 @@ var (
 )
 
 // StartHost starts a host VM.
-func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*host.Host, error) {
+func StartHost(api libmachine.API, cfg config.ClusterConfig, existing config.ClusterConfig, n config.Node) (*host.Host, error) {
 	// Prevent machine-driver boot races, as well as our own certificate race
 	releaser, err := acquireMachinesLock(cfg.Name)
 	if err != nil {
@@ -83,7 +83,7 @@ func StartHost(api libmachine.API, cfg config.ClusterConfig, n config.Node) (*ho
 		return createHost(api, cfg, n)
 	}
 	glog.Infoln("Skipping create...Using existing machine configuration")
-	return fixHost(api, cfg, n)
+	return fixHost(api, cfg, existing, n)
 }
 
 func engineOptions(cfg config.ClusterConfig) *engine.Options {
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index b29867f1b6..df7eed881a 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -23,6 +23,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"time"
 
 	"github.com/blang/semver"
 	"github.com/docker/machine/libmachine"
@@ -59,6 +60,12 @@ var (
 
 // configureRuntimes does what needs to happen to get a runtime going.
 func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
+	start := time.Now()
+	glog.Infof("configureRuntimes start")
+	defer func() {
+		glog.Infof("configureRuntimes took %s", time.Since(start))
+	}()
+
 	co := cruntime.Config{
 		Type:   viper.GetString(containerRuntime),
 		Runner: runner, ImageRepository: k8s.ImageRepository,
@@ -90,6 +97,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 		}
 	}
 
+	glog.Infof("enabling %s ...", cr.Name())
 	err = cr.Enable(disableOthers)
 	if err != nil {
 		exit.WithError("Failed to enable container runtime", err)
diff --git a/pkg/minikube/node/machine.go b/pkg/minikube/node/machine.go
index 483131515a..ffe4a792d7 100644
--- a/pkg/minikube/node/machine.go
+++ b/pkg/minikube/node/machine.go
@@ -39,12 +39,12 @@ import (
 	"k8s.io/minikube/pkg/util/retry"
 )
 
-func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+func startMachine(cfg *config.ClusterConfig, existing *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
 	m, err := machine.NewAPIClient()
 	if err != nil {
 		exit.WithError("Failed to get machine client", err)
 	}
-	host, preExists = startHost(m, *cfg, *node)
+	host, preExists = startHost(m, *cfg, *existing, *node)
 	runner, err = machine.CommandRunner(host)
 	if err != nil {
 		exit.WithError("Failed to get command runner", err)
@@ -68,13 +68,13 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 }
 
 // startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
+func startHost(api libmachine.API, mc config.ClusterConfig, existing config.ClusterConfig, n config.Node) (*host.Host, bool) {
 	exists, err := api.Exists(mc.Name)
 	if err != nil {
 		exit.WithError("Failed to check if machine exists", err)
 	}
 
-	host, err := machine.StartHost(api, mc, n)
+	host, err := machine.StartHost(api, mc, existing, n)
 	if err != nil {
 		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
 	}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index e92bad65b5..c25a9c95bd 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -65,7 +65,7 @@ func Add(cc *config.ClusterConfig, name string, controlPlane bool, worker bool,
 		return nil, err
 	}
 
-	_, err = Start(*cc, n, false, nil)
+	_, err = Start(*cc, *cc, n, false, nil)
 	return &n, err
 }
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index a3c5eee92b..8b75831f58 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -33,7 +33,7 @@ import (
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+func Start(mc config.ClusterConfig, existing config.ClusterConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
 	k8sVersion := mc.KubernetesConfig.KubernetesVersion
 	driverName := mc.Driver
 
@@ -59,7 +59,7 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
 	handleDownloadOnly(&cacheGroup, &kicGroup, k8sVersion)
 	waitDownloadKicArtifacts(&kicGroup)
 
-	mRunner, preExists, machineAPI, host := startMachine(&mc, &n)
+	mRunner, preExists, machineAPI, host := startMachine(&mc, &existing, &n)
 	defer machineAPI.Close()
 
 	// wait for preloaded tarball to finish downloading before configuring runtimes

From df608f70103878ba36b2309a5d1966c9b1ac2090 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 19 Mar 2020 23:45:29 -0700
Subject: [PATCH 118/668] exit earlier if the driver is invalid

---
 pkg/minikube/driver/driver.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 2dce6350cd..1e73df9edf 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -19,12 +19,15 @@ package driver
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"sort"
 	"strings"
 
 	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/registry"
 )
 
@@ -214,6 +217,9 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 // Status returns the status of a driver
 func Status(name string) registry.DriverState {
 	d := registry.Driver(name)
+	if d.Empty() {
+		exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": name, "os": runtime.GOOS})
+	}
 	return registry.DriverState{
 		Name:     d.Name,
 		Priority: d.Priority,

From 65d21b6fbed991144c18f680f4d08df60d42497c Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 07:03:38 -0700
Subject: [PATCH 119/668] Fix tests

---
 pkg/minikube/cruntime/cruntime_test.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/cruntime/cruntime_test.go b/pkg/minikube/cruntime/cruntime_test.go
index af70e01c80..9523f1126a 100644
--- a/pkg/minikube/cruntime/cruntime_test.go
+++ b/pkg/minikube/cruntime/cruntime_test.go
@@ -408,6 +408,10 @@ func (f *FakeRunner) crictl(args []string, _ bool) (string, error) {
 func (f *FakeRunner) systemctl(args []string, root bool) (string, error) { // nolint result 0 (string) is always ""
 	action := args[0]
 	svcs := args[1:]
+	// force
+	if svcs[0] == "-f" {
+		svcs = svcs[1:]
+	}
 	out := ""
 
 	for i, arg := range args {
@@ -503,9 +507,9 @@ func TestDisable(t *testing.T) {
 		runtime string
 		want    []string
 	}{
-		{"docker", []string{"sudo", "systemctl", "stop", "docker", "docker.socket"}},
-		{"crio", []string{"sudo", "systemctl", "stop", "crio"}},
-		{"containerd", []string{"sudo", "systemctl", "stop", "containerd"}},
+		{"docker", []string{"sudo", "systemctl", "stop", "-f", "docker", "docker.socket"}},
+		{"crio", []string{"sudo", "systemctl", "stop", "-f", "crio"}},
+		{"containerd", []string{"sudo", "systemctl", "stop", "-f", "containerd"}},
 	}
 	for _, tc := range tests {
 		t.Run(tc.runtime, func(t *testing.T) {

From ff9c4fdcc6a9c0bb4965e4ea95176427750d075e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 07:15:34 -0700
Subject: [PATCH 120/668] Lint fixes

---
 pkg/minikube/machine/client.go | 1 +
 pkg/provision/provision.go     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go
index 0121c92358..160b783a2c 100644
--- a/pkg/minikube/machine/client.go
+++ b/pkg/minikube/machine/client.go
@@ -172,6 +172,7 @@ func (api *LocalClient) Create(h *host.Host) error {
 		return fmt.Errorf("driver %q does not exist", h.DriverName)
 	}
 	if def.Init == nil {
+		// NOTE: This will call provision.DetectProvisioner
 		return api.legacyClient.Create(h)
 	}
 
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index ceb4a18464..7b2e9e6539 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -69,7 +69,7 @@ func init() {
 // NewSystemdProvisioner is our fork of the same name in the upstream provision library, without the packages
 func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.SystemdProvisioner {
 	return provision.SystemdProvisioner{
-		provision.GenericProvisioner{
+		GenericProvisioner: provision.GenericProvisioner{
 			SSHCommander:      provision.GenericSSHCommander{Driver: d},
 			DockerOptionsDir:  "/etc/docker",
 			DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
@@ -292,12 +292,12 @@ func concatStrings(src []string, prefix string, postfix string) []string {
 
 // updateUnit efficiently updates a systemd unit file
 func updateUnit(p provision.SSHCommander, name string, content string, dst string) error {
-	glog.Infof("Updating %s ...", dst)
+	glog.Infof("Updating %s unit: %s ...", name, dst)
 
 	if _, err := p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | sudo tee %s.new", path.Dir(dst), content, dst)); err != nil {
 		return err
 	}
-	if _, err := p.SSHCommand(fmt.Sprintf("sudo diff -u %s %s.new || { sudo mv %s.new %s; sudo systemctl -f daemon-reload && sudo sudo systemctl -f restart docker; }", dst, dst, dst, dst)); err != nil {
+	if _, err := p.SSHCommand(fmt.Sprintf("sudo diff -u %s %s.new || { sudo mv %s.new %s; sudo systemctl -f daemon-reload && sudo sudo systemctl -f restart %s; }", dst, dst, dst, dst, name)); err != nil {
 		return err
 	}
 	return nil

From e1a766e2c82e254644843c477502db03b6cfe846 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 08:10:01 -0700
Subject: [PATCH 121/668] Improve code structuring

---
 pkg/minikube/machine/client.go       | 19 ++++++++++---------
 pkg/minikube/machine/cluster_test.go |  9 ---------
 pkg/minikube/machine/fix.go          |  8 ++------
 pkg/minikube/machine/machine.go      | 25 +++++++++++++++++++++++++
 pkg/provision/provision.go           | 13 +++++++++++++
 5 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go
index 0121c92358..e9052ef448 100644
--- a/pkg/minikube/machine/client.go
+++ b/pkg/minikube/machine/client.go
@@ -36,11 +36,11 @@ import (
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/mcnutils"
 	"github.com/docker/machine/libmachine/persist"
-	lib_provision "github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/docker/machine/libmachine/version"
+	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/driver"
@@ -49,7 +49,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/registry"
 	"k8s.io/minikube/pkg/minikube/sshutil"
-	"k8s.io/minikube/pkg/provision"
 )
 
 // NewRPCClient gets a new client.
@@ -167,6 +166,12 @@ func CommandRunner(h *host.Host) (command.Runner, error) {
 
 // Create creates the host
 func (api *LocalClient) Create(h *host.Host) error {
+	glog.Infof("LocalClient.Create starting")
+	start := time.Now()
+	defer func() {
+		glog.Infof("LocalClient.Create took %s", time.Since(start))
+	}()
+
 	def := registry.Driver(h.DriverName)
 	if def.Empty() {
 		return fmt.Errorf("driver %q does not exist", h.DriverName)
@@ -209,21 +214,17 @@ func (api *LocalClient) Create(h *host.Host) error {
 		{
 			"provisioning",
 			func() error {
+				// Skippable because we don't reconfigure Docker?
 				if driver.BareMetal(h.Driver.DriverName()) {
 					return nil
 				}
-				var pv lib_provision.Provisioner
-				if driver.IsKIC(h.Driver.DriverName()) {
-					pv = provision.NewUbuntuProvisioner(h.Driver)
-				} else {
-					pv = provision.NewBuildrootProvisioner(h.Driver)
-				}
-				return pv.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions)
+				return provisionDockerMachine(h)
 			},
 		},
 	}
 
 	for _, step := range steps {
+
 		if err := step.f(); err != nil {
 			return errors.Wrap(err, step.name)
 		}
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index fbb0066691..a660b3448e 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -139,9 +139,6 @@ func TestStartHostExists(t *testing.T) {
 	if s, _ := h.Driver.GetState(); s != state.Running {
 		t.Fatalf("Machine not started.")
 	}
-	if !md.Provisioner.Provisioned {
-		t.Fatalf("Expected provision to be called")
-	}
 }
 
 func TestStartHostErrMachineNotExist(t *testing.T) {
@@ -185,9 +182,6 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	if s, _ := h.Driver.GetState(); s != state.Running {
 		t.Fatalf("Machine not started.")
 	}
-	if !md.Provisioner.Provisioned {
-		t.Fatalf("Expected provision to be called")
-	}
 }
 
 func TestStartStoppedHost(t *testing.T) {
@@ -223,9 +217,6 @@ func TestStartStoppedHost(t *testing.T) {
 		t.Fatalf("Machine must be saved after starting.")
 	}
 
-	if !md.Provisioner.Provisioned {
-		t.Fatalf("Expected provision to be called")
-	}
 }
 
 func TestStartHost(t *testing.T) {
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index c8fcee801e..83e57c4174 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -36,7 +36,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/provision"
 )
 
 // hostRunner is a minimal host.Host based interface for running commands
@@ -83,11 +82,8 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, existing config.Cluste
 	if !reflect.DeepEqual(old, e) {
 		glog.Infof("docker config changed, updating provisioner: %+v", e)
 		h.HostOptions.EngineOptions.Env = e.Env
-		p := provision.NewBuildrootProvisioner(h.Driver)
-		if driver.IsKIC(h.Driver.DriverName()) {
-			p = provision.NewUbuntuProvisioner(h.Driver)
-		}
-		if err := p.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
+		err := provisionDockerMachine(h)
+		if err != nil {
 			return h, errors.Wrap(err, "provision")
 		}
 	}
diff --git a/pkg/minikube/machine/machine.go b/pkg/minikube/machine/machine.go
index 215f240753..a9cba1e413 100644
--- a/pkg/minikube/machine/machine.go
+++ b/pkg/minikube/machine/machine.go
@@ -18,7 +18,10 @@ package machine
 
 import (
 	"github.com/docker/machine/libmachine/host"
+	libprovision "github.com/docker/machine/libmachine/provision"
 	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/provision"
 )
 
 // Machine contains information about a machine
@@ -74,3 +77,25 @@ func LoadMachine(name string) (*Machine, error) {
 	}
 	return &mm, nil
 }
+
+// provisionDockerMachine provides fast provisioning of a docker machine
+func provisionDockerMachine(h *host.Host) error {
+	p, err := fastDetectProvisioner(h)
+	if err != nil {
+		return errors.Wrap(err, "fast detect")
+	}
+	return p.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions)
+}
+
+// fastDetectProvisioner provides a shortcut for provisioner detection
+func fastDetectProvisioner(h *host.Host) (libprovision.Provisioner, error) {
+	d := h.Driver.DriverName()
+	switch {
+	case driver.IsKIC(d):
+		return provision.NewUbuntuProvisioner(h.Driver), nil
+	case driver.BareMetal(d):
+		return libprovision.DetectProvisioner(h.Driver)
+	default:
+		return provision.NewBuildrootProvisioner(h.Driver), nil
+	}
+}
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 52fb131960..b5dd4651fb 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -66,6 +66,19 @@ func init() {
 
 }
 
+// NewSystemdProvisioner is our fork of the same name in the upstream provision library, without the packages
+func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.SystemdProvisioner {
+	return provision.SystemdProvisioner{
+		GenericProvisioner: provision.GenericProvisioner{
+			SSHCommander:      provision.GenericSSHCommander{Driver: d},
+			DockerOptionsDir:  "/etc/docker",
+			DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
+			OsReleaseID:       osReleaseID,
+			Driver:            d,
+		},
+	}
+}
+
 func configureAuth(p miniProvisioner) error {
 	log.Infof("configureAuth start")
 	start := time.Now()

From 51bce4d780e5c5483ac1d12db449bb9060398aad Mon Sep 17 00:00:00 2001
From: Kenta Iso <type.mafty@gmail.com>
Date: Sat, 21 Mar 2020 00:35:23 +0900
Subject: [PATCH 122/668] =?UTF-8?q?bumpup=20istio=20operator=20addon=201.4?=
 =?UTF-8?q?.0=20=E2=86=92=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../istio-operator.yaml.tmpl                  | 47 +++++--------------
 deploy/addons/istio/README.md                 |  3 +-
 .../istio/istio-default-profile.yaml.tmpl     | 17 +++++--
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
index 0ac264461f..06b0ba995d 100644
--- a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
+++ b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
@@ -11,49 +11,24 @@ metadata:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: istiocontrolplanes.install.istio.io
+  name: istiooperators.install.istio.io
   labels:
     kubernetes.io/minikube-addons: istio
-    addonmanager.kubernetes.io/mode: EnsureExists 
+    addonmanager.kubernetes.io/mode: EnsureExists
 spec:
   group: install.istio.io
   names:
-    kind: IstioControlPlane
-    listKind: IstioControlPlaneList
-    plural: istiocontrolplanes
-    singular: istiocontrolplane
+    kind: IstioOperator
+    listKind: IstioOperatorList
+    plural: istiooperators
+    singular: istiooperator
     shortNames:
-    - icp
+    - iop
   scope: Namespaced
   subresources:
     status: {}
-  validation:
-    openAPIV3Schema:
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values.
-            More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase.
-            More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        spec:
-          description: 'Specification of the desired state of the istio control plane resource.
-            More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
-          type: object
-        status:
-          description: 'Status describes each of istio control plane component status at the current time.
-            0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING.
-            More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html &
-            https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
-          type: object
   versions:
-  - name: v1alpha2
+  - name: v1alpha1
     served: true
     storage: true
 ...
@@ -243,9 +218,9 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: docker.io/istio/operator:1.4.0
+          image: docker.io/istio/operator:1.5.0
           command:
-          - istio-operator
+          - operator
           - server
           imagePullPolicy: Always
           resources:
@@ -257,7 +232,7 @@ spec:
               memory: 128Mi
           env:
             - name: WATCH_NAMESPACE
-              value: ""
+              value: "istio-system"
             - name: LEADER_ELECTION_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/deploy/addons/istio/README.md b/deploy/addons/istio/README.md
index 0cc971bcf5..306948b876 100644
--- a/deploy/addons/istio/README.md
+++ b/deploy/addons/istio/README.md
@@ -3,9 +3,10 @@
 
 ### Enable istio on minikube
 Make sure to start minikube with at least 8192 MB of memory and 4 CPUs.
+See official [Platform Setup](https://istio.io/docs/setup/platform-setup/) documentation.
 
 ```shell script
-minikube start --memory=8000mb --cpus=4 
+minikube start --memory=8192mb --cpus=4
 ```
 
 To enable this addon, simply run:
diff --git a/deploy/addons/istio/istio-default-profile.yaml.tmpl b/deploy/addons/istio/istio-default-profile.yaml.tmpl
index 036c6f31dd..6f4ade1271 100644
--- a/deploy/addons/istio/istio-default-profile.yaml.tmpl
+++ b/deploy/addons/istio/istio-default-profile.yaml.tmpl
@@ -1,10 +1,19 @@
-apiVersion: install.istio.io/v1alpha2
-kind: IstioControlPlane
+apiVersion: v1
+kind: Namespace
 metadata:
-  namespace: istio-operator
+  name: istio-system
+  labels:
+    kubernetes.io/minikube-addons: istio
+    addonmanager.kubernetes.io/mode: EnsureExists
+
+---
+apiVersion: install.istio.io/v1alpha1
+kind: IstioOperator
+metadata:
+  namespace: istio-system
   name: example-istiocontrolplane
   labels:
     kubernetes.io/minikube-addons: istio
-    addonmanager.kubernetes.io/mode: Reconcile 
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   profile: default

From 4033b68355271dc836d9384e038db983d6fdf777 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 08:53:14 -0700
Subject: [PATCH 123/668] Wait 30 seconds before spamming console with error
 logs

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index e420307c65..0b4c8d887c 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -40,17 +40,18 @@ import (
 	"k8s.io/minikube/pkg/minikube/logs"
 )
 
+// minLogCheckTime how long to wait before spamming error logs to console
+const minLogCheckTime = 30 * time.Second
+
 // WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
 func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, start time.Time, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver process to appear ...")
-	minLogTime := kconst.APICallRetryInterval * 10
-
 	err := wait.PollImmediate(time.Millisecond*500, timeout, func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during process check")
 		}
 
-		if time.Since(start) > minLogTime {
+		if time.Since(start) > minLogCheckTime {
 			announceProblems(r, bs, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
@@ -81,13 +82,12 @@ func apiServerPID(cr command.Runner) (int, error) {
 func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
 	glog.Info("waiting for kube-system pods to appear ...")
 	pStart := time.Now()
-	minLogTime := kconst.APICallRetryInterval * 10
 
 	podList := func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during pod check")
 		}
-		if time.Since(start) > minLogTime {
+		if time.Since(start) > minLogCheckTime {
 			announceProblems(r, bs, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
@@ -116,13 +116,12 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
 
-	minLogTime := kconst.APICallRetryInterval * 10
 	healthz := func() (bool, error) {
 		if time.Since(start) > timeout {
 			return false, fmt.Errorf("cluster wait timed out during healthz check")
 		}
 
-		if time.Since(start) > minLogTime {
+		if time.Since(start) > minLogCheckTime {
 			announceProblems(r, bs, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}

From 9cf91284579486fb7f9f9f27409d323f208f6d13 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 11:05:14 -0700
Subject: [PATCH 124/668] Remove CrashLoopBackOff from root causes

---
 pkg/minikube/logs/logs.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index e4ec4a9047..5b497ce858 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -51,7 +51,6 @@ var rootCauses = []string{
 	`unable to evict any pods`,
 	`eviction manager: unexpected error`,
 	`Resetting AnonymousAuth to false`,
-	`CrashLoopBackOff`,
 	`Unable to register node.*forbidden`,
 	`Failed to initialize CSINodeInfo.*forbidden`,
 	`Failed to admit pod`,

From 0ccb04a6ead8fc58c0552b95bed7ba67326598ed Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 11:16:57 -0700
Subject: [PATCH 125/668] Skip kubeadm if cluster is running & properly
 configured

---
 pkg/minikube/bootstrapper/bsutil/binaries.go  |   5 +
 pkg/minikube/bootstrapper/bsutil/files.go     |   6 +-
 .../bootstrapper/bsutil/kverify/kverify.go    |  70 +++++++-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  | 163 +++++++++++-------
 4 files changed, 177 insertions(+), 67 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/binaries.go b/pkg/minikube/bootstrapper/bsutil/binaries.go
index 32b9a166a2..0ffcaa05ad 100644
--- a/pkg/minikube/bootstrapper/bsutil/binaries.go
+++ b/pkg/minikube/bootstrapper/bsutil/binaries.go
@@ -50,6 +50,11 @@ func TransferBinaries(cfg config.KubernetesConfig, c command.Runner) error {
 		return err
 	}
 
+	// stop kubelet to avoid "Text File Busy" error
+	if _, err := c.RunCmd(exec.Command("/bin/bash", "-c", "pgrep kubelet && sudo systemctl stop kubelet")); err != nil {
+		glog.Warningf("unable to stop kubelet: %s", err)
+	}
+
 	var g errgroup.Group
 	for _, name := range constants.KubernetesReleaseBinaries {
 		name := name
diff --git a/pkg/minikube/bootstrapper/bsutil/files.go b/pkg/minikube/bootstrapper/bsutil/files.go
index c184eca3c9..cec6d69085 100644
--- a/pkg/minikube/bootstrapper/bsutil/files.go
+++ b/pkg/minikube/bootstrapper/bsutil/files.go
@@ -40,9 +40,9 @@ const (
 // ConfigFileAssets returns configuration file assets
 func ConfigFileAssets(cfg config.KubernetesConfig, kubeadm []byte, kubelet []byte, kubeletSvc []byte, defaultCNIConfig []byte) []assets.CopyableFile {
 	fs := []assets.CopyableFile{
-		assets.NewMemoryAssetTarget(kubeadm, KubeadmYamlPath, "0640"),
-		assets.NewMemoryAssetTarget(kubelet, KubeletSystemdConfFile, "0644"),
-		assets.NewMemoryAssetTarget(kubeletSvc, KubeletServiceFile, "0644"),
+		assets.NewMemoryAssetTarget(kubeadm, KubeadmYamlPath+".new", "0640"),
+		assets.NewMemoryAssetTarget(kubelet, KubeletSystemdConfFile+".new", "0644"),
+		assets.NewMemoryAssetTarget(kubeletSvc, KubeletServiceFile+".new", "0644"),
 	}
 	// Copy the default CNI config (k8s.conf), so that kubelet can successfully
 	// start a Pod in the case a user hasn't manually installed any CNI plugin
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index e420307c65..75992ffd57 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -30,6 +30,7 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -77,6 +78,68 @@ func apiServerPID(cr command.Runner) (int, error) {
 	return strconv.Atoi(s)
 }
 
+// ExpectedComponentsRunning returns whether or not all expected components are running
+func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
+	expected := []string{
+		"kube-dns", // coredns
+		"etcd",
+		"kube-apiserver",
+		"kube-controller-manager",
+		"kube-proxy",
+		"kube-scheduler",
+	}
+
+	found := map[string]bool{}
+
+	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
+	if err != nil {
+		return err
+	}
+
+	for _, pod := range pods.Items {
+		glog.Infof("found pod: %s", podStatusMsg(pod))
+		if pod.Status.Phase != core.PodRunning {
+			continue
+		}
+		for k, v := range pod.ObjectMeta.Labels {
+			if k == "component" || k == "k8s-app" {
+				found[v] = true
+			}
+		}
+	}
+
+	missing := []string{}
+	for _, e := range expected {
+		if !found[e] {
+			missing = append(missing, e)
+		}
+	}
+	if len(missing) > 0 {
+		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
+	}
+	return nil
+}
+
+// podStatusMsg returns a human-readable pod status, for generating debug status
+func podStatusMsg(pod core.Pod) string {
+	var sb strings.Builder
+	sb.WriteString(fmt.Sprintf("%q [%s] %s", pod.ObjectMeta.GetName(), pod.ObjectMeta.GetUID(), pod.Status.Phase))
+	for i, c := range pod.Status.Conditions {
+		if c.Reason != "" {
+			if i == 0 {
+				sb.WriteString(": ")
+			} else {
+				sb.WriteString(" / ")
+			}
+			sb.WriteString(fmt.Sprintf("%s:%s", c.Type, c.Reason))
+		}
+		if c.Message != "" {
+			sb.WriteString(fmt.Sprintf(" (%s)", c.Message))
+		}
+	}
+	return sb.String()
+}
+
 // WaitForSystemPods verifies essential pods for running kurnetes is running
 func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
 	glog.Info("waiting for kube-system pods to appear ...")
@@ -99,6 +162,10 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr comm
 			return false, nil
 		}
 		glog.Infof("%d kube-system pods found", len(pods.Items))
+		for _, pod := range pods.Items {
+			glog.Infof(podStatusMsg(pod))
+		}
+
 		if len(pods.Items) < 2 {
 			return false, nil
 		}
@@ -160,7 +227,7 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 
 	pid, err := apiServerPID(cr)
 	if err != nil {
-		glog.Warningf("unable to get apiserver pid: %v", err)
+		glog.Warningf("stopped: unable to get apiserver pid: %v", err)
 		return state.Stopped, nil
 	}
 
@@ -206,6 +273,7 @@ func apiServerHealthz(ip net.IP, port int) (state.State, error) {
 	resp, err := client.Get(url)
 	// Connection refused, usually.
 	if err != nil {
+		glog.Infof("stopped: %s: %v", url, err)
 		return state.Stopped, nil
 	}
 	if resp.StatusCode == http.StatusUnauthorized {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 39618cf8a2..a1deb57745 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -202,7 +202,8 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
+	conf := bsutil.KubeadmYamlPath
+	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mv %s.new %s && %s init --config %s %s --ignore-preflight-errors=%s", conf, conf, bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), conf, extraFlags, strings.Join(ignore, ",")))
 	rr, err := k.c.RunCmd(c)
 	if err != nil {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
@@ -229,6 +230,20 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	return nil
 }
 
+func (k *Bootstrapper) controlPlaneEndpoint(cfg config.ClusterConfig) (string, int, error) {
+	cp, err := config.PrimaryControlPlane(&cfg)
+	if err != nil {
+		return "", 0, err
+	}
+
+	if driver.IsKIC(cfg.Driver) {
+		ip := oci.DefaultBindIPV4
+		port, err := oci.ForwardedPort(cfg.Driver, cfg.Name, cp.Port)
+		return ip, port, err
+	}
+	return cp.IP, cp.Port, nil
+}
+
 // client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver
 func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) {
 	if k.k8sClient != nil {
@@ -256,10 +271,7 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Duration) error {
 	start := time.Now()
 	out.T(out.Waiting, "Waiting for cluster to come online ...")
-	cp, err := config.PrimaryControlPlane(&cfg)
-	if err != nil {
-		return err
-	}
+
 	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
 		return err
@@ -269,14 +281,9 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		return err
 	}
 
-	ip := cp.IP
-	port := cp.Port
-	if driver.IsKIC(cfg.Driver) {
-		ip = oci.DefaultBindIPV4
-		port, err = oci.ForwardedPort(cfg.Driver, cfg.Name, port)
-		if err != nil {
-			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
-		}
+	ip, port, err := k.controlPlaneEndpoint(cfg)
+	if err != nil {
+		return err
 	}
 
 	if err := kverify.WaitForHealthyAPIServer(cr, k, k.c, start, ip, port, timeout); err != nil {
@@ -294,6 +301,31 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 	return nil
 }
 
+// needsReset returns whether or not the cluster needs to be reconfigured
+func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kubernetes.Clientset) bool {
+	if _, err := k.c.RunCmd(exec.Command("sudo", "diff", "-u", conf, conf+".new")); err != nil {
+		glog.Infof("needs reset: configs differ")
+		return true
+	}
+
+	st, err := kverify.APIServerStatus(k.c, net.ParseIP(ip), port)
+	if err != nil {
+		glog.Infof("needs reset: apiserver error: %v", err)
+		return true
+	}
+
+	if st != state.Running {
+		glog.Infof("needs reset: apiserver in state %s", st)
+		return true
+	}
+
+	if err := kverify.ExpectedComponentsRunning(client); err != nil {
+		glog.Infof("needs reset: %v", err)
+		return true
+	}
+	return false
+}
+
 // restartCluster restarts the Kubernetes cluster configured by kubeadm
 func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	glog.Infof("restartCluster start")
@@ -319,14 +351,36 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		glog.Errorf("failed to create compat symlinks: %v", err)
 	}
 
-	baseCmd := fmt.Sprintf("%s %s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), phase)
-	cmds := []string{
-		fmt.Sprintf("%s phase certs all --config %s", baseCmd, bsutil.KubeadmYamlPath),
-		fmt.Sprintf("%s phase kubeconfig all --config %s", baseCmd, bsutil.KubeadmYamlPath),
-		fmt.Sprintf("%s phase %s all --config %s", baseCmd, controlPlane, bsutil.KubeadmYamlPath),
-		fmt.Sprintf("%s phase etcd local --config %s", baseCmd, bsutil.KubeadmYamlPath),
+	ip, port, err := k.controlPlaneEndpoint(cfg)
+	if err != nil {
+		return errors.Wrap(err, "control plane")
 	}
 
+	client, err := k.client(ip, port)
+	if err != nil {
+		return errors.Wrap(err, "getting k8s client")
+	}
+
+	// If the cluster is running, check if we have any work to do.
+	conf := bsutil.KubeadmYamlPath
+	if !k.needsReset(conf, ip, port, client) {
+		glog.Infof("Taking a shortcut, as the cluster seems to be properly configured")
+		return nil
+	}
+
+	if _, err := k.c.RunCmd(exec.Command("sudo", "mv", conf+".new", conf)); err != nil {
+		return errors.Wrap(err, "mv")
+	}
+
+	baseCmd := fmt.Sprintf("%s %s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), phase)
+	cmds := []string{
+		fmt.Sprintf("%s phase certs all --config %s", baseCmd, conf),
+		fmt.Sprintf("%s phase kubeconfig all --config %s", baseCmd, conf),
+		fmt.Sprintf("%s phase %s all --config %s", baseCmd, controlPlane, conf),
+		fmt.Sprintf("%s phase etcd local --config %s", baseCmd, conf),
+	}
+
+	glog.Infof("resetting cluster from %s", conf)
 	// Run commands one at a time so that it is easier to root cause failures.
 	for _, c := range cmds {
 		rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", c))
@@ -337,7 +391,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 
 	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
-		return err
+		return errors.Wrap(err, "runtime")
 	}
 
 	// We must ensure that the apiserver is healthy before proceeding
@@ -345,34 +399,19 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
-	for _, n := range cfg.Nodes {
-		ip := n.IP
-		port := n.Port
-		if driver.IsKIC(cfg.Driver) {
-			ip = oci.DefaultBindIPV4
-			port, err = oci.ForwardedPort(cfg.Driver, cfg.Name, port)
-			if err != nil {
-				return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
-			}
-		}
-		client, err := k.client(ip, port)
-		if err != nil {
-			return errors.Wrap(err, "getting k8s client")
-		}
-
-		if err := kverify.WaitForSystemPods(cr, k, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
-			return errors.Wrap(err, "system pods")
-		}
-
-		// Explicitly re-enable kubeadm addons (proxy, coredns) so that they will check for IP or configuration changes.
-		if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, bsutil.KubeadmYamlPath))); err != nil {
-			return errors.Wrapf(err, fmt.Sprintf("addon phase cmd:%q", rr.Command()))
-		}
-
-		if err := bsutil.AdjustResourceLimits(k.c); err != nil {
-			glog.Warningf("unable to adjust resource limits: %v", err)
-		}
+	if err := kverify.WaitForSystemPods(cr, k, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+		return errors.Wrap(err, "system pods")
 	}
+
+	if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, bsutil.KubeadmYamlPath))); err != nil {
+		return errors.Wrapf(err, fmt.Sprintf("addon phase cmd:%q", rr.Command()))
+	}
+
+	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
+		glog.Warningf("unable to adjust resource limits: %v", err)
+	}
+
+	glog.Infof("hope that was not too painful")
 	return nil
 }
 
@@ -437,11 +476,6 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 
 	glog.Infof("kubelet %s config:\n%+v", kubeletCfg, cfg.KubernetesConfig)
 
-	// stop kubelet to avoid "Text File Busy" error
-	if err := stopKubelet(k.c); err != nil {
-		glog.Warningf("unable to stop kubelet: %s", err)
-	}
-
 	if err := bsutil.TransferBinaries(cfg.KubernetesConfig, k.c); err != nil {
 		return errors.Wrap(err, "downloading binaries")
 	}
@@ -450,25 +484,19 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 	if cfg.KubernetesConfig.EnableDefaultCNI {
 		cniFile = []byte(defaultCNIConfig)
 	}
+
+	// Install assets into temporary files
 	files := bsutil.ConfigFileAssets(cfg.KubernetesConfig, kubeadmCfg, kubeletCfg, kubeletService, cniFile)
 	if err := copyFiles(k.c, files); err != nil {
 		return err
 	}
 
-	if err := startKubelet(k.c); err != nil {
+	if err := reloadKubelet(k.c); err != nil {
 		return err
 	}
 	return nil
 }
 
-func stopKubelet(runner command.Runner) error {
-	stopCmd := exec.Command("/bin/bash", "-c", "pgrep kubelet && sudo systemctl stop kubelet")
-	if rr, err := runner.RunCmd(stopCmd); err != nil {
-		return errors.Wrapf(err, "command: %q output: %q", rr.Command(), rr.Output())
-	}
-	return nil
-}
-
 func copyFiles(runner command.Runner, files []assets.CopyableFile) error {
 	// Combine mkdir request into a single call to reduce load
 	dirs := []string{}
@@ -488,8 +516,17 @@ func copyFiles(runner command.Runner, files []assets.CopyableFile) error {
 	return nil
 }
 
-func startKubelet(runner command.Runner) error {
-	startCmd := exec.Command("/bin/bash", "-c", "sudo systemctl daemon-reload && sudo systemctl start kubelet")
+func reloadKubelet(runner command.Runner) error {
+	svc := bsutil.KubeletServiceFile
+	conf := bsutil.KubeletSystemdConfFile
+
+	checkCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("pgrep kubelet && diff -u %s %s.new && diff -u %s %s.new", svc, svc, conf, conf))
+	if _, err := runner.RunCmd(checkCmd); err == nil {
+		glog.Infof("kubelet is already running with the right configs")
+		return nil
+	}
+
+	startCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mv %s.new %s && sudo mv %s.new %s && sudo systemctl daemon-reload && sudo systemctl restart kubelet", svc, svc, conf, conf))
 	if _, err := runner.RunCmd(startCmd); err != nil {
 		return errors.Wrap(err, "starting kubelet")
 	}

From bb387039d17594830387be1e3acc34cd7e804f0c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 20 Mar 2020 11:29:36 -0700
Subject: [PATCH 126/668] move panic out of library

---
 cmd/minikube/cmd/start.go     | 10 ++++++++--
 pkg/minikube/driver/driver.go |  6 ------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index c9018c09d6..2508cc9511 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -465,13 +465,19 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 			out.T(out.Warning, warning, out.V{"driver": d, "vmd": vmd})
 		}
 		ds := driver.Status(d)
+		if ds.Name == "" {
+			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
+		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
 		return ds
 	}
 
 	// Fallback to old driver parameter
-	if viper.GetString("vm-driver") != "" {
+	if d := viper.GetString("vm-driver"); d != "" {
 		ds := driver.Status(viper.GetString("vm-driver"))
+		if ds.Name == "" {
+			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
+		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
 		return ds
 	}
@@ -551,7 +557,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 	name := ds.Name
 	glog.Infof("validating driver %q against %+v", name, existing)
 	if !driver.Supported(name) {
-		exit.WithCodeT(exit.Unavailable, "The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}", out.V{"driver": name, "os": runtime.GOOS})
+		exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": name, "os": runtime.GOOS})
 	}
 
 	st := ds.State
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 1e73df9edf..2dce6350cd 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -19,15 +19,12 @@ package driver
 import (
 	"fmt"
 	"os"
-	"runtime"
 	"sort"
 	"strings"
 
 	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/registry"
 )
 
@@ -217,9 +214,6 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 // Status returns the status of a driver
 func Status(name string) registry.DriverState {
 	d := registry.Driver(name)
-	if d.Empty() {
-		exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": name, "os": runtime.GOOS})
-	}
 	return registry.DriverState{
 		Name:     d.Name,
 		Priority: d.Priority,

From 9d0226e3586956335aa72113bdf5430556d11193 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 11:31:21 -0700
Subject: [PATCH 127/668] remove silly message

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index a1deb57745..45c6e65010 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -411,7 +411,6 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		glog.Warningf("unable to adjust resource limits: %v", err)
 	}
 
-	glog.Infof("hope that was not too painful")
 	return nil
 }
 

From ec57b5e606309f8bf12810d460a29ccb3c91e363 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 20 Mar 2020 11:30:21 -0700
Subject: [PATCH 128/668] If container isn't found, interpret as "nothing to
 do"  and return normally

---
 cmd/minikube/cmd/delete.go     | 4 +---
 pkg/minikube/machine/delete.go | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 89f1eed4e6..253f48128a 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -239,9 +239,7 @@ func deleteProfile(profile *config.Profile) error {
 		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	if driver.IsVM(cc.Driver) {
-		deleteHosts(api, cc)
-	}
+	deleteHosts(api, cc)
 
 	// In case DeleteHost didn't complete the job.
 	deleteProfileDirectory(profile.Name)
diff --git a/pkg/minikube/machine/delete.go b/pkg/minikube/machine/delete.go
index 518f7b3fc6..888f8f158e 100644
--- a/pkg/minikube/machine/delete.go
+++ b/pkg/minikube/machine/delete.go
@@ -66,8 +66,9 @@ func DeleteHost(api libmachine.API, machineName string) error {
 	// Get the status of the host. Ensure that it exists before proceeding ahead.
 	status, err := Status(api, machineName)
 	if err != nil {
-		// Warn, but proceed
-		out.WarningT(`Unable to get host status for "{{.name}}": {{.error}}`, out.V{"name": machineName, "error": err})
+		// Assume that the host has already been deleted, log and return
+		glog.Infof("Unable to get host status for %s, assuming it has already been deleted: %v", machineName, err)
+		return nil
 	}
 
 	if status == state.None.String() {

From 2822ee596e7b6ec63cdcf15cbf21d7a998f1c29e Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 20 Mar 2020 11:35:19 -0700
Subject: [PATCH 129/668] update urls

---
 site/content/en/docs/Contributing/triage.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index 5fb1e24ab7..318312107b 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -25,7 +25,7 @@ Daily triage has two goals:
 1. Responsiveness for new issues
 1. Responsiveness when explicitly requested information was provided
 
-The list of outstanding items are at https://teaparty-tts3vkcpgq-uc.a.run.app/s/daily-triage - it covers:
+The list of outstanding items are at http://tinyurl.com/mk-tparty/daily-triage - it covers:
 
 1. Issues without a `kind/` or `triage/` label
 1. Issues without a `priority/` label
@@ -119,7 +119,7 @@ Weekly triage has three goals:
 1. Reviewing and closing PR’s
 1. Closing stale issues
 
-The list of outstanding items can be found at https://teaparty-tts3vkcpgq-uc.a.run.app/s/weekly-triage.
+The list of outstanding items can be found at http://tinyurl.com/mk-tparty/weekly-triage.
 
 ## Post-Release Triage
 

From c027fc0e6247fd3cc93eb7702d3703b141071632 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 13:35:13 -0700
Subject: [PATCH 130/668] Make certificates per-profile and consistent until IP
 or names change

---
 pkg/minikube/bootstrapper/certs.go           | 221 +++++++++++--------
 pkg/minikube/bootstrapper/certs_test.go      |  17 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |   3 +-
 pkg/minikube/localpath/localpath.go          |   5 +
 pkg/minikube/node/config.go                  |   5 +-
 pkg/provision/buildroot.go                   |   2 +-
 6 files changed, 148 insertions(+), 105 deletions(-)

diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index 652392cb65..675ba79ed2 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -17,6 +17,7 @@ limitations under the License.
 package bootstrapper
 
 import (
+	"crypto/sha1"
 	"encoding/pem"
 	"fmt"
 	"io/ioutil"
@@ -25,9 +26,11 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/golang/glog"
+	"github.com/otiai10/copy"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/clientcmd/api"
@@ -40,63 +43,50 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
-	"k8s.io/minikube/pkg/util/lock"
-
-	"github.com/juju/mutex"
-)
-
-var (
-	certs = []string{
-		"ca.crt", "ca.key", "apiserver.crt", "apiserver.key", "proxy-client-ca.crt",
-		"proxy-client-ca.key", "proxy-client.crt", "proxy-client.key",
-	}
 )
 
 // SetupCerts gets the generated credentials required to talk to the APIServer.
-func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node) error {
-
-	localPath := localpath.MiniPath()
+func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node) ([]assets.CopyableFile, error) {
+	localPath := localpath.Profile(k8s.ClusterName)
 	glog.Infof("Setting up %s for IP: %s\n", localPath, n.IP)
 
-	// WARNING: This function was not designed for multiple profiles, so it is VERY racey:
-	//
-	// It updates a shared certificate file and uploads it to the apiserver before launch.
-	//
-	// If another process updates the shared certificate, it's invalid.
-	// TODO: Instead of racey manipulation of a shared certificate, use per-profile certs
-	spec := lock.PathMutexSpec(filepath.Join(localPath, "certs"))
-	glog.Infof("acquiring lock: %+v", spec)
-	releaser, err := mutex.Acquire(spec)
+	ccs, err := generateSharedCACerts()
 	if err != nil {
-		return errors.Wrapf(err, "unable to acquire lock for %+v", spec)
+		return nil, errors.Wrap(err, "shared CA certs")
 	}
-	defer releaser.Release()
 
-	if err := generateCerts(k8s, n); err != nil {
-		return errors.Wrap(err, "Error generating certs")
+	xfer, err := generateProfileCerts(k8s, n, ccs)
+	if err != nil {
+		return nil, errors.Wrap(err, "profile certs")
 	}
+
+	xfer = append(xfer, ccs.caCert)
+	xfer = append(xfer, ccs.caKey)
+	xfer = append(xfer, ccs.proxyCert)
+	xfer = append(xfer, ccs.proxyKey)
+
 	copyableFiles := []assets.CopyableFile{}
-	for _, cert := range certs {
-		p := filepath.Join(localPath, cert)
+	for _, p := range xfer {
+		cert := filepath.Base(p)
 		perms := "0644"
 		if strings.HasSuffix(cert, ".key") {
 			perms = "0600"
 		}
 		certFile, err := assets.NewFileAsset(p, vmpath.GuestKubernetesCertsDir, cert, perms)
 		if err != nil {
-			return err
+			return nil, errors.Wrapf(err, "key asset %s", cert)
 		}
 		copyableFiles = append(copyableFiles, certFile)
 	}
 
 	caCerts, err := collectCACerts()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	for src, dst := range caCerts {
 		certFile, err := assets.NewFileAsset(src, path.Dir(dst), path.Base(dst), "0644")
 		if err != nil {
-			return err
+			return nil, errors.Wrapf(err, "ca asset %s", src)
 		}
 
 		copyableFiles = append(copyableFiles, certFile)
@@ -114,11 +104,11 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 	kubeCfg := api.NewConfig()
 	err = kubeconfig.PopulateFromSettings(kcs, kubeCfg)
 	if err != nil {
-		return errors.Wrap(err, "populating kubeconfig")
+		return nil, errors.Wrap(err, "populating kubeconfig")
 	}
 	data, err := runtime.Encode(latest.Codec, kubeCfg)
 	if err != nil {
-		return errors.Wrap(err, "encoding kubeconfig")
+		return nil, errors.Wrap(err, "encoding kubeconfig")
 	}
 
 	kubeCfgFile := assets.NewMemoryAsset(data, vmpath.GuestPersistentDir, "kubeconfig", "0644")
@@ -126,46 +116,74 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 
 	for _, f := range copyableFiles {
 		if err := cmd.Copy(f); err != nil {
-			return errors.Wrapf(err, "Copy %s", f.GetAssetName())
+			return nil, errors.Wrapf(err, "Copy %s", f.GetAssetName())
 		}
 	}
 
 	if err := installCertSymlinks(cmd, caCerts); err != nil {
-		return errors.Wrapf(err, "certificate symlinks")
+		return nil, errors.Wrapf(err, "certificate symlinks")
 	}
-	return nil
+	return copyableFiles, nil
 }
 
-func generateCerts(k8s config.KubernetesConfig, n config.Node) error {
-	serviceIP, err := util.GetServiceClusterIP(k8s.ServiceCIDR)
-	if err != nil {
-		return errors.Wrap(err, "getting service cluster ip")
+type CACerts struct {
+	caCert    string
+	caKey     string
+	proxyCert string
+	proxyKey  string
+}
+
+// generateSharedCACerts generates CA certs shared among profiles, but only if missing
+func generateSharedCACerts() (CACerts, error) {
+	globalPath := localpath.MiniPath()
+	cc := CACerts{
+		caCert:    filepath.Join(globalPath, "ca.crt"),
+		caKey:     filepath.Join(globalPath, "ca.key"),
+		proxyCert: filepath.Join(globalPath, "proxy-client-ca.crt"),
+		proxyKey:  filepath.Join(globalPath, "proxy-client-ca.key"),
 	}
 
-	localPath := localpath.MiniPath()
-	caCertPath := filepath.Join(localPath, "ca.crt")
-	caKeyPath := filepath.Join(localPath, "ca.key")
-
-	proxyClientCACertPath := filepath.Join(localPath, "proxy-client-ca.crt")
-	proxyClientCAKeyPath := filepath.Join(localPath, "proxy-client-ca.key")
-
 	caCertSpecs := []struct {
 		certPath string
 		keyPath  string
 		subject  string
 	}{
 		{ // client / apiserver CA
-			certPath: caCertPath,
-			keyPath:  caKeyPath,
+			certPath: cc.caCert,
+			keyPath:  cc.caKey,
 			subject:  "minikubeCA",
 		},
 		{ // proxy-client CA
-			certPath: proxyClientCACertPath,
-			keyPath:  proxyClientCAKeyPath,
+			certPath: cc.proxyCert,
+			keyPath:  cc.proxyKey,
 			subject:  "proxyClientCA",
 		},
 	}
 
+	for _, ca := range caCertSpecs {
+		if canRead(ca.certPath) && canRead(ca.keyPath) {
+			glog.Infof("skipping %s CA generation: %s", ca.subject, ca.keyPath)
+			continue
+		}
+
+		glog.Infof("generating %s CA: %s", ca.subject, ca.keyPath)
+		if err := util.GenerateCACert(ca.certPath, ca.keyPath, ca.subject); err != nil {
+			return cc, errors.Wrap(err, "generate ca cert")
+		}
+	}
+
+	return cc, nil
+}
+
+// generateProfileCerts generates profile certs for a profile
+func generateProfileCerts(k8s config.KubernetesConfig, n config.Node, ccs CACerts) ([]string, error) {
+	profilePath := localpath.Profile(k8s.ClusterName)
+
+	serviceIP, err := util.GetServiceClusterIP(k8s.ServiceCIDR)
+	if err != nil {
+		return nil, errors.Wrap(err, "getting service cluster ip")
+	}
+
 	apiServerIPs := append(
 		k8s.APIServerIPs,
 		[]net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(oci.DefaultBindIPV4), net.ParseIP("10.0.0.1")}...)
@@ -174,9 +192,19 @@ func generateCerts(k8s config.KubernetesConfig, n config.Node) error {
 		apiServerNames,
 		util.GetAlternateDNS(k8s.DNSDomain)...)
 
-	signedCertSpecs := []struct {
-		certPath       string
-		keyPath        string
+	// Generate a hash input for certs that depend on ip/name combinations
+	hi := []string{}
+	hi = append(hi, apiServerAlternateNames...)
+	for _, ip := range apiServerIPs {
+		hi = append(hi, ip.String())
+	}
+	sort.Strings(hi)
+
+	specs := []struct {
+		certPath string
+		keyPath  string
+		hash     string
+
 		subject        string
 		ips            []net.IP
 		alternateNames []string
@@ -184,56 +212,77 @@ func generateCerts(k8s config.KubernetesConfig, n config.Node) error {
 		caKeyPath      string
 	}{
 		{ // Client cert
-			certPath:       filepath.Join(localPath, "client.crt"),
-			keyPath:        filepath.Join(localPath, "client.key"),
+			certPath:       filepath.Join(profilePath, "client.crt"),
+			keyPath:        filepath.Join(profilePath, "client.key"),
 			subject:        "minikube-user",
 			ips:            []net.IP{},
 			alternateNames: []string{},
-			caCertPath:     caCertPath,
-			caKeyPath:      caKeyPath,
+			caCertPath:     ccs.caCert,
+			caKeyPath:      ccs.caKey,
 		},
 		{ // apiserver serving cert
-			certPath:       filepath.Join(localPath, "apiserver.crt"),
-			keyPath:        filepath.Join(localPath, "apiserver.key"),
+			hash:           fmt.Sprintf("%x", sha1.Sum([]byte(strings.Join(hi, "/"))))[0:8],
+			certPath:       filepath.Join(profilePath, "apiserver.crt"),
+			keyPath:        filepath.Join(profilePath, "apiserver.key"),
 			subject:        "minikube",
 			ips:            apiServerIPs,
 			alternateNames: apiServerAlternateNames,
-			caCertPath:     caCertPath,
-			caKeyPath:      caKeyPath,
+			caCertPath:     ccs.caCert,
+			caKeyPath:      ccs.caKey,
 		},
 		{ // aggregator proxy-client cert
-			certPath:       filepath.Join(localPath, "proxy-client.crt"),
-			keyPath:        filepath.Join(localPath, "proxy-client.key"),
+			certPath:       filepath.Join(profilePath, "proxy-client.crt"),
+			keyPath:        filepath.Join(profilePath, "proxy-client.key"),
 			subject:        "aggregator",
 			ips:            []net.IP{},
 			alternateNames: []string{},
-			caCertPath:     proxyClientCACertPath,
-			caKeyPath:      proxyClientCAKeyPath,
+			caCertPath:     ccs.proxyCert,
+			caKeyPath:      ccs.proxyKey,
 		},
 	}
 
-	for _, caCertSpec := range caCertSpecs {
-		if !(canReadFile(caCertSpec.certPath) &&
-			canReadFile(caCertSpec.keyPath)) {
-			if err := util.GenerateCACert(
-				caCertSpec.certPath, caCertSpec.keyPath, caCertSpec.subject,
-			); err != nil {
-				return errors.Wrap(err, "Error generating CA certificate")
+	xfer := []string{}
+	for _, spec := range specs {
+		if spec.subject != "minikube-user" {
+			xfer = append(xfer, spec.certPath)
+			xfer = append(xfer, spec.keyPath)
+		}
+
+		cp := spec.certPath
+		kp := spec.keyPath
+		if spec.hash != "" {
+			cp = cp + "." + spec.hash
+			kp = kp + "." + spec.hash
+		}
+
+		if canRead(cp) && canRead(kp) {
+			glog.Infof("skipping %s signed cert generation: %s", spec.subject, kp)
+			continue
+		}
+
+		glog.Infof("generating %s signed cert: %s", spec.subject, kp)
+		err := util.GenerateSignedCert(
+			cp, kp, spec.subject,
+			spec.ips, spec.alternateNames,
+			spec.caCertPath, spec.caKeyPath,
+		)
+		if err != nil {
+			return xfer, errors.Wrapf(err, "generate signed cert for %q", spec.subject)
+		}
+
+		if spec.hash != "" {
+			glog.Infof("copying %s -> %s", cp, spec.certPath)
+			if err := copy.Copy(cp, spec.certPath); err != nil {
+				return xfer, errors.Wrap(err, "copy cert")
+			}
+			glog.Infof("copying %s -> %s", kp, spec.keyPath)
+			if err := copy.Copy(kp, spec.keyPath); err != nil {
+				return xfer, errors.Wrap(err, "copy key")
 			}
 		}
 	}
 
-	for _, signedCertSpec := range signedCertSpecs {
-		if err := util.GenerateSignedCert(
-			signedCertSpec.certPath, signedCertSpec.keyPath, signedCertSpec.subject,
-			signedCertSpec.ips, signedCertSpec.alternateNames,
-			signedCertSpec.caCertPath, signedCertSpec.caKeyPath,
-		); err != nil {
-			return errors.Wrap(err, "Error generating signed apiserver serving cert")
-		}
-	}
-
-	return nil
+	return xfer, nil
 }
 
 // isValidPEMCertificate checks whether the input file is a valid PEM certificate (with at least one CERTIFICATE block)
@@ -355,9 +404,9 @@ func installCertSymlinks(cr command.Runner, caCerts map[string]string) error {
 	return nil
 }
 
-// canReadFile returns true if the file represented
+// canRead returns true if the file represented
 // by path exists and is readable, otherwise false.
-func canReadFile(path string) bool {
+func canRead(path string) bool {
 	f, err := os.Open(path)
 	if err != nil {
 		return false
diff --git a/pkg/minikube/bootstrapper/certs_test.go b/pkg/minikube/bootstrapper/certs_test.go
index d92e174660..fd96b6a838 100644
--- a/pkg/minikube/bootstrapper/certs_test.go
+++ b/pkg/minikube/bootstrapper/certs_test.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/tests"
 	"k8s.io/minikube/pkg/util"
 )
@@ -58,20 +57,8 @@ func TestSetupCerts(t *testing.T) {
 	f := command.NewFakeCommandRunner()
 	f.SetCommandToOutput(expected)
 
-	var filesToBeTransferred []string
-	for _, cert := range certs {
-		filesToBeTransferred = append(filesToBeTransferred, filepath.Join(localpath.MiniPath(), cert))
-	}
-	filesToBeTransferred = append(filesToBeTransferred, filepath.Join(localpath.MiniPath(), "ca.crt"))
-	filesToBeTransferred = append(filesToBeTransferred, filepath.Join(localpath.MiniPath(), "certs", "mycert.pem"))
-
-	if err := SetupCerts(f, k8s, config.Node{}); err != nil {
+	_, err := SetupCerts(f, k8s, config.Node{})
+	if err != nil {
 		t.Fatalf("Error starting cluster: %v", err)
 	}
-	for _, cert := range filesToBeTransferred {
-		_, err := f.GetFileToContents(cert)
-		if err != nil {
-			t.Errorf("Cert not generated: %s", cert)
-		}
-	}
 }
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 39618cf8a2..df5dc17a0e 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -397,7 +397,8 @@ func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
 
 // SetupCerts sets up certificates within the cluster.
 func (k *Bootstrapper) SetupCerts(k8s config.KubernetesConfig, n config.Node) error {
-	return bootstrapper.SetupCerts(k.c, k8s, n)
+	_, err := bootstrapper.SetupCerts(k.c, k8s, n)
+	return err
 }
 
 // UpdateCluster updates the cluster
diff --git a/pkg/minikube/localpath/localpath.go b/pkg/minikube/localpath/localpath.go
index d9faef5d9a..3dd6d4158c 100644
--- a/pkg/minikube/localpath/localpath.go
+++ b/pkg/minikube/localpath/localpath.go
@@ -54,6 +54,11 @@ func MakeMiniPath(fileName ...string) string {
 	return filepath.Join(args...)
 }
 
+// Profile returns the path to a profile
+func Profile(name string) string {
+	return filepath.Join(MiniPath(), "profiles", name)
+}
+
 // MachinePath returns the Minikube machine path of a machine
 func MachinePath(machine string, miniHome ...string) string {
 	miniPath := MiniPath()
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index b29867f1b6..1ee307dcc6 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -122,6 +122,7 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, node config.Nod
 	if err := bs.UpdateCluster(cfg); err != nil {
 		exit.WithError("Failed to update cluster", err)
 	}
+
 	if err := bs.SetupCerts(cfg.KubernetesConfig, node); err != nil {
 		exit.WithError("Failed to setup certs", err)
 	}
@@ -137,8 +138,8 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 	kcs := &kubeconfig.Settings{
 		ClusterName:          clusterName,
 		ClusterServerAddress: addr,
-		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
-		ClientKey:            localpath.MakeMiniPath("client.key"),
+		ClientCertificate:    filepath.Join(localpath.Profile(cc.Name), "client.crt"),
+		ClientKey:            filepath.Join(localpath.Profile(cc.Name), "client.key"),
 		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
 		KeepContext:          viper.GetBool(keepContext),
 		EmbedCerts:           viper.GetBool(embedCerts),
diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 193478f215..15d9d39d74 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -160,7 +160,7 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	if err := p.Service("docker", serviceaction.Restart); err != nil {
+	if err := p.Service("docker", serviceaction.Start); err != nil {
 		return nil, err
 	}
 	return dockerCfg, nil

From 0711bd07bded295c09435baf3bc32b4fef1d2879 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 13:38:42 -0700
Subject: [PATCH 131/668] Revert test change

---
 pkg/provision/buildroot.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 15d9d39d74..193478f215 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -160,7 +160,7 @@ WantedBy=multi-user.target
 		return nil, err
 	}
 
-	if err := p.Service("docker", serviceaction.Start); err != nil {
+	if err := p.Service("docker", serviceaction.Restart); err != nil {
 		return nil, err
 	}
 	return dockerCfg, nil

From 35aec77fe4a595c169a67f78aff76849029c55ec Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 20 Mar 2020 14:07:43 -0700
Subject: [PATCH 132/668] code comments

---
 cmd/minikube/cmd/node_add.go                 | 4 +---
 cmd/minikube/cmd/ssh.go                      | 3 +--
 cmd/minikube/cmd/start.go                    | 4 ++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 5 -----
 pkg/minikube/node/node.go                    | 6 ++++++
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index 1e28103142..d593639b4d 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -17,8 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -48,7 +46,7 @@ var nodeAddCmd = &cobra.Command{
 			out.ErrT(out.FailureType, "none driver does not support multi-node clusters")
 		}
 
-		name := fmt.Sprintf("m%02d", len(cc.Nodes)+1)
+		name := node.Name(len(cc.Nodes) + 1)
 
 		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
 
diff --git a/cmd/minikube/cmd/ssh.go b/cmd/minikube/cmd/ssh.go
index 917733ac81..4a8508ec5d 100644
--- a/cmd/minikube/cmd/ssh.go
+++ b/cmd/minikube/cmd/ssh.go
@@ -60,8 +60,7 @@ var sshCmd = &cobra.Command{
 		} else {
 			n, _, err = node.Retrieve(cc, nodeName)
 			if err != nil {
-				out.FailureT("Node {{.nodeName}} does not exist.", out.V{"nodeName": nodeName})
-				exit.WithError("", err)
+				exit.WithCodeT(exit.Unavailable, "Node {{.nodeName}} does not exist.", out.V{"nodeName": nodeName})
 			}
 		}
 		host, err := machine.LoadHost(api, driver.MachineName(*cc, *n))
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 3a6771976a..75ff638511 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -356,10 +356,10 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 	if numNodes > 1 {
 		if driver.BareMetal(driverName) {
-			out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
+			exit.WithCodeT(exit.Config, "The none driver is not compatible with multi-node clusters.")
 		} else {
 			for i := 1; i < numNodes; i++ {
-				nodeName := fmt.Sprintf("m%02d", i+1)
+				nodeName := node.Name(i + 1)
 				n := config.Node{
 					Name:              nodeName,
 					Worker:            true,
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 37516d0f09..d00f166a54 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -419,13 +419,8 @@ func (k *Bootstrapper) GenerateToken(cc config.ClusterConfig) (string, error) {
 		return "", errors.Wrap(err, "generating bootstrap token")
 	}
 
-	/*cp, err := config.PrimaryControlPlane(&cc)
-	if err != nil {
-		return "", errors.Wrap(err, "getting primary control plane")
-	}*/
 	joinCmd := r.Stdout.String()
 	joinCmd = strings.Replace(joinCmd, "kubeadm", bsutil.InvokeKubeadm(cc.KubernetesConfig.KubernetesVersion), 1)
-	//joinCmd = strings.ReplaceAll(joinCmd, "localhost", cp.IP)
 	joinCmd = fmt.Sprintf("%s --ignore-preflight-errors=all", strings.TrimSpace(joinCmd))
 
 	return joinCmd, nil
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 55b2fdf298..97e9d2f204 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -18,6 +18,7 @@ package node
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -91,3 +92,8 @@ func Save(cfg *config.ClusterConfig, node *config.Node) error {
 	}
 	return config.SaveProfile(viper.GetString(config.ProfileName), cfg)
 }
+
+// Name returns the appropriate name for the node given the current number of nodes
+func Name(index int) string {
+	return fmt.Sprintf("m%02d", index)
+}

From a09aa6253588b1a6c75033aef55a43214090923f Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 20 Mar 2020 14:34:49 -0700
Subject: [PATCH 133/668] delete admin.conf before running kubedm init

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index d00f166a54..7a3ade16c2 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -165,6 +165,13 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		glog.Infof("StartCluster complete in %s", time.Since(start))
 	}()
 
+	// Remove admin.conf from any previous run
+	c := exec.Command("/bin/bash", "-c", "sudo rm -f /etc/kubernetes/admin.conf")
+	_, err = k.c.RunCmd(c)
+	if err != nil {
+		return errors.Wrap(err, "deleting admin.conf")
+	}
+
 	version, err := util.ParseKubernetesVersion(cfg.KubernetesConfig.KubernetesVersion)
 	if err != nil {
 		return errors.Wrap(err, "parsing kubernetes version")
@@ -202,7 +209,7 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
+	c = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
 	rr, err := k.c.RunCmd(c)
 	if err != nil {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())

From 4faa31ebcf7651220e6fe0527c517707e2a836f3 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Fri, 20 Mar 2020 14:56:04 -0700
Subject: [PATCH 134/668] Add logic to get desc node output in bootstrapper
 LogCommands func

---
 cmd/minikube/cmd/logs.go                     |  6 ++---
 pkg/minikube/bootstrapper/bootstrapper.go    |  2 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 12 ++++++---
 pkg/minikube/logs/logs.go                    | 28 ++++++--------------
 pkg/minikube/node/start.go                   |  2 +-
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index cf36b52cb2..66ed68d675 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -95,18 +95,18 @@ var logsCmd = &cobra.Command{
 			exit.WithError("Unable to get runtime", err)
 		}
 		if followLogs {
-			err := logs.Follow(cr, bs, runner)
+			err := logs.Follow(cr, bs, *cfg, runner)
 			if err != nil {
 				exit.WithError("Follow", err)
 			}
 			return
 		}
 		if showProblems {
-			problems := logs.FindProblems(cr, bs, runner)
+			problems := logs.FindProblems(cr, bs, *cfg, runner)
 			logs.OutputProblems(problems, numberOfProblems)
 			return
 		}
-		err = logs.Output(cr, bs, runner, numberOfLines)
+		err = logs.Output(cr, bs, *cfg, runner, numberOfLines)
 		if err != nil {
 			exit.WithError("Error getting machine logs", err)
 		}
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index 712446285d..6c1e48442a 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -40,7 +40,7 @@ type Bootstrapper interface {
 	DeleteCluster(config.KubernetesConfig) error
 	WaitForCluster(config.ClusterConfig, time.Duration) error
 	// LogCommands returns a map of log type to a command which will display that log.
-	LogCommands(LogOptions) map[string]string
+	LogCommands(config.ClusterConfig, LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
 	GetKubeletStatus() (string, error)
 	GetAPIServerStatus(net.IP, int) (string, error)
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 92f896e4ef..f2f4d47c73 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -110,7 +110,7 @@ func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, port int) (string, error) {
 }
 
 // LogCommands returns a map of log type to a command which will display that log.
-func (k *Bootstrapper) LogCommands(o bootstrapper.LogOptions) map[string]string {
+func (k *Bootstrapper) LogCommands(cfg config.ClusterConfig, o bootstrapper.LogOptions) map[string]string {
 	var kubelet strings.Builder
 	kubelet.WriteString("sudo journalctl -u kubelet")
 	if o.Lines > 0 {
@@ -128,9 +128,15 @@ func (k *Bootstrapper) LogCommands(o bootstrapper.LogOptions) map[string]string
 	if o.Lines > 0 {
 		dmesg.WriteString(fmt.Sprintf(" | tail -n %d", o.Lines))
 	}
+
+	describe_nodes := fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
+		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
+		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
+
 	return map[string]string{
-		"kubelet": kubelet.String(),
-		"dmesg":   dmesg.String(),
+		"kubelet":        kubelet.String(),
+		"dmesg":          dmesg.String(),
+		"describe nodes": describe_nodes,
 	}
 }
 
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index a44a9b6073..f284f0e98c 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -23,20 +23,17 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
 	"regexp"
 	"sort"
 	"strings"
 
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/out"
-	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
 // rootCauseRe is a regular expression that matches known failure root causes
@@ -66,9 +63,9 @@ type logRunner interface {
 const lookBackwardsCount = 400
 
 // Follow follows logs from multiple files in tail(1) format
-func Follow(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr logRunner) error {
+func Follow(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr logRunner) error {
 	cs := []string{}
-	for _, v := range logCommands(r, bs, 0, true) {
+	for _, v := range logCommands(r, bs, cfg, 0, true) {
 		cs = append(cs, v+" &")
 	}
 	cs = append(cs, "wait")
@@ -88,9 +85,9 @@ func IsProblem(line string) bool {
 }
 
 // FindProblems finds possible root causes among the logs
-func FindProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr logRunner) map[string][]string {
+func FindProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr logRunner) map[string][]string {
 	pMap := map[string][]string{}
-	cmds := logCommands(r, bs, lookBackwardsCount, false)
+	cmds := logCommands(r, bs, cfg, lookBackwardsCount, false)
 	for name := range cmds {
 		glog.Infof("Gathering logs for %s ...", name)
 		var b bytes.Buffer
@@ -132,8 +129,8 @@ func OutputProblems(problems map[string][]string, maxLines int) {
 }
 
 // Output displays logs from multiple sources in tail(1) format
-func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, runner command.Runner, lines int) error {
-	cmds := logCommands(r, bs, lines, false)
+func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, runner command.Runner, lines int) error {
+	cmds := logCommands(r, bs, cfg, lines, false)
 	cmds["kernel"] = "uptime && uname -a && grep PRETTY /etc/os-release"
 
 	names := []string{}
@@ -170,8 +167,8 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, runner command.Run
 }
 
 // logCommands returns a list of commands that would be run to receive the anticipated logs
-func logCommands(r cruntime.Manager, bs bootstrapper.Bootstrapper, length int, follow bool) map[string]string {
-	cmds := bs.LogCommands(bootstrapper.LogOptions{Lines: length, Follow: follow})
+func logCommands(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, length int, follow bool) map[string]string {
+	cmds := bs.LogCommands(cfg, bootstrapper.LogOptions{Lines: length, Follow: follow})
 	for _, pod := range importantPods {
 		ids, err := r.ListContainers(cruntime.ListOptions{Name: pod})
 		if err != nil {
@@ -191,14 +188,5 @@ func logCommands(r cruntime.Manager, bs bootstrapper.Bootstrapper, length int, f
 	cmds[r.Name()] = r.SystemLogCmd(length)
 	cmds["container status"] = cruntime.ContainerStatusCommand()
 
-	cfg, err := config.Load(viper.GetString(config.ProfileName))
-	if err != nil {
-		out.ErrLn("Error loading profile config: %v", err)
-	}
-
-	cmds["describe nodes"] = fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
-		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
-		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
-
 	return cmds
 }
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index a3c5eee92b..0916134f6d 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -88,7 +88,7 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
 	// pull images or restart cluster
 	out.T(out.Launch, "Launching Kubernetes ... ")
 	if err := bs.StartCluster(mc); err != nil {
-		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mc, mRunner))
 	}
 	configureMounts()
 

From 05814cce2833477531397d57a0a672f9c8e7f8e5 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 20 Mar 2020 15:10:45 -0700
Subject: [PATCH 135/668] only apply kic networking overlay to control plane

---
 pkg/minikube/bootstrapper/bootstrapper.go    |  1 -
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 17 ++++-------------
 pkg/minikube/node/start.go                   |  3 ---
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index 1dac315e80..5627e1b3c3 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -42,7 +42,6 @@ type Bootstrapper interface {
 	WaitForNode(config.ClusterConfig, config.Node, time.Duration) error
 	JoinCluster(config.ClusterConfig, config.Node, string) error
 	UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error
-	SetupNode(config.ClusterConfig) error
 	GenerateToken(config.ClusterConfig) (string, error)
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(LogOptions) map[string]string
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 7a3ade16c2..1c0268d779 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -215,8 +215,10 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
 	}
 
-	if err = k.SetupNode(cfg); err != nil {
-		return errors.Wrap(err, "setting up node")
+	if cfg.Driver == driver.Docker {
+		if err := k.applyKicOverlay(cfg); err != nil {
+			return errors.Wrap(err, "apply kic overlay")
+		}
 	}
 
 	if err := k.applyNodeLabels(cfg); err != nil {
@@ -234,17 +236,6 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	return nil
 }
 
-// SetupNode runs commands that need to be on all nodes
-func (k *Bootstrapper) SetupNode(cfg config.ClusterConfig) error {
-	if cfg.Driver == driver.Docker {
-		if err := k.applyKicOverlay(cfg); err != nil {
-			return errors.Wrap(err, "apply kic overlay")
-		}
-	}
-
-	return nil
-}
-
 // client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver
 func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) {
 	if k.k8sClient != nil {
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 6f9b441366..b46469837e 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -124,9 +124,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 			exit.WithError("setting up certs", err)
 		}
 
-		if err = bs.SetupNode(cc); err != nil {
-			exit.WithError("Failed to setup node", err)
-		}
 	}
 
 	configureMounts()

From c3f1f5e04bc1e7cd3ce45e63538e114f5f1af09f Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Fri, 20 Mar 2020 18:10:06 -0700
Subject: [PATCH 136/668] some more plumbing work to pass cfg in kverify.go

---
 .../bootstrapper/bsutil/kverify/kverify.go      | 17 +++++++++--------
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go    | 14 +++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 0b4c8d887c..47af70f492 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -36,6 +36,7 @@ import (
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/logs"
 )
@@ -44,7 +45,7 @@ import (
 const minLogCheckTime = 30 * time.Second
 
 // WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
-func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, start time.Time, timeout time.Duration) error {
+func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver process to appear ...")
 	err := wait.PollImmediate(time.Millisecond*500, timeout, func() (bool, error) {
 		if time.Since(start) > timeout {
@@ -52,7 +53,7 @@ func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 		}
 
 		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cr)
+			announceProblems(r, bs, cfg, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
 
@@ -79,7 +80,7 @@ func apiServerPID(cr command.Runner) (int, error) {
 }
 
 // WaitForSystemPods verifies essential pods for running kurnetes is running
-func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
+func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
 	glog.Info("waiting for kube-system pods to appear ...")
 	pStart := time.Now()
 
@@ -88,7 +89,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr comm
 			return false, fmt.Errorf("cluster wait timed out during pod check")
 		}
 		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cr)
+			announceProblems(r, bs, cfg, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
 
@@ -112,7 +113,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr comm
 }
 
 // WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
 
@@ -122,7 +123,7 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 		}
 
 		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cr)
+			announceProblems(r, bs, cfg, cr)
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
 
@@ -145,8 +146,8 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 }
 
 // announceProblems checks for problems, and slows polling down if any are found
-func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cr command.Runner) {
-	problems := logs.FindProblems(r, bs, cr)
+func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner) {
+	problems := logs.FindProblems(r, bs, cfg, cr)
 	if len(problems) > 0 {
 		logs.OutputProblems(problems, 5)
 		time.Sleep(kconst.APICallRetryInterval * 15)
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index e669621000..4c6a9f9f9e 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -129,14 +129,14 @@ func (k *Bootstrapper) LogCommands(cfg config.ClusterConfig, o bootstrapper.LogO
 		dmesg.WriteString(fmt.Sprintf(" | tail -n %d", o.Lines))
 	}
 
-	describe_nodes := fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
+	describeNodes := fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
 		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
 
 	return map[string]string{
 		"kubelet":        kubelet.String(),
 		"dmesg":          dmesg.String(),
-		"describe nodes": describe_nodes,
+		"describe nodes": describeNodes,
 	}
 }
 
@@ -271,7 +271,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		return err
 	}
 
-	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, start, timeout); err != nil {
+	if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, start, timeout); err != nil {
 		return err
 	}
 
@@ -285,7 +285,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		}
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, k.c, start, ip, port, timeout); err != nil {
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, start, ip, port, timeout); err != nil {
 		return err
 	}
 
@@ -294,7 +294,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
 		return errors.Wrap(err, "get k8s client")
 	}
 
-	if err := kverify.WaitForSystemPods(cr, k, k.c, c, start, timeout); err != nil {
+	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, c, start, timeout); err != nil {
 		return errors.Wrap(err, "waiting for system pods")
 	}
 	return nil
@@ -347,7 +347,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	}
 
 	// We must ensure that the apiserver is healthy before proceeding
-	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+	if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
@@ -366,7 +366,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 			return errors.Wrap(err, "getting k8s client")
 		}
 
-		if err := kverify.WaitForSystemPods(cr, k, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+		if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 			return errors.Wrap(err, "system pods")
 		}
 

From 90a6eb3da0f27a87cbd7f4fc934f8d380f331d67 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 19:12:30 -0700
Subject: [PATCH 137/668] Recover from ssh restart

---
 pkg/minikube/machine/start.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index a885b0476e..fe94b92432 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -32,6 +32,7 @@ import (
 	"github.com/juju/mutex"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
+	"golang.org/x/crypto/ssh"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -43,6 +44,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/sshutil"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util/lock"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 var (
@@ -191,6 +193,7 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error {
 	}
 
 	glog.Infof("creating required directories: %v", requiredDirectories)
+
 	r, err := commandRunner(h)
 	if err != nil {
 		return errors.Wrap(err, "command runner")
@@ -229,11 +232,19 @@ func commandRunner(h *host.Host) (command.Runner, error) {
 	}
 
 	glog.Infof("Creating SSH client and returning SSHRunner for %q driver", d)
-	client, err := sshutil.NewSSHClient(h.Driver)
-	if err != nil {
-		return nil, errors.Wrap(err, "ssh client")
+
+	// Retry in order to survive an ssh restart, which sometimes happens due to provisioning
+	var sc *ssh.Client
+	getSSH := func() (err error) {
+		sc, err = sshutil.NewSSHClient(h.Driver)
+		return err
 	}
-	return command.NewSSHRunner(client), nil
+
+	if err := retry.Expo(getSSH, 250*time.Millisecond, 2*time.Second); err != nil {
+		return nil, err
+	}
+
+	return command.NewSSHRunner(sc), nil
 }
 
 // acquireMachinesLock protects against code that is not parallel-safe (libmachine, cert setup)

From f90e59756d8d2cd5a64aa38545b838473b1b1551 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 19:12:32 -0700
Subject: [PATCH 138/668] Ensure that provisionDockerMachine is always called:
 for old images, and for corrupted ones

---
 pkg/minikube/machine/fix.go     | 15 ++++++---------
 pkg/minikube/machine/machine.go |  9 +++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 83e57c4174..8bf997b6f6 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"math"
 	"os"
-	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -77,15 +76,13 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, existing config.Cluste
 		return h, err
 	}
 
-	old := engineOptions(existing)
+	// Technically, we should only have to call provision if Docker has changed,
+	// but who can predict what shape the existing VM is in.
 	e := engineOptions(cc)
-	if !reflect.DeepEqual(old, e) {
-		glog.Infof("docker config changed, updating provisioner: %+v", e)
-		h.HostOptions.EngineOptions.Env = e.Env
-		err := provisionDockerMachine(h)
-		if err != nil {
-			return h, errors.Wrap(err, "provision")
-		}
+	h.HostOptions.EngineOptions.Env = e.Env
+	err = provisionDockerMachine(h)
+	if err != nil {
+		return h, errors.Wrap(err, "provision")
 	}
 
 	if driver.IsMock(h.DriverName) {
diff --git a/pkg/minikube/machine/machine.go b/pkg/minikube/machine/machine.go
index a9cba1e413..26470c3e7a 100644
--- a/pkg/minikube/machine/machine.go
+++ b/pkg/minikube/machine/machine.go
@@ -17,8 +17,11 @@ limitations under the License.
 package machine
 
 import (
+	"time"
+
 	"github.com/docker/machine/libmachine/host"
 	libprovision "github.com/docker/machine/libmachine/provision"
+	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/provision"
@@ -80,6 +83,12 @@ func LoadMachine(name string) (*Machine, error) {
 
 // provisionDockerMachine provides fast provisioning of a docker machine
 func provisionDockerMachine(h *host.Host) error {
+	glog.Infof("provisioning docker machine ...")
+	start := time.Now()
+	defer func() {
+		glog.Infof("provisioned docker machine in %s", time.Since(start))
+	}()
+
 	p, err := fastDetectProvisioner(h)
 	if err != nil {
 		return errors.Wrap(err, "fast detect")

From 32d32dcc47e083113f41fc8b5001de6ba39427e7 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 20 Mar 2020 21:20:22 -0700
Subject: [PATCH 139/668] Also clear admin.conf on update

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 1c0268d779..cfa110d46a 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -165,13 +165,6 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		glog.Infof("StartCluster complete in %s", time.Since(start))
 	}()
 
-	// Remove admin.conf from any previous run
-	c := exec.Command("/bin/bash", "-c", "sudo rm -f /etc/kubernetes/admin.conf")
-	_, err = k.c.RunCmd(c)
-	if err != nil {
-		return errors.Wrap(err, "deleting admin.conf")
-	}
-
 	version, err := util.ParseKubernetesVersion(cfg.KubernetesConfig.KubernetesVersion)
 	if err != nil {
 		return errors.Wrap(err, "parsing kubernetes version")
@@ -209,7 +202,13 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	c = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
+	// Remove the previous kubeadm kubeconfig as the IP may have changed
+	_, err = k.c.RunCmd(exec.Command("sudo", "rm", "-f", "/etc/kubernetes/admin.conf"))
+	if err != nil {
+		return errors.Wrap(err, "deleting admin.conf")
+	}
+
+	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), bsutil.KubeadmYamlPath, extraFlags, strings.Join(ignore, ",")))
 	rr, err := k.c.RunCmd(c)
 	if err != nil {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
@@ -328,6 +327,12 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		glog.Errorf("failed to create compat symlinks: %v", err)
 	}
 
+	// Remove the previous kubeadm kubeconfig as the IP may have changed
+	_, err = k.c.RunCmd(exec.Command("sudo", "rm", "-f", "/etc/kubernetes/admin.conf"))
+	if err != nil {
+		return errors.Wrap(err, "deleting admin.conf")
+	}
+
 	baseCmd := fmt.Sprintf("%s %s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), phase)
 	cmds := []string{
 		fmt.Sprintf("%s phase certs all --config %s", baseCmd, bsutil.KubeadmYamlPath),

From beadb8626e0c3c1b118426318190187dc3cdb6f4 Mon Sep 17 00:00:00 2001
From: Tacio Costa <taciomcosta@gmail.com>
Date: Fri, 20 Mar 2020 03:52:00 -0300
Subject: [PATCH 140/668] Fix script to update kubernetes version looking for
 wrong files and regex

---
 hack/kubernetes_version/update_kubernetes_version.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hack/kubernetes_version/update_kubernetes_version.go b/hack/kubernetes_version/update_kubernetes_version.go
index 87466c6249..6bd5325c21 100644
--- a/hack/kubernetes_version/update_kubernetes_version.go
+++ b/hack/kubernetes_version/update_kubernetes_version.go
@@ -52,18 +52,18 @@ func main() {
 	}
 	mode := info.Mode()
 
-	re := regexp.MustCompile(`var DefaultKubernetesVersion = .*`)
-	f := re.ReplaceAllString(string(cf), "var DefaultKubernetesVersion = \""+v+"\"")
+	re := regexp.MustCompile(`DefaultKubernetesVersion = \".*`)
+	f := re.ReplaceAllString(string(cf), "DefaultKubernetesVersion = \""+v+"\"")
 
-	re = regexp.MustCompile(`var NewestKubernetesVersion = .*`)
-	f = re.ReplaceAllString(f, "var NewestKubernetesVersion = \""+v+"\"")
+	re = regexp.MustCompile(`NewestKubernetesVersion = \".*`)
+	f = re.ReplaceAllString(f, "NewestKubernetesVersion = \""+v+"\"")
 
 	if err := ioutil.WriteFile(constantsFile, []byte(f), mode); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
-	testData := "../../pkg/minikube/bootstrapper/kubeadm/testdata"
+	testData := "../../pkg/minikube/bootstrapper/bsutil/testdata"
 
 	err = filepath.Walk(testData, func(path string, info os.FileInfo, err error) error {
 		if err != nil {

From eca69790a5d4c047bd545b5f168c098fb72af8ca Mon Sep 17 00:00:00 2001
From: Iso Kenta <k-iso@colopl.co.jp>
Date: Sat, 21 Mar 2020 18:27:57 +0900
Subject: [PATCH 141/668] =?UTF-8?q?bumpup=20helm-tiller=20v2.16.1=20?=
 =?UTF-8?q?=E2=86=92=20v2.16.3=20and=20add=20integration=20test=20for=20ti?=
 =?UTF-8?q?ller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/addons/helm-tiller/helm-tiller-dp.tmpl |  2 +-
 test/integration/addons_test.go               | 45 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/deploy/addons/helm-tiller/helm-tiller-dp.tmpl b/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
index 49ae46166e..deccc348a3 100644
--- a/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
+++ b/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
@@ -46,7 +46,7 @@ spec:
               value: kube-system
             - name: TILLER_HISTORY_MAX
               value: "0"
-          image: gcr.io/kubernetes-helm/tiller:v2.16.1
+          image: gcr.io/kubernetes-helm/tiller:v2.16.3
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 2120ca4060..313fa01d15 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -40,7 +40,7 @@ func TestAddons(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	args := append([]string{"start", "-p", profile, "--wait=false", "--memory=2600", "--alsologtostderr", "-v=1", "--addons=ingress", "--addons=registry", "--addons=metrics-server"}, StartArgs()...)
+	args := append([]string{"start", "-p", profile, "--wait=false", "--memory=2600", "--alsologtostderr", "-v=1", "--addons=ingress", "--addons=registry", "--addons=metrics-server", "--addons=helm-tiller"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
@@ -55,6 +55,7 @@ func TestAddons(t *testing.T) {
 			{"Registry", validateRegistryAddon},
 			{"Ingress", validateIngressAddon},
 			{"MetricsServer", validateMetricsServerAddon},
+			{"HelmTiller", validateHelmTillerAddon},
 		}
 		for _, tc := range tests {
 			tc := tc
@@ -249,3 +250,45 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
 		t.Errorf("%s failed: %v", rr.Args, err)
 	}
 }
+
+func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string) {
+	client, err := kapi.Client(profile)
+	if err != nil {
+		t.Fatalf("kubernetes client: %v", client)
+	}
+
+	start := time.Now()
+	if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "tiller-deploy", Minutes(6)); err != nil {
+		t.Errorf("waiting for tiller-deploy deployment to stabilize: %v", err)
+	}
+	t.Logf("tiller-deploy stabilized in %s", time.Since(start))
+
+	if _, err := PodWait(ctx, t, profile, "kube-system", "app=helm", Minutes(6)); err != nil {
+		t.Fatalf("wait: %v", err)
+	}
+
+	want := "Server: &version.Version"
+	// Test from inside the cluster (`helm version` use pod.list permission. we use tiller serviceaccount in kube-system to list pod)
+	checkHelmTiller := func() error {
+		rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "helm-test", "--restart=Never", "--image=alpine/helm:2.16.3", "-it", "--namespace=kube-system", "--serviceaccount=tiller", "--", "version"))
+		if err != nil {
+			return err
+		}
+		if rr.Stderr.String() != "" {
+			t.Logf("%v: unexpected stderr: %s", rr.Args, rr.Stderr)
+		}
+		if !strings.Contains(rr.Stdout.String(), want) {
+			return fmt.Errorf("%v stdout = %q, want %q", rr.Args, rr.Stdout, want)
+		}
+		return nil
+	}
+
+	if err := retry.Expo(checkHelmTiller, 500*time.Millisecond, Minutes(2)); err != nil {
+		t.Errorf(err.Error())
+	}
+
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "helm-tiller", "--alsologtostderr", "-v=1"))
+	if err != nil {
+		t.Errorf("%s failed: %v", rr.Args, err)
+	}
+}

From 39fea36ea5958ff1d97dedd8de2ba3c1deeb9263 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sat, 21 Mar 2020 17:51:42 +0800
Subject: [PATCH 142/668] Update Nvidia GPU plugin

---
 ...ce-plugin.yaml.tmpl => nvidia-gpu-device-plugin.yaml} | 9 +++------
 pkg/minikube/assets/addons.go                            | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename deploy/addons/gpu/{nvidia-gpu-device-plugin.yaml.tmpl => nvidia-gpu-device-plugin.yaml} (84%)

diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
similarity index 84%
rename from deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
rename to deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
index 96252d1ba5..d4ee2ead9c 100644
--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
@@ -46,21 +46,18 @@ spec:
         hostPath:
           path: /dev
       containers:
-      - image: "{{default "k8s.gcr.io" .ImageRepository}}/nvidia-gpu-device-plugin@sha256:0842734032018be107fa2490c98156992911e3e1f2a21e059ff0105b07dd8e9e"
-        command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
+      - image: "nvidia/k8s-device-plugin:1.0.0-beta4"
+        command: ["/usr/bin/nvidia-device-plugin", "-logtostderr"]
         name: nvidia-gpu-device-plugin
         resources:
           requests:
             cpu: 50m
             memory: 10Mi
-          limits:
-            cpu: 50m
-            memory: 10Mi
         securityContext:
           privileged: true
         volumeMounts:
         - name: device-plugin
-          mountPath: /device-plugin
+          mountPath: /var/lib/kubelet/device-plugins
         - name: dev
           mountPath: /dev
   updateStrategy:
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 4e20974058..852eb27252 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -296,11 +296,11 @@ var Addons = map[string]*Addon{
 	}, false, "nvidia-driver-installer"),
 	"nvidia-gpu-device-plugin": NewAddon([]*BinAsset{
 		MustBinAsset(
-			"deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl",
+			"deploy/addons/gpu/nvidia-gpu-device-plugin.yaml",
 			vmpath.GuestAddonsDir,
 			"nvidia-gpu-device-plugin.yaml",
 			"0640",
-			true),
+			false),
 	}, false, "nvidia-gpu-device-plugin"),
 	"logviewer": NewAddon([]*BinAsset{
 		MustBinAsset(

From c42ecf95e0c198fdd8de7fa7c95e1d1f448da7d6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 07:53:03 -0700
Subject: [PATCH 143/668] Download dependencies for non-Docker runtimes

---
 test/integration/aaa_download_only_test.go | 227 +++++++++++----------
 1 file changed, 115 insertions(+), 112 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 3eda60e8cf..300c9323c1 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -40,138 +40,141 @@ import (
 )
 
 func TestDownloadOnly(t *testing.T) {
-	profile := UniqueProfileName("download")
-	ctx, cancel := context.WithTimeout(context.Background(), Minutes(15))
-	defer Cleanup(t, profile, cancel)
+	for _, r := range []string{"crio", "docker", "containerd"} {
+		t.Run(r, func(t *testing.T) {
+			// Stores the startup run result for later error messages
+			var rrr *RunResult
+			var err error
 
-	// Stores the startup run result for later error messages
-	var rrr *RunResult
-	var err error
+			profile := UniqueProfileName(r)
+			ctx, cancel := context.WithTimeout(context.Background(), Minutes(30))
+			defer Cleanup(t, profile, cancel)
 
-	t.Run("group", func(t *testing.T) {
-		versions := []string{
-			constants.OldestKubernetesVersion,
-			constants.DefaultKubernetesVersion,
-			constants.NewestKubernetesVersion,
-		}
-		for _, v := range versions {
-			t.Run(v, func(t *testing.T) {
-				// Explicitly does not pass StartArgs() to test driver default
-				// --force to avoid uid check
-				args := append([]string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr", fmt.Sprintf("--kubernetes-version=%s", v)}, StartArgs()...)
+			versions := []string{
+				constants.OldestKubernetesVersion,
+				constants.DefaultKubernetesVersion,
+				constants.NewestKubernetesVersion,
+			}
 
-				// Preserve the initial run-result for debugging
-				if rrr == nil {
-					rrr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
-				} else {
-					_, err = Run(t, exec.CommandContext(ctx, Target(), args...))
-				}
+			for _, v := range versions {
+				t.Run(v, func(t *testing.T) {
+					// Explicitly does not pass StartArgs() to test driver default
+					// --force to avoid uid check
+					args := append([]string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr", fmt.Sprintf("--kubernetes-version=%s", v), fmt.Sprintf("--container-runtime=%s", r)}, StartArgs()...)
 
-				if err != nil {
-					t.Errorf("%s failed: %v", args, err)
-				}
-
-				if download.PreloadExists(v, "docker") {
-					// Just make sure the tarball path exists
-					if _, err := os.Stat(download.TarballPath(v)); err != nil {
-						t.Errorf("preloaded tarball path doesn't exist: %v", err)
+					// Preserve the initial run-result for debugging
+					if rrr == nil {
+						rrr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
+					} else {
+						_, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 					}
-					return
-				}
 
-				imgs, err := images.Kubeadm("", v)
-				if err != nil {
-					t.Errorf("kubeadm images: %v %+v", v, err)
-				}
+					if err != nil {
+						t.Errorf("%s failed: %v", args, err)
+					}
 
-				// skip verify for cache images if --driver=none
-				if !NoneDriver() {
-					for _, img := range imgs {
-						img = strings.Replace(img, ":", "_", 1) // for example kube-scheduler:v1.15.2 --> kube-scheduler_v1.15.2
-						fp := filepath.Join(localpath.MiniPath(), "cache", "images", img)
-						_, err := os.Stat(fp)
-						if err != nil {
-							t.Errorf("expected image file exist at %q but got error: %v", fp, err)
+					if download.PreloadExists(v, "docker") {
+						// Just make sure the tarball path exists
+						if _, err := os.Stat(download.TarballPath(v)); err != nil {
+							t.Errorf("preloaded tarball path doesn't exist: %v", err)
+						}
+						return
+					}
+
+					imgs, err := images.Kubeadm("", v)
+					if err != nil {
+						t.Errorf("kubeadm images: %v %+v", v, err)
+					}
+
+					// skip verify for cache images if --driver=none
+					if !NoneDriver() {
+						for _, img := range imgs {
+							img = strings.Replace(img, ":", "_", 1) // for example kube-scheduler:v1.15.2 --> kube-scheduler_v1.15.2
+							fp := filepath.Join(localpath.MiniPath(), "cache", "images", img)
+							_, err := os.Stat(fp)
+							if err != nil {
+								t.Errorf("expected image file exist at %q but got error: %v", fp, err)
+							}
 						}
 					}
+
+					// checking binaries downloaded (kubelet,kubeadm)
+					for _, bin := range constants.KubernetesReleaseBinaries {
+						fp := filepath.Join(localpath.MiniPath(), "cache", "linux", v, bin)
+						_, err := os.Stat(fp)
+						if err != nil {
+							t.Errorf("expected the file for binary exist at %q but got error %v", fp, err)
+						}
+					}
+
+					// If we are on darwin/windows, check to make sure OS specific kubectl has been downloaded
+					// as well for the `minikube kubectl` command
+					if runtime.GOOS == "linux" {
+						return
+					}
+					binary := "kubectl"
+					if runtime.GOOS == "windows" {
+						binary = "kubectl.exe"
+					}
+					fp := filepath.Join(localpath.MiniPath(), "cache", runtime.GOOS, v, binary)
+					if _, err := os.Stat(fp); err != nil {
+						t.Errorf("expected the file for binary exist at %q but got error %v", fp, err)
+					}
+				})
+			}
+
+			// Check that the profile we've created has the expected driver
+			t.Run("ExpectedDefaultDriver", func(t *testing.T) {
+				if ExpectedDefaultDriver() == "" {
+					t.Skipf("--expected-default-driver is unset, skipping test")
+					return
+				}
+				rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
+				if err != nil {
+					t.Errorf("%s failed: %v", rr.Args, err)
+				}
+				var ps map[string][]config.Profile
+				err = json.Unmarshal(rr.Stdout.Bytes(), &ps)
+				if err != nil {
+					t.Errorf("%s failed: %v", rr.Args, err)
 				}
 
-				// checking binaries downloaded (kubelet,kubeadm)
-				for _, bin := range constants.KubernetesReleaseBinaries {
-					fp := filepath.Join(localpath.MiniPath(), "cache", "linux", v, bin)
-					_, err := os.Stat(fp)
-					if err != nil {
-						t.Errorf("expected the file for binary exist at %q but got error %v", fp, err)
+				got := ""
+				for _, p := range ps["valid"] {
+					if p.Name == profile {
+						got = p.Config.Driver
 					}
 				}
 
-				// If we are on darwin/windows, check to make sure OS specific kubectl has been downloaded
-				// as well for the `minikube kubectl` command
-				if runtime.GOOS == "linux" {
-					return
-				}
-				binary := "kubectl"
-				if runtime.GOOS == "windows" {
-					binary = "kubectl.exe"
-				}
-				fp := filepath.Join(localpath.MiniPath(), "cache", runtime.GOOS, v, binary)
-				if _, err := os.Stat(fp); err != nil {
-					t.Errorf("expected the file for binary exist at %q but got error %v", fp, err)
+				if got != ExpectedDefaultDriver() {
+					t.Errorf("got driver %q, expected %q\nstart output: %s", got, ExpectedDefaultDriver(), rrr.Output())
 				}
 			})
-		}
 
-		// Check that the profile we've created has the expected driver
-		t.Run("ExpectedDefaultDriver", func(t *testing.T) {
-			if ExpectedDefaultDriver() == "" {
-				t.Skipf("--expected-default-driver is unset, skipping test")
-				return
-			}
-			rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
-			if err != nil {
-				t.Errorf("%s failed: %v", rr.Args, err)
-			}
-			var ps map[string][]config.Profile
-			err = json.Unmarshal(rr.Stdout.Bytes(), &ps)
-			if err != nil {
-				t.Errorf("%s failed: %v", rr.Args, err)
-			}
-
-			got := ""
-			for _, p := range ps["valid"] {
-				if p.Name == profile {
-					got = p.Config.Driver
+			// This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete!
+			t.Run("DeleteAll", func(t *testing.T) {
+				if !CanCleanup() {
+					t.Skip("skipping, as cleanup is disabled")
 				}
-			}
-
-			if got != ExpectedDefaultDriver() {
-				t.Errorf("got driver %q, expected %q\nstart output: %s", got, ExpectedDefaultDriver(), rrr.Output())
-			}
+				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all"))
+				if err != nil {
+					t.Errorf("%s failed: %v", rr.Args, err)
+				}
+			})
+			// Delete should always succeed, even if previously partially or fully deleted.
+			t.Run("DeleteAlwaysSucceeds", func(t *testing.T) {
+				if !CanCleanup() {
+					t.Skip("skipping, as cleanup is disabled")
+				}
+				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
+				if err != nil {
+					t.Errorf("%s failed: %v", rr.Args, err)
+				}
+			})
 		})
-
-		// This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete!
-		t.Run("DeleteAll", func(t *testing.T) {
-			if !CanCleanup() {
-				t.Skip("skipping, as cleanup is disabled")
-			}
-			rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all"))
-			if err != nil {
-				t.Errorf("%s failed: %v", rr.Args, err)
-			}
-		})
-		// Delete should always succeed, even if previously partially or fully deleted.
-		t.Run("DeleteAlwaysSucceeds", func(t *testing.T) {
-			if !CanCleanup() {
-				t.Skip("skipping, as cleanup is disabled")
-			}
-			rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
-			if err != nil {
-				t.Errorf("%s failed: %v", rr.Args, err)
-			}
-		})
-	})
-
+	}
 }
+
 func TestDownloadOnlyDocker(t *testing.T) {
 	if !runningDockerDriver(StartArgs()) {
 		t.Skip("this test only runs with the docker driver")

From 66e7acd39a7c36fe295cb1d6ffcca4f5aab18bd8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 08:15:05 -0700
Subject: [PATCH 144/668] Fix merge regression, add localpath functions for
 certs

---
 pkg/minikube/bootstrapper/certs.go  |  6 +++---
 pkg/minikube/localpath/localpath.go | 15 +++++++++++++++
 pkg/minikube/node/start.go          |  6 +++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index e752b732a7..de938082cc 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -139,7 +139,7 @@ type CACerts struct {
 func generateSharedCACerts() (CACerts, error) {
 	globalPath := localpath.MiniPath()
 	cc := CACerts{
-		caCert:    filepath.Join(globalPath, "ca.crt"),
+		caCert:    localpath.CACert(),
 		caKey:     filepath.Join(globalPath, "ca.key"),
 		proxyCert: filepath.Join(globalPath, "proxy-client-ca.crt"),
 		proxyKey:  filepath.Join(globalPath, "proxy-client-ca.key"),
@@ -214,8 +214,8 @@ func generateProfileCerts(k8s config.KubernetesConfig, n config.Node, ccs CACert
 		caKeyPath      string
 	}{
 		{ // Client cert
-			certPath:       filepath.Join(profilePath, "client.crt"),
-			keyPath:        filepath.Join(profilePath, "client.key"),
+			certPath:       localpath.ClientCert(k8s.ClusterName),
+			keyPath:        localpath.ClientKey(k8s.ClusterName),
 			subject:        "minikube-user",
 			ips:            []net.IP{},
 			alternateNames: []string{},
diff --git a/pkg/minikube/localpath/localpath.go b/pkg/minikube/localpath/localpath.go
index 3dd6d4158c..6bc9ef1239 100644
--- a/pkg/minikube/localpath/localpath.go
+++ b/pkg/minikube/localpath/localpath.go
@@ -59,6 +59,21 @@ func Profile(name string) string {
 	return filepath.Join(MiniPath(), "profiles", name)
 }
 
+// ClientCert returns client certificate path, used by kubeconfig
+func ClientCert(name string) string {
+	return filepath.Join(Profile(name), "client.crt")
+}
+
+// ClientKey returns client certificate path, used by kubeconfig
+func ClientKey(name string) string {
+	return filepath.Join(Profile(name), "client.key")
+}
+
+// CACert returns the minikube CA certificate shared between profiles
+func CACert() string {
+	return filepath.Join(MiniPath(), "ca.crt")
+}
+
 // MachinePath returns the Minikube machine path of a machine
 func MachinePath(machine string, miniHome ...string) string {
 	miniPath := MiniPath()
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index b46469837e..d69bad75f7 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -250,9 +250,9 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 	kcs := &kubeconfig.Settings{
 		ClusterName:          clusterName,
 		ClusterServerAddress: addr,
-		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
-		ClientKey:            localpath.MakeMiniPath("client.key"),
-		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
+		ClientCertificate:    localpath.ClientCert(cc.Name),
+		ClientKey:            localpath.ClientKey(cc.Name),
+		CertificateAuthority: localpath.CACert(),
 		KeepContext:          viper.GetBool(keepContext),
 		EmbedCerts:           viper.GetBool(embedCerts),
 	}

From d75dc6a2294853be85cc6e78411704ab4acb9c6b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 10:22:45 -0700
Subject: [PATCH 145/668] Remove broken ExpectedDefaultDriver test, fix call to
 PreloadExists

---
 hack/jenkins/common.sh                        |  1 -
 .../windows_integration_test_hyperv.ps1       |  2 +-
 .../windows_integration_test_virtualbox.ps1   |  2 +-
 test/integration/aaa_download_only_test.go    | 32 +------------------
 test/integration/main.go                      |  1 -
 5 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 404b7aa4f9..8b908d3d73 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -286,7 +286,6 @@ fi
 touch "${TEST_OUT}"
 ${SUDO_PREFIX}${E2E_BIN} \
   -minikube-start-args="--driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \
-  -expected-default-driver="${EXPECTED_DEFAULT_DRIVER}" \
   -test.timeout=70m -test.v \
   ${EXTRA_TEST_ARGS} \
   -binary="${MINIKUBE_BIN}" 2>&1 | tee "${TEST_OUT}"
diff --git a/hack/jenkins/windows_integration_test_hyperv.ps1 b/hack/jenkins/windows_integration_test_hyperv.ps1
index f1c4db8b9d..536c4e35cc 100644
--- a/hack/jenkins/windows_integration_test_hyperv.ps1
+++ b/hack/jenkins/windows_integration_test_hyperv.ps1
@@ -19,7 +19,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
 
 ./out/minikube-windows-amd64.exe delete
 
-out/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args="--driver=hyperv --hyperv-virtual-switch=primary-virtual-switch" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=65m
+out/e2e-windows-amd64.exe -minikube-start-args="--driver=hyperv --hyperv-virtual-switch=primary-virtual-switch" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=65m
 $env:result=$lastexitcode
 # If the last exit code was 0->success, x>0->error
 If($env:result -eq 0){$env:status="success"}
diff --git a/hack/jenkins/windows_integration_test_virtualbox.ps1 b/hack/jenkins/windows_integration_test_virtualbox.ps1
index 6d9c7f318b..2f5957301f 100644
--- a/hack/jenkins/windows_integration_test_virtualbox.ps1
+++ b/hack/jenkins/windows_integration_test_virtualbox.ps1
@@ -19,7 +19,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
 
 ./out/minikube-windows-amd64.exe delete
 
-out/e2e-windows-amd64.exe -minikube-start-args="--driver=virtualbox" -expected-default-driver=hyperv -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
+out/e2e-windows-amd64.exe -minikube-start-args="--driver=virtualbox" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
 $env:result=$lastexitcode
 # If the last exit code was 0->success, x>0->error
 If($env:result -eq 0){$env:status="success"}
diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 300c9323c1..9640212800 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -21,7 +21,6 @@ package integration
 import (
 	"context"
 	"crypto/md5"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -33,7 +32,6 @@ import (
 	"time"
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/localpath"
@@ -73,7 +71,7 @@ func TestDownloadOnly(t *testing.T) {
 						t.Errorf("%s failed: %v", args, err)
 					}
 
-					if download.PreloadExists(v, "docker") {
+					if download.PreloadExists(v, r) {
 						// Just make sure the tarball path exists
 						if _, err := os.Stat(download.TarballPath(v)); err != nil {
 							t.Errorf("preloaded tarball path doesn't exist: %v", err)
@@ -123,34 +121,6 @@ func TestDownloadOnly(t *testing.T) {
 				})
 			}
 
-			// Check that the profile we've created has the expected driver
-			t.Run("ExpectedDefaultDriver", func(t *testing.T) {
-				if ExpectedDefaultDriver() == "" {
-					t.Skipf("--expected-default-driver is unset, skipping test")
-					return
-				}
-				rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
-				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
-				}
-				var ps map[string][]config.Profile
-				err = json.Unmarshal(rr.Stdout.Bytes(), &ps)
-				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
-				}
-
-				got := ""
-				for _, p := range ps["valid"] {
-					if p.Name == profile {
-						got = p.Config.Driver
-					}
-				}
-
-				if got != ExpectedDefaultDriver() {
-					t.Errorf("got driver %q, expected %q\nstart output: %s", got, ExpectedDefaultDriver(), rrr.Output())
-				}
-			})
-
 			// This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete!
 			t.Run("DeleteAll", func(t *testing.T) {
 				if !CanCleanup() {
diff --git a/test/integration/main.go b/test/integration/main.go
index 33c5e09618..54a644518c 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -27,7 +27,6 @@ import (
 
 // General configuration: used to set the VM Driver
 var startArgs = flag.String("minikube-start-args", "", "Arguments to pass to minikube start")
-var defaultDriver = flag.String("expected-default-driver", "", "Expected default driver")
 
 // Flags for faster local integration testing
 var forceProfile = flag.String("profile", "", "force tests to run against a particular profile")

From e6948b90b4aa9a7047cb4be2303d7425c8938c8c Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 10:47:08 -0700
Subject: [PATCH 146/668] Trim crio prefix, dedup results

---
 test/integration/start_stop_delete_test.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index c891309a69..38ca1d9b9a 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -260,12 +260,14 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 	if err != nil {
 		t.Errorf("images unmarshal: %v", err)
 	}
-	gotImages := []string{}
+	found := map[string]bool{}
 	for _, img := range jv["images"] {
 		for _, i := range img.Tags {
+			// Remove container-specific prefixes for naming consistency
+			i = strings.TrimPrefix(i, "docker.io/")
+			i = strings.TrimPrefix(i, "localhost/")
 			if defaultImage(i) {
-				// Remove docker.io for naming consistency between container runtimes
-				gotImages = append(gotImages, strings.TrimPrefix(i, "docker.io/"))
+				found[i] = true
 			} else {
 				t.Logf("Found non-minikube image: %s", i)
 			}
@@ -275,6 +277,10 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 	if err != nil {
 		t.Errorf("kubeadm images: %v", version)
 	}
+	gotImages := []string{}
+	for k := range found {
+		gotImages = append(gotImages, k)
+	}
 	sort.Strings(want)
 	sort.Strings(gotImages)
 	if diff := cmp.Diff(want, gotImages); diff != "" {

From 17e6d84c3f5bf34537fc7153d2e5a0d9a0467a7e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 10:47:58 -0700
Subject: [PATCH 147/668] Remove unused code

---
 test/integration/main.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/integration/main.go b/test/integration/main.go
index 54a644518c..3c159a6e42 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -68,11 +68,6 @@ func HyperVDriver() bool {
 	return strings.Contains(*startArgs, "--driver=hyperv")
 }
 
-// ExpectedDefaultDriver returns the expected default driver, if any
-func ExpectedDefaultDriver() string {
-	return *defaultDriver
-}
-
 // CanCleanup returns if cleanup is allowed
 func CanCleanup() bool {
 	return *cleanup

From 314692a03825f9eb9e49702ff16f22ef3693d596 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 11:09:59 -0700
Subject: [PATCH 148/668] Version bump: v1.9.0-beta.2

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 Makefile     |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 835ccf9552..baebf87467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Release Notes
 
+## Version 1.9.0-beta.2 - 2020-03-21
+
+New features & improvements
+
+* Add experimental multi-node support 🎉 [#6787](https://github.com/kubernetes/minikube/pull/6787)
+* Skip kubeadm if cluster is running & properly configured [#7124](https://github.com/kubernetes/minikube/pull/7124)
+* Make certificates per-profile and consistent until IP or names change [#7125](https://github.com/kubernetes/minikube/pull/7125)
+* bumpup helm-tiller v2.16.1 → v2.16.3 [#7130](https://github.com/kubernetes/minikube/pull/7130)
+* Update Nvidia GPU plugin [#7132](https://github.com/kubernetes/minikube/pull/7132)
+* bumpup istio & istio-provisoner addon 1.4.0 → 1.5.0 [#7120](https://github.com/kubernetes/minikube/pull/7120)
+* New addon: registry-aliases [#6657](https://github.com/kubernetes/minikube/pull/6657)
+* Upgrade buildroot minor version [#7101](https://github.com/kubernetes/minikube/pull/7101)
+
+Bugfixes
+
+* Prevent crash if namespace or service doesn't exist [#5844](https://github.com/kubernetes/minikube/pull/5844)
+* Only run deleteHosts if running a VM [#7110](https://github.com/kubernetes/minikube/pull/7110)
+* provisioner: only reload docker if necessary, don't install curl [#7115](https://github.com/kubernetes/minikube/pull/7115)
+* Improve error when docker-env is used with non-docker runtime [#7112](https://github.com/kubernetes/minikube/pull/7112)
+* Add warning if both vm-driver and driver are specified [#7109](https://github.com/kubernetes/minikube/pull/7109)
+
+Thank you to our contributors:
+
+- Anders F Björklund
+- Iso Kenta
+- Kamesh Sampath
+- Kenta Iso
+- Priya Wadhwa
+- Sharif Elgamal
+- Tacio Costa
+- Thomas Stromberg
+- Thomas Strömberg
+- Zhongcheng Lao
+- rajula96reddy
+- sayboras
+
 ## Version 1.9.0-beta.1 - 2020-03-18
 
 New features
diff --git a/Makefile b/Makefile
index f1256f8eb5..f7b45a07ed 100755
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 9
-VERSION_BUILD ?= 0-beta.1
+VERSION_BUILD ?= 0-beta.2
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 

From ae9fd2a1e6b86926c22223d9773a7145793b35a6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 11:10:48 -0700
Subject: [PATCH 149/668] Remove dupe

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baebf87467..e0c8f2efe0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,6 @@ Thank you to our contributors:
 - Priya Wadhwa
 - Sharif Elgamal
 - Tacio Costa
-- Thomas Stromberg
 - Thomas Strömberg
 - Zhongcheng Lao
 - rajula96reddy

From 151db5ffe63dd84b726a02216704ff1018475031 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sat, 21 Mar 2020 19:27:38 +0800
Subject: [PATCH 150/668] Use hostname as node name for 'none' driver

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go |  2 +-
 pkg/minikube/bootstrapper/bsutil/kubelet.go |  5 +++--
 pkg/minikube/driver/driver.go               | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 8b675ae644..6fc923c855 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -94,7 +94,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:         driver.MachineName(cc, n),
+		NodeName:         driver.KubeNodeName(cc, n),
 		CRISocket:        r.SocketPath(),
 		ImageRepository:  k8s.ImageRepository,
 		ComponentOptions: componentOpts,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index ce161b41da..3f22f8fbc7 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -60,8 +60,9 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	if nc.Name != "" {
-		extraOpts["hostname-override"] = driver.MachineName(mc, nc)
+	nodeName := driver.KubeNodeName(mc, nc)
+	if nodeName != "" {
+		extraOpts["hostname-override"] = nodeName
 	}
 
 	pauseImage := images.Pause(version, k8s.ImageRepository)
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b6106474d8..54f379439b 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -237,6 +237,16 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
+// KubeNodeName returns the node name registered in Kubernetes
+func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
+	if cc.Driver == None {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+	return MachineName(cc, n)
+}
+
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {

From ba6dbc57c233cfcdba5f18f43dc0d813854c7ccf Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Sat, 21 Mar 2020 12:18:50 -0700
Subject: [PATCH 151/668] Update the call to logProblems in node/start.go

---
 pkg/minikube/node/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index b46469837e..21a65d15ab 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -112,7 +112,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		bs = setupKubeAdm(machineAPI, cc, n)
 		err = bs.StartCluster(cc)
 		if err != nil {
-			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
 		}
 	} else {
 		bs, err = cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)

From a59750627e71a8e7190b245ead5599c2bb2ca8aa Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 15:51:31 -0700
Subject: [PATCH 152/668] Improve stale endpoint detection and resolution in
 Kubernetes configs

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go  |  2 -
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 62 ++++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 8b675ae644..67187d6109 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -102,8 +102,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		NoTaintMaster:    false, // That does not work with k8s 1.12+
 		DNSDomain:        k8s.DNSDomain,
 		NodeIP:           n.IP,
-		// NOTE: If set to an specific VM IP, things may break if the IP changes on host restart
-		// For multi-node, we may need to figure out an alternate strategy, like DNS or hosts files
 		ControlPlaneAddress: cp.IP,
 	}
 
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index e859511099..a6c1bbe3dd 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -110,7 +110,7 @@ func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, port int) (string, error) {
 }
 
 // LogCommands returns a map of log type to a command which will display that log.
-func (k *Bootstrapper) LogCommands(o bootstrapper.LogOptions) map[string]string {
+func (k *Bootstrapper) LogCommands(cfg config.ClusterConfig, o bootstrapper.LogOptions) map[string]string {
 	var kubelet strings.Builder
 	kubelet.WriteString("sudo journalctl -u kubelet")
 	if o.Lines > 0 {
@@ -128,9 +128,15 @@ func (k *Bootstrapper) LogCommands(o bootstrapper.LogOptions) map[string]string
 	if o.Lines > 0 {
 		dmesg.WriteString(fmt.Sprintf(" | tail -n %d", o.Lines))
 	}
+
+	describeNodes := fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
+		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
+		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
+
 	return map[string]string{
-		"kubelet": kubelet.String(),
-		"dmesg":   dmesg.String(),
+		"kubelet":        kubelet.String(),
+		"dmesg":          dmesg.String(),
+		"describe nodes": describeNodes,
 	}
 }
 
@@ -151,6 +157,30 @@ func (k *Bootstrapper) createCompatSymlinks() error {
 	return nil
 }
 
+// clearStaleConfigs clears configurations which may have stale IP addresses
+func (k *Bootstrapper) clearStaleConfigs(cfg config.ClusterConfig) error {
+	cp, err := config.PrimaryControlPlane(&cfg)
+	if err != nil {
+		return err
+	}
+
+	paths := []string{
+		"/etc/kubernetes/admin.conf",
+		"/etc/kubernetes/kubelet.conf",
+		"/etc/kubernetes/controller-manager.conf",
+		"/etc/kubernetes/scheduler.conf",
+	}
+
+	endpoint := fmt.Sprintf("https://%s", net.JoinHostPort(cp.IP, strconv.Itoa(cp.Port)))
+	for _, path := range paths {
+		_, err := k.c.RunCmd(exec.Command("sudo", "/bin/bash", "-c", fmt.Sprintf("grep %s %s || sudo rm -f %s", endpoint, path, path)))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // StartCluster starts the cluster
 func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	err := bsutil.ExistingConfig(k.c)
@@ -202,10 +232,8 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 
 	}
 
-	// Remove the previous kubeadm kubeconfig as the IP may have changed
-	_, err = k.c.RunCmd(exec.Command("sudo", "rm", "-f", "/etc/kubernetes/admin.conf"))
-	if err != nil {
-		return errors.Wrap(err, "deleting admin.conf")
+	if err := k.clearStaleConfigs(cfg); err != nil {
+		return errors.Wrap(err, "clearing stale configs")
 	}
 
 	conf := bsutil.KubeadmYamlPath
@@ -287,7 +315,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return err
 	}
 
-	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, start, timeout); err != nil {
+	if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, start, timeout); err != nil {
 		return err
 	}
 
@@ -296,7 +324,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return err
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, k.c, start, ip, port, timeout); err != nil {
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, start, ip, port, timeout); err != nil {
 		return err
 	}
 
@@ -305,7 +333,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return errors.Wrap(err, "get k8s client")
 	}
 
-	if err := kverify.WaitForSystemPods(cr, k, k.c, c, start, timeout); err != nil {
+	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, c, start, timeout); err != nil {
 		return errors.Wrap(err, "waiting for system pods")
 	}
 	return nil
@@ -313,8 +341,8 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 
 // needsReset returns whether or not the cluster needs to be reconfigured
 func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kubernetes.Clientset) bool {
-	if _, err := k.c.RunCmd(exec.Command("sudo", "diff", "-u", conf, conf+".new")); err != nil {
-		glog.Infof("needs reset: configs differ")
+	if rr, err := k.c.RunCmd(exec.Command("sudo", "diff", "-u", conf, conf+".new")); err != nil {
+		glog.Infof("needs reset: configs differ:\n%s", rr.Output())
 		return true
 	}
 
@@ -378,10 +406,8 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return nil
 	}
 
-	// Remove the previous kubeadm kubeconfig as the IP may have changed
-	_, err = k.c.RunCmd(exec.Command("sudo", "rm", "-f", "/etc/kubernetes/admin.conf"))
-	if err != nil {
-		return errors.Wrap(err, "deleting admin.conf")
+	if err := k.clearStaleConfigs(cfg); err != nil {
+		return errors.Wrap(err, "clearing stale configs")
 	}
 
 	if _, err := k.c.RunCmd(exec.Command("sudo", "mv", conf+".new", conf)); err != nil {
@@ -411,11 +437,11 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	}
 
 	// We must ensure that the apiserver is healthy before proceeding
-	if err := kverify.WaitForAPIServerProcess(cr, k, k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+	if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
-	if err := kverify.WaitForSystemPods(cr, k, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
+	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "system pods")
 	}
 

From f76cdea82a94707c1f8cea24f2b2bd6e3b1380fa Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 16:05:00 -0700
Subject: [PATCH 153/668] Run gofmt

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 67187d6109..b2af8d8a90 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -94,14 +94,14 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:         driver.MachineName(cc, n),
-		CRISocket:        r.SocketPath(),
-		ImageRepository:  k8s.ImageRepository,
-		ComponentOptions: componentOpts,
-		FeatureArgs:      kubeadmFeatureArgs,
-		NoTaintMaster:    false, // That does not work with k8s 1.12+
-		DNSDomain:        k8s.DNSDomain,
-		NodeIP:           n.IP,
+		NodeName:            driver.MachineName(cc, n),
+		CRISocket:           r.SocketPath(),
+		ImageRepository:     k8s.ImageRepository,
+		ComponentOptions:    componentOpts,
+		FeatureArgs:         kubeadmFeatureArgs,
+		NoTaintMaster:       false, // That does not work with k8s 1.12+
+		DNSDomain:           k8s.DNSDomain,
+		NodeIP:              n.IP,
 		ControlPlaneAddress: cp.IP,
 	}
 

From 373364d6257c0462675eafb074e10037a54a00fc Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 18:47:26 -0700
Subject: [PATCH 154/668] Update to include last minute changes

---
 CHANGELOG.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0c8f2efe0..fe559157a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,22 +4,22 @@
 
 New features & improvements
 
-* Add experimental multi-node support 🎉 [#6787](https://github.com/kubernetes/minikube/pull/6787)
-* Skip kubeadm if cluster is running & properly configured [#7124](https://github.com/kubernetes/minikube/pull/7124)
-* Make certificates per-profile and consistent until IP or names change [#7125](https://github.com/kubernetes/minikube/pull/7125)
+* 🎉 Experimental multi-node support 🎊 [#6787](https://github.com/kubernetes/minikube/pull/6787)
+* Add kubectl desc nodes to minikube logs [#7105](https://github.com/kubernetes/minikube/pull/7105)
 * bumpup helm-tiller v2.16.1 → v2.16.3 [#7130](https://github.com/kubernetes/minikube/pull/7130)
 * Update Nvidia GPU plugin [#7132](https://github.com/kubernetes/minikube/pull/7132)
 * bumpup istio & istio-provisoner addon 1.4.0 → 1.5.0 [#7120](https://github.com/kubernetes/minikube/pull/7120)
 * New addon: registry-aliases [#6657](https://github.com/kubernetes/minikube/pull/6657)
 * Upgrade buildroot minor version [#7101](https://github.com/kubernetes/minikube/pull/7101)
+* Skip kubeadm if cluster is running & properly configured [#7124](https://github.com/kubernetes/minikube/pull/7124)
+* Make certificates per-profile and consistent until IP or names change [#7125](https://github.com/kubernetes/minikube/pull/7125)
 
 Bugfixes
 
-* Prevent crash if namespace or service doesn't exist [#5844](https://github.com/kubernetes/minikube/pull/5844)
-* Only run deleteHosts if running a VM [#7110](https://github.com/kubernetes/minikube/pull/7110)
-* provisioner: only reload docker if necessary, don't install curl [#7115](https://github.com/kubernetes/minikube/pull/7115)
-* Improve error when docker-env is used with non-docker runtime [#7112](https://github.com/kubernetes/minikube/pull/7112)
+* Prevent minikube from crashing if namespace or service doesn't exist [#5844](https://github.com/kubernetes/minikube/pull/5844)
 * Add warning if both vm-driver and driver are specified [#7109](https://github.com/kubernetes/minikube/pull/7109)
+* Improve error when docker-env is used with non-docker runtime [#7112](https://github.com/kubernetes/minikube/pull/7112)
+* provisioner: only reload docker if necessary, don't install curl [#7115](https://github.com/kubernetes/minikube/pull/7115)
 
 Thank you to our contributors:
 
@@ -27,6 +27,7 @@ Thank you to our contributors:
 - Iso Kenta
 - Kamesh Sampath
 - Kenta Iso
+- Prasad Katti
 - Priya Wadhwa
 - Sharif Elgamal
 - Tacio Costa

From 6ff82c6246d2a7578df1fbe9425869e8fffae002 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sun, 22 Mar 2020 14:31:37 +0800
Subject: [PATCH 155/668] Make node name registered in K8s part of Node type

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go |  3 +--
 pkg/minikube/bootstrapper/bsutil/kubelet.go |  3 +--
 pkg/minikube/config/types.go                | 12 ++++++++++++
 pkg/minikube/driver/driver.go               | 10 ----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index bcc363c9da..55cec06303 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 )
@@ -94,7 +93,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:            driver.KubeNodeName(cc, n),
+		NodeName:            n.InternalName(),
 		CRISocket:           r.SocketPath(),
 		ImageRepository:     k8s.ImageRepository,
 		ComponentOptions:    componentOpts,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 3f22f8fbc7..06e52d0ed2 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -60,7 +59,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := driver.KubeNodeName(mc, nc)
+	nodeName := nc.InternalName()
 	if nodeName != "" {
 		extraOpts["hostname-override"] = nodeName
 	}
diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index 97c2a13039..af1dc66773 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -18,6 +18,7 @@ package config
 
 import (
 	"net"
+	"os"
 
 	"github.com/blang/semver"
 )
@@ -102,6 +103,17 @@ type Node struct {
 	Worker            bool
 }
 
+// returns the name to be registered kubernetes
+func (n Node) InternalName() string {
+	if n.Name == "" {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+
+	return n.Name
+}
+
 // VersionedExtraOption holds information on flags to apply to a specific range
 // of versions
 type VersionedExtraOption struct {
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 54f379439b..b6106474d8 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -237,16 +237,6 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
-// KubeNodeName returns the node name registered in Kubernetes
-func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
-	if cc.Driver == None {
-		// Always use hostname for "none" driver
-		hostname, _ := os.Hostname()
-		return hostname
-	}
-	return MachineName(cc, n)
-}
-
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {

From 15b1647b42c1bcbf8365115bd8b7bfb8f772d7d3 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sun, 22 Mar 2020 15:06:38 +0800
Subject: [PATCH 156/668] Revert "Make node name registered in K8s part of Node
 type"

This reverts commit 6ff82c6246d2a7578df1fbe9425869e8fffae002.
---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go |  3 ++-
 pkg/minikube/bootstrapper/bsutil/kubelet.go |  3 ++-
 pkg/minikube/config/types.go                | 12 ------------
 pkg/minikube/driver/driver.go               | 10 ++++++++++
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index 55cec06303..bcc363c9da 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 )
@@ -93,7 +94,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:            n.InternalName(),
+		NodeName:            driver.KubeNodeName(cc, n),
 		CRISocket:           r.SocketPath(),
 		ImageRepository:     k8s.ImageRepository,
 		ComponentOptions:    componentOpts,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 06e52d0ed2..3f22f8fbc7 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -59,7 +60,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := nc.InternalName()
+	nodeName := driver.KubeNodeName(mc, nc)
 	if nodeName != "" {
 		extraOpts["hostname-override"] = nodeName
 	}
diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index af1dc66773..97c2a13039 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -18,7 +18,6 @@ package config
 
 import (
 	"net"
-	"os"
 
 	"github.com/blang/semver"
 )
@@ -103,17 +102,6 @@ type Node struct {
 	Worker            bool
 }
 
-// returns the name to be registered kubernetes
-func (n Node) InternalName() string {
-	if n.Name == "" {
-		// Always use hostname for "none" driver
-		hostname, _ := os.Hostname()
-		return hostname
-	}
-
-	return n.Name
-}
-
 // VersionedExtraOption holds information on flags to apply to a specific range
 // of versions
 type VersionedExtraOption struct {
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b6106474d8..54f379439b 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -237,6 +237,16 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
+// KubeNodeName returns the node name registered in Kubernetes
+func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
+	if cc.Driver == None {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+	return MachineName(cc, n)
+}
+
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {

From 43b5f7c86d79d33b8530a104079371ebde8324da Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Sun, 22 Mar 2020 15:11:03 +0800
Subject: [PATCH 157/668] Move KubeNodeName out of driver package

---
 pkg/minikube/bootstrapper/bsutil/kubeadm.go |  3 +--
 pkg/minikube/bootstrapper/bsutil/kubelet.go | 13 ++++++++++++-
 pkg/minikube/driver/driver.go               | 10 ----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index bcc363c9da..46104c1d44 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 )
@@ -94,7 +93,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		EtcdDataDir:       EtcdDataDir(),
 		ClusterName:       cc.Name,
 		//kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine
-		NodeName:            driver.KubeNodeName(cc, n),
+		NodeName:            KubeNodeName(cc, n),
 		CRISocket:           r.SocketPath(),
 		ImageRepository:     k8s.ImageRepository,
 		ComponentOptions:    componentOpts,
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 3f22f8fbc7..c2180838a3 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -19,6 +19,7 @@ package bsutil
 
 import (
 	"bytes"
+	"os"
 	"path"
 
 	"github.com/pkg/errors"
@@ -60,7 +61,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := driver.KubeNodeName(mc, nc)
+	nodeName := KubeNodeName(mc, nc)
 	if nodeName != "" {
 		extraOpts["hostname-override"] = nodeName
 	}
@@ -117,3 +118,13 @@ func NewKubeletService(cfg config.KubernetesConfig) ([]byte, error) {
 	}
 	return b.Bytes(), nil
 }
+
+// KubeNodeName returns the node name registered in Kubernetes
+func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
+	if cc.Driver == driver.None {
+		// Always use hostname for "none" driver
+		hostname, _ := os.Hostname()
+		return hostname
+	}
+	return driver.MachineName(cc, n)
+}
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 54f379439b..b6106474d8 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -237,16 +237,6 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
-// KubeNodeName returns the node name registered in Kubernetes
-func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
-	if cc.Driver == None {
-		// Always use hostname for "none" driver
-		hostname, _ := os.Hostname()
-		return hostname
-	}
-	return MachineName(cc, n)
-}
-
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) (string, string) {
 	if strings.Contains(name, "---") {

From 6ee7e6fa6736d0f514da3c00341429a34b27b24f Mon Sep 17 00:00:00 2001
From: vikkyomkar <vikkyomkar@gmail.com>
Date: Sun, 22 Mar 2020 19:25:03 +0530
Subject: [PATCH 158/668] updated as per suggestion

---
 pkg/minikube/driver/driver.go        | 15 ++--------
 pkg/minikube/registry/global.go      | 44 ++++++++++++++++++++++++++--
 pkg/minikube/registry/global_test.go |  2 +-
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b790af5c9b..efbfac95cd 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -165,22 +165,13 @@ func FlagDefaults(name string) FlagHints {
 
 // Choices returns a list of drivers which are possible on this system
 func Choices(vm bool) []registry.DriverState {
-	var drivers []registry.DriverState
-	options := registry.Available()
-	if vm {
-		for _, ds := range options {
-			if IsVM(ds.Name) {
-				drivers = append(drivers, ds)
-			}
-		}
-	} else {
-		drivers = options
-	}
+	options := registry.Available(vm)
+
 	// Descending priority for predictability and appearance
 	sort.Slice(options, func(i, j int) bool {
 		return options[i].Priority > options[j].Priority
 	})
-	return drivers
+	return options
 }
 
 // Suggest returns a suggested driver from a set of options
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
index 301f61cb9f..16ede79a27 100644
--- a/pkg/minikube/registry/global.go
+++ b/pkg/minikube/registry/global.go
@@ -24,6 +24,40 @@ import (
 	"github.com/golang/glog"
 )
 
+const (
+	// Podman is Kubernetes in container using podman driver
+	Podman = "podman"
+	// Docker is Kubernetes in container using docker driver
+	Docker = "docker"
+	// Mock driver
+	Mock = "mock"
+	// None driver
+	None = "none"
+)
+
+// IsKIC checks if the driver is a kubernetes in container
+func IsKIC(name string) bool {
+	return name == Docker || name == Podman
+}
+
+// IsMock checks if the driver is a mock
+func IsMock(name string) bool {
+	return name == Mock
+}
+
+// IsVM checks if the driver is a VM
+func IsVM(name string) bool {
+	if IsKIC(name) || IsMock(name) || BareMetal(name) {
+		return false
+	}
+	return true
+}
+
+// BareMetal returns if this driver is unisolated
+func BareMetal(name string) bool {
+	return name == None || name == Mock
+}
+
 var (
 	// globalRegistry is a globally accessible driver registry
 	globalRegistry = newRegistry()
@@ -59,7 +93,7 @@ func Driver(name string) DriverDef {
 }
 
 // Available returns a list of available drivers in the global registry
-func Available() []DriverState {
+func Available(vm bool) []DriverState {
 	sts := []DriverState{}
 	glog.Infof("Querying for installed drivers using PATH=%s", os.Getenv("PATH"))
 
@@ -76,7 +110,13 @@ func Available() []DriverState {
 			priority = Unhealthy
 		}
 
-		sts = append(sts, DriverState{Name: d.Name, Priority: priority, State: s})
+		if vm {
+			if IsVM(d.Name) {
+				sts = append(sts, DriverState{Name: d.Name, Priority: priority, State: s})
+			}
+		} else {
+			sts = append(sts, DriverState{Name: d.Name, Priority: priority, State: s})
+		}
 	}
 
 	// Descending priority for predictability
diff --git a/pkg/minikube/registry/global_test.go b/pkg/minikube/registry/global_test.go
index dbc76b6d51..9cb01a1e35 100644
--- a/pkg/minikube/registry/global_test.go
+++ b/pkg/minikube/registry/global_test.go
@@ -102,7 +102,7 @@ func TestGlobalAvailable(t *testing.T) {
 		},
 	}
 
-	if diff := cmp.Diff(Available(), expected); diff != "" {
+	if diff := cmp.Diff(Available(false), expected); diff != "" {
 		t.Errorf("available mismatch (-want +got):\n%s", diff)
 	}
 }

From 566196c9d0db8a4524cda9f7e72e77c8e87ff973 Mon Sep 17 00:00:00 2001
From: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
Date: Mon, 23 Mar 2020 00:06:05 +0800
Subject: [PATCH 159/668] Do not run GPU plugin under priviledge mode

---
 deploy/addons/gpu/nvidia-gpu-device-plugin.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
index d4ee2ead9c..e895e5394a 100644
--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
@@ -42,9 +42,6 @@ spec:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
-      - name: dev
-        hostPath:
-          path: /dev
       containers:
       - image: "nvidia/k8s-device-plugin:1.0.0-beta4"
         command: ["/usr/bin/nvidia-device-plugin", "-logtostderr"]
@@ -54,11 +51,11 @@ spec:
             cpu: 50m
             memory: 10Mi
         securityContext:
-          privileged: true
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop: ["ALL"]
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
   updateStrategy:
     type: RollingUpdate

From 2b87e766c6114bb107cee48c0950c87041704b6e Mon Sep 17 00:00:00 2001
From: Tom <tommyp1ckles@users.noreply.github.com>
Date: Sun, 22 Mar 2020 13:00:14 -0700
Subject: [PATCH 160/668] Update nfsexports version

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index a703f57861..be48dd84f6 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 // indirect
-	github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345
+	github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f
 	github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c
 	github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d // indirect
 	github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
diff --git a/go.sum b/go.sum
index 8a4fe67c98..875768f6c7 100644
--- a/go.sum
+++ b/go.sum
@@ -423,6 +423,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345 h1:XP1VL9iOZu4yz/rq8zj+yvB23XEY5erXRzp8JYmkWu0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
+github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
+github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=

From b47cd9c0cb2f098df6c717483b02664aa2f9a59e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Mon, 23 Mar 2020 08:11:45 -0700
Subject: [PATCH 161/668] Consistently detect old driver when existing.Driver
 is unset

---
 cmd/minikube/cmd/start.go | 57 +++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 559407c04f..f758cdbc74 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -466,8 +466,9 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
 
 	// By default, the driver is whatever we used last time
-	if existing != nil && existing.Driver != "" {
-		ds := driver.Status(existing.Driver)
+	if existing != nil {
+		old := hostDriver(existing)
+		ds := driver.Status(old)
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on existing profile`, out.V{"driver": ds.String()})
 		return ds
 	}
@@ -519,46 +520,55 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	return pick
 }
 
+// hostDriver returns the true driver used without relying on config fields
+func hostDriver(existing *config.ClusterConfig) string {
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		glog.Warningf("selectDriver NewAPIClient: %v", err)
+		return existing.Driver
+	}
+
+	cp, err := config.PrimaryControlPlane(existing)
+	if err != nil {
+		glog.Warningf("Unable to get control plane from existing config: %v", err)
+		return existing.Driver
+	}
+	machineName := driver.MachineName(*existing, cp)
+	h, err := api.Load(machineName)
+	if err != nil {
+		glog.Warningf("selectDriver api.Load: %v", err)
+		return existing.Driver
+	}
+
+	return h.Driver.DriverName()
+}
+
 // validateSpecifiedDriver makes sure that if a user has passed in a driver
 // it matches the existing cluster if there is one
 func validateSpecifiedDriver(existing *config.ClusterConfig) {
 	if existing == nil {
 		return
 	}
-	old := existing.Driver
+
 	var requested string
 	if d := viper.GetString("driver"); d != "" {
 		requested = d
 	} else if d := viper.GetString("vm-driver"); d != "" {
 		requested = d
 	}
+
 	// Neither --vm-driver or --driver was specified
 	if requested == "" {
 		return
 	}
-	if old == requested {
-		return
-	}
 
-	api, err := machine.NewAPIClient()
-	if err != nil {
-		glog.Warningf("selectDriver NewAPIClient: %v", err)
-		return
-	}
-
-	cp, err := config.PrimaryControlPlane(existing)
-	if err != nil {
-		exit.WithError("Error getting primary cp", err)
-	}
-	machineName := driver.MachineName(*existing, cp)
-	h, err := api.Load(machineName)
-	if err != nil {
-		glog.Warningf("selectDriver api.Load: %v", err)
+	old := hostDriver(existing)
+	if requested == old {
 		return
 	}
 
 	out.ErrT(out.Conflict, `The existing "{{.profile_name}}" VM was created using the "{{.old_driver}}" driver, and is incompatible with the "{{.driver}}" driver.`,
-		out.V{"profile_name": machineName, "driver": requested, "old_driver": h.Driver.DriverName()})
+		out.V{"profile_name": existing.Name, "driver": requested, "old_driver": old})
 
 	out.ErrT(out.Workaround, `To proceed, either:
 
@@ -567,7 +577,7 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 * or *
 
 2) Start the existing "{{.profile_name}}" cluster using: '{{.command}} start --driver={{.old_driver}}'
-`, out.V{"command": minikubeCmd(), "old_driver": h.Driver.DriverName(), "profile_name": machineName})
+`, out.V{"command": minikubeCmd(), "old_driver": old, "profile_name": existing.Name})
 
 	exit.WithCodeT(exit.Config, "Exiting.")
 }
@@ -582,6 +592,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 
 	st := ds.State
 	glog.Infof("status for %s: %+v", name, st)
+	old := hostDriver(existing)
 
 	if st.Error != nil {
 		out.ErrLn("")
@@ -594,7 +605,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 		out.ErrLn("")
 
 		if !st.Installed && !viper.GetBool(force) {
-			if existing != nil && name == existing.Driver {
+			if existing != nil && name == old {
 				exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}", out.V{"driver": name})
 			}
 			exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed", out.V{"driver": name})

From a55573be125d720b1d5d08a5d812aeafb506b4b9 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Mon, 23 Mar 2020 08:33:49 -0700
Subject: [PATCH 162/668] Fix results when existing is nil

---
 cmd/minikube/cmd/start.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index f758cdbc74..6b39b8955f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -522,6 +522,9 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 
 // hostDriver returns the true driver used without relying on config fields
 func hostDriver(existing *config.ClusterConfig) string {
+	if existing == nil {
+		return ""
+	}
 	api, err := machine.NewAPIClient()
 	if err != nil {
 		glog.Warningf("selectDriver NewAPIClient: %v", err)
@@ -592,7 +595,6 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 
 	st := ds.State
 	glog.Infof("status for %s: %+v", name, st)
-	old := hostDriver(existing)
 
 	if st.Error != nil {
 		out.ErrLn("")
@@ -605,8 +607,10 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 		out.ErrLn("")
 
 		if !st.Installed && !viper.GetBool(force) {
-			if existing != nil && name == old {
-				exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}", out.V{"driver": name})
+			if existing != nil {
+				if old := hostDriver(existing); name == old {
+					exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}", out.V{"driver": name})
+				}
 			}
 			exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed", out.V{"driver": name})
 		}

From 14f8ee3984f292417b6a4681fef7647512c70cd0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Mon, 23 Mar 2020 09:41:00 -0700
Subject: [PATCH 163/668] hyperv Delete: call StopHost before removing VM

---
 cmd/minikube/cmd/delete.go     |  2 +-
 pkg/minikube/machine/delete.go | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 253f48128a..23c3229ac4 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -402,7 +402,7 @@ func deleteProfileDirectory(profile string) {
 		out.T(out.DeletingHost, `Removing {{.directory}} ...`, out.V{"directory": machineDir})
 		err := os.RemoveAll(machineDir)
 		if err != nil {
-			exit.WithError("Unable to remove machine directory: %v", err)
+			exit.WithError("Unable to remove machine directory", err)
 		}
 	}
 }
diff --git a/pkg/minikube/machine/delete.go b/pkg/minikube/machine/delete.go
index 888f8f158e..c51a9d0931 100644
--- a/pkg/minikube/machine/delete.go
+++ b/pkg/minikube/machine/delete.go
@@ -75,18 +75,26 @@ func DeleteHost(api libmachine.API, machineName string) error {
 		return mcnerror.ErrHostDoesNotExist{Name: machineName}
 	}
 
-	// This is slow if SSH is not responding, but HyperV hangs otherwise, See issue #2914
+	// Hyper-V requires special care to avoid ACPI and file locking issues
 	if host.Driver.DriverName() == driver.HyperV {
-		if err := trySSHPowerOff(host); err != nil {
-			glog.Infof("Unable to power off minikube because the host was not found.")
+		if err := StopHost(api, machineName); err != nil {
+			glog.Warningf("stop host: %v", err)
 		}
-		out.T(out.DeletingHost, "Successfully powered off Hyper-V. minikube driver -- {{.driver}}", out.V{"driver": host.Driver.DriverName()})
+		// Hack: give the Hyper-V VM more time to stop before deletion
+		time.Sleep(1 * time.Second)
 	}
 
 	out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": host.DriverName})
 	if err := host.Driver.Remove(); err != nil {
-		return errors.Wrap(err, "host remove")
+		glog.Warningf("remove failed, will retry: %v", err)
+		time.Sleep(2 * time.Second)
+
+		nerr := host.Driver.Remove()
+		if nerr != nil {
+			return errors.Wrap(nerr, "host remove retry")
+		}
 	}
+
 	if err := api.Remove(machineName); err != nil {
 		return errors.Wrap(err, "api remove")
 	}

From cf31a34071e534d9fdfc7d965ed8420edcbc9714 Mon Sep 17 00:00:00 2001
From: priyawadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 11:45:34 -0700
Subject: [PATCH 164/668] Update roadmap.en.md

---
 site/content/en/docs/Contributing/roadmap.en.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/content/en/docs/Contributing/roadmap.en.md b/site/content/en/docs/Contributing/roadmap.en.md
index 37b135a78f..d169145a59 100644
--- a/site/content/en/docs/Contributing/roadmap.en.md
+++ b/site/content/en/docs/Contributing/roadmap.en.md
@@ -14,9 +14,9 @@ Please send a PR to suggest any improvements to it.
 
 ## (#1) Inclusive and community-driven
 
-- [ ] Maintainers from 4 countries, 4 companies
+- [x] Maintainers from 4 countries, 4 companies
 - [ ] Installation documentation in 5+ written languages
-- [ ] Enhancements approved by a community-driven process
+- [x] Enhancements approved by a community-driven process
 
 ## (#2) User-friendly
 
@@ -33,7 +33,7 @@ Please send a PR to suggest any improvements to it.
 
 ## (#4) Cross-platform
 
-- [ ] VM-free deployment to containers (Docker, Podman)
+- [x] VM-free deployment to containers (Docker, Podman)
 - [ ] Windows as a first-class citizen
 - [ ] WSL2 support (no additional VM required)
 - [ ] Firecracker VM support
@@ -49,7 +49,7 @@ Please send a PR to suggest any improvements to it.
 
 - [ ] Startup latency under 30s
 - [ ] Kernel-assisted mounts (CIFS, NFS) by default
-- [ ] Suspend and Resume
+- [x] Pause support
 - [ ] <25% CPU overhead on a single core
 
 ## (#7) Developer Focused

From bfe8aee3b57ad4c07660cfb63ce83ccf9c7e6d9b Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 12:29:49 -0700
Subject: [PATCH 165/668] Pass in container runtime to preload tarball name

This way we don't have to individually check if we support a container runtime
---
 hack/preload-images/preload_images.go |  2 +-
 pkg/drivers/kic/kic.go                |  2 +-
 pkg/minikube/cruntime/docker.go       |  3 +-
 pkg/minikube/download/preload.go      | 47 +++++++++++++--------------
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 60b6bc9e2a..7427d867e8 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -61,7 +61,7 @@ func main() {
 
 	for _, kv := range k8sVersions {
 		for _, cr := range containerRuntimes {
-			tf := download.TarballName(kv)
+			tf := download.TarballName(kv, cr)
 			if tarballExists(tf) {
 				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kv)
 				continue
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 2620d981ff..d75f7ba01e 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -126,7 +126,7 @@ func (d *Driver) Create() error {
 	t := time.Now()
 	glog.Infof("Starting extracting preloaded images to volume")
 	// Extract preloaded images to container
-	if err := oci.ExtractTarballToVolume(download.TarballPath(d.NodeConfig.KubernetesVersion), params.Name, BaseImage); err != nil {
+	if err := oci.ExtractTarballToVolume(download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil {
 		glog.Infof("Unable to extract preloaded tarball to volume: %v", err)
 	} else {
 		glog.Infof("Took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 8641092573..0812eece0e 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -291,6 +291,7 @@ func (r *Docker) SystemLogCmd(len int) string {
 // 3. Remove the tarball within the VM
 func (r *Docker) Preload(cfg config.KubernetesConfig) error {
 	k8sVersion := cfg.KubernetesVersion
+	cRuntime := cfg.ContainerRuntime
 
 	// If images already exist, return
 	images, err := images.Kubeadm(cfg.ImageRepository, k8sVersion)
@@ -307,7 +308,7 @@ func (r *Docker) Preload(cfg config.KubernetesConfig) error {
 		glog.Infof("error saving reference store: %v", err)
 	}
 
-	tarballPath := download.TarballPath(k8sVersion)
+	tarballPath := download.TarballPath(k8sVersion, cRuntime)
 	targetDir := "/"
 	targetName := "preloaded.tar.lz4"
 	dest := path.Join(targetDir, targetName)
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 2008d4eddc..0fe1ea7778 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -46,13 +46,13 @@ const (
 )
 
 // TarballName returns name of the tarball
-func TarballName(k8sVersion string) string {
-	return fmt.Sprintf("preloaded-images-k8s-%s-%s-docker-overlay2-%s.tar.lz4", PreloadVersion, k8sVersion, runtime.GOOS)
+func TarballName(k8sVersion, containerRuntime string) string {
+	return fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-overlay2-%s.tar.lz4", PreloadVersion, k8sVersion, containerRuntime, runtime.GOOS)
 }
 
 // returns the name of the checksum file
-func checksumName(k8sVersion string) string {
-	return fmt.Sprintf("%s.checksum", TarballName(k8sVersion))
+func checksumName(k8sVersion, containerRuntime string) string {
+	return fmt.Sprintf("%s.checksum", TarballName(k8sVersion, containerRuntime))
 }
 
 // returns target dir for all cached items related to preloading
@@ -61,18 +61,18 @@ func targetDir() string {
 }
 
 // PreloadChecksumPath returns path to checksum file
-func PreloadChecksumPath(k8sVersion string) string {
-	return path.Join(targetDir(), checksumName(k8sVersion))
+func PreloadChecksumPath(k8sVersion, containerRuntime string) string {
+	return path.Join(targetDir(), checksumName(k8sVersion, containerRuntime))
 }
 
 // TarballPath returns the path to the preloaded tarball
-func TarballPath(k8sVersion string) string {
-	return path.Join(targetDir(), TarballName(k8sVersion))
+func TarballPath(k8sVersion, containerRuntime string) string {
+	return path.Join(targetDir(), TarballName(k8sVersion, containerRuntime))
 }
 
 // remoteTarballURL returns the URL for the remote tarball in GCS
-func remoteTarballURL(k8sVersion string) string {
-	return fmt.Sprintf("https://storage.googleapis.com/%s/%s", PreloadBucket, TarballName(k8sVersion))
+func remoteTarballURL(k8sVersion, containerRuntime string) string {
+	return fmt.Sprintf("https://storage.googleapis.com/%s/%s", PreloadBucket, TarballName(k8sVersion, containerRuntime))
 }
 
 // PreloadExists returns true if there is a preloaded tarball that can be used
@@ -82,13 +82,13 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 	}
 
 	// Omit remote check if tarball exists locally
-	targetPath := TarballPath(k8sVersion)
+	targetPath := TarballPath(k8sVersion, containerRuntime)
 	if _, err := os.Stat(targetPath); err == nil {
 		glog.Infof("Found local preload: %s", targetPath)
 		return true
 	}
 
-	url := remoteTarballURL(k8sVersion)
+	url := remoteTarballURL(k8sVersion, containerRuntime)
 	resp, err := http.Head(url)
 	if err != nil {
 		glog.Warningf("%s fetch error: %v", url, err)
@@ -107,10 +107,7 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 
 // Preload caches the preloaded images tarball on the host machine
 func Preload(k8sVersion, containerRuntime string) error {
-	if containerRuntime != "docker" {
-		return nil
-	}
-	targetPath := TarballPath(k8sVersion)
+	targetPath := TarballPath(k8sVersion, containerRuntime)
 
 	if _, err := os.Stat(targetPath); err == nil {
 		glog.Infof("Found %s in cache, skipping download", targetPath)
@@ -124,7 +121,7 @@ func Preload(k8sVersion, containerRuntime string) error {
 	}
 
 	out.T(out.FileDownload, "Downloading preloaded images tarball for k8s {{.version}} ...", out.V{"version": k8sVersion})
-	url := remoteTarballURL(k8sVersion)
+	url := remoteTarballURL(k8sVersion, containerRuntime)
 
 	tmpDst := targetPath + ".download"
 	client := &getter.Client{
@@ -139,34 +136,34 @@ func Preload(k8sVersion, containerRuntime string) error {
 		return errors.Wrapf(err, "download failed: %s", url)
 	}
 
-	if err := saveChecksumFile(k8sVersion); err != nil {
+	if err := saveChecksumFile(k8sVersion, containerRuntime); err != nil {
 		return errors.Wrap(err, "saving checksum file")
 	}
 
-	if err := verifyChecksum(k8sVersion, tmpDst); err != nil {
+	if err := verifyChecksum(k8sVersion, containerRuntime, tmpDst); err != nil {
 		return errors.Wrap(err, "verify")
 	}
 	return os.Rename(tmpDst, targetPath)
 }
 
-func saveChecksumFile(k8sVersion string) error {
-	glog.Infof("saving checksum for %s ...", TarballName(k8sVersion))
+func saveChecksumFile(k8sVersion, containerRuntime string) error {
+	glog.Infof("saving checksum for %s ...", TarballName(k8sVersion, containerRuntime))
 	ctx := context.Background()
 	client, err := storage.NewClient(ctx, option.WithoutAuthentication())
 	if err != nil {
 		return errors.Wrap(err, "getting storage client")
 	}
-	attrs, err := client.Bucket(PreloadBucket).Object(TarballName(k8sVersion)).Attrs(ctx)
+	attrs, err := client.Bucket(PreloadBucket).Object(TarballName(k8sVersion, containerRuntime)).Attrs(ctx)
 	if err != nil {
 		return errors.Wrap(err, "getting storage object")
 	}
 	checksum := attrs.MD5
-	return ioutil.WriteFile(PreloadChecksumPath(k8sVersion), checksum, 0644)
+	return ioutil.WriteFile(PreloadChecksumPath(k8sVersion, containerRuntime), checksum, 0644)
 }
 
 // verifyChecksum returns true if the checksum of the local binary matches
 // the checksum of the remote binary
-func verifyChecksum(k8sVersion string, path string) error {
+func verifyChecksum(k8sVersion, containerRuntime, path string) error {
 	glog.Infof("verifying checksumm of %s ...", path)
 	// get md5 checksum of tarball path
 	contents, err := ioutil.ReadFile(path)
@@ -175,7 +172,7 @@ func verifyChecksum(k8sVersion string, path string) error {
 	}
 	checksum := md5.Sum(contents)
 
-	remoteChecksum, err := ioutil.ReadFile(PreloadChecksumPath(k8sVersion))
+	remoteChecksum, err := ioutil.ReadFile(PreloadChecksumPath(k8sVersion, containerRuntime))
 	if err != nil {
 		return errors.Wrap(err, "reading checksum file")
 	}

From 72c4bef5caea7f0c8ed616bea7a0b90b95cf43f2 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 12:32:36 -0700
Subject: [PATCH 166/668] update integration test

---
 test/integration/aaa_download_only_test.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 9640212800..99f43a2f05 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -73,7 +73,7 @@ func TestDownloadOnly(t *testing.T) {
 
 					if download.PreloadExists(v, r) {
 						// Just make sure the tarball path exists
-						if _, err := os.Stat(download.TarballPath(v)); err != nil {
+						if _, err := os.Stat(download.TarballPath(v, r)); err != nil {
 							t.Errorf("preloaded tarball path doesn't exist: %v", err)
 						}
 						return
@@ -150,6 +150,8 @@ func TestDownloadOnlyDocker(t *testing.T) {
 		t.Skip("this test only runs with the docker driver")
 	}
 
+	cRuntime := "docker"
+
 	profile := UniqueProfileName("download-docker")
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
 	defer Cleanup(t, profile, cancel)
@@ -161,14 +163,14 @@ func TestDownloadOnlyDocker(t *testing.T) {
 	}
 
 	// Make sure the downloaded image tarball exists
-	tarball := download.TarballPath(constants.DefaultKubernetesVersion)
+	tarball := download.TarballPath(constants.DefaultKubernetesVersion, cRuntime)
 	contents, err := ioutil.ReadFile(tarball)
 	if err != nil {
 		t.Errorf("reading tarball: %v", err)
 	}
 	// Make sure it has the correct checksum
 	checksum := md5.Sum(contents)
-	remoteChecksum, err := ioutil.ReadFile(download.PreloadChecksumPath(constants.DefaultKubernetesVersion))
+	remoteChecksum, err := ioutil.ReadFile(download.PreloadChecksumPath(constants.DefaultKubernetesVersion, cRuntime))
 	if err != nil {
 		t.Errorf("reading checksum file: %v", err)
 	}

From 8f9a2b94136bb13749076932804bdd4768880282 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 21 Mar 2020 18:39:45 -0700
Subject: [PATCH 167/668] Consolidate cluster loading from cmd

---
 cmd/minikube/cmd/config/addons_list.go |   5 +-
 cmd/minikube/cmd/config/disable.go     |   4 +-
 cmd/minikube/cmd/config/enable.go      |   4 +-
 cmd/minikube/cmd/config/get.go         |   4 +-
 cmd/minikube/cmd/config/open.go        |  32 +----
 cmd/minikube/cmd/config/profile.go     |  16 ++-
 cmd/minikube/cmd/config/set.go         |   8 +-
 cmd/minikube/cmd/config/unset.go       |   6 +-
 cmd/minikube/cmd/config/util_test.go   |  23 +---
 cmd/minikube/cmd/dashboard.go          |  66 ++--------
 cmd/minikube/cmd/delete.go             |  18 +--
 cmd/minikube/cmd/docker-env.go         | 151 ++++++++--------------
 cmd/minikube/cmd/ip.go                 |  37 +-----
 cmd/minikube/cmd/kubectl.go            |  22 +---
 cmd/minikube/cmd/logs.go               |  49 ++------
 cmd/minikube/cmd/mount.go              |  40 ++----
 cmd/minikube/cmd/node_add.go           |  16 +--
 cmd/minikube/cmd/node_delete.go        |  15 +--
 cmd/minikube/cmd/node_start.go         |  15 +--
 cmd/minikube/cmd/node_stop.go          |  14 +--
 cmd/minikube/cmd/pause.go              |  28 +----
 cmd/minikube/cmd/podman-env.go         | 118 +++++++-----------
 cmd/minikube/cmd/service.go            |  32 +----
 cmd/minikube/cmd/service_list.go       |  29 +----
 cmd/minikube/cmd/ssh-key.go            |   9 +-
 cmd/minikube/cmd/ssh.go                |  34 ++---
 cmd/minikube/cmd/start.go              |  22 ++--
 cmd/minikube/cmd/status.go             |  21 +---
 cmd/minikube/cmd/stop.go               |  19 +--
 cmd/minikube/cmd/tunnel.go             |  25 ++--
 cmd/minikube/cmd/unpause.go            |  30 ++---
 cmd/minikube/cmd/update-context.go     |  23 +---
 pkg/minikube/mustload/mustload.go      | 166 +++++++++++++++++++++++++
 pkg/minikube/out/style.go              |   2 +
 pkg/minikube/out/style_enum.go         |   2 +
 35 files changed, 421 insertions(+), 684 deletions(-)
 create mode 100644 pkg/minikube/mustload/mustload.go

diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go
index 73c72ec37e..5ed95a850b 100644
--- a/cmd/minikube/cmd/config/addons_list.go
+++ b/cmd/minikube/cmd/config/addons_list.go
@@ -26,7 +26,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -98,7 +97,7 @@ var printAddonsList = func() {
 	table.SetAutoFormatHeaders(true)
 	table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true})
 	table.SetCenterSeparator("|")
-	pName := viper.GetString(config.ProfileName)
+	pName := ClusterFlagValue()
 
 	for _, addonName := range addonNames {
 		addonBundle := assets.Addons[addonName]
@@ -123,7 +122,7 @@ var printAddonsList = func() {
 
 var printAddonsJSON = func() {
 	addonNames := make([]string, 0, len(assets.Addons))
-	pName := viper.GetString(config.ProfileName)
+	pName := ClusterFlagValue()
 	for addonName := range assets.Addons {
 		addonNames = append(addonNames, addonName)
 	}
diff --git a/cmd/minikube/cmd/config/disable.go b/cmd/minikube/cmd/config/disable.go
index af050c105e..552eaf7108 100644
--- a/cmd/minikube/cmd/config/disable.go
+++ b/cmd/minikube/cmd/config/disable.go
@@ -18,9 +18,7 @@ package config
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/addons"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -35,7 +33,7 @@ var addonsDisableCmd = &cobra.Command{
 		}
 
 		addon := args[0]
-		err := addons.Set(addon, "false", viper.GetString(config.ProfileName))
+		err := addons.Set(addon, "false", ClusterFlagValue())
 		if err != nil {
 			exit.WithError("disable failed", err)
 		}
diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go
index 5f325a6eed..99cbb3bb88 100644
--- a/cmd/minikube/cmd/config/enable.go
+++ b/cmd/minikube/cmd/config/enable.go
@@ -18,9 +18,7 @@ package config
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/addons"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -34,7 +32,7 @@ var addonsEnableCmd = &cobra.Command{
 			exit.UsageT("usage: minikube addons enable ADDON_NAME")
 		}
 		addon := args[0]
-		err := addons.Set(addon, "true", viper.GetString(config.ProfileName))
+		err := addons.Set(addon, "true", ClusterFlagValue())
 		if err != nil {
 			exit.WithError("enable failed", err)
 		}
diff --git a/cmd/minikube/cmd/config/get.go b/cmd/minikube/cmd/config/get.go
index 5c3f034ab7..f5a7899aa2 100644
--- a/cmd/minikube/cmd/config/get.go
+++ b/cmd/minikube/cmd/config/get.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	pkgConfig "k8s.io/minikube/pkg/minikube/config"
+	config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -59,5 +59,5 @@ func init() {
 
 // Get gets a property
 func Get(name string) (string, error) {
-	return pkgConfig.Get(name)
+	return config.Get(name)
 }
diff --git a/cmd/minikube/cmd/config/open.go b/cmd/minikube/cmd/config/open.go
index c4c8b5416d..babbc7c00b 100644
--- a/cmd/minikube/cmd/config/open.go
+++ b/cmd/minikube/cmd/config/open.go
@@ -18,19 +18,14 @@ package config
 
 import (
 	"fmt"
-	"os"
 	"text/template"
 
 	"github.com/pkg/browser"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/service"
 )
@@ -62,32 +57,17 @@ var addonsOpenCmd = &cobra.Command{
 			exit.UsageT("usage: minikube addons open ADDON_NAME")
 		}
 		addonName := args[0]
-		// TODO(r2d4): config should not reference API, pull this out
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
 
-		profileName := viper.GetString(pkg_config.ProfileName)
-		cc, err := config.Load(profileName)
-		if err != nil {
-			exit.WithError("Error getting cluster", err)
-		}
-		cp, err := config.PrimaryControlPlane(cc)
-		if err != nil {
-			exit.WithError("Error getting control plane", err)
-		}
-		if !machine.IsRunning(api, driver.MachineName(*cc, cp)) {
-			os.Exit(1)
-		}
+		cname := ClusterFlagValue()
+		co := mustload.Healthy(cname)
+
 		addon, ok := assets.Addons[addonName] // validate addon input
 		if !ok {
 			exit.WithCodeT(exit.Data, `addon '{{.name}}' is not a valid addon packaged with minikube.
 To see the list of available addons run:
 minikube addons list`, out.V{"name": addonName})
 		}
-		ok, err = addon.IsEnabled(profileName)
+		ok, err := addon.IsEnabled(cname)
 		if err != nil {
 			exit.WithError("IsEnabled failed", err)
 		}
@@ -112,7 +92,7 @@ You can add one by annotating a service with the label {{.labelName}}:{{.addonNa
 			svc := serviceList.Items[i].ObjectMeta.Name
 			var urlString []string
 
-			if urlString, err = service.WaitForService(api, namespace, svc, addonsURLTemplate, addonsURLMode, https, wait, interval); err != nil {
+			if urlString, err = service.WaitForService(co.API, namespace, svc, addonsURLTemplate, addonsURLMode, https, wait, interval); err != nil {
 				exit.WithCodeT(exit.Unavailable, "Wait failed: {{.error}}", out.V{"error": err})
 			}
 
diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go
index 31bd0bb0af..4161ee3aac 100644
--- a/cmd/minikube/cmd/config/profile.go
+++ b/cmd/minikube/cmd/config/profile.go
@@ -20,9 +20,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	pkgConfig "k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -35,7 +33,7 @@ var ProfileCmd = &cobra.Command{
 	Long:  "profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			profile := viper.GetString(pkgConfig.ProfileName)
+			profile := ClusterFlagValue()
 			out.T(out.Empty, profile)
 			os.Exit(0)
 		}
@@ -49,7 +47,7 @@ var ProfileCmd = &cobra.Command{
 		we need to add code over here to check whether the profile
 		name is in the list of reserved keywords
 		*/
-		if pkgConfig.ProfileNameInReservedKeywords(profile) {
+		if config.ProfileNameInReservedKeywords(profile) {
 			out.ErrT(out.FailureType, `Profile name "{{.profilename}}" is minikube keyword. To delete profile use command minikube delete -p <profile name>  `, out.V{"profilename": profile})
 			os.Exit(0)
 		}
@@ -64,18 +62,18 @@ var ProfileCmd = &cobra.Command{
 			}
 		}
 
-		if !pkgConfig.ProfileExists(profile) {
+		if !config.ProfileExists(profile) {
 			out.ErrT(out.Tip, `if you want to create a profile you can by this command: minikube start -p {{.profile_name}}`, out.V{"profile_name": profile})
 			os.Exit(0)
 		}
 
-		err := Set(pkgConfig.ProfileName, profile)
+		err := Set(config.ProfileName, profile)
 		if err != nil {
 			exit.WithError("Setting profile failed", err)
 		}
-		cc, err := pkgConfig.Load(profile)
+		cc, err := config.Load(profile)
 		// might err when loading older version of cfg file that doesn't have KeepContext field
-		if err != nil && !pkg_config.IsNotExist(err) {
+		if err != nil && !config.IsNotExist(err) {
 			out.ErrT(out.Sad, `Error loading profile config: {{.error}}`, out.V{"error": err})
 		}
 		if err == nil {
diff --git a/cmd/minikube/cmd/config/set.go b/cmd/minikube/cmd/config/set.go
index 21f99863bf..b074af6aef 100644
--- a/cmd/minikube/cmd/config/set.go
+++ b/cmd/minikube/cmd/config/set.go
@@ -19,7 +19,7 @@ package config
 import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	pkgConfig "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -61,11 +61,11 @@ func Set(name string, value string) error {
 	}
 
 	// Set the value
-	config, err := pkgConfig.ReadConfig(localpath.ConfigFile())
+	cc, err := config.ReadConfig(localpath.ConfigFile())
 	if err != nil {
 		return errors.Wrapf(err, "read config file %q", localpath.ConfigFile())
 	}
-	err = s.set(config, name, value)
+	err = s.set(cc, name, value)
 	if err != nil {
 		return errors.Wrapf(err, "set")
 	}
@@ -77,5 +77,5 @@ func Set(name string, value string) error {
 	}
 
 	// Write the value
-	return pkgConfig.WriteConfig(localpath.ConfigFile(), config)
+	return config.WriteConfig(localpath.ConfigFile(), cc)
 }
diff --git a/cmd/minikube/cmd/config/unset.go b/cmd/minikube/cmd/config/unset.go
index 1c68b53d9f..122d8ca828 100644
--- a/cmd/minikube/cmd/config/unset.go
+++ b/cmd/minikube/cmd/config/unset.go
@@ -18,7 +18,7 @@ package config
 
 import (
 	"github.com/spf13/cobra"
-	pkgConfig "k8s.io/minikube/pkg/minikube/config"
+	config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
@@ -44,10 +44,10 @@ func init() {
 
 // Unset unsets a property
 func Unset(name string) error {
-	m, err := pkgConfig.ReadConfig(localpath.ConfigFile())
+	m, err := config.ReadConfig(localpath.ConfigFile())
 	if err != nil {
 		return err
 	}
 	delete(m, name)
-	return pkgConfig.WriteConfig(localpath.ConfigFile(), m)
+	return config.WriteConfig(localpath.ConfigFile(), m)
 }
diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go
index b085ea965f..4347cb4073 100644
--- a/cmd/minikube/cmd/config/util_test.go
+++ b/cmd/minikube/cmd/config/util_test.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"testing"
 
-	pkgConfig "k8s.io/minikube/pkg/minikube/config"
+	config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 )
 
-var minikubeConfig = pkgConfig.MinikubeConfig{
+var minikubeConfig = config.MinikubeConfig{
 	"driver":               driver.KVM2,
 	"cpus":                 12,
 	"show-libmachine-logs": true,
@@ -83,21 +83,10 @@ func TestSetBool(t *testing.T) {
 }
 
 func TestValidateProfile(t *testing.T) {
-	testCases := []struct {
-		profileName string
-	}{
-		{
-			profileName: "82374328742_2974224498",
-		},
-		{
-			profileName: "validate_test",
-		},
-	}
-
-	for _, test := range testCases {
-		profileNam := test.profileName
-		expected := fmt.Sprintf("profile %q not found", test.profileName)
-		err, ok := ValidateProfile(profileNam)
+	testCases := []string{"82374328742_2974224498", "validate_test"}
+	for _, name := range testCases {
+		expected := fmt.Sprintf("profile %q not found", name)
+		err, ok := ValidateProfile(name)
 		if !ok && err.Error() != expected {
 			t.Errorf("got error %q, expected %q", err, expected)
 		}
diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go
index b5fd848eb3..5a77d95650 100644
--- a/cmd/minikube/cmd/dashboard.go
+++ b/cmd/minikube/cmd/dashboard.go
@@ -21,25 +21,19 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"os/exec"
 	"os/user"
 	"regexp"
 	"time"
 
-	"github.com/docker/machine/libmachine/mcnerror"
 	"github.com/golang/glog"
 	"github.com/pkg/browser"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	pkgaddons "k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/minikube/service"
@@ -59,47 +53,11 @@ var dashboardCmd = &cobra.Command{
 	Short: "Access the kubernetes dashboard running within the minikube cluster",
 	Long:  `Access the kubernetes dashboard running within the minikube cluster`,
 	Run: func(cmd *cobra.Command, args []string) {
-		profileName := viper.GetString(pkg_config.ProfileName)
-		cc, err := pkg_config.Load(profileName)
-		if err != nil && !pkg_config.IsNotExist(err) {
-			exit.WithError("Error loading profile config", err)
-		}
+		cname := ClusterFlagValue()
+		co := mustload.Healthy(cname)
 
-		if err != nil {
-			out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": profileName})
-			os.Exit(1)
-		}
-
-		api, err := machine.NewAPIClient()
-		defer func() {
-			err := api.Close()
-			if err != nil {
-				glog.Warningf("Failed to close API: %v", err)
-			}
-		}()
-
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-
-		cp, err := config.PrimaryControlPlane(cc)
-		if err != nil {
-			exit.WithError("Error getting primary control plane", err)
-		}
-
-		machineName := driver.MachineName(*cc, cp)
-		if _, err = api.Load(machineName); err != nil {
-			switch err := errors.Cause(err).(type) {
-			case mcnerror.ErrHostDoesNotExist:
-				exit.WithCodeT(exit.Unavailable, "{{.name}} cluster does not exist", out.V{"name": cc.Name})
-			default:
-				exit.WithError("Error getting cluster", err)
-			}
-		}
-
-		for _, n := range cc.Nodes {
-			err = proxy.ExcludeIP(n.IP) // to be used for http get calls
-			if err != nil {
+		for _, n := range co.Config.Nodes {
+			if err := proxy.ExcludeIP(n.IP); err != nil {
 				glog.Errorf("Error excluding IP from proxy: %s", err)
 			}
 		}
@@ -109,18 +67,14 @@ var dashboardCmd = &cobra.Command{
 			exit.WithCodeT(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
 		}
 
-		if !machine.IsRunning(api, machineName) {
-			os.Exit(1)
-		}
-
 		// Check dashboard status before enabling it
 		dashboardAddon := assets.Addons["dashboard"]
-		dashboardStatus, _ := dashboardAddon.IsEnabled(profileName)
+		dashboardStatus, _ := dashboardAddon.IsEnabled(cname)
 		if !dashboardStatus {
 			// Send status messages to stderr for folks re-using this output.
 			out.ErrT(out.Enabling, "Enabling dashboard ...")
 			// Enable the dashboard add-on
-			err = pkgaddons.Set("dashboard", "true", profileName)
+			err = pkgaddons.Set("dashboard", "true", cname)
 			if err != nil {
 				exit.WithError("Unable to enable dashboard", err)
 			}
@@ -135,7 +89,7 @@ var dashboardCmd = &cobra.Command{
 		}
 
 		out.ErrT(out.Launch, "Launching proxy ...")
-		p, hostPort, err := kubectlProxy(kubectl, machineName)
+		p, hostPort, err := kubectlProxy(kubectl, cname)
 		if err != nil {
 			exit.WithError("kubectl proxy", err)
 		}
@@ -169,10 +123,10 @@ var dashboardCmd = &cobra.Command{
 }
 
 // kubectlProxy runs "kubectl proxy", returning host:port
-func kubectlProxy(path string, machineName string) (*exec.Cmd, string, error) {
+func kubectlProxy(path string, contextName string) (*exec.Cmd, string, error) {
 	// port=0 picks a random system port
 
-	cmd := exec.Command(path, "--context", machineName, "proxy", "--port=0")
+	cmd := exec.Command(path, "--context", contextName, "proxy", "--port=0")
 
 	stdoutPipe, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 253f48128a..1676861d8b 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -141,10 +141,10 @@ func runDelete(cmd *cobra.Command, args []string) {
 			exit.UsageT("usage: minikube delete")
 		}
 
-		profileName := viper.GetString(config.ProfileName)
-		profile, err := config.LoadProfile(profileName)
+		cname := ClusterFlagValue()
+		profile, err := config.LoadProfile(cname)
 		if err != nil {
-			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": profileName})
+			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": cname})
 		}
 
 		errs := DeleteProfiles([]*config.Profile{profile})
@@ -272,13 +272,13 @@ func deleteHosts(api libmachine.API, cc *config.ClusterConfig) {
 	}
 }
 
-func deleteConfig(profileName string) error {
-	if err := config.DeleteProfile(profileName); err != nil {
+func deleteConfig(cname string) error {
+	if err := config.DeleteProfile(cname); err != nil {
 		if config.IsNotExist(err) {
-			delErr := profileDeletionErr(profileName, fmt.Sprintf("\"%s\" profile does not exist", profileName))
+			delErr := profileDeletionErr(cname, fmt.Sprintf("\"%s\" profile does not exist", cname))
 			return DeletionError{Err: delErr, Errtype: MissingProfile}
 		}
-		delErr := profileDeletionErr(profileName, fmt.Sprintf("failed to remove profile %v", err))
+		delErr := profileDeletionErr(cname, fmt.Sprintf("failed to remove profile %v", err))
 		return DeletionError{Err: delErr, Errtype: Fatal}
 	}
 	return nil
@@ -317,8 +317,8 @@ func deleteInvalidProfile(profile *config.Profile) []error {
 	return errs
 }
 
-func profileDeletionErr(profileName string, additionalInfo string) error {
-	return fmt.Errorf("error deleting profile \"%s\": %s", profileName, additionalInfo)
+func profileDeletionErr(cname string, additionalInfo string) error {
+	return fmt.Errorf("error deleting profile \"%s\": %s", cname, additionalInfo)
 }
 
 func uninstallKubernetes(api libmachine.API, cc config.ClusterConfig, n config.Node, bsName string) error {
diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index 138c2f0282..4b61a435d2 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -24,20 +24,18 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"strconv"
 	"strings"
 
-	"github.com/docker/machine/libmachine/drivers"
-	"github.com/docker/machine/libmachine/state"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/shell"
 )
@@ -117,23 +115,10 @@ func (EnvNoProxyGetter) GetNoProxyVar() (string, string) {
 }
 
 // isDockerActive checks if Docker is active
-func isDockerActive(d drivers.Driver) (bool, error) {
-	client, err := drivers.GetSSHClientFromDriver(d)
-	if err != nil {
-		return false, err
-	}
-	cmd := "sudo systemctl is-active docker"
-
-	output, err := client.Output(cmd)
-	s := strings.TrimSpace(output)
-
-	if err != nil {
-		return false, fmt.Errorf("%s failed: %v\noutput: %q", cmd, err, s)
-	}
-	if s != "active" {
-		return false, fmt.Errorf("%s returned %q", cmd, s)
-	}
-	return true, nil
+func isDockerActive(r command.Runner) bool {
+	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "docker")
+	_, err := r.RunCmd(c)
+	return err == nil
 }
 
 // dockerEnvCmd represents the docker-env command
@@ -142,94 +127,62 @@ var dockerEnvCmd = &cobra.Command{
 	Short: "Sets up docker env variables; similar to '$(docker-machine env)'",
 	Long:  `Sets up docker env variables; similar to '$(docker-machine env)'.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
+		driverName := co.CPHost.DriverName
+
+		if driverName == driver.None {
+			exit.UsageT(`'none' driver does not support 'minikube docker-env' command`)
 		}
-		defer api.Close()
 
-		profile := viper.GetString(config.ProfileName)
-		cc, err := config.Load(profile)
-		if err != nil {
-			exit.WithError("Error getting config", err)
+		if co.Config.KubernetesConfig.ContainerRuntime != "docker" {
+			exit.WithCodeT(exit.BadUsage, `The docker-env command is only compatible with the "docker" runtime, but this cluster was configured to use the "{{.runtime}}" runtime.`,
+				out.V{"runtime": co.Config.KubernetesConfig.ContainerRuntime})
 		}
-		for _, n := range cc.Nodes {
-			machineName := driver.MachineName(*cc, n)
-			host, err := machine.LoadHost(api, machineName)
+
+		if ok := isDockerActive(co.CPRunner); !ok {
+			exit.WithCodeT(exit.Unavailable, `The docker service within '{{.name}}' is not active`, out.V{"name": cname})
+		}
+
+		sh := shell.EnvConfig{
+			Shell: shell.ForceShell,
+		}
+
+		var err error
+		port := constants.DockerDaemonPort
+		if driver.IsKIC(driverName) {
+			port, err = oci.ForwardedPort(driverName, cname, port)
 			if err != nil {
-				exit.WithError("Error getting host", err)
-			}
-			if host.Driver.DriverName() == driver.None {
-				exit.UsageT(`'none' driver does not support 'minikube docker-env' command`)
+				exit.WithCodeT(exit.Failure, "Error getting port binding for '{{.driver_name}} driver: {{.error}}", out.V{"driver_name": driverName, "error": err})
 			}
+		}
 
-			hostSt, err := machine.Status(api, machineName)
+		ec := DockerEnvConfig{
+			EnvConfig: sh,
+			profile:   cname,
+			driver:    driverName,
+			hostIP:    co.DriverIP.String(),
+			port:      port,
+			certsDir:  localpath.MakeMiniPath("certs"),
+			noProxy:   noProxy,
+		}
+
+		if ec.Shell == "" {
+			ec.Shell, err = shell.Detect()
 			if err != nil {
-				exit.WithError("Error getting host status", err)
-			}
-			if hostSt != state.Running.String() {
-				exit.WithCodeT(exit.Unavailable, `'{{.profile}}' is not running`, out.V{"profile": profile})
+				exit.WithError("Error detecting shell", err)
 			}
+		}
 
-			if cc.KubernetesConfig.ContainerRuntime != "docker" {
-				exit.WithCodeT(exit.BadUsage, `The docker-env command is only compatible with the "docker" runtime, but this cluster was configured to use the "{{.runtime}}" runtime.`,
-					out.V{"runtime": cc.KubernetesConfig.ContainerRuntime})
+		if dockerUnset {
+			if err := dockerUnsetScript(ec, os.Stdout); err != nil {
+				exit.WithError("Error generating unset output", err)
 			}
+			return
+		}
 
-			ok, err := isDockerActive(host.Driver)
-			if err != nil {
-				exit.WithError("Docker runtime check failed", err)
-			}
-
-			if !ok {
-				exit.WithCodeT(exit.Unavailable, `The docker service within '{{.profile}}' is not active`, out.V{"profile": profile})
-			}
-
-			hostIP, err := host.Driver.GetIP()
-			if err != nil {
-				exit.WithError("Error getting host IP", err)
-			}
-
-			sh := shell.EnvConfig{
-				Shell: shell.ForceShell,
-			}
-
-			port := constants.DockerDaemonPort
-			if driver.IsKIC(host.DriverName) { // for kic we need to find what port docker/podman chose for us
-				hostIP = oci.DefaultBindIPV4
-				port, err = oci.ForwardedPort(host.DriverName, profile, port)
-				if err != nil {
-					exit.WithCodeT(exit.Failure, "Error getting port binding for '{{.driver_name}} driver: {{.error}}", out.V{"driver_name": host.DriverName, "error": err})
-				}
-			}
-
-			ec := DockerEnvConfig{
-				EnvConfig: sh,
-				profile:   profile,
-				driver:    host.DriverName,
-				hostIP:    hostIP,
-				port:      port,
-				certsDir:  localpath.MakeMiniPath("certs"),
-				noProxy:   noProxy,
-			}
-
-			if ec.Shell == "" {
-				ec.Shell, err = shell.Detect()
-				if err != nil {
-					exit.WithError("Error detecting shell", err)
-				}
-			}
-
-			if dockerUnset {
-				if err := dockerUnsetScript(ec, os.Stdout); err != nil {
-					exit.WithError("Error generating unset output", err)
-				}
-				return
-			}
-
-			if err := dockerSetScript(ec, os.Stdout); err != nil {
-				exit.WithError("Error generating set output", err)
-			}
+		if err := dockerSetScript(ec, os.Stdout); err != nil {
+			exit.WithError("Error generating set output", err)
 		}
 	},
 }
diff --git a/cmd/minikube/cmd/ip.go b/cmd/minikube/cmd/ip.go
index 466323b4a4..04dd705fb5 100644
--- a/cmd/minikube/cmd/ip.go
+++ b/cmd/minikube/cmd/ip.go
@@ -17,14 +17,8 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/docker/machine/libmachine/mcnerror"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -34,32 +28,7 @@ var ipCmd = &cobra.Command{
 	Short: "Retrieves the IP address of the running cluster",
 	Long:  `Retrieves the IP address of the running cluster, and writes it to STDOUT.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
-		for _, n := range cc.Nodes {
-			machineName := driver.MachineName(*cc, n)
-			host, err := api.Load(machineName)
-			if err != nil {
-				switch err := errors.Cause(err).(type) {
-				case mcnerror.ErrHostDoesNotExist:
-					exit.WithCodeT(exit.NoInput, `"{{.profile_name}}" host does not exist, unable to show an IP`, out.V{"profile_name": cc.Name})
-				default:
-					exit.WithError("Error getting host", err)
-				}
-			}
-			ip, err := host.Driver.GetIP()
-			if err != nil {
-				exit.WithError("Error getting IP", err)
-			}
-			out.Ln(ip)
-		}
+		co := mustload.Running(ClusterFlagValue())
+		out.Ln(co.DriverIP.String())
 	},
 }
diff --git a/cmd/minikube/cmd/kubectl.go b/cmd/minikube/cmd/kubectl.go
index e24943a7d4..f4867b45e0 100644
--- a/cmd/minikube/cmd/kubectl.go
+++ b/cmd/minikube/cmd/kubectl.go
@@ -24,10 +24,8 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -42,21 +40,11 @@ Examples:
 minikube kubectl -- --help
 minikube kubectl -- get pods --namespace kube-system`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error getting client: %v\n", err)
-			os.Exit(1)
-		}
-		defer api.Close()
+		co := mustload.Healthy(ClusterFlagValue())
 
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil && !config.IsNotExist(err) {
-			out.ErrLn("Error loading profile config: %v", err)
-		}
-
-		version := constants.DefaultKubernetesVersion
-		if cc != nil {
-			version = cc.KubernetesConfig.KubernetesVersion
+		version := co.Config.KubernetesConfig.KubernetesVersion
+		if version == "" {
+			version = constants.DefaultKubernetesVersion
 		}
 
 		path, err := node.CacheKubectlBinary(version)
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index e6ca33f9fb..098ab0d99f 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -21,13 +21,10 @@ import (
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/logs"
-	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/node"
+	"k8s.io/minikube/pkg/minikube/mustload"
 )
 
 const (
@@ -51,62 +48,30 @@ var logsCmd = &cobra.Command{
 	Short: "Gets the logs of the running instance, used for debugging minikube, not user code.",
 	Long:  `Gets the logs of the running instance, used for debugging minikube, not user code.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		cfg, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
+		co := mustload.Running(ClusterFlagValue())
 
-		if nodeName == "" {
-			cp, err := config.PrimaryControlPlane(cfg)
-			if err != nil {
-				exit.WithError("Error getting primary control plane", err)
-			}
-			nodeName = cp.Name
-		}
-
-		n, _, err := node.Retrieve(cfg, nodeName)
-		if err != nil {
-			exit.WithError("Error retrieving node", err)
-		}
-
-		machineName := driver.MachineName(*cfg, *n)
-
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-
-		h, err := api.Load(machineName)
-		if err != nil {
-			exit.WithError("api load", err)
-		}
-		runner, err := machine.CommandRunner(h)
-		if err != nil {
-			exit.WithError("command runner", err)
-		}
-		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper), *cfg, *n)
+		bs, err := cluster.Bootstrapper(co.API, viper.GetString(cmdcfg.Bootstrapper), *co.Config, *co.CPNode)
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}
 
-		cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: runner})
+		cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: co.CPRunner})
 		if err != nil {
 			exit.WithError("Unable to get runtime", err)
 		}
 		if followLogs {
-			err := logs.Follow(cr, bs, *cfg, runner)
+			err := logs.Follow(cr, bs, *co.Config, co.CPRunner)
 			if err != nil {
 				exit.WithError("Follow", err)
 			}
 			return
 		}
 		if showProblems {
-			problems := logs.FindProblems(cr, bs, *cfg, runner)
+			problems := logs.FindProblems(cr, bs, *co.Config, co.CPRunner)
 			logs.OutputProblems(problems, numberOfProblems)
 			return
 		}
-		err = logs.Output(cr, bs, *cfg, runner, numberOfLines)
+		err = logs.Output(cr, bs, *co.Config, co.CPRunner, numberOfLines)
 		if err != nil {
 			exit.WithError("Error getting machine logs", err)
 		}
diff --git a/cmd/minikube/cmd/mount.go b/cmd/minikube/cmd/mount.go
index 46ea74b524..570a76447e 100644
--- a/cmd/minikube/cmd/mount.go
+++ b/cmd/minikube/cmd/mount.go
@@ -30,12 +30,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/third_party/go9p/ufs"
 )
@@ -99,30 +97,16 @@ var mountCmd = &cobra.Command{
 		if glog.V(1) {
 			debugVal = 1 // ufs.StartServer takes int debug param
 		}
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
 
-		cp, err := config.PrimaryControlPlane(cc)
-		if err != nil {
-			exit.WithError("Error getting primary cp", err)
-		}
-		host, err := api.Load(driver.MachineName(*cc, cp))
-		if err != nil {
-			exit.WithError("Error loading api", err)
-		}
-		if host.Driver.DriverName() == driver.None {
+		co := mustload.Running(ClusterFlagValue())
+		if co.CPHost.Driver.DriverName() == driver.None {
 			exit.UsageT(`'none' driver does not support 'minikube mount' command`)
 		}
+
 		var ip net.IP
+		var err error
 		if mountIP == "" {
-			ip, err = cluster.GetVMHostIP(host)
+			ip, err = cluster.GetVMHostIP(co.CPHost)
 			if err != nil {
 				exit.WithError("Error getting the host IP address to use from within the VM", err)
 			}
@@ -163,7 +147,7 @@ var mountCmd = &cobra.Command{
 		}
 
 		bindIP := ip.String() // the ip to listen on the user's host machine
-		if driver.IsKIC(host.Driver.DriverName()) && runtime.GOOS != "linux" {
+		if driver.IsKIC(co.CPHost.Driver.DriverName()) && runtime.GOOS != "linux" {
 			bindIP = "127.0.0.1"
 		}
 		out.T(out.Mounting, "Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...", out.V{"sourcePath": hostPath, "destinationPath": vmPath})
@@ -187,19 +171,13 @@ var mountCmd = &cobra.Command{
 			}()
 		}
 
-		// Use CommandRunner, as the native docker ssh service dies when Ctrl-C is received.
-		runner, err := machine.CommandRunner(host)
-		if err != nil {
-			exit.WithError("Failed to get command runner", err)
-		}
-
 		// Unmount if Ctrl-C or kill request is received.
 		c := make(chan os.Signal, 1)
 		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 		go func() {
 			for sig := range c {
 				out.T(out.Unmount, "Unmounting {{.path}} ...", out.V{"path": vmPath})
-				err := cluster.Unmount(runner, vmPath)
+				err := cluster.Unmount(co.CPRunner, vmPath)
 				if err != nil {
 					out.ErrT(out.FailureType, "Failed unmount: {{.error}}", out.V{"error": err})
 				}
@@ -207,7 +185,7 @@ var mountCmd = &cobra.Command{
 			}
 		}()
 
-		err = cluster.Mount(runner, ip.String(), vmPath, cfg)
+		err = cluster.Mount(co.CPRunner, ip.String(), vmPath, cfg)
 		if err != nil {
 			exit.WithError("mount failed", err)
 		}
diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index d593639b4d..b923b9e935 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -19,10 +19,10 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -36,11 +36,8 @@ var nodeAddCmd = &cobra.Command{
 	Short: "Adds a node to the given cluster.",
 	Long:  "Adds a node to the given cluster config, and starts it.",
 	Run: func(cmd *cobra.Command, args []string) {
-		profile := viper.GetString(config.ProfileName)
-		cc, err := config.Load(profile)
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
+		co := mustload.Healthy(ClusterFlagValue())
+		cc := co.Config
 
 		if driver.BareMetal(cc.Driver) {
 			out.ErrT(out.FailureType, "none driver does not support multi-node clusters")
@@ -48,7 +45,7 @@ var nodeAddCmd = &cobra.Command{
 
 		name := node.Name(len(cc.Nodes) + 1)
 
-		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
+		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name})
 
 		// TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here.
 		n := config.Node{
@@ -58,12 +55,11 @@ var nodeAddCmd = &cobra.Command{
 			KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
 		}
 
-		err = node.Add(cc, n)
-		if err != nil {
+		if err := node.Add(cc, n); err != nil {
 			exit.WithError("Error adding node to cluster", err)
 		}
 
-		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": profile})
+		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": cc.Name})
 	},
 }
 
diff --git a/cmd/minikube/cmd/node_delete.go b/cmd/minikube/cmd/node_delete.go
index 8f43749a27..bca5c497c4 100644
--- a/cmd/minikube/cmd/node_delete.go
+++ b/cmd/minikube/cmd/node_delete.go
@@ -18,9 +18,8 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -36,16 +35,10 @@ var nodeDeleteCmd = &cobra.Command{
 		}
 		name := args[0]
 
-		profile := viper.GetString(config.ProfileName)
-		out.T(out.DeletingHost, "Deleting node {{.name}} from cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
+		co := mustload.Healthy(ClusterFlagValue())
+		out.T(out.DeletingHost, "Deleting node {{.name}} from cluster {{.cluster}}", out.V{"name": name, "cluster": co.Config.Name})
 
-		cc, err := config.Load(profile)
-		if err != nil {
-			exit.WithError("loading config", err)
-		}
-
-		err = node.Delete(*cc, name)
-		if err != nil {
+		if err := node.Delete(*co.Config, name); err != nil {
 			exit.WithError("deleting node", err)
 		}
 
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 17e3da8694..285de93d7b 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -20,10 +20,9 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -37,24 +36,14 @@ var nodeStartCmd = &cobra.Command{
 			exit.UsageT("Usage: minikube node start [name]")
 		}
 
+		api, cc := mustload.Partial(ClusterFlagValue())
 		name := args[0]
 
-		// Make sure it's not running
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("creating api client", err)
-		}
-
 		if machine.IsRunning(api, name) {
 			out.T(out.Check, "{{.name}} is already running", out.V{"name": name})
 			os.Exit(0)
 		}
 
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("loading config", err)
-		}
-
 		n, _, err := node.Retrieve(cc, name)
 		if err != nil {
 			exit.WithError("retrieving node", err)
diff --git a/cmd/minikube/cmd/node_stop.go b/cmd/minikube/cmd/node_stop.go
index e2a37573b8..5dbceba1bc 100644
--- a/cmd/minikube/cmd/node_stop.go
+++ b/cmd/minikube/cmd/node_stop.go
@@ -18,11 +18,10 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -37,16 +36,7 @@ var nodeStopCmd = &cobra.Command{
 		}
 
 		name := args[0]
-
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("creating api client", err)
-		}
-
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("getting config", err)
-		}
+		api, cc := mustload.Partial(ClusterFlagValue())
 
 		n, _, err := node.Retrieve(cc, name)
 		if err != nil {
diff --git a/cmd/minikube/cmd/pause.go b/cmd/minikube/cmd/pause.go
index 4b63ed963c..33ef1f9f04 100644
--- a/cmd/minikube/cmd/pause.go
+++ b/cmd/minikube/cmd/pause.go
@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"os"
 	"strings"
 
 	"github.com/golang/glog"
@@ -25,11 +24,11 @@ import (
 	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -46,27 +45,10 @@ var pauseCmd = &cobra.Command{
 }
 
 func runPause(cmd *cobra.Command, args []string) {
-	cname := viper.GetString(config.ProfileName)
-	api, err := machine.NewAPIClient()
-	if err != nil {
-		exit.WithError("Error getting client", err)
-	}
-	defer api.Close()
-	cc, err := config.Load(cname)
+	co := mustload.Running(ClusterFlagValue())
 
-	if err != nil && !config.IsNotExist(err) {
-		exit.WithError("Error loading profile config", err)
-	}
-
-	if err != nil {
-		out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": cname})
-		os.Exit(1)
-	}
-
-	glog.Infof("config: %+v", cc)
-
-	for _, n := range cc.Nodes {
-		host, err := machine.LoadHost(api, driver.MachineName(*cc, n))
+	for _, n := range co.Config.Nodes {
+		host, err := machine.LoadHost(co.API, driver.MachineName(*co.Config, n))
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}
@@ -76,7 +58,7 @@ func runPause(cmd *cobra.Command, args []string) {
 			exit.WithError("Failed to get command runner", err)
 		}
 
-		cr, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime, Runner: r})
+		cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: r})
 		if err != nil {
 			exit.WithError("Failed runtime", err)
 		}
diff --git a/cmd/minikube/cmd/podman-env.go b/cmd/minikube/cmd/podman-env.go
index f68191f539..c55ba5f5f0 100644
--- a/cmd/minikube/cmd/podman-env.go
+++ b/cmd/minikube/cmd/podman-env.go
@@ -27,16 +27,13 @@ import (
 	"strings"
 
 	"github.com/docker/machine/libmachine/drivers"
-	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/ssh"
-	"github.com/docker/machine/libmachine/state"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/shell"
 )
@@ -67,15 +64,16 @@ func podmanShellCfgSet(ec PodmanEnvConfig, envMap map[string]string) *PodmanShel
 }
 
 // isPodmanAvailable checks if Podman is available
-func isPodmanAvailable(host *host.Host) (bool, error) {
-	// we need both "varlink bridge" and "podman varlink"
-	if _, err := host.RunSSHCommand("which varlink"); err != nil {
-		return false, err
+func isPodmanAvailable(r command.Runner) bool {
+	if _, err := r.RunCmd(exec.Command("which", "varlink")); err != nil {
+		return false
 	}
-	if _, err := host.RunSSHCommand("which podman"); err != nil {
-		return false, err
+
+	if _, err := r.RunCmd(exec.Command("which", "podman")); err != nil {
+		return false
 	}
-	return true, nil
+
+	return true
 }
 
 func createExternalSSHClient(d drivers.Driver) (*ssh.ExternalClient, error) {
@@ -108,75 +106,49 @@ var podmanEnvCmd = &cobra.Command{
 	Short: "Sets up podman env variables; similar to '$(podman-machine env)'",
 	Long:  `Sets up podman env variables; similar to '$(podman-machine env)'.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
+		driverName := co.CPHost.DriverName
+
+		if driverName == driver.None {
+			exit.UsageT(`'none' driver does not support 'minikube podman-env' command`)
 		}
-		defer api.Close()
 
-		profile := viper.GetString(config.ProfileName)
-		cc, err := config.Load(profile)
-		if err != nil {
-			exit.WithError("Error getting config", err)
+		if ok := isPodmanAvailable(co.CPRunner); !ok {
+			exit.WithCodeT(exit.Unavailable, `The podman service within '{{.cluster}}' is not active`, out.V{"cluster": cname})
 		}
-		for _, n := range cc.Nodes {
-			machineName := driver.MachineName(*cc, n)
-			host, err := machine.LoadHost(api, machineName)
+
+		client, err := createExternalSSHClient(co.CPHost.Driver)
+		if err != nil {
+			exit.WithError("Error getting ssh client", err)
+		}
+
+		sh := shell.EnvConfig{
+			Shell: shell.ForceShell,
+		}
+		ec := PodmanEnvConfig{
+			EnvConfig: sh,
+			profile:   cname,
+			driver:    driverName,
+			client:    client,
+		}
+
+		if ec.Shell == "" {
+			ec.Shell, err = shell.Detect()
 			if err != nil {
-				exit.WithError("Error getting host", err)
-			}
-			if host.Driver.DriverName() == driver.None {
-				exit.UsageT(`'none' driver does not support 'minikube podman-env' command`)
+				exit.WithError("Error detecting shell", err)
 			}
+		}
 
-			hostSt, err := machine.Status(api, machineName)
-			if err != nil {
-				exit.WithError("Error getting host status", err)
-			}
-			if hostSt != state.Running.String() {
-				exit.WithCodeT(exit.Unavailable, `'{{.profile}}' is not running`, out.V{"profile": profile})
-			}
-			ok, err := isPodmanAvailable(host)
-			if err != nil {
-				exit.WithError("Error getting service status", err)
+		if podmanUnset {
+			if err := podmanUnsetScript(ec, os.Stdout); err != nil {
+				exit.WithError("Error generating unset output", err)
 			}
+			return
+		}
 
-			if !ok {
-				exit.WithCodeT(exit.Unavailable, `The podman service within '{{.profile}}' is not active`, out.V{"profile": profile})
-			}
-
-			client, err := createExternalSSHClient(host.Driver)
-			if err != nil {
-				exit.WithError("Error getting ssh client", err)
-			}
-
-			sh := shell.EnvConfig{
-				Shell: shell.ForceShell,
-			}
-			ec := PodmanEnvConfig{
-				EnvConfig: sh,
-				profile:   profile,
-				driver:    host.DriverName,
-				client:    client,
-			}
-
-			if ec.Shell == "" {
-				ec.Shell, err = shell.Detect()
-				if err != nil {
-					exit.WithError("Error detecting shell", err)
-				}
-			}
-
-			if podmanUnset {
-				if err := podmanUnsetScript(ec, os.Stdout); err != nil {
-					exit.WithError("Error generating unset output", err)
-				}
-				return
-			}
-
-			if err := podmanSetScript(ec, os.Stdout); err != nil {
-				exit.WithError("Error generating set output", err)
-			}
+		if err := podmanSetScript(ec, os.Stdout); err != nil {
+			exit.WithError("Error generating set output", err)
 		}
 	},
 }
diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 08c0fb87d5..9c673790be 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -32,15 +32,11 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/service"
 	"k8s.io/minikube/pkg/minikube/tunnel/kic"
@@ -78,32 +74,16 @@ var serviceCmd = &cobra.Command{
 		}
 
 		svc := args[0]
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
 
-		profileName := viper.GetString(pkg_config.ProfileName)
-		cfg, err := config.Load(profileName)
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
-		cp, err := config.PrimaryControlPlane(cfg)
-		if err != nil {
-			exit.WithError("Error getting control plane", err)
-		}
-		machineName := driver.MachineName(*cfg, cp)
-		if !machine.IsRunning(api, machineName) {
-			os.Exit(1)
-		}
+		cname := ClusterFlagValue()
+		co := mustload.Healthy(cname)
 
-		if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
-			startKicServiceTunnel(svc, cfg.Name)
+		if runtime.GOOS == "darwin" && co.Config.Driver == oci.Docker {
+			startKicServiceTunnel(svc, cname)
 			return
 		}
 
-		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
+		urls, err := service.WaitForService(co.API, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
 			var s *service.SVCNotFoundError
 			if errors.As(err, &s) {
diff --git a/cmd/minikube/cmd/service_list.go b/cmd/minikube/cmd/service_list.go
index f22aa71d23..8932c75fea 100644
--- a/cmd/minikube/cmd/service_list.go
+++ b/cmd/minikube/cmd/service_list.go
@@ -22,14 +22,10 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	core "k8s.io/api/core/v1"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/service"
 )
@@ -42,24 +38,9 @@ var serviceListCmd = &cobra.Command{
 	Short: "Lists the URLs for the services in your local cluster",
 	Long:  `Lists the URLs for the services in your local cluster`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-		profileName := viper.GetString(pkg_config.ProfileName)
-		cfg, err := config.Load(profileName)
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
-		cp, err := config.PrimaryControlPlane(cfg)
-		if err != nil {
-			exit.WithError("Error getting primary control plane", err)
-		}
-		if !machine.IsRunning(api, driver.MachineName(*cfg, cp)) {
-			exit.WithCodeT(exit.Unavailable, "profile {{.name}} is not running.", out.V{"name": profileName})
-		}
-		serviceURLs, err := service.GetServiceURLs(api, serviceListNamespace, serviceURLTemplate)
+		co := mustload.Healthy(ClusterFlagValue())
+
+		serviceURLs, err := service.GetServiceURLs(co.API, serviceListNamespace, serviceURLTemplate)
 		if err != nil {
 			out.FatalT("Failed to get service URL: {{.error}}", out.V{"error": err})
 			out.ErrT(out.Notice, "Check that minikube is running and that you have specified the correct namespace (-n flag) if required.")
@@ -74,7 +55,7 @@ var serviceListCmd = &cobra.Command{
 				serviceURLs := strings.Join(serviceURL.URLs, "\n")
 
 				// if we are running Docker on OSX we empty the internal service URLs
-				if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
+				if runtime.GOOS == "darwin" && co.Config.Driver == oci.Docker {
 					serviceURLs = ""
 				}
 
diff --git a/cmd/minikube/cmd/ssh-key.go b/cmd/minikube/cmd/ssh-key.go
index 61d2c441a8..b7a0ddf0de 100644
--- a/cmd/minikube/cmd/ssh-key.go
+++ b/cmd/minikube/cmd/ssh-key.go
@@ -20,10 +20,8 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -33,10 +31,7 @@ var sshKeyCmd = &cobra.Command{
 	Short: "Retrieve the ssh identity key path of the specified cluster",
 	Long:  "Retrieve the ssh identity key path of the specified cluster.",
 	Run: func(cmd *cobra.Command, args []string) {
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Getting machine config failed", err)
-		}
+		_, cc := mustload.Partial(ClusterFlagValue())
 		out.Ln(filepath.Join(localpath.MiniPath(), "machines", cc.Name, "id_rsa"))
 	},
 }
diff --git a/cmd/minikube/cmd/ssh.go b/cmd/minikube/cmd/ssh.go
index 4a8508ec5d..a18ae297de 100644
--- a/cmd/minikube/cmd/ssh.go
+++ b/cmd/minikube/cmd/ssh.go
@@ -21,12 +21,12 @@ import (
 
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -41,42 +41,30 @@ var sshCmd = &cobra.Command{
 	Short: "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'",
 	Long:  "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.",
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Error getting config", err)
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
+		if co.CPHost.DriverName == driver.None {
+			exit.UsageT("'none' driver does not support 'minikube ssh' command")
 		}
+
+		var err error
 		var n *config.Node
 		if nodeName == "" {
-			cp, err := config.PrimaryControlPlane(cc)
-			if err != nil {
-				exit.WithError("Getting primary control plane", err)
-			}
-			n = &cp
+			n = co.CPNode
 		} else {
-			n, _, err = node.Retrieve(cc, nodeName)
+			n, _, err = node.Retrieve(co.Config, nodeName)
 			if err != nil {
 				exit.WithCodeT(exit.Unavailable, "Node {{.nodeName}} does not exist.", out.V{"nodeName": nodeName})
 			}
 		}
-		host, err := machine.LoadHost(api, driver.MachineName(*cc, *n))
-		if err != nil {
-			exit.WithError("Error getting host", err)
-		}
-		if host.Driver.DriverName() == driver.None {
-			exit.UsageT("'none' driver does not support 'minikube ssh' command")
-		}
+
 		if nativeSSHClient {
 			ssh.SetDefaultClient(ssh.Native)
 		} else {
 			ssh.SetDefaultClient(ssh.External)
 		}
 
-		err = machine.CreateSSHShell(api, *cc, *n, args)
+		err = machine.CreateSSHShell(co.API, *co.Config, *n, args)
 		if err != nil {
 			// This is typically due to a non-zero exit code, so no need for flourish.
 			out.ErrLn("ssh: %v", err)
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 559407c04f..c5b3610d20 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -291,7 +291,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		registryMirror = viper.GetStringSlice("registry_mirror")
 	}
 
-	existing, err := config.Load(viper.GetString(config.ProfileName))
+	existing, err := config.Load(ClusterFlagValue())
 	if err != nil && !config.IsNotExist(err) {
 		exit.WithCodeT(exit.Data, "Unable to load config: {{.error}}", out.V{"error": err})
 	}
@@ -390,8 +390,8 @@ func updateDriver(driverName string) {
 
 func displayVersion(version string) {
 	prefix := ""
-	if viper.GetString(config.ProfileName) != constants.DefaultClusterName {
-		prefix = fmt.Sprintf("[%s] ", viper.GetString(config.ProfileName))
+	if ClusterFlagValue() != constants.DefaultClusterName {
+		prefix = fmt.Sprintf("[%s] ", ClusterFlagValue())
 	}
 
 	versionState := out.Happy
@@ -653,14 +653,6 @@ func selectImageRepository(mirrorCountry string, v semver.Version) (bool, string
 	return false, fallback, nil
 }
 
-// Return a minikube command containing the current profile name
-func minikubeCmd() string {
-	if viper.GetString(config.ProfileName) != constants.DefaultClusterName {
-		return fmt.Sprintf("minikube -p %s", config.ProfileName)
-	}
-	return "minikube"
-}
-
 // validateUser validates minikube is run by the recommended user (privileged or regular)
 func validateUser(drvName string) {
 	u, err := user.Current()
@@ -686,7 +678,7 @@ func validateUser(drvName string) {
 	if !useForce {
 		os.Exit(exit.Permissions)
 	}
-	_, err = config.Load(viper.GetString(config.ProfileName))
+	_, err = config.Load(ClusterFlagValue())
 	if err == nil || !config.IsNotExist(err) {
 		out.T(out.Tip, "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete", out.V{"cmd": minikubeCmd()})
 	}
@@ -811,7 +803,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 	}
 
 	if driver.BareMetal(drvName) {
-		if viper.GetString(config.ProfileName) != constants.DefaultClusterName {
+		if ClusterFlagValue() != constants.DefaultClusterName {
 			exit.WithCodeT(exit.Config, "The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/", out.V{"name": drvName})
 		}
 
@@ -938,7 +930,7 @@ func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repositor
 	}
 
 	cfg := config.ClusterConfig{
-		Name:                    viper.GetString(config.ProfileName),
+		Name:                    ClusterFlagValue(),
 		KeepContext:             viper.GetBool(keepContext),
 		EmbedCerts:              viper.GetBool(embedCerts),
 		MinikubeISO:             viper.GetString(isoURL),
@@ -971,7 +963,7 @@ func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repositor
 		NatNicType:              viper.GetString(natNicType),
 		KubernetesConfig: config.KubernetesConfig{
 			KubernetesVersion:      k8sVersion,
-			ClusterName:            viper.GetString(config.ProfileName),
+			ClusterName:            ClusterFlagValue(),
 			APIServerName:          viper.GetString(apiServerName),
 			APIServerNames:         apiServerNames,
 			APIServerIPs:           apiServerIPs,
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 44b96bc8e2..965ab56761 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -29,16 +29,14 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/mustload"
 )
 
 var statusFormat string
@@ -101,24 +99,13 @@ var statusCmd = &cobra.Command{
 			exit.UsageT("Cannot use both --output and --format options")
 		}
 
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithCodeT(exit.Unavailable, "Error getting client: {{.error}}", out.V{"error": err})
-		}
-		defer api.Close()
-
-		cc, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			if config.IsNotExist(err) {
-				exit.WithCodeT(exitCode(&Status{}), `The "{{.name}}" cluster does not exist!`, out.V{"name": viper.GetString(config.ProfileName)})
-			}
-			exit.WithError("getting config", err)
-		}
+		cname := ClusterFlagValue()
+		api, cc := mustload.Partial(cname)
 
 		var st *Status
 		for _, n := range cc.Nodes {
 			machineName := driver.MachineName(*cc, n)
-			st, err = status(api, machineName, n.ControlPlane)
+			st, err := status(api, machineName, n.ControlPlane)
 			if err != nil {
 				glog.Errorf("status error: %v", err)
 			}
diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 005284a022..6d79b0446f 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -24,13 +24,12 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
-	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util/retry"
 )
@@ -46,17 +45,10 @@ itself, leaving all files intact. The cluster can be started again with the "sta
 
 // runStop handles the executes the flow of "minikube stop"
 func runStop(cmd *cobra.Command, args []string) {
-	profile := viper.GetString(pkg_config.ProfileName)
-	api, err := machine.NewAPIClient()
-	if err != nil {
-		exit.WithError("Error getting client", err)
-	}
-	defer api.Close()
+	cname := ClusterFlagValue()
 
-	cc, err := config.Load(profile)
-	if err != nil {
-		exit.WithError("Error getting cluster config", err)
-	}
+	api, cc := mustload.Partial(cname)
+	defer api.Close()
 
 	for _, n := range cc.Nodes {
 		nonexistent := stop(api, *cc, n)
@@ -70,8 +62,7 @@ func runStop(cmd *cobra.Command, args []string) {
 		out.T(out.Warning, "Unable to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	err = kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv())
-	if err != nil {
+	if err := kubeconfig.UnsetCurrentContext(cname, kubeconfig.PathFromEnv()); err != nil {
 		exit.WithError("update config", err)
 	}
 }
diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go
index 493fc98797..dbf66cf110 100644
--- a/cmd/minikube/cmd/tunnel.go
+++ b/cmd/minikube/cmd/tunnel.go
@@ -27,13 +27,12 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/service"
 	"k8s.io/minikube/pkg/minikube/tunnel"
 	"k8s.io/minikube/pkg/minikube/tunnel/kic"
@@ -51,6 +50,8 @@ var tunnelCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		manager := tunnel.NewManager()
+		cname := ClusterFlagValue()
+		co := mustload.Healthy(cname)
 
 		if cleanup {
 			glog.Info("Checking for tunnels to cleanup...")
@@ -60,13 +61,6 @@ var tunnelCmd = &cobra.Command{
 			return
 		}
 
-		glog.Infof("Creating docker machine client...")
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("error creating machine client", err)
-		}
-		glog.Infof("Creating k8s client...")
-
 		// Tunnel uses the k8s clientset to query the API server for services in the LoadBalancerEmulator.
 		// We define the tunnel and minikube error free if the API server responds within a second.
 		// This also contributes to better UX, the tunnel status check can happen every second and
@@ -76,11 +70,6 @@ var tunnelCmd = &cobra.Command{
 			exit.WithError("error creating clientset", err)
 		}
 
-		cfg, err := config.Load(viper.GetString(config.ProfileName))
-		if err != nil {
-			exit.WithError("Error getting config", err)
-		}
-
 		ctrlC := make(chan os.Signal, 1)
 		signal.Notify(ctrlC, os.Interrupt)
 		ctx, cancel := context.WithCancel(context.Background())
@@ -89,13 +78,13 @@ var tunnelCmd = &cobra.Command{
 			cancel()
 		}()
 
-		if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
-			port, err := oci.ForwardedPort(oci.Docker, cfg.Name, 22)
+		if runtime.GOOS == "darwin" && co.Config.Driver == oci.Docker {
+			port, err := oci.ForwardedPort(oci.Docker, cname, 22)
 			if err != nil {
 				exit.WithError("error getting ssh port", err)
 			}
 			sshPort := strconv.Itoa(port)
-			sshKey := filepath.Join(localpath.MiniPath(), "machines", cfg.Name, "id_rsa")
+			sshKey := filepath.Join(localpath.MiniPath(), "machines", cname, "id_rsa")
 
 			kicSSHTunnel := kic.NewSSHTunnel(ctx, sshPort, sshKey, clientset.CoreV1())
 			err = kicSSHTunnel.Start()
@@ -106,7 +95,7 @@ var tunnelCmd = &cobra.Command{
 			return
 		}
 
-		done, err := manager.StartTunnel(ctx, cfg.Name, api, config.DefaultLoader, clientset.CoreV1())
+		done, err := manager.StartTunnel(ctx, cname, co.API, config.DefaultLoader, clientset.CoreV1())
 		if err != nil {
 			exit.WithError("error starting tunnel", err)
 		}
diff --git a/cmd/minikube/cmd/unpause.go b/cmd/minikube/cmd/unpause.go
index 7549f1b008..d27801fc23 100644
--- a/cmd/minikube/cmd/unpause.go
+++ b/cmd/minikube/cmd/unpause.go
@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"os"
 	"strings"
 
 	"github.com/golang/glog"
@@ -25,11 +24,11 @@ import (
 	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -38,27 +37,12 @@ var unpauseCmd = &cobra.Command{
 	Use:   "unpause",
 	Short: "unpause Kubernetes",
 	Run: func(cmd *cobra.Command, args []string) {
-		cname := viper.GetString(config.ProfileName)
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-		cc, err := config.Load(cname)
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
 
-		if err != nil && !config.IsNotExist(err) {
-			exit.WithError("Error loading profile config", err)
-		}
-
-		if err != nil {
-			out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": cname})
-			os.Exit(1)
-		}
-		glog.Infof("config: %+v", cc)
-
-		for _, n := range cc.Nodes {
-			machineName := driver.MachineName(*cc, n)
-			host, err := machine.LoadHost(api, machineName)
+		for _, n := range co.Config.Nodes {
+			machineName := driver.MachineName(*co.Config, n)
+			host, err := machine.LoadHost(co.API, machineName)
 			if err != nil {
 				exit.WithError("Error getting host", err)
 			}
@@ -68,7 +52,7 @@ var unpauseCmd = &cobra.Command{
 				exit.WithError("Failed to get command runner", err)
 			}
 
-			cr, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime, Runner: r})
+			cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: r})
 			if err != nil {
 				exit.WithError("Failed runtime", err)
 			}
diff --git a/cmd/minikube/cmd/update-context.go b/cmd/minikube/cmd/update-context.go
index 2532672bbc..39a76e5929 100644
--- a/cmd/minikube/cmd/update-context.go
+++ b/cmd/minikube/cmd/update-context.go
@@ -18,12 +18,9 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/cluster"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
-	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -34,24 +31,16 @@ var updateContextCmd = &cobra.Command{
 	Long: `Retrieves the IP address of the running cluster, checks it
 			with IP in kubeconfig, and corrects kubeconfig if incorrect.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		api, err := machine.NewAPIClient()
-		if err != nil {
-			exit.WithError("Error getting client", err)
-		}
-		defer api.Close()
-		machineName := viper.GetString(config.ProfileName)
-		ip, err := cluster.GetHostDriverIP(api, machineName)
-		if err != nil {
-			exit.WithError("Error host driver ip status", err)
-		}
-		updated, err := kubeconfig.UpdateIP(ip, machineName, kubeconfig.PathFromEnv())
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
+		updated, err := kubeconfig.UpdateIP(co.DriverIP, cname, kubeconfig.PathFromEnv())
 		if err != nil {
 			exit.WithError("update config", err)
 		}
 		if updated {
-			out.T(out.Celebrate, "{{.machine}} IP has been updated to point at {{.ip}}", out.V{"machine": machineName, "ip": ip})
+			out.T(out.Celebrate, "{{.cluster}} IP has been updated to point at {{.ip}}", out.V{"cluster": cname, "ip": co.DriverIP})
 		} else {
-			out.T(out.Meh, "{{.machine}} IP was already correctly configured for {{.ip}}", out.V{"machine": machineName, "ip": ip})
+			out.T(out.Meh, "{{.cluster}} IP was already correctly configured for {{.ip}}", out.V{"cluster": cname, "ip": co.DriverIP})
 		}
 
 	},
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
new file mode 100644
index 0000000000..f7d25b6924
--- /dev/null
+++ b/pkg/minikube/mustload/mustload.go
@@ -0,0 +1,166 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// mustload loads minikube clusters, exiting with user-friendly messages
+package mustload
+
+import (
+	"fmt"
+	"net"
+	"os"
+
+	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
+	"github.com/docker/machine/libmachine/state"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+type ClusterController struct {
+	Config   *config.ClusterConfig
+	API      libmachine.API
+	CPHost   *host.Host
+	CPNode   *config.Node
+	CPRunner command.Runner
+	DriverIP net.IP
+}
+
+// Partial is a cmd-friendly way to load a cluster which may or may not be running
+func Partial(name string) (libmachine.API, *config.ClusterConfig) {
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		exit.WithError("libmachine failed", err)
+	}
+
+	cc, err := config.Load(name)
+	if err != nil {
+		if config.IsNotExist(err) {
+			out.T(out.Shrug, `There is no local cluster named "{{.cluster}}"`, out.V{"cluster": name})
+			exitTip("start", name, exit.Data)
+		}
+		exit.WithError("Error getting cluster config", err)
+	}
+
+	return api, cc
+}
+
+// Running is a cmd-friendly way to load a running cluster
+func Running(name string) ClusterController {
+	api, cc := Partial(name)
+
+	cp, err := config.PrimaryControlPlane(cc)
+	if err != nil {
+		exit.WithError("Unable to find control plane", err)
+	}
+
+	hs, err := machine.Status(api, cp.Name)
+	if err != nil {
+		exit.WithError("Unable to get machine status", err)
+	}
+
+	if hs == state.None.String() {
+		out.T(out.Shrug, `The control plane node "{{.name}}" does not exist.`, out.V{"name": cp.Name})
+		exitTip("start", name, exit.Unavailable)
+	}
+
+	if hs == state.Stopped.String() {
+		out.T(out.Shrug, `The control plane node must be running for this command`)
+		exitTip("start", name, exit.Unavailable)
+	}
+
+	if hs != state.Running.String() {
+		out.T(out.Shrug, `The control plane node is not running (state={{.state}})`, out.V{"name": cp.Name, "state": hs})
+		exitTip("start", name, exit.Unavailable)
+	}
+
+	host, err := machine.LoadHost(api, name)
+	if err != nil {
+		exit.WithError("Unable to load host", err)
+	}
+
+	cr, err := machine.CommandRunner(host)
+	if err != nil {
+		exit.WithError("Unable to get command runner", err)
+	}
+
+	ips, err := host.Driver.GetIP()
+	if err != nil {
+		exit.WithError("Unable to get driver IP", err)
+	}
+
+	if driver.IsKIC(host.DriverName) {
+		ips = oci.DefaultBindIPV4
+	}
+
+	ip := net.ParseIP(ips)
+	if ip == nil {
+		exit.WithCodeT(exit.Software, fmt.Sprintf("Unable to parse driver IP: %q", ips))
+	}
+
+	return ClusterController{
+		API:      api,
+		Config:   cc,
+		CPRunner: cr,
+		CPHost:   host,
+		CPNode:   &cp,
+		DriverIP: ip,
+	}
+}
+
+// Healthy is a cmd-friendly way to load a healthy cluster
+func Healthy(name string) ClusterController {
+	co := Running(name)
+
+	as, err := kverify.APIServerStatus(co.CPRunner, net.ParseIP(co.CPNode.IP), co.CPNode.Port)
+	if err != nil {
+		out.T(out.FailureType, `Unable to get control plane status: {{.error}}`, out.V{"error": err})
+		exitTip("delete", name, exit.Unavailable)
+	}
+
+	if as == state.Paused {
+		out.T(out.Shrug, `The control plane for "{{.name}}" is paused!`, out.V{"name": name})
+		exitTip("unpause", name, exit.Unavailable)
+	}
+
+	if as != state.Running {
+		out.T(out.Shrug, `This control plane is not running! (state={{.state}})`, out.V{"state": as.String()})
+		out.T(out.Warning, `This is unusual - you may want to investigate using "{{.command}} logs"`, out.V{"command": minikubeCmd(name)})
+		exitTip("start", name, exit.Unavailable)
+	}
+	return co
+}
+
+// Return a minikube command containing the current profile name
+func minikubeCmd(cname string) string {
+	if cname != constants.DefaultClusterName {
+		return fmt.Sprintf("minikube -p %s", cname)
+	}
+	return "minikube"
+}
+
+// exitTip returns an action tip and exits
+func exitTip(action string, profile string, code int) {
+	command := minikubeCmd(profile) + " " + action
+	out.T(out.Workaround, "To fix this, run: {{.command}}", out.V{"command": command})
+	os.Exit(code)
+}
diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index 8154f46980..150a7af30d 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -83,6 +83,8 @@ var styles = map[StyleEnum]style{
 	Sparkle:       {Prefix: "✨  "},
 	Pause:         {Prefix: "⏸️  "},
 	Unpause:       {Prefix: "⏯️  "},
+	Confused:      {Prefix: "😕  "},
+	Shrug:         {Prefix: "🤷  "},
 
 	// Specialized purpose styles
 	ISODownload:      {Prefix: "💿  "},
diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go
index d5937e2383..747c277faf 100644
--- a/pkg/minikube/out/style_enum.go
+++ b/pkg/minikube/out/style_enum.go
@@ -61,6 +61,7 @@ const (
 	DeletingHost
 	Copying
 	Connectivity
+	Confused
 	Internet
 	Mounting
 	Celebrate
@@ -89,4 +90,5 @@ const (
 	DryRun
 	AddonEnable
 	AddonDisable
+	Shrug
 )

From 77f97a58f470802f0e66497d92e401f1aa29f7f2 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 13:16:37 -0700
Subject: [PATCH 168/668] Fix uninitalized variable

---
 cmd/minikube/cmd/status.go        | 7 ++++++-
 pkg/minikube/mustload/mustload.go | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 965ab56761..0db9e57ea8 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -103,9 +103,13 @@ var statusCmd = &cobra.Command{
 		api, cc := mustload.Partial(cname)
 
 		var st *Status
+		var err error
 		for _, n := range cc.Nodes {
+			glog.Infof("checking status of %s ...", n.Name)
 			machineName := driver.MachineName(*cc, n)
-			st, err := status(api, machineName, n.ControlPlane)
+			st, err = status(api, machineName, n.ControlPlane)
+			glog.Infof("%s status: %+v", machineName, st)
+
 			if err != nil {
 				glog.Errorf("status error: %v", err)
 			}
@@ -127,6 +131,7 @@ var statusCmd = &cobra.Command{
 			}
 		}
 
+		// TODO: Update for multi-node
 		os.Exit(exitCode(st))
 	},
 }
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index f7d25b6924..1cdc8358b8 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -25,6 +25,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/state"
+	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -47,6 +48,7 @@ type ClusterController struct {
 
 // Partial is a cmd-friendly way to load a cluster which may or may not be running
 func Partial(name string) (libmachine.API, *config.ClusterConfig) {
+	glog.Infof("Loading cluster: %s", name)
 	api, err := machine.NewAPIClient()
 	if err != nil {
 		exit.WithError("libmachine failed", err)

From b8c7638976349d80828f3ccc7ca475d14d581883 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 13:17:34 -0700
Subject: [PATCH 169/668] Add flag functions

---
 cmd/minikube/cmd/config/flags.go | 11 +++++++++++
 cmd/minikube/cmd/flags.go        | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 cmd/minikube/cmd/config/flags.go
 create mode 100644 cmd/minikube/cmd/flags.go

diff --git a/cmd/minikube/cmd/config/flags.go b/cmd/minikube/cmd/config/flags.go
new file mode 100644
index 0000000000..4df6082a40
--- /dev/null
+++ b/cmd/minikube/cmd/config/flags.go
@@ -0,0 +1,11 @@
+package config
+
+import (
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
+)
+
+// ClusterFlagValue returns the current cluster name based on flags
+func ClusterFlagValue() string {
+	return viper.GetString(config.ProfileName)
+}
diff --git a/cmd/minikube/cmd/flags.go b/cmd/minikube/cmd/flags.go
new file mode 100644
index 0000000000..c00bb54286
--- /dev/null
+++ b/cmd/minikube/cmd/flags.go
@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+)
+
+// Return a minikube command containing the current profile name
+func minikubeCmd() string {
+	cname := ClusterFlagValue()
+	if cname != constants.DefaultClusterName {
+		return fmt.Sprintf("minikube -p %s", cname)
+	}
+	return "minikube"
+}
+
+// ClusterFlagValue returns the current cluster name based on flags
+func ClusterFlagValue() string {
+	return viper.GetString(config.ProfileName)
+}

From 0ce81acbf49f9a56f702f132fb097fd98e15e1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Mon, 23 Mar 2020 21:49:19 +0100
Subject: [PATCH 170/668] Centralize the handling of browser.OpenURL

So we can catch when xdg-open not installed
---
 cmd/minikube/cmd/config/open.go |  3 +--
 cmd/minikube/cmd/dashboard.go   |  2 +-
 cmd/minikube/cmd/service.go     |  2 +-
 pkg/minikube/browser/browser.go | 35 +++++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 pkg/minikube/browser/browser.go

diff --git a/cmd/minikube/cmd/config/open.go b/cmd/minikube/cmd/config/open.go
index c4c8b5416d..dc4fd0fb7a 100644
--- a/cmd/minikube/cmd/config/open.go
+++ b/cmd/minikube/cmd/config/open.go
@@ -21,11 +21,10 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/pkg/browser"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
+	"k8s.io/minikube/pkg/minikube/browser"
 	"k8s.io/minikube/pkg/minikube/config"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go
index b5fd848eb3..b65c53eb84 100644
--- a/cmd/minikube/cmd/dashboard.go
+++ b/cmd/minikube/cmd/dashboard.go
@@ -29,12 +29,12 @@ import (
 
 	"github.com/docker/machine/libmachine/mcnerror"
 	"github.com/golang/glog"
-	"github.com/pkg/browser"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	pkgaddons "k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/assets"
+	"k8s.io/minikube/pkg/minikube/browser"
 	"k8s.io/minikube/pkg/minikube/config"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 08c0fb87d5..ae14afda08 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -30,11 +30,11 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/browser"
 	"k8s.io/minikube/pkg/minikube/config"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
diff --git a/pkg/minikube/browser/browser.go b/pkg/minikube/browser/browser.go
new file mode 100644
index 0000000000..dd6a4799db
--- /dev/null
+++ b/pkg/minikube/browser/browser.go
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package browser
+
+import (
+	"os/exec"
+	"runtime"
+
+	"github.com/pkg/browser"
+)
+
+// OpenURL opens a new browser window pointing to URL.
+func OpenURL(url string) error {
+	if runtime.GOOS == "linux" {
+		_, err := exec.LookPath("xdg-open")
+		if err != nil {
+			return err
+		}
+	}
+	return browser.OpenURL(url)
+}

From 54bbdde812e264e9bf31812363a89aa5a6fe4d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Mon, 23 Mar 2020 22:11:22 +0100
Subject: [PATCH 171/668] Print the URL, instead of return an error

Let the terminal user open it themselves
---
 pkg/minikube/browser/browser.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/browser/browser.go b/pkg/minikube/browser/browser.go
index dd6a4799db..890e068844 100644
--- a/pkg/minikube/browser/browser.go
+++ b/pkg/minikube/browser/browser.go
@@ -21,6 +21,7 @@ import (
 	"runtime"
 
 	"github.com/pkg/browser"
+	"k8s.io/minikube/pkg/minikube/out"
 )
 
 // OpenURL opens a new browser window pointing to URL.
@@ -28,7 +29,8 @@ func OpenURL(url string) error {
 	if runtime.GOOS == "linux" {
 		_, err := exec.LookPath("xdg-open")
 		if err != nil {
-			return err
+			out.T(out.URL, url)
+			return nil
 		}
 	}
 	return browser.OpenURL(url)

From 29f5007f4604d802588b5e9b44e0b5d4195b1bf2 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 14:25:47 -0700
Subject: [PATCH 172/668] Use correct machine name for status check

---
 pkg/minikube/mustload/mustload.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index 1cdc8358b8..59ab08e212 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -75,7 +75,8 @@ func Running(name string) ClusterController {
 		exit.WithError("Unable to find control plane", err)
 	}
 
-	hs, err := machine.Status(api, cp.Name)
+	machineName := driver.MachineName(*cc, cp)
+	hs, err := machine.Status(api, machineName)
 	if err != nil {
 		exit.WithError("Unable to get machine status", err)
 	}

From b9049288fd9b82538ebef68d3381df9574692051 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 14:25:59 -0700
Subject: [PATCH 173/668] Improve experience for paused cluster

---
 cmd/minikube/cmd/logs.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index 098ab0d99f..f2a1fba453 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -17,6 +17,8 @@ limitations under the License.
 package cmd
 
 import (
+	"os"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
@@ -25,6 +27,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/mustload"
+	"k8s.io/minikube/pkg/minikube/out"
 )
 
 const (
@@ -73,7 +76,10 @@ var logsCmd = &cobra.Command{
 		}
 		err = logs.Output(cr, bs, *co.Config, co.CPRunner, numberOfLines)
 		if err != nil {
-			exit.WithError("Error getting machine logs", err)
+			out.Ln("")
+			// Avoid exit.WithError, since it outputs the issue URL
+			out.T(out.Warning, "{{.error}}", out.V{"error": err})
+			os.Exit(exit.Unavailable)
 		}
 	},
 }

From 81393a0bc39d688124be3746ea3ed14d50d3cab4 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 14:39:49 -0700
Subject: [PATCH 174/668] Add boilerplate

---
 cmd/minikube/cmd/config/flags.go | 16 ++++++++++++++++
 cmd/minikube/cmd/flags.go        | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/cmd/minikube/cmd/config/flags.go b/cmd/minikube/cmd/config/flags.go
index 4df6082a40..5a978ab08b 100644
--- a/cmd/minikube/cmd/config/flags.go
+++ b/cmd/minikube/cmd/config/flags.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package config
 
 import (
diff --git a/cmd/minikube/cmd/flags.go b/cmd/minikube/cmd/flags.go
index c00bb54286..6911e9a7c7 100644
--- a/cmd/minikube/cmd/flags.go
+++ b/cmd/minikube/cmd/flags.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package cmd
 
 import (

From 74380b0eda5e290ab78aa1b53ff87cead82db0e6 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 14:40:02 -0700
Subject: [PATCH 175/668] Fix output of ssh command test

The /r isn't actually returned.
---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 8445aa364a..ec4ce69051 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -698,7 +698,7 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
 	if NoneDriver() {
 		t.Skipf("skipping: ssh unsupported by none")
 	}
-	want := "hello\r\n"
+	want := "hello\n"
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("echo hello")))
 	if err != nil {
 		t.Errorf("%s failed: %v", rr.Args, err)

From 80bd7b1532cf8ba91e81454731a7a82c18f95661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Mon, 23 Mar 2020 22:41:06 +0100
Subject: [PATCH 176/668] Upgrade machine to machine-drivers/master 0.16.2

---
 go.mod | 4 ++--
 go.sum | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index a703f57861..3f4a02bf9f 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/docker/cli v0.0.0-20200303162255-7d407207c304 // indirect
 	github.com/docker/docker v1.13.1
 	github.com/docker/go-units v0.4.0
-	github.com/docker/machine v0.7.1-0.20190718054102-a555e4f7a8f5 // version is 0.7.1 to pin to a555e4f7a8f5
+	github.com/docker/machine v0.7.1-0.20190902101342-b170508bf44c // v0.16.2^
 	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f
 	github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
@@ -95,7 +95,7 @@ require (
 replace (
 	git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
 	github.com/docker/docker => github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
-	github.com/docker/machine => github.com/medyagh/machine v0.16.4
+	github.com/docker/machine => github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8
 	github.com/hashicorp/go-getter => github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c
 	github.com/samalba/dockerclient => github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97
 	k8s.io/api => k8s.io/api v0.17.3
diff --git a/go.sum b/go.sum
index 8a4fe67c98..29d0ae43c8 100644
--- a/go.sum
+++ b/go.sum
@@ -178,6 +178,8 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
+github.com/docker/machine v0.7.1-0.20190902101342-b170508bf44c h1:/CqsDCJqQY+xBxJ65ri4ZGw6jXugauXisH3roam3Ics=
+github.com/docker/machine v0.7.1-0.20190902101342-b170508bf44c/go.mod h1:I8mPNDeK1uH+JTcUU7X0ZW8KiYz0jyAgNaeSJ1rCfDI=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -486,6 +488,8 @@ github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H7
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
 github.com/machine-drivers/docker-machine-driver-vmware v0.1.1 h1:+E1IKKk+6kaQrCPg6edJZ/zISZijuZTPnzy6RE4C/Ho=
 github.com/machine-drivers/docker-machine-driver-vmware v0.1.1/go.mod h1:ej014C83EmSnxJeJ8PtVb8OLJ91PJKO1Q8Y7sM5CK0o=
+github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8 h1:CIddS19fAKG4rUkZAotX0WPQtx/v/SdLhhDU3MVhLy0=
+github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8/go.mod h1:79Uwa2hGd5S39LDJt58s8JZcIhGEK6pkq9bsuTbFWbk=
 github.com/magiconair/properties v1.7.6/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -517,8 +521,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 h1:g+4J5sZg6osfvEfkRZxJ1em0VT95/UOZgi/l7zi1/oE=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
-github.com/medyagh/machine v0.16.4 h1:oEsH3C1TYzs5axakAI/K1yc5O3r6de0+mCGumX4aHwM=
-github.com/medyagh/machine v0.16.4/go.mod h1:/HegrAvHvD0AGQYQaLfrmUqxQTQF3Ks9qkj34p/ZH40=
 github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
 github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
 github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=

From 6f50b27a2045f90f41f31bb0bd06a421435095a4 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 15:38:17 -0700
Subject: [PATCH 177/668] install conntrack for none tests

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a2daefe32d..a6146b5b5a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,7 +88,7 @@ jobs:
         docker info || true
         docker version || true
         docker ps || true
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -228,11 +228,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: install lz4
+    - name: Install conntrack
       shell: bash
       run: |
         sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -295,11 +295,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: install lz4
+    - name: Install conntrack
       shell: bash
       run: |
         sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |

From 31dec90cc890faaad2b5db7d7075fa331f9c5fa4 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 22:45:22 +0000
Subject: [PATCH 178/668] formatting

---
 .github/workflows/main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a2daefe32d..92259e9e85 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,7 +88,7 @@ jobs:
         docker info || true
         docker version || true
         docker ps || true
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -155,7 +155,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     needs: [build_minikube]
     steps:
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -228,7 +228,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -295,7 +295,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -362,12 +362,12 @@ jobs:
         SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
       runs-on: ubuntu-18.04
       steps:
-      - name: install lz4
+      - name: Install lz4
         shell: bash
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
-      - name: install podman
+      - name: Install podman
         shell: bash
         run: |
           . /etc/os-release

From 61c3e2d6a087942fc6cd803f082cfa12b6682258 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 15:46:45 -0700
Subject: [PATCH 179/668] formatting

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a6146b5b5a..3ade2e60d5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -155,7 +155,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     needs: [build_minikube]
     steps:
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -362,12 +362,12 @@ jobs:
         SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
       runs-on: ubuntu-18.04
       steps:
-      - name: install lz4
+      - name: Install lz4
         shell: bash
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
-      - name: install podman
+      - name: Install podman
         shell: bash
         run: |
           . /etc/os-release

From 673341ce35e51fe9aa50a574d1230382b84034d7 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 15:51:02 -0700
Subject: [PATCH 180/668] Improve hostDriver comment

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6b39b8955f..c349f5fa3f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -520,7 +520,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	return pick
 }
 
-// hostDriver returns the true driver used without relying on config fields
+// hostDriver returns the actual driver used by a libmachine host, which can differ from our config
 func hostDriver(existing *config.ClusterConfig) string {
 	if existing == nil {
 		return ""

From b99e9436846884f1073640bbc7bec47636404152 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 16:00:53 -0700
Subject: [PATCH 181/668] Improve minikubeCmd, promote to public function

---
 cmd/minikube/cmd/flags.go         | 12 ------------
 cmd/minikube/cmd/start.go         | 15 +++++----------
 pkg/minikube/mustload/mustload.go | 10 +++++-----
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/cmd/minikube/cmd/flags.go b/cmd/minikube/cmd/flags.go
index 6911e9a7c7..4c8c0efa0f 100644
--- a/cmd/minikube/cmd/flags.go
+++ b/cmd/minikube/cmd/flags.go
@@ -17,22 +17,10 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/constants"
 )
 
-// Return a minikube command containing the current profile name
-func minikubeCmd() string {
-	cname := ClusterFlagValue()
-	if cname != constants.DefaultClusterName {
-		return fmt.Sprintf("minikube -p %s", cname)
-	}
-	return "minikube"
-}
-
 // ClusterFlagValue returns the current cluster name based on flags
 func ClusterFlagValue() string {
 	return viper.GetString(config.ProfileName)
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index c5b3610d20..ad8c52ad91 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -54,6 +54,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/notify"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -550,15 +551,9 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 	if err != nil {
 		exit.WithError("Error getting primary cp", err)
 	}
-	machineName := driver.MachineName(*existing, cp)
-	h, err := api.Load(machineName)
-	if err != nil {
-		glog.Warningf("selectDriver api.Load: %v", err)
-		return
-	}
 
-	out.ErrT(out.Conflict, `The existing "{{.profile_name}}" VM was created using the "{{.old_driver}}" driver, and is incompatible with the "{{.driver}}" driver.`,
-		out.V{"profile_name": machineName, "driver": requested, "old_driver": h.Driver.DriverName()})
+	out.ErrT(out.Conflict, `The existing "{{.name}}" ccluster was created using the "{{.old}}" driver, and is incompatible with the "{{.new}}" driver.`,
+		out.V{"name": existing.Name, "new": requested, "old": h.Driver.DriverName()})
 
 	out.ErrT(out.Workaround, `To proceed, either:
 
@@ -566,8 +561,8 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 
 * or *
 
-2) Start the existing "{{.profile_name}}" cluster using: '{{.command}} start --driver={{.old_driver}}'
-`, out.V{"command": minikubeCmd(), "old_driver": h.Driver.DriverName(), "profile_name": machineName})
+2) Start the existing "{{.profile_name}}" cluster using: '{{.command}} --driver={{.old_driver}}'
+`, out.V{"command": mustload.ExampleCmd(existing.Name, "start"), "old_driver": h.Driver.DriverName(), "profile_name": cname})
 
 	exit.WithCodeT(exit.Config, "Exiting.")
 }
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index 59ab08e212..4d6db076dd 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -153,17 +153,17 @@ func Healthy(name string) ClusterController {
 	return co
 }
 
-// Return a minikube command containing the current profile name
-func minikubeCmd(cname string) string {
+// ExampleCmd Return a minikube command containing the current profile name
+func ExampleCmd(cname string, action string) string {
 	if cname != constants.DefaultClusterName {
-		return fmt.Sprintf("minikube -p %s", cname)
+		return fmt.Sprintf("minikube %s -p %s", action, cname)
 	}
-	return "minikube"
+	return fmt.Sprintf("minikube %s", action)
 }
 
 // exitTip returns an action tip and exits
 func exitTip(action string, profile string, code int) {
-	command := minikubeCmd(profile) + " " + action
+	command := ExampleCmd(profile, action)
 	out.T(out.Workaround, "To fix this, run: {{.command}}", out.V{"command": command})
 	os.Exit(code)
 }

From 2a2b3428fdb96bccea17f96e0dc6be7eaa1aa4fd Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 16:42:39 -0700
Subject: [PATCH 182/668] add lz4 back

---
 .github/workflows/main.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ade2e60d5..d03af33653 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -228,10 +228,14 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: Install conntrack
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
@@ -295,10 +299,14 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: Install conntrack
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
+        sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash

From 0ff8becc6323991db7cd3ea2c1ac967877144050 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 17:09:12 -0700
Subject: [PATCH 183/668] install conntrack everywhere, check for vm-driver in
 tests

---
 .github/workflows/main.yml | 24 ++++++++++++++----------
 test/integration/main.go   |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d03af33653..379b82f120 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,6 +93,10 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -160,6 +164,10 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
+        sudo apt-get -qq -y install conntrack
     - name: Docker Info
       shell: bash
       run: |
@@ -228,14 +236,10 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: Install lz4
-      shell: bash
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
     - name: Install conntrack
       shell: bash
       run: |
+        sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
@@ -299,14 +303,10 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: Install lz4
-      shell: bash
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
     - name: Install conntrack
       shell: bash
       run: |
+        sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
@@ -375,6 +375,10 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
+      - name: Install conntrack
+        shell: bash
+        run: |
+          sudo apt-get -qq -y install conntrack
       - name: Install podman
         shell: bash
         run: |
diff --git a/test/integration/main.go b/test/integration/main.go
index 3c159a6e42..04c22da305 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -60,12 +60,12 @@ func Target() string {
 
 // NoneDriver returns whether or not this test is using the none driver
 func NoneDriver() bool {
-	return strings.Contains(*startArgs, "--driver=none")
+	return strings.Contains(*startArgs, "--driver=none") || strings.Contains(*startArgs, "--vm-driver=none")
 }
 
 // HyperVDriver returns whether or not this test is using the Hyper-V driver
 func HyperVDriver() bool {
-	return strings.Contains(*startArgs, "--driver=hyperv")
+	return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
 }
 
 // CanCleanup returns if cleanup is allowed

From a42d1c40c13c0b130b41442d20730e3d605228d5 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 17:21:44 -0700
Subject: [PATCH 184/668] conntrack only needed for none

---
 .github/workflows/main.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 379b82f120..1304c3634c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,10 +93,6 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
-    - name: Install conntrack
-      shell: bash
-      run: |
-        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -164,10 +160,6 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
-    - name: Install conntrack
-      shell: bash
-      run: |
-        sudo apt-get -qq -y install conntrack
     - name: Docker Info
       shell: bash
       run: |
@@ -236,6 +228,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
+    # conntrack is required for kubernetes 1.18 and highter
     - name: Install conntrack
       shell: bash
       run: |
@@ -303,6 +296,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
+    # conntrack is required for kubernetes 1.18 and highter
     - name: Install conntrack
       shell: bash
       run: |
@@ -375,10 +369,6 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
-      - name: Install conntrack
-        shell: bash
-        run: |
-          sudo apt-get -qq -y install conntrack
       - name: Install podman
         shell: bash
         run: |

From 1273d4f8e756ac5eca89d94c449450fb2da21a5a Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 17:22:47 -0700
Subject: [PATCH 185/668] typo

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1304c3634c..fda40cd7f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -228,7 +228,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    # conntrack is required for kubernetes 1.18 and highter
+    # conntrack is required for kubernetes 1.18 and higher
     - name: Install conntrack
       shell: bash
       run: |
@@ -296,7 +296,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    # conntrack is required for kubernetes 1.18 and highter
+    # conntrack is required for kubernetes 1.18 and higher
     - name: Install conntrack
       shell: bash
       run: |

From 82eafa57d4d8c2d2f9addb20d18f4f66437d21c9 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 23 Mar 2020 17:25:25 -0700
Subject: [PATCH 186/668] Smoothly retry host startup

---
 pkg/minikube/node/start.go | 39 ++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 204ed14b97..7e3e1836b0 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -320,14 +320,45 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 }
 
 // startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, mc config.ClusterConfig, n config.Node) (*host.Host, bool) {
-	host, exists, err := machine.StartHost(api, mc, n)
-	if err != nil {
-		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
+func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, bool) {
+	host, exists, err := machine.StartHost(api, cc, n)
+	if err == nil {
+		return host, exists
 	}
+	out.T(out.Embarrassed, "StartHost failed, but will try again: {{.error}}", out.V{"error": err})
+
+	// NOTE: People get very cranky if you delete their prexisting VM. Only delete new ones.
+	if !exists {
+		err := machine.DeleteHost(api, driver.MachineName(cc, n))
+		if err != nil {
+			glog.Warningf("delete host: %v", err)
+		}
+	}
+
+	// Try again, but just once to avoid copious error messages
+	time.Sleep(5 * time.Second)
+
+	host, exists, err = machine.StartHost(api, cc, n)
+	if err == nil {
+		return host, exists
+	}
+
+	out.T(out.FailureType, "StartHost failed again: {{.error}}", out.V{"error": err})
+	out.T(out.Workaround, `Run: "{{.cmd}} delete", then "{{.cmd}} start --alsologtostderr -v=1" to try again with more logs`,
+		out.V{"cmd": minikubeCmd()})
+
+	exit.WithError("Unable to start VM after repeated tries. Please try {{'minikube delete' if possible", err)
 	return host, exists
 }
 
+// Return a minikube command containing the current profile name
+func minikubeCmd() string {
+	if viper.GetString(config.ProfileName) != constants.DefaultClusterName {
+		return fmt.Sprintf("minikube -p %s", config.ProfileName)
+	}
+	return "minikube"
+}
+
 // validateNetwork tries to catch network problems as soon as possible
 func validateNetwork(h *host.Host, r command.Runner) string {
 	ip, err := h.Driver.GetIP()

From abf35cfbc15b52b1d5149f66d9224a6fa7d742a3 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 17:41:06 -0700
Subject: [PATCH 187/668] Upgrade podman and add libglib2.0-0 to kicbase image

The `TestOffline/group/crio` integration test was failing with the error:

```
crio load image: sudo podman load -i /var/lib/minikube/images/storage-provisioner_v1.8.1: exit status 125
```

I tried SSH'ing into minikube and running the command myself, and got the error:

```
Error: could not get runtime: please update to v2.0.1 or later: outdated conmon version
```

I then tried updating conmon, but got the error:

```
conmon: error while loading shared libraries: libglib-2.0.so.0: cannot open shared object file: No such file or directory
```

I then tried adding the libglib2.0-0 library to the kic base image and upgrading podman, which seems to have resolved the issue.
---
 hack/images/kicbase.Dockerfile | 4 +++-
 pkg/drivers/kic/types.go       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hack/images/kicbase.Dockerfile b/hack/images/kicbase.Dockerfile
index baadf88df3..5afbe6e146 100644
--- a/hack/images/kicbase.Dockerfile
+++ b/hack/images/kicbase.Dockerfile
@@ -12,6 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     docker.io=19.03.2-0ubuntu1 \
     openssh-server=1:8.0p1-6build1 \
     dnsutils=1:9.11.5.P4+dfsg-5.1ubuntu2.1 \
+    # libglib2.0-0 is required for conmon, which is required for podman
+    libglib2.0-0=2.62.1-1 \
     && rm /etc/crictl.yaml
 # install cri-o based on https://github.com/cri-o/cri-o/commit/96b0c34b31a9fc181e46d7d8e34fb8ee6c4dc4e1#diff-04c6e90faac2675aa89e2176d2eec7d8R128
 RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_19.10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \    
@@ -19,7 +21,7 @@ RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/lib
     apt-key add - < Release.key && apt-get update && \
     apt-get install -y --no-install-recommends cri-o-1.17=1.17.0-3
 # install podman
-RUN apt-get install -y --no-install-recommends podman=1.8.0~7
+RUN apt-get install -y --no-install-recommends podman=1.8.2~1
 # disable non-docker runtimes by default
 RUN systemctl disable containerd && systemctl disable crio && rm /etc/crictl.yaml
 # enable docker which is default
diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index 32e2950396..d31aac0b85 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -30,9 +30,9 @@ const (
 	DefaultPodCIDR = "10.244.0.0/16"
 
 	// Version is the current version of kic
-	Version = "v0.0.7"
+	Version = "v0.0.8"
 	// SHA of the kic base image
-	baseImageSHA = "a6f288de0e5863cdeab711fa6bafa38ee7d8d285ca14216ecf84fcfb07c7d176"
+	baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81"
 
 	// OverlayImage is the cni plugin used for overlay image, created by kind.
 	// CNI plugin image used for kic drivers created by kind.

From 4f3c4dee06de1d4871bd660c6496bc298f94914c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 17:48:26 -0700
Subject: [PATCH 188/668] add nice error message for missing conntrack

---
 pkg/minikube/problem/err_map.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index ec93a3569a..72547cf57f 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -179,6 +179,7 @@ var vmProblems = map[string]match{
 		GOOS:   []string{"linux"},
 		Issues: []int{5950},
 	},
+
 	// None
 	"NONE_APISERVER_MISSING": {
 		Regexp: re(`apiserver process never appeared`),
@@ -225,6 +226,12 @@ var vmProblems = map[string]match{
 		Issues: []int{6083, 5636},
 		GOOS:   []string{"linux"},
 	},
+	"NONE_CONNTRACK": {
+		Regexp: re(`[ERROR FileExisting-conntrack]: conntrack not found in system path`),
+		Advice: "Kubernetes 1.18 and higher requires conntrack to be installed, to install it on your machine for the none driver simply run `apt-get install conntrack` as root.",
+		GOOS:   []string{"linux"},
+	},
+
 	// VirtualBox
 	"VBOX_BLOCKED": {
 		Regexp: re(`NS_ERROR_FAILURE.*0x80004005`),

From 091059b88619b6ff1c6764f309de66acb7dcee63 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 17:55:00 -0700
Subject: [PATCH 189/668] Add timeout on needsTransfer function

needsTransfer requires a network connection as it tries to get the digest of the image it is verifying. When running `TestOffline/group/crio`, LoadImages takes 6m30s to complete because it's waiting for i/o timeout. With this timeout, LoadImages takes ~45 seconds when running that integratin test.
---
 pkg/minikube/machine/cache_images.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
index 34b4379314..dd3fc58d9e 100644
--- a/pkg/minikube/machine/cache_images.go
+++ b/pkg/minikube/machine/cache_images.go
@@ -92,7 +92,11 @@ func LoadImages(cc *config.ClusterConfig, runner command.Runner, images []string
 	for _, image := range images {
 		image := image
 		g.Go(func() error {
-			err := needsTransfer(imgClient, image, cr)
+			// Put a ten second limit on deciding if an image needs transfer
+			// because it takes much less than that time to just transfer the image.
+			// This is needed because if running in offline mode, we can spend minutes here
+			// waiting for i/o timeout.
+			err := timedNeedsTransfer(imgClient, image, cr, 10*time.Second)
 			if err == nil {
 				return nil
 			}
@@ -107,6 +111,28 @@ func LoadImages(cc *config.ClusterConfig, runner command.Runner, images []string
 	return nil
 }
 
+func timedNeedsTransfer(imgClient *client.Client, imgName string, cr cruntime.Manager, t time.Duration) error {
+	timeout := make(chan bool, 1)
+	go func() {
+		time.Sleep(t)
+		timeout <- true
+	}()
+
+	transferFinished := make(chan bool, 1)
+	var err error
+	go func() {
+		err = needsTransfer(imgClient, imgName, cr)
+		transferFinished <- true
+	}()
+
+	select {
+	case <-transferFinished:
+		return err
+	case <-timeout:
+		return fmt.Errorf("needs transfer timed out in %f seconds", t.Seconds())
+	}
+}
+
 // needsTransfer returns an error if an image needs to be retransfered
 func needsTransfer(imgClient *client.Client, imgName string, cr cruntime.Manager) error {
 	imgDgst := ""         // for instance sha256:7c92a2c6bbcb6b6beff92d0a940779769c2477b807c202954c537e2e0deb9bed

From 9e81e06e61fc29c5a765c5b19c9a13c01800d452 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 18:04:29 -0700
Subject: [PATCH 190/668] fix regex

---
 go.sum                          | 2 --
 pkg/minikube/problem/err_map.go | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/go.sum b/go.sum
index 29d0ae43c8..70ea938169 100644
--- a/go.sum
+++ b/go.sum
@@ -178,8 +178,6 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
-github.com/docker/machine v0.7.1-0.20190902101342-b170508bf44c h1:/CqsDCJqQY+xBxJ65ri4ZGw6jXugauXisH3roam3Ics=
-github.com/docker/machine v0.7.1-0.20190902101342-b170508bf44c/go.mod h1:I8mPNDeK1uH+JTcUU7X0ZW8KiYz0jyAgNaeSJ1rCfDI=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index 72547cf57f..ad37cc2478 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -227,7 +227,7 @@ var vmProblems = map[string]match{
 		GOOS:   []string{"linux"},
 	},
 	"NONE_CONNTRACK": {
-		Regexp: re(`[ERROR FileExisting-conntrack]: conntrack not found in system path`),
+		Regexp: re(`\[ERROR FileExisting-conntrack\]: conntrack not found in system path`),
 		Advice: "Kubernetes 1.18 and higher requires conntrack to be installed, to install it on your machine for the none driver simply run `apt-get install conntrack` as root.",
 		GOOS:   []string{"linux"},
 	},

From 3c37556627b8932f76e3db46b6ebdae8dc0ed156 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 23 Mar 2020 18:06:53 -0700
Subject: [PATCH 191/668] update vm podman to same version

---
 deploy/iso/minikube-iso/package/podman/podman.hash | 1 +
 deploy/iso/minikube-iso/package/podman/podman.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash
index af242fcc80..fda1df9870 100644
--- a/deploy/iso/minikube-iso/package/podman/podman.hash
+++ b/deploy/iso/minikube-iso/package/podman/podman.hash
@@ -12,3 +12,4 @@ sha256 2e027c1b935f3a03f27ef7f17823ccf334607a17d033d4ce53a90b98294e7f68 v1.4.4.t
 sha256 61b44b739c485125f179044f7aa7dc58c820f771bce4ce495fa555a38dc68b57 v1.6.3.tar.gz
 sha256 6e59821320b435543bc7554e73faa66d5956e4ad3f7e7f4ea03bebd6726758e9 v1.6.4.tar.gz
 sha256 50960293c2019e38ce69e4cf5f0a683e7fea1562b180e38e38c9355fcd7c4f0d v1.6.5.tar.gz
+sha256 69f7ff81da1510ebf2962c1de3170675ca3cd8a24bc00c93742a24bcce17c752 v1.8.2.tar.gz
diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk
index 911dc30cf3..8781c0b0b9 100644
--- a/deploy/iso/minikube-iso/package/podman/podman.mk
+++ b/deploy/iso/minikube-iso/package/podman/podman.mk
@@ -1,5 +1,5 @@
-PODMAN_VERSION = v1.6.5
-PODMAN_COMMIT = 45e7be192ef99e870c59a1cd2c1fa7940b0af2d6
+PODMAN_VERSION = v1.8.2
+PODMAN_COMMIT = 028e3317eb1494b9b2acba4a0a295df80fae66cc
 PODMAN_SITE = https://github.com/containers/libpod/archive
 PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz
 PODMAN_LICENSE = Apache-2.0

From 90de1d4c7f82212bd58899a0b2f24d751c7460aa Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 18:37:13 -0700
Subject: [PATCH 192/668] install conntrack on integeration machines

---
 hack/jenkins/linux_integration_tests_none.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index a902ef15ee..9f45f2ad54 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -49,7 +49,15 @@ sudo rm -rf /var/lib/minikube/*
 # Stop any leftover kubelet
 sudo systemctl is-active --quiet kubelet \
   && echo "stopping kubelet" \
-  && sudo systemctl stop kubelet
+  && sudo systemctl stop -f kubelet
+
+ # conntrack is required for kubernetes 1.18 and higher for none driver
+if ! conntrack --version &>/dev/null; then
+  echo "WARNING: No contrack is not installed"
+  sudo apt-get update -qq
+  sudo apt-get -qq -y install conntrack
+fi
+
 
 mkdir -p cron && gsutil -m rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
 sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"

From 8b587384912fd838baaafeccd799bdf08a29c5ca Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 02:54:47 +0000
Subject: [PATCH 193/668] check for conntrack at start time, remove useless
 solution message

---
 cmd/minikube/cmd/start.go       | 10 ++++++++++
 pkg/minikube/problem/err_map.go |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index c349f5fa3f..67e9267830 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -834,6 +834,16 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 		if runtime != "docker" {
 			out.WarningT("Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!", out.V{"runtime": runtime})
 		}
+
+		conntrackK8sVersion, _ := semver.Make("1.18.0-rc.0")
+		currentK8sVersion, _ := semver.Make(strings.TrimPrefix(getKubernetesVersion(nil), version.VersionPrefix))
+		if currentK8sVersion.GE(conntrackK8sVersion) {
+			err := exec.Command("conntrack").Run()
+			if err != nil {
+				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": currentK8sVersion.String()})
+
+			}
+		}
 	}
 
 	// check that kubeadm extra args contain only whitelisted parameters
diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index ad37cc2478..75a02575ca 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -226,11 +226,6 @@ var vmProblems = map[string]match{
 		Issues: []int{6083, 5636},
 		GOOS:   []string{"linux"},
 	},
-	"NONE_CONNTRACK": {
-		Regexp: re(`\[ERROR FileExisting-conntrack\]: conntrack not found in system path`),
-		Advice: "Kubernetes 1.18 and higher requires conntrack to be installed, to install it on your machine for the none driver simply run `apt-get install conntrack` as root.",
-		GOOS:   []string{"linux"},
-	},
 
 	// VirtualBox
 	"VBOX_BLOCKED": {

From 4ab849b604f945ace1d358e6a6597cbc2e246220 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 20:18:03 -0700
Subject: [PATCH 194/668] shorter variable names

---
 cmd/minikube/cmd/start.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 67e9267830..74a6fcd134 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -835,12 +835,12 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 			out.WarningT("Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!", out.V{"runtime": runtime})
 		}
 
-		conntrackK8sVersion, _ := semver.Make("1.18.0-rc.0")
-		currentK8sVersion, _ := semver.Make(strings.TrimPrefix(getKubernetesVersion(nil), version.VersionPrefix))
-		if currentK8sVersion.GE(conntrackK8sVersion) {
+		connVer, _ := semver.Make("1.18.0-rc.0")
+		k8sVersion, _ := semver.Make(strings.TrimPrefix(getKubernetesVersion(nil), version.VersionPrefix))
+		if k8sVersion.GE(connVer) {
 			err := exec.Command("conntrack").Run()
 			if err != nil {
-				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": currentK8sVersion.String()})
+				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": k8sVersion.String()})
 
 			}
 		}

From ca3f88a73416feb90a30d0a9338e8ad0939ee3cd Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 20:19:07 -0700
Subject: [PATCH 195/668] comment

---
 cmd/minikube/cmd/start.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 74a6fcd134..5710797933 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -835,6 +835,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 			out.WarningT("Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!", out.V{"runtime": runtime})
 		}
 
+		// conntrack is required starting with kubernetes 1.18, include the release candidates for completion
 		connVer, _ := semver.Make("1.18.0-rc.0")
 		k8sVersion, _ := semver.Make(strings.TrimPrefix(getKubernetesVersion(nil), version.VersionPrefix))
 		if k8sVersion.GE(connVer) {

From 8489c074fe9746b60466fb89ffab641e562e5f2f Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 20:46:51 -0700
Subject: [PATCH 196/668] code cleanup

---
 cmd/minikube/cmd/start.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 5710797933..22e3cae81e 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -60,6 +60,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/minikube/registry"
 	"k8s.io/minikube/pkg/minikube/translate"
+	"k8s.io/minikube/pkg/util"
 	pkgutil "k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/version"
 )
@@ -836,12 +837,11 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 		}
 
 		// conntrack is required starting with kubernetes 1.18, include the release candidates for completion
-		connVer, _ := semver.Make("1.18.0-rc.0")
-		k8sVersion, _ := semver.Make(strings.TrimPrefix(getKubernetesVersion(nil), version.VersionPrefix))
-		if k8sVersion.GE(connVer) {
+		version, _ := util.ParseKubernetesVersion(getKubernetesVersion(nil))
+		if version.GTE(semver.MustParse("1.18.0-beta.1")) {
 			err := exec.Command("conntrack").Run()
 			if err != nil {
-				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": k8sVersion.String()})
+				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": version.String()})
 
 			}
 		}

From beec3b1ce133cc4de8c32d488a7e853d90b4bfae Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 13:34:36 -0700
Subject: [PATCH 197/668] stop kubelet on docker stop

---
 pkg/drivers/common.go    | 32 ++++++++++++++++++++++++++++++++
 pkg/drivers/kic/kic.go   |  6 ++++++
 pkg/drivers/none/none.go | 37 ++++---------------------------------
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index 2fde2efde8..20d3f537a9 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -17,11 +17,15 @@ limitations under the License.
 package drivers
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"strings"
 	"syscall"
+	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -29,6 +33,8 @@ import (
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 // This file is for common code shared among internal machine drivers
@@ -139,3 +145,29 @@ func fixMachinePermissions(path string) error {
 	}
 	return nil
 }
+
+// StopKubelet idempotently stops the kubelet
+func StopKubelet(cr command.Runner) error {
+	glog.Infof("stopping kubelet.service ...")
+	stop := func() error {
+		cmd := exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
+		if rr, err := cr.RunCmd(cmd); err != nil {
+			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
+		}
+		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
+		rr, err := cr.RunCmd(cmd)
+		if err != nil {
+			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
+		}
+		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
+			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
+		}
+		return nil
+	}
+
+	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
+		return errors.Wrapf(err, "error stopping kubelet")
+	}
+
+	return nil
+}
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 2488ca8e86..ea50fe3ad2 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -312,6 +312,12 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
+	// docker does not send right SIG for systemd to know to stop the systemd.
+	// to avoid bind adress be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v", err)
+	}
+
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
 	if err := cmd.Run(); err != nil {
 		return errors.Wrapf(err, "stopping %s", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 2fd3565741..f05f907138 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"net"
 	"os/exec"
-	"strings"
-	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/state"
@@ -35,7 +33,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/vmpath"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // cleanupPaths are paths to be removed by cleanup, and are used by both kubeadm and minikube.
@@ -156,8 +153,8 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
-	if err := stopKubelet(d.exec); err != nil {
-		return errors.Wrap(err, "kubelet")
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v. will continue with kill anyways.", err)
 	}
 
 	// First try to gracefully stop containers
@@ -220,8 +217,8 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
-	if err := stopKubelet(d.exec); err != nil {
-		return errors.Wrap(err, "stop kubelet")
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v. will continue with stop anyways.", err)
 	}
 	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
 	if err != nil {
@@ -241,32 +238,6 @@ func (d *Driver) RunSSHCommandFromDriver() error {
 	return fmt.Errorf("driver does not support ssh commands")
 }
 
-// stopKubelet idempotently stops the kubelet
-func stopKubelet(cr command.Runner) error {
-	glog.Infof("stopping kubelet.service ...")
-	stop := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
-		if rr, err := cr.RunCmd(cmd); err != nil {
-			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
-		}
-		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
-		rr, err := cr.RunCmd(cmd)
-		if err != nil {
-			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
-		}
-		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
-			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
-		}
-		return nil
-	}
-
-	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
-		return errors.Wrapf(err, "error stopping kubelet")
-	}
-
-	return nil
-}
-
 // restartKubelet restarts the kubelet
 func restartKubelet(cr command.Runner) error {
 	glog.Infof("restarting kubelet.service ...")

From 298be78e5f9fdbc300493f7382361e69a9418cd8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 13:41:15 -0700
Subject: [PATCH 198/668] remove duplicate code

---
 pkg/drivers/common.go           | 32 --------------------------------
 pkg/drivers/kic/kic.go          |  7 ++++---
 pkg/drivers/none/none.go        |  9 +++++----
 pkg/minikube/kubelet/kubelet.go |  2 +-
 4 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index 20d3f537a9..2fde2efde8 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -17,15 +17,11 @@ limitations under the License.
 package drivers
 
 import (
-	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"strings"
 	"syscall"
-	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -33,8 +29,6 @@ import (
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // This file is for common code shared among internal machine drivers
@@ -145,29 +139,3 @@ func fixMachinePermissions(path string) error {
 	}
 	return nil
 }
-
-// StopKubelet idempotently stops the kubelet
-func StopKubelet(cr command.Runner) error {
-	glog.Infof("stopping kubelet.service ...")
-	stop := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
-		if rr, err := cr.RunCmd(cmd); err != nil {
-			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
-		}
-		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
-		rr, err := cr.RunCmd(cmd)
-		if err != nil {
-			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
-		}
-		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
-			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
-		}
-		return nil
-	}
-
-	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
-		return errors.Wrapf(err, "error stopping kubelet")
-	}
-
-	return nil
-}
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index ea50fe3ad2..d43fdd33c4 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/download"
+	"k8s.io/minikube/pkg/minikube/kubelet"
 )
 
 // Driver represents a kic driver https://minikube.sigs.k8s.io/docs/reference/drivers/docker
@@ -313,9 +314,9 @@ func (d *Driver) Start() error {
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
 	// docker does not send right SIG for systemd to know to stop the systemd.
-	// to avoid bind adress be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
-	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
-		glog.Warning("couldn't stop kubelet %v", err)
+	// to avoid bind address be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
+	if err := kubelet.Stop(d.exec); err != nil {
+		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
 	}
 
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index f05f907138..e772282a04 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/kubelet"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
@@ -153,8 +154,8 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
-	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
-		glog.Warning("couldn't stop kubelet %v. will continue with kill anyways.", err)
+	if err := kubelet.Stop(d.exec); err != nil {
+		glog.Warningf("couldn't stop kubelet. will continue with kill anyways: %v", err)
 	}
 
 	// First try to gracefully stop containers
@@ -217,8 +218,8 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
-	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
-		glog.Warning("couldn't stop kubelet %v. will continue with stop anyways.", err)
+	if err := kubelet.Stop(d.exec); err != nil {
+		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
 	}
 	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
 	if err != nil {
diff --git a/pkg/minikube/kubelet/kubelet.go b/pkg/minikube/kubelet/kubelet.go
index 2adc132681..4df9148636 100644
--- a/pkg/minikube/kubelet/kubelet.go
+++ b/pkg/minikube/kubelet/kubelet.go
@@ -32,7 +32,7 @@ import (
 func Stop(cr command.Runner) error {
 	glog.Infof("stopping kubelet ...")
 	stop := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
+		cmd := exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
 		if rr, err := cr.RunCmd(cmd); err != nil {
 			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
 		}

From fae3e34319b8dd82ed58fef3ce91b01cc2faf93b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 14:07:47 -0700
Subject: [PATCH 199/668] add stop force stop

---
 pkg/drivers/kic/kic.go          |  3 +++
 pkg/drivers/none/none.go        |  4 ++--
 pkg/minikube/kubelet/kubelet.go | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index d43fdd33c4..5bf91e9710 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -247,6 +247,9 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
+	if err := kubelet.ForceStop(d.exec); err != nil {
+		glog.Warningf("couldn't force stop kubelet. will continue with kill anyways: %v", err)
+	}
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName)
 	if err := cmd.Run(); err != nil {
 		return errors.Wrapf(err, "killing kic node %s", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index e772282a04..6e655183a8 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -154,8 +154,8 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
-	if err := kubelet.Stop(d.exec); err != nil {
-		glog.Warningf("couldn't stop kubelet. will continue with kill anyways: %v", err)
+	if err := kubelet.ForceStop(d.exec); err != nil {
+		glog.Warningf("couldn't force stop kubelet. will continue with kill anyways: %v", err)
 	}
 
 	// First try to gracefully stop containers
diff --git a/pkg/minikube/kubelet/kubelet.go b/pkg/minikube/kubelet/kubelet.go
index 4df9148636..dc6037f2b8 100644
--- a/pkg/minikube/kubelet/kubelet.go
+++ b/pkg/minikube/kubelet/kubelet.go
@@ -30,9 +30,22 @@ import (
 
 // Stop idempotently stops the kubelet
 func Stop(cr command.Runner) error {
+	return stop(cr, false)
+}
+
+// ForceStop idempotently force stops the kubelet
+func ForceStop(cr command.Runner) error {
+	return stop(cr, true)
+}
+
+// stop dempotently stops the kubelet
+func stop(cr command.Runner, force bool) error {
 	glog.Infof("stopping kubelet ...")
 	stop := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
+		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
+		if force {
+			cmd = exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
+		}
 		if rr, err := cr.RunCmd(cmd); err != nil {
 			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
 		}

From 5f90a319bd79fcc5dff1c61dc735ddfe43f93dd3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 16:38:09 -0700
Subject: [PATCH 200/668] stop k8s in kic and none

---
 cmd/minikube/cmd/pause.go           |  3 ++-
 cmd/minikube/cmd/unpause.go         |  3 ++-
 pkg/drivers/kic/kic.go              | 22 ++++++++++++++++++++++
 pkg/drivers/none/none.go            |  3 ++-
 pkg/minikube/cluster/pause.go       |  8 --------
 pkg/minikube/constants/constants.go |  8 ++++++++
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/cmd/minikube/cmd/pause.go b/cmd/minikube/cmd/pause.go
index 33ef1f9f04..d7b090ce83 100644
--- a/cmd/minikube/cmd/pause.go
+++ b/cmd/minikube/cmd/pause.go
@@ -24,6 +24,7 @@ import (
 	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -84,6 +85,6 @@ func runPause(cmd *cobra.Command, args []string) {
 }
 
 func init() {
-	pauseCmd.Flags().StringSliceVarP(&namespaces, "--namespaces", "n", cluster.DefaultNamespaces, "namespaces to pause")
+	pauseCmd.Flags().StringSliceVarP(&namespaces, "--namespaces", "n", constants.DefaultNamespaces, "namespaces to pause")
 	pauseCmd.Flags().BoolVarP(&allNamespaces, "all-namespaces", "A", false, "If set, pause all namespaces")
 }
diff --git a/cmd/minikube/cmd/unpause.go b/cmd/minikube/cmd/unpause.go
index d27801fc23..e7295b74cd 100644
--- a/cmd/minikube/cmd/unpause.go
+++ b/cmd/minikube/cmd/unpause.go
@@ -24,6 +24,7 @@ import (
 	"github.com/spf13/viper"
 
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -82,6 +83,6 @@ var unpauseCmd = &cobra.Command{
 }
 
 func init() {
-	unpauseCmd.Flags().StringSliceVarP(&namespaces, "--namespaces", "n", cluster.DefaultNamespaces, "namespaces to unpause")
+	unpauseCmd.Flags().StringSliceVarP(&namespaces, "--namespaces", "n", constants.DefaultNamespaces, "namespaces to unpause")
 	unpauseCmd.Flags().BoolVarP(&allNamespaces, "all-namespaces", "A", false, "If set, unpause all namespaces")
 }
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 5bf91e9710..78d2e45828 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -36,6 +36,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/kubelet"
 )
@@ -320,6 +321,27 @@ func (d *Driver) Stop() error {
 	// to avoid bind address be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
 	if err := kubelet.Stop(d.exec); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
+		if err := kubelet.ForceStop(d.exec); err != nil {
+			glog.Warningf("couldn't force stop kubelet. will continue with stop anyways: %v", err)
+		}
+	}
+
+	runtime, err := cruntime.New(cruntime.Config{Type: d.NodeConfig.ContainerRuntime, Runner: d.exec})
+	if err != nil { // won't return error because:
+		// even though we can't stop the cotainers inside, we still wanna stop the minikube container itself
+		glog.Errorf("unable to get container runtime: %v", err)
+	} else {
+		containers, err := runtime.ListContainers(cruntime.ListOptions{Namespaces: constants.DefaultNamespaces})
+		if err != nil {
+			return errors.Wrap(err, "containers")
+		}
+		if len(containers) > 0 {
+			if err := runtime.StopContainers(containers); err != nil {
+				return errors.Wrap(err, "stop containers")
+			}
+		}
+		glog.Infof("successfully stopped kubernetes!")
+
 	}
 
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 6e655183a8..a0be67ff56 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -221,7 +221,8 @@ func (d *Driver) Stop() error {
 	if err := kubelet.Stop(d.exec); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
 	}
-	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
+	containers, err := d.runtime.ListContainers(cruntime.ListOptions{Namespaces: constants.DefaultNamespaces})
+
 	if err != nil {
 		return errors.Wrap(err, "containers")
 	}
diff --git a/pkg/minikube/cluster/pause.go b/pkg/minikube/cluster/pause.go
index 2f98cf6de3..d7661f1274 100644
--- a/pkg/minikube/cluster/pause.go
+++ b/pkg/minikube/cluster/pause.go
@@ -24,14 +24,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/kubelet"
 )
 
-// DefaultNamespaces are namespaces used by minikube, including addons
-var DefaultNamespaces = []string{
-	"kube-system",
-	"kubernetes-dashboard",
-	"storage-gluster",
-	"istio-operator",
-}
-
 // Pause pauses a Kubernetes cluster
 func Pause(cr cruntime.Manager, r command.Runner, namespaces []string) ([]string, error) {
 	ids := []string{}
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index ecaa8cdb98..33ae576f48 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -92,4 +92,12 @@ var (
 	KubernetesReleaseBinaries = []string{"kubelet", "kubeadm", "kubectl"}
 	// ImageCacheDir is the path to the image cache directory
 	ImageCacheDir = localpath.MakeMiniPath("cache", "images")
+
+	// DefaultNamespaces are kubernetes namespaces used by minikube, including addons
+	DefaultNamespaces = []string{
+		"kube-system",
+		"kubernetes-dashboard",
+		"storage-gluster",
+		"istio-operator",
+	}
 )

From 47c8e9c87b69aba17b44ac190e614a34c46a4368 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 16:42:55 -0700
Subject: [PATCH 201/668] dont return on error kic sto

---
 pkg/drivers/kic/kic.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 78d2e45828..c1fa7535c8 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -333,11 +333,11 @@ func (d *Driver) Stop() error {
 	} else {
 		containers, err := runtime.ListContainers(cruntime.ListOptions{Namespaces: constants.DefaultNamespaces})
 		if err != nil {
-			return errors.Wrap(err, "containers")
+			glog.Errorf("unable list containers : %v", err)
 		}
 		if len(containers) > 0 {
 			if err := runtime.StopContainers(containers); err != nil {
-				return errors.Wrap(err, "stop containers")
+				glog.Errorf("unable to stop containers : %v", err)
 			}
 		}
 		glog.Infof("successfully stopped kubernetes!")

From 545348341a6b698e95fbfc10ca147af35a71ced5 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 16:44:33 -0700
Subject: [PATCH 202/668] for none let it stop all containers

---
 pkg/drivers/none/none.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index a0be67ff56..d42d72c95a 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -221,7 +221,7 @@ func (d *Driver) Stop() error {
 	if err := kubelet.Stop(d.exec); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
 	}
-	containers, err := d.runtime.ListContainers(cruntime.ListOptions{Namespaces: constants.DefaultNamespaces})
+	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
 
 	if err != nil {
 		return errors.Wrap(err, "containers")

From 36f3f657af8da5aaf1fe9dbe725e8f58fd4a79f6 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 16:51:18 -0700
Subject: [PATCH 203/668] force stop if cant stop for none

---
 pkg/drivers/none/none.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index d42d72c95a..566275f6aa 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -220,6 +220,9 @@ func (d *Driver) Start() error {
 func (d *Driver) Stop() error {
 	if err := kubelet.Stop(d.exec); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
+		if err := kubelet.ForceStop(d.exec); err != nil {
+			glog.Warningf("couldn't force stop kubelet. will continue with stop anyways: %v", err)
+		}
 	}
 	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
 

From 7619a5075ae85f50ef71ae12b2d9e0c7e972b5d1 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 17:43:21 -0700
Subject: [PATCH 204/668] fix logging

---
 pkg/drivers/kic/kic.go          | 2 +-
 pkg/minikube/kubelet/kubelet.go | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index c1fa7535c8..bdeefc0665 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -333,7 +333,7 @@ func (d *Driver) Stop() error {
 	} else {
 		containers, err := runtime.ListContainers(cruntime.ListOptions{Namespaces: constants.DefaultNamespaces})
 		if err != nil {
-			glog.Errorf("unable list containers : %v", err)
+			glog.Infof("unable list containers : %v", err)
 		}
 		if len(containers) > 0 {
 			if err := runtime.StopContainers(containers); err != nil {
diff --git a/pkg/minikube/kubelet/kubelet.go b/pkg/minikube/kubelet/kubelet.go
index dc6037f2b8..8f15e6aca0 100644
--- a/pkg/minikube/kubelet/kubelet.go
+++ b/pkg/minikube/kubelet/kubelet.go
@@ -41,18 +41,18 @@ func ForceStop(cr command.Runner) error {
 // stop dempotently stops the kubelet
 func stop(cr command.Runner, force bool) error {
 	glog.Infof("stopping kubelet ...")
-	stop := func() error {
+	stp := func() error {
 		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
 		if force {
 			cmd = exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
 		}
 		if rr, err := cr.RunCmd(cmd); err != nil {
-			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
+			return fmt.Errorf("temporary error for %q : %v", rr.Command(), err)
 		}
 		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
 		rr, err := cr.RunCmd(cmd)
 		if err != nil {
-			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
+			return fmt.Errorf("temporary error: for %q : %v", rr.Command(), err)
 		}
 		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
 			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
@@ -60,10 +60,9 @@ func stop(cr command.Runner, force bool) error {
 		return nil
 	}
 
-	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
+	if err := retry.Expo(stp, 1*time.Second, time.Minute, 2); err != nil {
 		return errors.Wrapf(err, "error stopping kubelet")
 	}
-
 	return nil
 }
 

From aec6fdc25aa793ffb7c08f6dc8d4a432d0b962d4 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 20:39:21 -0700
Subject: [PATCH 205/668] initialize kic runner in stop

---
 pkg/drivers/kic/kic.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index bdeefc0665..2055f91931 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -248,6 +248,8 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
+	// on init this doesn't get filled when called from cmd
+	d.exec = command.NewKICRunner(d.MachineName, d.OCIBinary)
 	if err := kubelet.ForceStop(d.exec); err != nil {
 		glog.Warningf("couldn't force stop kubelet. will continue with kill anyways: %v", err)
 	}
@@ -317,6 +319,8 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
+	// on init this doesn't get filled when called from cmd
+	d.exec = command.NewKICRunner(d.MachineName, d.OCIBinary)
 	// docker does not send right SIG for systemd to know to stop the systemd.
 	// to avoid bind address be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
 	if err := kubelet.Stop(d.exec); err != nil {

From 67bd258465d5c8b40737d651c8f9f468f58101a6 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 23:02:27 -0700
Subject: [PATCH 206/668] remove extra line

---
 pkg/drivers/none/none.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 566275f6aa..fe5498c91a 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -225,7 +225,6 @@ func (d *Driver) Stop() error {
 		}
 	}
 	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
-
 	if err != nil {
 		return errors.Wrap(err, "containers")
 	}

From 653fac46ec7d75320993b9b50c5e95127146a81f Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 00:46:48 -0700
Subject: [PATCH 207/668] skip preload test for none

---
 test/integration/aaa_download_only_test.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 9640212800..7cd32410ab 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -71,14 +71,16 @@ func TestDownloadOnly(t *testing.T) {
 						t.Errorf("%s failed: %v", args, err)
 					}
 
-					if download.PreloadExists(v, r) {
-						// Just make sure the tarball path exists
-						if _, err := os.Stat(download.TarballPath(v)); err != nil {
-							t.Errorf("preloaded tarball path doesn't exist: %v", err)
+					// skip for none, as none driver does not have preload feature.
+					if !NoneDriver() {
+						if download.PreloadExists(v, r) {
+							// Just make sure the tarball path exists
+							if _, err := os.Stat(download.TarballPath(v)); err != nil {
+								t.Errorf("preloaded tarball path doesn't exist: %v", err)
+							}
+							return
 						}
-						return
 					}
-
 					imgs, err := images.Kubeadm("", v)
 					if err != nil {
 						t.Errorf("kubeadm images: %v %+v", v, err)

From 1d5ef29f2ed3eb8770df83b2eebadd658ddc0204 Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Tue, 24 Mar 2020 04:11:11 -0700
Subject: [PATCH 208/668] Adjust GitHub actions timeout multiplier

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fda40cd7f1..37d1991a0d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,7 +113,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=70m -test.v -timeout-multiplier=3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -186,7 +186,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=70m -test.v -timeout-multiplier=3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -254,7 +254,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -322,7 +322,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -400,7 +400,7 @@ jobs:
           chmod a+x e2e-*
           chmod a+x minikube-*
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))

From 407637b4a2070122229e91cf7930e2c18d6b08bc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 06:07:51 -0700
Subject: [PATCH 209/668] download only for both docker and podman

---
 .github/workflows/main.yml                 | 20 +++++++++++++++-----
 test/integration/aaa_download_only_test.go | 22 ++++++----------------
 test/integration/functional_test.go        |  2 +-
 test/integration/main.go                   |  5 +++++
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 37d1991a0d..79a9f0982e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,7 +113,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -145,6 +145,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
   docker_ubuntu_18_04:
     runs-on: ubuntu-18.04
@@ -186,7 +188,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -218,6 +220,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
   none_ubuntu16_04:
     needs: [build_minikube]
@@ -254,7 +258,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -286,6 +290,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
   none_ubuntu18_04:
     needs: [build_minikube]
@@ -322,7 +328,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -354,6 +360,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
   podman_ubuntu_18_04:
       needs: [build_minikube]
@@ -400,7 +408,7 @@ jobs:
           chmod a+x e2e-*
           chmod a+x minikube-*
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
@@ -432,6 +440,8 @@ jobs:
           echo "----------------${numFail} Failures----------------------------"
           echo $STAT | jq '.FailedTests' || true
           echo "-------------------------------------------------------"
+          numPass=$(echo $STAT | jq '.NumberOfPass')
+          echo "*** $numPass Passed ***"
           if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
   # After all 4 integration tests finished
   # collect all the reports and upload
diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 7cd32410ab..8be373a5dd 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -29,7 +29,6 @@ import (
 	"runtime"
 	"strings"
 	"testing"
-	"time"
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/constants"
@@ -147,16 +146,16 @@ func TestDownloadOnly(t *testing.T) {
 	}
 }
 
-func TestDownloadOnlyDocker(t *testing.T) {
-	if !runningDockerDriver(StartArgs()) {
-		t.Skip("this test only runs with the docker driver")
+func TestDownloadOnlyKic(t *testing.T) {
+	if !KicDriver() {
+		t.Skip("skipping, only for docker or podman driver")
 	}
-
 	profile := UniqueProfileName("download-docker")
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(15))
 	defer Cleanup(t, profile, cancel)
 
-	args := []string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr", "--driver=docker"}
+	args := []string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr"}
+	args = append(args, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
 		t.Errorf("%s failed: %v:\n%s", args, err, rr.Output())
@@ -178,12 +177,3 @@ func TestDownloadOnlyDocker(t *testing.T) {
 		t.Errorf("checksum of %s does not match remote checksum (%s != %s)", tarball, string(remoteChecksum), string(checksum[:]))
 	}
 }
-
-func runningDockerDriver(startArgs []string) bool {
-	for _, s := range startArgs {
-		if s == "--driver=docker" {
-			return true
-		}
-	}
-	return false
-}
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index ec4ce69051..fc53eea6c0 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -725,7 +725,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 		rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;"))
 		return err
 	}
-	if err = retry.Expo(mysql, 5*time.Second, 180*time.Second); err != nil {
+	if err = retry.Expo(mysql, 5*time.Second, Seconds(180)); err != nil {
 		t.Errorf("mysql failing: %v", err)
 	}
 }
diff --git a/test/integration/main.go b/test/integration/main.go
index 04c22da305..b6c5a3916f 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -68,6 +68,11 @@ func HyperVDriver() bool {
 	return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
 }
 
+// KicDriver returns whether or not this test is using the docker or podman driver
+func KicDriver() bool {
+	return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker") || strings.Contains(*startArgs, "--vm-driver=podman") || strings.Contains(*startArgs, "driver=podman")
+}
+
 // CanCleanup returns if cleanup is allowed
 func CanCleanup() bool {
 	return *cleanup

From 42980d609bc20c2790567296cab5a861055d2e33 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 06:29:35 -0700
Subject: [PATCH 210/668] remove not needed retry

---
 test/integration/functional_test.go      |  2 +-
 test/integration/version_upgrade_test.go | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index fc53eea6c0..5111590fe6 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -725,7 +725,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 		rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;"))
 		return err
 	}
-	if err = retry.Expo(mysql, 5*time.Second, Seconds(180)); err != nil {
+	if err = retry.Expo(mysql, 2*time.Second, Seconds(180)); err != nil {
 		t.Errorf("mysql failing: %v", err)
 	}
 }
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index e9c655a9b4..0c553b9998 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -76,7 +76,7 @@ func TestVersionUpgrade(t *testing.T) {
 	}
 
 	// Retry to allow flakiness for the previous release
-	if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err != nil {
+	if err := retry.Expo(r, 1*time.Second, Minutes(30), 2); err != nil {
 		t.Fatalf("release start failed: %v", err)
 	}
 
@@ -120,14 +120,8 @@ func TestVersionUpgrade(t *testing.T) {
 	}
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
-	rr = &RunResult{}
-	r = func() error {
-		rr, err = Run(t, exec.CommandContext(ctx, tf.Name(), args...))
-		return err
-	}
-
-	if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err == nil {
-		t.Fatalf("downgrading kubernetes should not be allowed: %v", err)
+	if rr, err := Run(t, exec.CommandContext(ctx, tf.Name(), args...)); err == nil {
+		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Args())
 	}
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)

From 0478f2d2048e7b82627351c9afe530156f0843b9 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 06:37:16 -0700
Subject: [PATCH 211/668] adjuts the retry times

---
 test/integration/addons_test.go          | 4 ++--
 test/integration/fn_mount_cmd.go         | 2 +-
 test/integration/fn_pvc.go               | 2 +-
 test/integration/fn_tunnel_cmd.go        | 2 +-
 test/integration/version_upgrade_test.go | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 313fa01d15..a784f381bf 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -129,7 +129,7 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 		return nil
 	}
 
-	if err := retry.Expo(checkIngress, 500*time.Millisecond, Minutes(1)); err != nil {
+	if err := retry.Expo(checkIngress, 500*time.Millisecond, Seconds(90)); err != nil {
 		t.Errorf("ingress never responded as expected on 127.0.0.1:80: %v", err)
 	}
 
@@ -241,7 +241,7 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
 	}
 
 	// metrics-server takes some time to be able to collect metrics
-	if err := retry.Expo(checkMetricsServer, Seconds(13), Minutes(6)); err != nil {
+	if err := retry.Expo(checkMetricsServer, time.Second*3, Minutes(6)); err != nil {
 		t.Errorf(err.Error())
 	}
 
diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go
index eedc9e7983..8a3a9f68ee 100644
--- a/test/integration/fn_mount_cmd.go
+++ b/test/integration/fn_mount_cmd.go
@@ -106,7 +106,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	}
 
 	start := time.Now()
-	if err := retry.Expo(checkMount, time.Second, 15*time.Second); err != nil {
+	if err := retry.Expo(checkMount, time.Millisecond*500, Seconds(15)); err != nil {
 		// For local testing, allow macOS users to click prompt. If they don't, skip the test.
 		if runtime.GOOS == "darwin" {
 			t.Skip("skipping: mount did not appear, likely because macOS requires prompt to allow non-codesigned binaries to listen on non-localhost port")
diff --git a/test/integration/fn_pvc.go b/test/integration/fn_pvc.go
index 4f97c830ef..785783fd80 100644
--- a/test/integration/fn_pvc.go
+++ b/test/integration/fn_pvc.go
@@ -57,7 +57,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
 	}
 
 	// Ensure the addon-manager has created the StorageClass before creating a claim, otherwise it won't be bound
-	if err := retry.Expo(checkStorageClass, time.Second, 90*time.Second); err != nil {
+	if err := retry.Expo(checkStorageClass, time.Millisecond*500, Seconds(100)); err != nil {
 		t.Errorf("no default storage class after retry: %v", err)
 	}
 
diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go
index a21b9350c3..e4598b3da7 100644
--- a/test/integration/fn_tunnel_cmd.go
+++ b/test/integration/fn_tunnel_cmd.go
@@ -119,7 +119,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 		}
 		return nil
 	}
-	if err = retry.Expo(fetch, time.Millisecond*500, Minutes(2), 6); err != nil {
+	if err = retry.Expo(fetch, time.Millisecond*500, Minutes(2), 13); err != nil {
 		t.Errorf("failed to contact nginx at %s: %v", nginxIP, err)
 	}
 
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index 0c553b9998..a03676a335 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -75,7 +75,7 @@ func TestVersionUpgrade(t *testing.T) {
 		return err
 	}
 
-	// Retry to allow flakiness for the previous release
+	// Retry up to two times, to allow flakiness for the previous release
 	if err := retry.Expo(r, 1*time.Second, Minutes(30), 2); err != nil {
 		t.Fatalf("release start failed: %v", err)
 	}
@@ -121,7 +121,7 @@ func TestVersionUpgrade(t *testing.T) {
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	if rr, err := Run(t, exec.CommandContext(ctx, tf.Name(), args...)); err == nil {
-		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Args())
+		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Args)
 	}
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)

From 83cc28e0826a8b01109af317485d38c9e5b629a3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 07:11:22 -0700
Subject: [PATCH 212/668] add logging for when container status is running

---
 pkg/drivers/kic/oci/oci.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index df5117164f..2de446a4cd 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -156,6 +156,10 @@ func CreateContainerNode(p CreateParams) error {
 		if s != "running" {
 			return fmt.Errorf("temporary error created container %q is not running yet", p.Name)
 		}
+		if s == "running" {
+			glog.Infof("the created container %q has a running status.", p.Name)
+			return nil
+		}
 		return nil
 	}
 

From 41b16b1568d83e3fcc23645d701f5f41502d32fe Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 07:27:07 -0700
Subject: [PATCH 213/668] fail if container is not running

---
 pkg/drivers/kic/oci/oci.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 2de446a4cd..b0904d586b 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -164,8 +164,8 @@ func CreateContainerNode(p CreateParams) error {
 	}
 
 	// retry up to up 5 seconds to make sure the created container status is running.
-	if err := retry.Expo(checkRunning, 13*time.Millisecond, time.Second*5); err != nil {
-		glog.Warningf("The created container %q failed to report to be running in 5 seconds.", p.Name)
+	if err := retry.Expo(checkRunning, 13*time.Millisecond, time.Second*10); err != nil {
+		return errors.Wrapf(err, "check container %q running", p.Name)
 	}
 
 	return nil

From 940baa09eae4197074dad120475f54e3576d59b6 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 24 Mar 2020 07:31:22 -0700
Subject: [PATCH 214/668] fix comment

---
 pkg/drivers/kic/oci/oci.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index b0904d586b..295925b8cf 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -163,8 +163,8 @@ func CreateContainerNode(p CreateParams) error {
 		return nil
 	}
 
-	// retry up to up 5 seconds to make sure the created container status is running.
-	if err := retry.Expo(checkRunning, 13*time.Millisecond, time.Second*10); err != nil {
+	// retry up to up 13 seconds to make sure the created container status is running.
+	if err := retry.Expo(checkRunning, 13*time.Millisecond, time.Second*13); err != nil {
 		return errors.Wrapf(err, "check container %q running", p.Name)
 	}
 

From fed6713a3fbd1568208bc96104c9e8cac243cb89 Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Tue, 24 Mar 2020 08:45:29 -0700
Subject: [PATCH 215/668] Enable HW_RANDOM_VIRTIO

---
 deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
index ebf694f191..40c43c77ce 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
@@ -380,6 +380,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 CONFIG_NVRAM=y

From e9e9a41049fca2d5ad8d7f3d0cfbd9e2953b0ac8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 24 Mar 2020 08:58:15 -0700
Subject: [PATCH 216/668] Use ExampleCmd now that it is available

---
 pkg/minikube/node/start.go | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 7e3e1836b0..5f7b131a6e 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -48,6 +48,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/util"
@@ -335,7 +336,7 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 		}
 	}
 
-	// Try again, but just once to avoid copious error messages
+	// Try again, but just once to avoid making the logs overly confusing
 	time.Sleep(5 * time.Second)
 
 	host, exists, err = machine.StartHost(api, cc, n)
@@ -344,21 +345,13 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 	}
 
 	out.T(out.FailureType, "StartHost failed again: {{.error}}", out.V{"error": err})
-	out.T(out.Workaround, `Run: "{{.cmd}} delete", then "{{.cmd}} start --alsologtostderr -v=1" to try again with more logs`,
-		out.V{"cmd": minikubeCmd()})
+	out.T(out.Workaround, `Run: "{{.delete}}", then "{{.start}} --alsologtostderr -v=1" to try again with more logging`,
+		out.V{"delete": mustload.ExampleCmd(cc.Name, "delete"), "start": mustload.ExampleCmd(cc.Name, "start")})
 
 	exit.WithError("Unable to start VM after repeated tries. Please try {{'minikube delete' if possible", err)
 	return host, exists
 }
 
-// Return a minikube command containing the current profile name
-func minikubeCmd() string {
-	if viper.GetString(config.ProfileName) != constants.DefaultClusterName {
-		return fmt.Sprintf("minikube -p %s", config.ProfileName)
-	}
-	return "minikube"
-}
-
 // validateNetwork tries to catch network problems as soon as possible
 func validateNetwork(h *host.Host, r command.Runner) string {
 	ip, err := h.Driver.GetIP()

From b5d5aa1d52b2212986219515f6bec70d641f3b7f Mon Sep 17 00:00:00 2001
From: Vincent Link <mail@linkvt.de>
Date: Tue, 24 Mar 2020 16:46:00 +0100
Subject: [PATCH 217/668] Parse --disk-size and --memory sizes with binary
 suffixes

---
 pkg/util/utils.go      | 5 +++--
 pkg/util/utils_test.go | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index fdd38f4f35..37de6085cd 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -38,12 +38,13 @@ func CalculateSizeInMB(humanReadableSize string) (int, error) {
 	if err == nil {
 		humanReadableSize += "mb"
 	}
-	size, err := units.FromHumanSize(humanReadableSize)
+	// parse the size suffix binary instead of decimal so that 1G -> 1024MB instead of 1000MB
+	size, err := units.RAMInBytes(humanReadableSize)
 	if err != nil {
 		return 0, fmt.Errorf("FromHumanSize: %v", err)
 	}
 
-	return int(size / units.MB), nil
+	return int(size / units.MiB), nil
 }
 
 // GetBinaryDownloadURL returns a suitable URL for the platform
diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go
index f1fe867c48..55392d7ebc 100644
--- a/pkg/util/utils_test.go
+++ b/pkg/util/utils_test.go
@@ -51,6 +51,7 @@ func TestCalculateSizeInMB(t *testing.T) {
 		{"1024KB", 1},
 		{"1024mb", 1024},
 		{"1024b", 0},
+		{"1g", 1024},
 	}
 
 	for _, tt := range testData {
@@ -59,7 +60,7 @@ func TestCalculateSizeInMB(t *testing.T) {
 			t.Fatalf("unexpected err: %v", err)
 		}
 		if number != tt.expectedNumber {
-			t.Fatalf("Expected '%d'' but got '%d'", tt.expectedNumber, number)
+			t.Fatalf("Expected '%d' but got '%d' from size '%s'", tt.expectedNumber, number, tt.size)
 		}
 	}
 }

From f00f5ff6008c17652d77626192773927ccf349a3 Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Tue, 24 Mar 2020 10:21:32 -0700
Subject: [PATCH 218/668] remove extra if

---
 pkg/drivers/kic/oci/oci.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 295925b8cf..5885b0e1cf 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -156,10 +156,7 @@ func CreateContainerNode(p CreateParams) error {
 		if s != "running" {
 			return fmt.Errorf("temporary error created container %q is not running yet", p.Name)
 		}
-		if s == "running" {
-			glog.Infof("the created container %q has a running status.", p.Name)
-			return nil
-		}
+		glog.Infof("the created container %q has a running status.", p.Name)
 		return nil
 	}
 

From 5ef83f35e222c8d4d829dc5776837ee2eccff3cc Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 10:53:02 -0700
Subject: [PATCH 219/668] Add --preload flag to optionally turn off preload

---
 cmd/minikube/cmd/start.go                  | 2 ++
 go.mod                                     | 2 +-
 go.sum                                     | 2 ++
 pkg/minikube/download/preload.go           | 5 +++++
 test/integration/start_stop_delete_test.go | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 01f27f68c4..7d6e92cbf6 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -123,6 +123,7 @@ const (
 	hostOnlyNicType         = "host-only-nic-type"
 	natNicType              = "nat-nic-type"
 	nodes                   = "nodes"
+	preload                 = "preload"
 )
 
 var (
@@ -175,6 +176,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
 	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
 	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
+	startCmd.Flags().Bool(preload, true, "If true, download tarball of preloaded images if available to improve start time.")
 }
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
diff --git a/go.mod b/go.mod
index 3f4a02bf9f..29a5ac30d5 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 // indirect
-	github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345
+	github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f
 	github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c
 	github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d // indirect
 	github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
diff --git a/go.sum b/go.sum
index 70ea938169..d7d0bc3a61 100644
--- a/go.sum
+++ b/go.sum
@@ -423,6 +423,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345 h1:XP1VL9iOZu4yz/rq8zj+yvB23XEY5erXRzp8JYmkWu0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
+github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
+github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 09e0d8d35e..0291a15b93 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -31,6 +31,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/hashicorp/go-getter"
 	"github.com/pkg/errors"
+	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -76,6 +77,10 @@ func remoteTarballURL(k8sVersion string) string {
 
 // PreloadExists returns true if there is a preloaded tarball that can be used
 func PreloadExists(k8sVersion, containerRuntime string) bool {
+	if !viper.GetBool("preload") {
+		return false
+	}
+
 	if containerRuntime != "docker" {
 		return false
 	}
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 38ca1d9b9a..6ba37042ef 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -175,7 +175,7 @@ func TestStartStopWithPreload(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
+	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true", "--preload=false"}
 	startArgs = append(startArgs, StartArgs()...)
 	k8sVersion := "v1.17.0"
 	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))

From 4a7f59f8a8c7da65b4a9ffd737250cf0020548a2 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 10:59:25 -0700
Subject: [PATCH 220/668] remove preload flag

---
 test/integration/start_stop_delete_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 6ba37042ef..38ca1d9b9a 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -175,7 +175,7 @@ func TestStartStopWithPreload(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true", "--preload=false"}
+	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
 	startArgs = append(startArgs, StartArgs()...)
 	k8sVersion := "v1.17.0"
 	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))

From 8d9e26d9940a7c2e89387661dd15b6e6d76cb217 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 11:58:41 -0700
Subject: [PATCH 221/668] Test restart with preloaded tarball and without

---
 test/integration/start_stop_delete_test.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 38ca1d9b9a..f0aeb03450 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -175,7 +175,7 @@ func TestStartStopWithPreload(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
+	startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true", "--preload=false"}
 	startArgs = append(startArgs, StartArgs()...)
 	k8sVersion := "v1.17.0"
 	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))
@@ -191,6 +191,18 @@ func TestStartStopWithPreload(t *testing.T) {
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}
+
+	// Restart again with v1.17.0, this time with the preloaded tarball
+	startArgs = []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
+	startArgs = append(startArgs, StartArgs()...)
+	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))
+
+	rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
+	if err != nil {
+		t.Fatalf("%s failed: %v", rr.Args, err)
+	}
+	verifyImageExistsInDaemon(ctx, t, profile, image)
+
 	// Restart minikube with v1.17.3, which has a preloaded tarball
 	startArgs = []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
 	startArgs = append(startArgs, StartArgs()...)
@@ -200,9 +212,13 @@ func TestStartStopWithPreload(t *testing.T) {
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}
+	verifyImageExistsInDaemon(ctx, t, profile, image)
 
+}
+
+func verifyImageExistsInDaemon(ctx context.Context, t *testing.T, profile, image string) {
 	// Ensure that busybox still exists in the daemon
-	rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}

From 0d76e2a68477c09dc6ba924d9504d972672063f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Tue, 24 Mar 2020 20:19:01 +0100
Subject: [PATCH 222/668] Avoid dereferencing nil, in case of an error

---
 pkg/minikube/assets/vm_assets.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go
index c3f30a667d..e3b4678544 100644
--- a/pkg/minikube/assets/vm_assets.go
+++ b/pkg/minikube/assets/vm_assets.go
@@ -120,7 +120,10 @@ func (f *FileAsset) GetLength() (flen int) {
 // GetModTime returns modification time of the file
 func (f *FileAsset) GetModTime() (time.Time, error) {
 	fi, err := os.Stat(f.AssetName)
-	return fi.ModTime(), err
+	if err != nil {
+		return time.Time{}, err
+	}
+	return fi.ModTime(), nil
 }
 
 // Read reads the asset

From 972ff3cc00099ec52cb15c0594c767d66560e842 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 24 Mar 2020 12:21:27 -0700
Subject: [PATCH 223/668] Update DefaultKubernetesVersion to v1.18.0

---
 pkg/minikube/bootstrapper/bsutil/kubelet_test.go | 8 ++++----
 pkg/minikube/constants/constants.go              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
index 052b9937dd..660b8e5b91 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go
@@ -81,7 +81,7 @@ Wants=crio.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -107,7 +107,7 @@ Wants=containerd.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -140,7 +140,7 @@ Wants=containerd.service
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
+ExecStart=/var/lib/minikube/binaries/v1.18.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m
 
 [Install]
 `,
@@ -167,7 +167,7 @@ Wants=docker.socket
 
 [Service]
 ExecStart=
-ExecStart=/var/lib/minikube/binaries/v1.18.0-rc.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests
+ExecStart=/var/lib/minikube/binaries/v1.18.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests
 
 [Install]
 `,
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 33ae576f48..8b181152a7 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -26,9 +26,9 @@ import (
 
 const (
 	// DefaultKubernetesVersion is the default kubernetes version
-	DefaultKubernetesVersion = "v1.18.0-rc.1"
+	DefaultKubernetesVersion = "v1.18.0"
 	// NewestKubernetesVersion is the newest Kubernetes version to test against
-	NewestKubernetesVersion = "v1.18.0-rc.1"
+	NewestKubernetesVersion = "v1.18.0"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.11.10"
 	// DefaultClusterName is the default nane for the k8s cluster

From e3bcdbf42ac35c685e3f658eec768d2efdff69b2 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 12:55:31 -0700
Subject: [PATCH 224/668] fix validateSpecificDriver error message

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 01f27f68c4..302bf72a0a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -577,7 +577,7 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 
 	out.ErrT(out.Workaround, `To proceed, either:
 
-1) Delete the existing "{{.name}}" cluster using: '{{.command}} delete'
+1) Delete the existing "{{.name}}" cluster using: 'minikube delete -p {{.name}}'
 
 * or *
 

From 2933953cfa2c95b1d135d449b536c3d2e909c38c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 13:18:59 -0700
Subject: [PATCH 225/668] use mustload

---
 cmd/minikube/cmd/start.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 302bf72a0a..60d2cce40b 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -577,12 +577,12 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) {
 
 	out.ErrT(out.Workaround, `To proceed, either:
 
-1) Delete the existing "{{.name}}" cluster using: 'minikube delete -p {{.name}}'
+1) Delete the existing "{{.name}}" cluster using: '{{.delcommand}}'
 
 * or *
 
 2) Start the existing "{{.name}}" cluster using: '{{.command}} --driver={{.old}}'
-`, out.V{"command": mustload.ExampleCmd(existing.Name, "start"), "old": old, "name": existing.Name})
+`, out.V{"command": mustload.ExampleCmd(existing.Name, "start"), "delcommand": mustload.ExampleCmd(existing.Name, "delete"), "old": old, "name": existing.Name})
 
 	exit.WithCodeT(exit.Config, "Exiting.")
 }

From b5e088ad59bb4c320d335633bc0d420223932a6b Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 13:44:51 -0700
Subject: [PATCH 226/668] run preload on hot restarts as well, in case
 kubernetes version has been upgraded

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index a6c1bbe3dd..5de297a003 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -524,17 +524,22 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "kubeadm images")
 	}
 
-	if cfg.KubernetesConfig.ShouldLoadCachedImages {
-		if err := machine.LoadImages(&cfg, k.c, images, constants.ImageCacheDir); err != nil {
-			out.FailureT("Unable to load cached images: {{.error}}", out.V{"error": err})
-		}
-	}
 	r, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime,
 		Runner: k.c, Socket: cfg.KubernetesConfig.CRISocket})
 	if err != nil {
 		return errors.Wrap(err, "runtime")
 	}
 
+	if err := r.Preload(cfg.KubernetesConfig); err != nil {
+		return errors.Wrap(err, "preloading")
+	}
+
+	if cfg.KubernetesConfig.ShouldLoadCachedImages {
+		if err := machine.LoadImages(&cfg, k.c, images, constants.ImageCacheDir); err != nil {
+			out.FailureT("Unable to load cached images: {{.error}}", out.V{"error": err})
+		}
+	}
+
 	for _, n := range cfg.Nodes {
 		err := k.UpdateNode(cfg, n, r)
 		if err != nil {

From 3ad1dfb4bb3d8e4a016a3aca1585a3b07b4b78e9 Mon Sep 17 00:00:00 2001
From: Vincent Link <mail@linkvt.de>
Date: Tue, 24 Mar 2020 20:19:13 +0100
Subject: [PATCH 227/668] Add 'stable' and 'latest' as valid kubernetes-version
 values

---
 cmd/minikube/cmd/start.go      | 22 ++++++++++++----------
 cmd/minikube/cmd/start_test.go | 12 +++++++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 01f27f68c4..595058f4f9 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -179,7 +179,7 @@ func initMinikubeFlags() {
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
 func initKubernetesFlags() {
-	startCmd.Flags().String(kubernetesVersion, "", "The kubernetes version that the minikube VM will use (ex: v1.2.3)")
+	startCmd.Flags().String(kubernetesVersion, "", fmt.Sprintf("The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for %s, 'latest' for %s). Defaults to 'stable'.", constants.DefaultKubernetesVersion, constants.NewestKubernetesVersion))
 	startCmd.Flags().Var(&config.ExtraOptions, "extra-config",
 		`A set of key=value pairs that describe configuration that may be passed to different components.
 		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
@@ -480,10 +480,10 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 		if vmd := viper.GetString("vm-driver"); vmd != "" {
 			// Output a warning
 			warning := `Both driver={{.driver}} and vm-driver={{.vmd}} have been set.
-			
+
     Since vm-driver is deprecated, minikube will default to driver={{.driver}}.
 
-    If vm-driver is set in the global config, please run "minikube config unset vm-driver" to resolve this warning.			
+    If vm-driver is set in the global config, please run "minikube config unset vm-driver" to resolve this warning.
 			`
 			out.T(out.Warning, warning, out.V{"driver": d, "vmd": vmd})
 		}
@@ -1065,13 +1065,15 @@ func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 func getKubernetesVersion(old *config.ClusterConfig) string {
 	paramVersion := viper.GetString(kubernetesVersion)
 
-	if paramVersion == "" { // if the user did not specify any version then ...
-		if old != nil { // .. use the old version from config (if any)
-			paramVersion = old.KubernetesConfig.KubernetesVersion
-		}
-		if paramVersion == "" { // .. otherwise use the default version
-			paramVersion = constants.DefaultKubernetesVersion
-		}
+	// try to load the old version first if the user didn't specify anything
+	if paramVersion == "" && old != nil {
+		paramVersion = old.KubernetesConfig.KubernetesVersion
+	}
+
+	if paramVersion == "" || strings.EqualFold(paramVersion, "stable") {
+		paramVersion = constants.DefaultKubernetesVersion
+	} else if strings.EqualFold(paramVersion, "latest") {
+		paramVersion = constants.NewestKubernetesVersion
 	}
 
 	nvs, err := semver.Make(strings.TrimPrefix(paramVersion, version.VersionPrefix))
diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go
index ef7e4b7403..0a443aa507 100644
--- a/cmd/minikube/cmd/start_test.go
+++ b/cmd/minikube/cmd/start_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 )
 
-func TestGetKuberneterVersion(t *testing.T) {
+func TestGetKubernetesVersion(t *testing.T) {
 	var tests = []struct {
 		description     string
 		expectedVersion string
@@ -55,6 +55,16 @@ func TestGetKuberneterVersion(t *testing.T) {
 			paramVersion:    "v1.16.0",
 			cfg:             &cfg.ClusterConfig{KubernetesConfig: cfg.KubernetesConfig{KubernetesVersion: "v1.15.0"}},
 		},
+		{
+			description:     "kubernetes-version given as 'stable', no config",
+			expectedVersion: constants.DefaultKubernetesVersion,
+			paramVersion:    "stable",
+		},
+		{
+			description:     "kubernetes-version given as 'latest', no config",
+			expectedVersion: constants.NewestKubernetesVersion,
+			paramVersion:    "latest",
+		},
 	}
 
 	for _, test := range tests {

From 28672dec786c49417879e3159e3100018db2a5fd Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 14:43:11 -0700
Subject: [PATCH 228/668] remove ClusterNameFromMachine

---
 cmd/minikube/cmd/status.go    | 12 +++++++-----
 pkg/minikube/driver/driver.go | 10 +---------
 pkg/provision/buildroot.go    |  4 +++-
 pkg/provision/provision.go    |  8 +++++---
 pkg/provision/ubuntu.go       |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 0db9e57ea8..7b44488e1c 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -31,6 +31,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -107,7 +108,7 @@ var statusCmd = &cobra.Command{
 		for _, n := range cc.Nodes {
 			glog.Infof("checking status of %s ...", n.Name)
 			machineName := driver.MachineName(*cc, n)
-			st, err = status(api, machineName, n.ControlPlane)
+			st, err = status(api, *cc, n)
 			glog.Infof("%s status: %+v", machineName, st)
 
 			if err != nil {
@@ -150,12 +151,12 @@ func exitCode(st *Status) int {
 	return c
 }
 
-func status(api libmachine.API, name string, controlPlane bool) (*Status, error) {
+func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status, error) {
 
-	profile, node := driver.ClusterNameFromMachine(name)
+	controlPlane := n.ControlPlane
 
 	st := &Status{
-		Name:       node,
+		Name:       n.Name,
 		Host:       Nonexistent,
 		APIServer:  Nonexistent,
 		Kubelet:    Nonexistent,
@@ -163,6 +164,7 @@ func status(api libmachine.API, name string, controlPlane bool) (*Status, error)
 		Worker:     !controlPlane,
 	}
 
+	name := driver.MachineName(cc, n)
 	hs, err := machine.Status(api, name)
 	glog.Infof("%s host status = %q (err=%v)", name, hs, err)
 	if err != nil {
@@ -205,7 +207,7 @@ func status(api libmachine.API, name string, controlPlane bool) (*Status, error)
 	}
 
 	if st.Kubeconfig != Irrelevant {
-		ok, err := kubeconfig.IsClusterInConfig(ip, profile)
+		ok, err := kubeconfig.IsClusterInConfig(ip, cc.Name)
 		glog.Infof("%s is in kubeconfig at ip %s: %v (err=%v)", name, ip, ok, err)
 		if ok {
 			st.Kubeconfig = Configured
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b6106474d8..e064f70799 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -234,13 +234,5 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	if len(cc.Nodes) == 1 || n.ControlPlane {
 		return cc.Name
 	}
-	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
-}
-
-// ClusterNameFromMachine retrieves the cluster name embedded in the machine name
-func ClusterNameFromMachine(name string) (string, string) {
-	if strings.Contains(name, "---") {
-		return strings.Split(name, "---")[0], strings.Split(name, "---")[1]
-	}
-	return name, name
+	return fmt.Sprintf("%s-%s", cc.Name, n.Name)
 }
diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 913d8b34d0..1a9e49338f 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -29,6 +29,8 @@ import (
 	"github.com/docker/machine/libmachine/provision/pkgaction"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -180,7 +182,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p); err != nil {
+	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), viper.GetString(config.ProfileName), p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 0a297d50d8..4f7aed6cc0 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -36,10 +36,10 @@ import (
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/sshutil"
 )
 
@@ -76,6 +76,9 @@ func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.Syste
 			DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
 			OsReleaseID:       osReleaseID,
 			Driver:            d,
+			SwarmOptions: swarm.Options{
+				ArbitraryFlags: []string{viper.GetString(config.ProfileName)},
+			},
 		},
 	}
 }
@@ -208,8 +211,7 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
 	return authOptions
 }
 
-func setContainerRuntimeOptions(name string, p miniProvisioner) error {
-	cluster, _ := driver.ClusterNameFromMachine(name)
+func setContainerRuntimeOptions(name string, cluster string, p miniProvisioner) error {
 	c, err := config.Load(cluster)
 	if err != nil {
 		return errors.Wrap(err, "getting cluster config")
diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
index 9d2b272bd2..c0aaf46780 100644
--- a/pkg/provision/ubuntu.go
+++ b/pkg/provision/ubuntu.go
@@ -185,7 +185,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p); err != nil {
+	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.SwarmOptions.ArbitraryFlags[0], p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}

From 1d72a1c8263fe1d40a81d5c3faa24ca532cc7e44 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 15:01:31 -0700
Subject: [PATCH 229/668] don't extract volume if tarball doesn't exist

---
 pkg/drivers/kic/kic.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 2055f91931..6e05e2de05 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -121,6 +121,10 @@ func (d *Driver) Create() error {
 		return errors.Wrap(err, "prepare kic ssh")
 	}
 
+	// If preload doesn't exist, don't both extracting tarball to volume
+	if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) {
+		return nil
+	}
 	t := time.Now()
 	glog.Infof("Starting extracting preloaded images to volume")
 	// Extract preloaded images to container

From 4a24cfcf30ee267507b74d022b3bf1e2ffc5c072 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 15:54:39 -0700
Subject: [PATCH 230/668] add cluster name to provisioner object directly

---
 pkg/provision/buildroot.go | 4 +++-
 pkg/provision/provision.go | 4 ----
 pkg/provision/ubuntu.go    | 5 ++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 1a9e49338f..723e24c72f 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -37,12 +37,14 @@ import (
 // BuildrootProvisioner provisions the custom system based on Buildroot
 type BuildrootProvisioner struct {
 	provision.SystemdProvisioner
+	clusterName string
 }
 
 // NewBuildrootProvisioner creates a new BuildrootProvisioner
 func NewBuildrootProvisioner(d drivers.Driver) provision.Provisioner {
 	return &BuildrootProvisioner{
 		NewSystemdProvisioner("buildroot", d),
+		viper.GetString(config.ProfileName),
 	}
 }
 
@@ -182,7 +184,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), viper.GetString(config.ProfileName), p); err != nil {
+	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.clusterName, p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 4f7aed6cc0..19e6f0c43a 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -36,7 +36,6 @@ import (
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -76,9 +75,6 @@ func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.Syste
 			DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
 			OsReleaseID:       osReleaseID,
 			Driver:            d,
-			SwarmOptions: swarm.Options{
-				ArbitraryFlags: []string{viper.GetString(config.ProfileName)},
-			},
 		},
 	}
 }
diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
index c0aaf46780..2fc32e67a3 100644
--- a/pkg/provision/ubuntu.go
+++ b/pkg/provision/ubuntu.go
@@ -29,6 +29,8 @@ import (
 	"github.com/docker/machine/libmachine/provision/pkgaction"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -42,6 +44,7 @@ func NewUbuntuProvisioner(d drivers.Driver) provision.Provisioner {
 	return &UbuntuProvisioner{
 		BuildrootProvisioner{
 			NewSystemdProvisioner("ubuntu", d),
+			viper.GetString(config.ProfileName),
 		},
 	}
 }
@@ -185,7 +188,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.SwarmOptions.ArbitraryFlags[0], p); err != nil {
+	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.clusterName, p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}

From 06dca4555357990d14e27e4b70066fda5232e9e8 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 24 Mar 2020 16:10:20 -0700
Subject: [PATCH 231/668] lint

---
 pkg/provision/buildroot.go | 2 +-
 pkg/provision/provision.go | 4 ++--
 pkg/provision/ubuntu.go    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
index 723e24c72f..2f630f9332 100644
--- a/pkg/provision/buildroot.go
+++ b/pkg/provision/buildroot.go
@@ -184,7 +184,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.clusterName, p); err != nil {
+	if err := setContainerRuntimeOptions(p.clusterName, p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 19e6f0c43a..7b2e9e6539 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -207,8 +207,8 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
 	return authOptions
 }
 
-func setContainerRuntimeOptions(name string, cluster string, p miniProvisioner) error {
-	c, err := config.Load(cluster)
+func setContainerRuntimeOptions(name string, p miniProvisioner) error {
+	c, err := config.Load(name)
 	if err != nil {
 		return errors.Wrap(err, "getting cluster config")
 	}
diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
index 2fc32e67a3..3fbf006b69 100644
--- a/pkg/provision/ubuntu.go
+++ b/pkg/provision/ubuntu.go
@@ -188,7 +188,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
 	}
 
 	glog.Infof("setting minikube options for container-runtime")
-	if err := setContainerRuntimeOptions(p.Driver.GetMachineName(), p.clusterName, p); err != nil {
+	if err := setContainerRuntimeOptions(p.clusterName, p); err != nil {
 		glog.Infof("Error setting container-runtime options during provisioning %v", err)
 		return err
 	}

From 0e897f8448bfb79b8d58b20b7b266b3dd54a808e Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 16:25:57 -0700
Subject: [PATCH 232/668] Only run preload if it exists

---
 pkg/minikube/cruntime/docker.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 8641092573..843c7529f8 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -290,6 +290,9 @@ func (r *Docker) SystemLogCmd(len int) string {
 // 2. Extract the preloaded tarball to the correct directory
 // 3. Remove the tarball within the VM
 func (r *Docker) Preload(cfg config.KubernetesConfig) error {
+	if !download.PreloadExists(cfg.KubernetesVersion, cfg.ContainerRuntime) {
+		return nil
+	}
 	k8sVersion := cfg.KubernetesVersion
 
 	// If images already exist, return

From 744f76e3b677f7164dbdbc5d7b60d3c328de9376 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 17:25:27 -0700
Subject: [PATCH 233/668] fix lint

---
 test/integration/aaa_download_only_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index c6c1c203ef..dc76967ce1 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -74,7 +74,7 @@ func TestDownloadOnly(t *testing.T) {
 					if !NoneDriver() {
 						if download.PreloadExists(v, r) {
 							// Just make sure the tarball path exists
-							if _, err := os.Stat(download.TarballPath(v)); err != nil {
+							if _, err := os.Stat(download.TarballPath(v, r)); err != nil {
 								t.Errorf("preloaded tarball path doesn't exist: %v", err)
 							}
 							return
@@ -154,6 +154,8 @@ func TestDownloadOnlyKic(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(15))
 	defer Cleanup(t, profile, cancel)
 
+	cRuntime := "docker"
+
 	args := []string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr"}
 	args = append(args, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))

From 455ebeac0130a245e524b385917bd24737cbf7fd Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 17:28:57 -0700
Subject: [PATCH 234/668] update test, don't need to rerun v1.17.0 since those
 images exist anyway

---
 test/integration/start_stop_delete_test.go | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index f0aeb03450..e948f4b6ef 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -192,17 +192,6 @@ func TestStartStopWithPreload(t *testing.T) {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}
 
-	// Restart again with v1.17.0, this time with the preloaded tarball
-	startArgs = []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
-	startArgs = append(startArgs, StartArgs()...)
-	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))
-
-	rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
-	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
-	}
-	verifyImageExistsInDaemon(ctx, t, profile, image)
-
 	// Restart minikube with v1.17.3, which has a preloaded tarball
 	startArgs = []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
 	startArgs = append(startArgs, StartArgs()...)
@@ -212,13 +201,7 @@ func TestStartStopWithPreload(t *testing.T) {
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}
-	verifyImageExistsInDaemon(ctx, t, profile, image)
-
-}
-
-func verifyImageExistsInDaemon(ctx context.Context, t *testing.T, profile, image string) {
-	// Ensure that busybox still exists in the daemon
-	rr, err := Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
+	rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}

From ab4b7d92b380b477801280289aaf2531454e11e9 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Tue, 24 Mar 2020 17:36:04 -0700
Subject: [PATCH 235/668] Flush logs before writing to stdout

---
 pkg/minikube/out/out.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
index 9ecb23c053..38c817339b 100644
--- a/pkg/minikube/out/out.go
+++ b/pkg/minikube/out/out.go
@@ -68,6 +68,9 @@ func T(style StyleEnum, format string, a ...V) {
 
 // String writes a basic formatted string to stdout
 func String(format string, a ...interface{}) {
+	// Flush log buffer so that output order makes sense
+	glog.Flush()
+
 	if outFile == nil {
 		glog.Warningf("[unset outFile]: %s", fmt.Sprintf(format, a...))
 		return

From d3fcd40feba97e809d115839bc45be45831730a0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Tue, 24 Mar 2020 17:37:59 -0700
Subject: [PATCH 236/668] Use correct preload paths on Windows, announce base
 image pull

---
 pkg/minikube/download/preload.go | 12 ++++++------
 pkg/minikube/node/cache.go       |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 09e0d8d35e..4a4979acc0 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"path"
+	"path/filepath"
 
 	"cloud.google.com/go/storage"
 	"google.golang.org/api/option"
@@ -59,14 +59,14 @@ func targetDir() string {
 	return localpath.MakeMiniPath("cache", "preloaded-tarball")
 }
 
-// PreloadChecksumPath returns path to checksum file
+// PreloadChecksumPath returns the local path to the cached checksum file
 func PreloadChecksumPath(k8sVersion string) string {
-	return path.Join(targetDir(), checksumName(k8sVersion))
+	return filepath.Join(targetDir(), checksumName(k8sVersion))
 }
 
-// TarballPath returns the path to the preloaded tarball
+// TarballPath returns the local path to the cached preload tarball
 func TarballPath(k8sVersion string) string {
-	return path.Join(targetDir(), TarballName(k8sVersion))
+	return filepath.Join(targetDir(), TarballName(k8sVersion))
 }
 
 // remoteTarballURL returns the URL for the remote tarball in GCS
@@ -122,7 +122,7 @@ func Preload(k8sVersion, containerRuntime string) error {
 		return nil
 	}
 
-	out.T(out.FileDownload, "Downloading preloaded images tarball for k8s {{.version}} ...", out.V{"version": k8sVersion})
+	out.T(out.FileDownload, "Downloading Kubernetes {{.version}} preload ...", out.V{"version": k8sVersion})
 	url := remoteTarballURL(k8sVersion)
 
 	tmpDst := targetPath + ".download"
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index f1b3ac8f32..ebeb04fdc0 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -100,6 +100,7 @@ func doCacheBinaries(k8sVersion string) error {
 
 // BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
 func beginDownloadKicArtifacts(g *errgroup.Group) {
+	out.T(out.Pulling, "Pulling base image ...")
 	glog.Info("Beginning downloading kic artifacts")
 	g.Go(func() error {
 		glog.Infof("Downloading %s to local daemon", kic.BaseImage)

From 2e9054f495ddc99cecf2c80daef1dbe7a99ac641 Mon Sep 17 00:00:00 2001
From: ZouYu <zouy.fnst@cn.fujitsu.com>
Date: Wed, 25 Mar 2020 11:08:27 +0800
Subject: [PATCH 237/668] add unit test for pkg/drivers/hyperkit/iso.go

Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>
---
 pkg/drivers/hyperkit/iso_test.go  |  91 ++++++++++++++++++++++++++++++
 pkg/drivers/hyperkit/iso_test.iso | Bin 0 -> 362496 bytes
 2 files changed, 91 insertions(+)
 create mode 100644 pkg/drivers/hyperkit/iso_test.go
 create mode 100644 pkg/drivers/hyperkit/iso_test.iso

diff --git a/pkg/drivers/hyperkit/iso_test.go b/pkg/drivers/hyperkit/iso_test.go
new file mode 100644
index 0000000000..8dda1e4a6e
--- /dev/null
+++ b/pkg/drivers/hyperkit/iso_test.go
@@ -0,0 +1,91 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package hyperkit
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func TestExtractFile(t *testing.T) {
+	testDir, err := ioutil.TempDir(os.TempDir(), "")
+	if nil != err {
+		return
+	}
+	defer os.Remove(testDir)
+
+	tests := []struct {
+		name          string
+		isoPath       string
+		srcPath       string
+		destPath      string
+		expectedError bool
+	}{
+		{
+			name:          "all is right",
+			isoPath:       "iso_test.iso",
+			srcPath:       "/test1.txt",
+			destPath:      testDir + "/test1.txt",
+			expectedError: false,
+		},
+		{
+			name:          "isoPath is error",
+			isoPath:       "tests.iso",
+			srcPath:       "/test1.txt",
+			destPath:      testDir + "/test1.txt",
+			expectedError: true,
+		},
+		{
+			name:          "srcPath is empty",
+			isoPath:       "iso_tests.iso",
+			srcPath:       "",
+			destPath:      testDir + "/test1.txt",
+			expectedError: true,
+		},
+		{
+			name:          "srcPath is error",
+			isoPath:       "iso_tests.iso",
+			srcPath:       "/t1.txt",
+			destPath:      testDir + "/test1.txt",
+			expectedError: true,
+		},
+		{
+			name:          "destPath is empty",
+			isoPath:       "iso_test.iso",
+			srcPath:       "/test1.txt",
+			destPath:      "",
+			expectedError: true,
+		},
+		{
+			name:          "find files in a folder",
+			isoPath:       "./iso_test.iso",
+			srcPath:       "/test2/test2.txt",
+			destPath:      testDir + "/test2.txt",
+			expectedError: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := ExtractFile(tt.isoPath, tt.srcPath, tt.destPath)
+			if (nil != err) != tt.expectedError {
+				t.Errorf("expectedError = %v, get = %v", tt.expectedError, err)
+				return
+			}
+		})
+	}
+}
diff --git a/pkg/drivers/hyperkit/iso_test.iso b/pkg/drivers/hyperkit/iso_test.iso
new file mode 100644
index 0000000000000000000000000000000000000000..dbed69dd413fd8b02f0f019e33ac700e6f75d699
GIT binary patch
literal 362496
zcmeI(+fEZf7y#f|4Wu5pQp4fGOt>(bVA-|=(s<RBr4&nR+9iPp@Co$7*YXK<hXo8l
zgqsFzzDc?>ot@pze!J<Po#YQeAwYlt0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0tB-DexA3oFdB|ePUG#RzdxNE-@ZFuO8%@H7u99&%{mJqOP|nagtdD2+N(dq
z-lXPcSgm_jLnAdB;m6aJXIm@rNjfkcAC(6c7!>2-Y%)CV4T@MbVt02p-#$E;#e?Cf
zn4Qha;yCuFMX#Jp<NN-H*y?sWv1p!6PR4`%-l(|j-22$h^WAvV{8IF$v&ne-s5$E&
z4oB5fIXEAacBe6Wv3d|c56f5<y?;H9^HFK%)f76dPTt+w>EwAHZ*)|h*GjlCA`A1G
zo3s8e0`-5IErCZM@arP}KZ2>40s#U92oNAZfB*pk1PBlyFeicRe2u+YO%F@w>+o49
zi&@#8)2}%#0RjXF5FkK+009C72oNCf5CZAVzghyQs-@Ig3z_%-1fdWhK!5-N0t5&U
zAV7csfkhIyJIC&p5pS=u@UpG2UX!dZ*Y$GB(|frbt8Xb!??qZtXf?~z@>A>GRkq*X
zbNZGnKh%b{1PBlyKwypnn|H+H?Cvc5D*kWOGu*fq|6j+d_bUFk>-ay%OL1xf1PBly
zK;WJN-@ktQ-g<t|!G;kaK!5-N0t+FK;(uHGUx<6@A_x#5K!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
h009C72oNAZfB*pk1PBlyK!5-N0t5&UAh5^+zX52X(Y62p

literal 0
HcmV?d00001


From 1b4f6efe632b492359b3851ca8c59b68df014c16 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 20:12:49 -0700
Subject: [PATCH 238/668] Use runtime.GOARCH since we want amd64, not
 runtime.GOOS

---
 pkg/minikube/download/preload.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 0fe1ea7778..fdf5fd43bd 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -47,7 +47,7 @@ const (
 
 // TarballName returns name of the tarball
 func TarballName(k8sVersion, containerRuntime string) string {
-	return fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-overlay2-%s.tar.lz4", PreloadVersion, k8sVersion, containerRuntime, runtime.GOOS)
+	return fmt.Sprintf("preloaded-images-k8s-%s-%s-%s-overlay2-%s.tar.lz4", PreloadVersion, k8sVersion, containerRuntime, runtime.GOARCH)
 }
 
 // returns the name of the checksum file

From 646609ec30fcd5aa4f0e7c0be029bbad46873e55 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 24 Mar 2020 21:24:43 -0700
Subject: [PATCH 239/668] review comments

---
 cmd/minikube/cmd/start.go        | 2 +-
 pkg/minikube/download/preload.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 7d6e92cbf6..ef568571ba 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -176,7 +176,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
 	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
 	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
-	startCmd.Flags().Bool(preload, true, "If true, download tarball of preloaded images if available to improve start time.")
+	startCmd.Flags().Bool(preload, true, "If set, download tarball of preloaded images if available to improve start time. Defaults to true.")
 }
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 0291a15b93..9016371d68 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -81,6 +81,9 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 		return false
 	}
 
+	// See https://github.com/kubernetes/minikube/issues/6933
+	// and https://github.com/kubernetes/minikube/issues/6934
+	// to track status of adding containerd & crio
 	if containerRuntime != "docker" {
 		return false
 	}

From 1be46bceec192a87b0525039d8d91076389505cc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 01:12:27 -0700
Subject: [PATCH 240/668] implement Preload check for crio and containerd

---
 pkg/minikube/cruntime/containerd.go | 4 ++++
 pkg/minikube/cruntime/crio.go       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go
index 67beb710a7..89a2e3912a 100644
--- a/pkg/minikube/cruntime/containerd.go
+++ b/pkg/minikube/cruntime/containerd.go
@@ -30,6 +30,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -313,5 +314,8 @@ func (r *Containerd) SystemLogCmd(len int) string {
 
 // Preload preloads the container runtime with k8s images
 func (r *Containerd) Preload(cfg config.KubernetesConfig) error {
+	if !download.PreloadExists(cfg.KubernetesVersion, cfg.ContainerRuntime) {
+		return nil
+	}
 	return fmt.Errorf("not yet implemented for %s", r.Name())
 }
diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go
index fff4a8c270..5678a9d6a4 100644
--- a/pkg/minikube/cruntime/crio.go
+++ b/pkg/minikube/cruntime/crio.go
@@ -26,6 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -230,5 +231,8 @@ func (r *CRIO) SystemLogCmd(len int) string {
 
 // Preload preloads the container runtime with k8s images
 func (r *CRIO) Preload(cfg config.KubernetesConfig) error {
+	if !download.PreloadExists(cfg.KubernetesVersion, cfg.ContainerRuntime) {
+		return nil
+	}
 	return fmt.Errorf("not yet implemented for %s", r.Name())
 }

From f42572f29ce69f7b015cd0d00c623dafe9c13a88 Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Wed, 25 Mar 2020 22:44:40 +1100
Subject: [PATCH 241/668] Add TestMiniPath test

---
 pkg/minikube/localpath/localpath.go      |  9 +++---
 pkg/minikube/localpath/localpath_test.go | 39 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/localpath/localpath.go b/pkg/minikube/localpath/localpath.go
index 6bc9ef1239..1ac1172b6a 100644
--- a/pkg/minikube/localpath/localpath.go
+++ b/pkg/minikube/localpath/localpath.go
@@ -38,13 +38,14 @@ func ConfigFile() string {
 
 // MiniPath returns the path to the user's minikube dir
 func MiniPath() string {
-	if os.Getenv(MinikubeHome) == "" {
+	minikubeHomeEnv := os.Getenv(MinikubeHome)
+	if minikubeHomeEnv == "" {
 		return filepath.Join(homedir.HomeDir(), ".minikube")
 	}
-	if filepath.Base(os.Getenv(MinikubeHome)) == ".minikube" {
-		return os.Getenv(MinikubeHome)
+	if filepath.Base(minikubeHomeEnv) == ".minikube" {
+		return minikubeHomeEnv
 	}
-	return filepath.Join(os.Getenv(MinikubeHome), ".minikube")
+	return filepath.Join(minikubeHomeEnv, ".minikube")
 }
 
 // MakeMiniPath is a utility to calculate a relative path to our directory.
diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 173ca5df88..81b40722dc 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -17,10 +17,15 @@ limitations under the License.
 package localpath
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
+
+	"k8s.io/client-go/util/homedir"
 )
 
 func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
@@ -61,3 +66,37 @@ func TestHasWindowsDriveLetter(t *testing.T) {
 		}
 	}
 }
+
+func TestConfigFile(t *testing.T) {
+	configFile := ConfigFile()
+	if !strings.Contains(configFile, "config.json") {
+		t.Errorf("ConfigFile returned path without 'config.json': %s", configFile)
+	}
+}
+
+func TestMiniPath(t *testing.T) {
+	var testCases = []struct {
+		env, basePath string
+	}{
+		{"/tmp/.minikube", "/tmp/"},
+		{"/tmp/", "/tmp"},
+		{"", homedir.HomeDir()},
+	}
+	for _, tc := range testCases {
+		originalEnv := os.Getenv(MinikubeHome)
+		defer func() { // revert to pre-test env var
+			err := os.Setenv(MinikubeHome, originalEnv)
+			if err != nil {
+				t.Fatalf("Error reverting env %s to its original value (%s) var after test ", MinikubeHome, originalEnv)
+			}
+		}()
+		t.Run(fmt.Sprintf("%s", tc.env), func(t *testing.T) {
+			expectedPath := filepath.Join(tc.basePath, ".minikube")
+			os.Setenv(MinikubeHome, tc.env)
+			path := MiniPath()
+			if path != expectedPath {
+				t.Errorf("MiniPath expected to return '%s', but got '%s'", expectedPath, path)
+			}
+		})
+	}
+}

From 4383a4883c8a5050097c9568fa7a1740ea152a4d Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 07:28:23 -0700
Subject: [PATCH 242/668] Improve host recreation experience

---
 pkg/minikube/machine/delete.go | 33 +++++++++++++++++++++++
 pkg/minikube/machine/fix.go    | 48 ++++++++++++++--------------------
 pkg/minikube/out/style.go      |  1 -
 pkg/minikube/out/style_enum.go |  1 -
 4 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/pkg/minikube/machine/delete.go b/pkg/minikube/machine/delete.go
index c51a9d0931..136d232ac4 100644
--- a/pkg/minikube/machine/delete.go
+++ b/pkg/minikube/machine/delete.go
@@ -22,11 +22,13 @@ import (
 	"time"
 
 	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/mcnerror"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -100,3 +102,34 @@ func DeleteHost(api libmachine.API, machineName string) error {
 	}
 	return nil
 }
+
+// destroy demolishes a host by any means necessary
+// Use only when the machine state appears to be inconsistent
+func destroy(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) {
+	machineName := driver.MachineName(cc, n)
+	glog.Infof("destroying %s ...", machineName)
+
+	// First try using the official friendly API's.
+
+	// This will probably fail
+	err := StopHost(api, machineName)
+	if err != nil {
+		glog.Infof("stophost failed: %v", err)
+	}
+
+	// For 95% of cases, this should be enough
+	err = DeleteHost(api, machineName)
+	if err != nil {
+		glog.Warningf("deletehost failed: %v", err)
+	}
+
+	// DeleteHost may have returned success prematurely. Go further.
+	if err = h.Driver.Remove(); err != nil {
+		glog.Warningf("driver remove failed: %v", err)
+	}
+
+	// Clean up the local files relating to this machine
+	if err = api.Remove(cc.Name); err != nil {
+		glog.Warningf("api remove failed: %v", err)
+	}
+}
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 9575f92294..943bc7d8b0 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -54,8 +54,6 @@ var (
 
 // fixHost fixes up a previously configured VM so that it is ready to run Kubernetes
 func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, error) {
-	out.T(out.Waiting, "Reconfiguring existing host ...")
-
 	start := time.Now()
 	glog.Infof("fixHost starting: %s", n.Name)
 	defer func() {
@@ -101,43 +99,35 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 }
 
 func recreateIfNeeded(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) (*host.Host, error) {
+	machineName := driver.MachineName(cc, n)
+	machineType := driver.MachineType(cc.Driver)
+
 	s, err := h.Driver.GetState()
+	glog.Infof("recreateIfNeeded on %s: state=%s err=%v", machineName, s, err)
 	if err != nil || s == state.Stopped || s == state.None {
 		// If virtual machine does not exist due to user interrupt cancel(i.e. Ctrl + C), recreate virtual machine
 		me, err := machineExists(h.Driver.DriverName(), s, err)
-		if !me {
-			// If the error is that virtual machine does not exist error, handle error(recreate virtual machine)
-			if err == ErrorMachineNotExist {
-				// remove virtual machine
-				if err := h.Driver.Remove(); err != nil {
-					// skip returning error since it may be before docker image pulling(so, no host exist)
-					if h.Driver.DriverName() != driver.Docker {
-						return nil, errors.Wrap(err, "host remove")
-					}
-				}
-				// remove machine config directory
-				if err := api.Remove(cc.Name); err != nil {
-					return nil, errors.Wrap(err, "api remove")
-				}
-				// recreate virtual machine
-				out.T(out.Meh, "machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.", out.V{"name": cc.Name})
-				h, err = createHost(api, cc, n)
-				if err != nil {
-					return nil, errors.Wrap(err, "Error recreating VM")
-				}
-				// return ErrMachineNotExist err to initialize preExists flag
-				return h, ErrorMachineNotExist
+		glog.Infof("exists: %v err=%v", me, err)
+
+		if !me || err == ErrorMachineNotExist {
+			out.T(out.Provisioning, `Recreating {{.driver_name}} "{{.cluster}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
+			destroy(api, cc, n, h)
+			time.Sleep(1 * time.Second)
+			h, err = createHost(api, cc, n)
+			if err != nil {
+				return nil, errors.Wrap(err, "recreate")
+			}
+			s, err = h.Driver.GetState()
+			if err != nil {
+				return nil, errors.Wrap(err, "recreated state")
 			}
-			// If the error is not that virtual machine does not exist error, return error
-			return nil, errors.Wrap(err, "Error getting state for host")
 		}
 	}
 
-	machineType := driver.MachineType(cc.Driver)
 	if s == state.Running {
-		out.T(out.Running, `Using the running {{.driver_name}} "{{.profile_name}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "profile_name": cc.Name, "machine_type": machineType})
+		out.T(out.Running, `Updating the running {{.driver_name}} "{{.cluster}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
 	} else {
-		out.T(out.Restarting, `Starting existing {{.driver_name}} {{.machine_type}} for "{{.profile_name}}" ...`, out.V{"driver_name": cc.Driver, "profile_name": cc.Name, "machine_type": machineType})
+		out.T(out.Restarting, `Retarting existing {{.driver_name}} {{.machine_type}} for "{{.cluster}}" ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
 		if err := h.Driver.Start(); err != nil {
 			return h, errors.Wrap(err, "driver start")
 		}
diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index 150a7af30d..2ae3f25304 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -60,7 +60,6 @@ var styles = map[StyleEnum]style{
 	Running:       {Prefix: "🏃  "},
 	Provisioning:  {Prefix: "🌱  "},
 	Restarting:    {Prefix: "🔄  "},
-	Reconfiguring: {Prefix: "📯  "},
 	Stopping:      {Prefix: "✋  "},
 	Stopped:       {Prefix: "🛑  "},
 	Warning:       {Prefix: "❗  ", LowPrefix: lowWarning},
diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go
index 747c277faf..097f4452dc 100644
--- a/pkg/minikube/out/style_enum.go
+++ b/pkg/minikube/out/style_enum.go
@@ -32,7 +32,6 @@ const (
 	Running
 	Provisioning
 	Restarting
-	Reconfiguring
 	Stopping
 	Stopped
 	Warning

From d33684d7eb68e0684f0b35b32f683ceb03563526 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 08:10:08 -0700
Subject: [PATCH 243/668] Make private stop/delete functions to avoid wheel
 reinvention

---
 pkg/minikube/machine/delete.go | 31 +++++++++++-------------
 pkg/minikube/machine/fix.go    | 43 ++++++++++++++++++++--------------
 pkg/minikube/machine/stop.go   | 17 +++++++++-----
 3 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/pkg/minikube/machine/delete.go b/pkg/minikube/machine/delete.go
index 136d232ac4..69b493ac26 100644
--- a/pkg/minikube/machine/delete.go
+++ b/pkg/minikube/machine/delete.go
@@ -87,11 +87,16 @@ func DeleteHost(api libmachine.API, machineName string) error {
 	}
 
 	out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": host.DriverName})
-	if err := host.Driver.Remove(); err != nil {
+	return delete(api, host, machineName)
+}
+
+// delete removes a host and it's local data files
+func delete(api libmachine.API, h *host.Host, machineName string) error {
+	if err := h.Driver.Remove(); err != nil {
 		glog.Warningf("remove failed, will retry: %v", err)
 		time.Sleep(2 * time.Second)
 
-		nerr := host.Driver.Remove()
+		nerr := h.Driver.Remove()
 		if nerr != nil {
 			return errors.Wrap(nerr, "host remove retry")
 		}
@@ -103,18 +108,17 @@ func DeleteHost(api libmachine.API, machineName string) error {
 	return nil
 }
 
-// destroy demolishes a host by any means necessary
-// Use only when the machine state appears to be inconsistent
-func destroy(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) {
+// demolish destroys a host by any means necessary - use only if state is inconsistent
+func demolish(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) {
 	machineName := driver.MachineName(cc, n)
 	glog.Infof("destroying %s ...", machineName)
 
-	// First try using the official friendly API's.
+	// First try using the friendly API's.
 
 	// This will probably fail
-	err := StopHost(api, machineName)
+	err := stop(h)
 	if err != nil {
-		glog.Infof("stophost failed: %v", err)
+		glog.Infof("stophost failed (probably ok): %v", err)
 	}
 
 	// For 95% of cases, this should be enough
@@ -123,13 +127,6 @@ func destroy(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host
 		glog.Warningf("deletehost failed: %v", err)
 	}
 
-	// DeleteHost may have returned success prematurely. Go further.
-	if err = h.Driver.Remove(); err != nil {
-		glog.Warningf("driver remove failed: %v", err)
-	}
-
-	// Clean up the local files relating to this machine
-	if err = api.Remove(cc.Name); err != nil {
-		glog.Warningf("api remove failed: %v", err)
-	}
+	err = delete(api, h, machineName)
+	glog.Warningf("delete failed (probably ok) %v", err)
 }
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 943bc7d8b0..cc8e8e8271 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -101,41 +101,48 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 func recreateIfNeeded(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) (*host.Host, error) {
 	machineName := driver.MachineName(cc, n)
 	machineType := driver.MachineType(cc.Driver)
+	recreated := false
+	s, serr := h.Driver.GetState()
 
-	s, err := h.Driver.GetState()
-	glog.Infof("recreateIfNeeded on %s: state=%s err=%v", machineName, s, err)
-	if err != nil || s == state.Stopped || s == state.None {
+	glog.Infof("recreateIfNeeded on %s: state=%s err=%v", machineName, s, serr)
+	if serr != nil || s == state.Stopped || s == state.None {
 		// If virtual machine does not exist due to user interrupt cancel(i.e. Ctrl + C), recreate virtual machine
-		me, err := machineExists(h.Driver.DriverName(), s, err)
+		me, err := machineExists(h.Driver.DriverName(), s, serr)
 		glog.Infof("exists: %v err=%v", me, err)
 
 		if !me || err == ErrorMachineNotExist {
-			out.T(out.Provisioning, `Recreating {{.driver_name}} "{{.cluster}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
-			destroy(api, cc, n, h)
+			out.T(out.Shrug, `{{.driver_name}} "{{.cluster}}" {{.machine_type}} is missing, will recreate.`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
+			demolish(api, cc, n, h)
 			time.Sleep(1 * time.Second)
 			h, err = createHost(api, cc, n)
 			if err != nil {
 				return nil, errors.Wrap(err, "recreate")
 			}
-			s, err = h.Driver.GetState()
-			if err != nil {
-				return nil, errors.Wrap(err, "recreated state")
-			}
+			recreated = true
+			s, serr = h.Driver.GetState()
 		}
 	}
 
+	if serr != ErrorMachineNotExist {
+		glog.Warningf("unexpected machine state, will restart: %v", serr)
+	}
+
 	if s == state.Running {
-		out.T(out.Running, `Updating the running {{.driver_name}} "{{.cluster}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
-	} else {
-		out.T(out.Restarting, `Retarting existing {{.driver_name}} {{.machine_type}} for "{{.cluster}}" ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
-		if err := h.Driver.Start(); err != nil {
-			return h, errors.Wrap(err, "driver start")
-		}
-		if err := api.Save(h); err != nil {
-			return h, errors.Wrap(err, "save")
+		if !recreated {
+			out.T(out.Running, `Updating the running {{.driver_name}} "{{.cluster}}" {{.machine_type}} ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
 		}
+		return h, nil
 	}
 
+	if !recreated {
+		out.T(out.Restarting, `Retarting existing {{.driver_name}} {{.machine_type}} for "{{.cluster}}" ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
+	}
+	if err := h.Driver.Start(); err != nil {
+		return h, errors.Wrap(err, "driver start")
+	}
+	if err := api.Save(h); err != nil {
+		return h, errors.Wrap(err, "save")
+	}
 	return h, nil
 }
 
diff --git a/pkg/minikube/machine/stop.go b/pkg/minikube/machine/stop.go
index 97931a2b00..5c4ba4e671 100644
--- a/pkg/minikube/machine/stop.go
+++ b/pkg/minikube/machine/stop.go
@@ -30,25 +30,30 @@ import (
 
 // StopHost stops the host VM, saving state to disk.
 func StopHost(api libmachine.API, machineName string) error {
-	host, err := api.Load(machineName)
+	h, err := api.Load(machineName)
 	if err != nil {
 		return errors.Wrapf(err, "load")
 	}
 
-	out.T(out.Stopping, `Stopping "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": host.DriverName})
-	if host.DriverName == driver.HyperV {
+	out.T(out.Stopping, `Stopping "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": h.DriverName})
+	return stop(h)
+}
+
+// stop forcibly stops a host without needing to load
+func stop(h *host.Host) error {
+	if h.DriverName == driver.HyperV {
 		glog.Infof("As there are issues with stopping Hyper-V VMs using API, trying to shut down using SSH")
-		if err := trySSHPowerOff(host); err != nil {
+		if err := trySSHPowerOff(h); err != nil {
 			return errors.Wrap(err, "ssh power off")
 		}
 	}
 
-	if err := host.Stop(); err != nil {
+	if err := h.Stop(); err != nil {
 		alreadyInStateError, ok := err.(mcnerror.ErrHostAlreadyInState)
 		if ok && alreadyInStateError.State == state.Stopped {
 			return nil
 		}
-		return &retry.RetriableError{Err: errors.Wrapf(err, "Stop: %s", machineName)}
+		return &retry.RetriableError{Err: errors.Wrap(err, "stop")}
 	}
 	return nil
 }

From 8afe879c56b56658526dea5d9b20e1e33634f7b6 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 25 Mar 2020 10:09:22 -0700
Subject: [PATCH 244/668] remove unnecessary check; we check this when
 cr.Preload is called

---
 pkg/minikube/node/start.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 9e90bc747f..5f7b131a6e 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -42,7 +42,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
@@ -198,7 +197,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 	}
 
 	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
-	if driver.IsVM(drvName) && download.PreloadExists(k8s.KubernetesVersion, k8s.ContainerRuntime) {
+	if driver.IsVM(drvName) {
 		if err := cr.Preload(k8s); err != nil {
 			switch err.(type) {
 			case *cruntime.ErrISOFeature:

From a8d63f7fa55423c81eb9947076257363eab09273 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 10:24:57 -0700
Subject: [PATCH 245/668] none:  Skip checkHelmTiller if socat is not installed

---
 test/integration/addons_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index a784f381bf..3e001cd072 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -267,9 +267,17 @@ func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string)
 		t.Fatalf("wait: %v", err)
 	}
 
+	if NoneDriver() {
+		_, err := exec.LookPath("socat")
+		if err != nil {
+			t.Skipf("socat is required by kubectl to complete this test")
+		}
+	}
+
 	want := "Server: &version.Version"
 	// Test from inside the cluster (`helm version` use pod.list permission. we use tiller serviceaccount in kube-system to list pod)
 	checkHelmTiller := func() error {
+
 		rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "helm-test", "--restart=Never", "--image=alpine/helm:2.16.3", "-it", "--namespace=kube-system", "--serviceaccount=tiller", "--", "version"))
 		if err != nil {
 			return err

From 442a7869d3bf9d6e5689afcf5dbb6062c42392ef Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 12:48:51 -0700
Subject: [PATCH 246/668] Re-initalize failed Kubernetes clusters

---
 go.sum                                       |   2 -
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 104 +++++++++++++------
 2 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/go.sum b/go.sum
index d7d0bc3a61..15a7b48dae 100644
--- a/go.sum
+++ b/go.sum
@@ -421,8 +421,6 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345 h1:XP1VL9iOZu4yz/rq8zj+yvB23XEY5erXRzp8JYmkWu0=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 5de297a003..9308439bdd 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -51,6 +51,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/kubelet"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/vmpath"
@@ -129,7 +130,7 @@ func (k *Bootstrapper) LogCommands(cfg config.ClusterConfig, o bootstrapper.LogO
 		dmesg.WriteString(fmt.Sprintf(" | tail -n %d", o.Lines))
 	}
 
-	describeNodes := fmt.Sprintf("sudo %s describe node -A --kubeconfig=%s",
+	describeNodes := fmt.Sprintf("sudo %s describe nodes --kubeconfig=%s",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"),
 		path.Join(vmpath.GuestPersistentDir, "kubeconfig"))
 
@@ -181,20 +182,7 @@ func (k *Bootstrapper) clearStaleConfigs(cfg config.ClusterConfig) error {
 	return nil
 }
 
-// StartCluster starts the cluster
-func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
-	err := bsutil.ExistingConfig(k.c)
-	if err == nil { // if there is an existing cluster don't reconfigure it
-		return k.restartCluster(cfg)
-	}
-	glog.Infof("existence check: %v", err)
-
-	start := time.Now()
-	glog.Infof("StartCluster: %+v", cfg)
-	defer func() {
-		glog.Infof("StartCluster complete in %s", time.Since(start))
-	}()
-
+func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 	version, err := util.ParseKubernetesVersion(cfg.KubernetesConfig.KubernetesVersion)
 	if err != nil {
 		return errors.Wrap(err, "parsing kubernetes version")
@@ -237,10 +225,10 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	}
 
 	conf := bsutil.KubeadmYamlPath
-	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mv %s.new %s && %s init --config %s %s --ignore-preflight-errors=%s", conf, conf, bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), conf, extraFlags, strings.Join(ignore, ",")))
-	rr, err := k.c.RunCmd(c)
-	if err != nil {
-		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
+	c := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s init --config %s %s --ignore-preflight-errors=%s",
+		bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), conf, extraFlags, strings.Join(ignore, ",")))
+	if _, err := k.c.RunCmd(c); err != nil {
+		return errors.Wrap(err, "run")
 	}
 
 	if cfg.Driver == driver.Docker {
@@ -258,10 +246,47 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	}
 
 	if err := k.elevateKubeSystemPrivileges(cfg); err != nil {
-		glog.Warningf("unable to create cluster role binding, some addons might not work : %v. ", err)
+		glog.Warningf("unable to create cluster role binding, some addons might not work: %v", err)
+	}
+	return nil
+}
+
+// StartCluster starts the cluster
+func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
+	start := time.Now()
+	glog.Infof("StartCluster: %+v", cfg)
+	defer func() {
+		glog.Infof("StartCluster complete in %s", time.Since(start))
+	}()
+
+	if err := bsutil.ExistingConfig(k.c); err == nil {
+		glog.Infof("found existing configuration files, will attempt cluster restart")
+		rerr := k.restartCluster(cfg)
+		if rerr == nil {
+			return nil
+		}
+		out.T(out.Embarrassed, "Unable to restart cluster, will reset it: {{.error}}", out.V{"error": rerr})
+		if err := k.DeleteCluster(cfg.KubernetesConfig); err != nil {
+			glog.Warningf("delete failed: %v", err)
+		}
+		// Fall-through to init
 	}
 
-	return nil
+	conf := bsutil.KubeadmYamlPath
+	if _, err := k.c.RunCmd(exec.Command("sudo", "cp", conf+".new", conf)); err != nil {
+		return errors.Wrap(err, "cp")
+	}
+
+	err := k.init(cfg)
+	if err == nil {
+		return nil
+	}
+
+	out.T(out.Conflict, "initialization failed, will try again: {{.error}}", out.V{"error": err})
+	if err := k.DeleteCluster(cfg.KubernetesConfig); err != nil {
+		glog.Warningf("delete failed: %v", err)
+	}
+	return k.init(cfg)
 }
 
 func (k *Bootstrapper) controlPlaneEndpoint(cfg config.ClusterConfig) (string, int, error) {
@@ -410,8 +435,8 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "clearing stale configs")
 	}
 
-	if _, err := k.c.RunCmd(exec.Command("sudo", "mv", conf+".new", conf)); err != nil {
-		return errors.Wrap(err, "mv")
+	if _, err := k.c.RunCmd(exec.Command("sudo", "cp", conf+".new", conf)); err != nil {
+		return errors.Wrap(err, "cp")
 	}
 
 	baseCmd := fmt.Sprintf("%s %s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), phase)
@@ -425,9 +450,9 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 	glog.Infof("resetting cluster from %s", conf)
 	// Run commands one at a time so that it is easier to root cause failures.
 	for _, c := range cmds {
-		rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", c))
+		_, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", c))
 		if err != nil {
-			return errors.Wrapf(err, "running cmd: %s", rr.Command())
+			return errors.Wrap(err, "run")
 		}
 	}
 
@@ -504,11 +529,32 @@ func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
 		cmd = fmt.Sprintf("%s reset", bsutil.InvokeKubeadm(k8s.KubernetesVersion))
 	}
 
-	if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", cmd)); err != nil {
-		return errors.Wrapf(err, "kubeadm reset: cmd: %q", rr.Command())
+	rr, derr := k.c.RunCmd(exec.Command("/bin/bash", "-c", cmd))
+	if derr != nil {
+		glog.Warningf("%s: %v", rr.Command(), err)
 	}
 
-	return nil
+	if err := kubelet.ForceStop(k.c); err != nil {
+		glog.Warningf("stop kubelet: %v", err)
+	}
+
+	cr, err := cruntime.New(cruntime.Config{Type: k8s.ContainerRuntime, Runner: k.c, Socket: k8s.CRISocket})
+	if err != nil {
+		return errors.Wrap(err, "runtime")
+	}
+
+	containers, err := cr.ListContainers(cruntime.ListOptions{Namespaces: []string{"kube-system"}})
+	if err != nil {
+		glog.Warningf("unable to list kube-system containers: %v", err)
+	}
+	if len(containers) > 0 {
+		glog.Warningf("found %d kube-system containers to stop", len(containers))
+		if err := cr.StopContainers(containers); err != nil {
+			glog.Warningf("error stopping containers: %v", err)
+		}
+	}
+
+	return derr
 }
 
 // SetupCerts sets up certificates within the cluster.
@@ -619,7 +665,7 @@ func reloadKubelet(runner command.Runner) error {
 		return nil
 	}
 
-	startCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mv %s.new %s && sudo mv %s.new %s && sudo systemctl daemon-reload && sudo systemctl restart kubelet", svc, svc, conf, conf))
+	startCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo cp %s.new %s && sudo cp %s.new %s && sudo systemctl daemon-reload && sudo systemctl restart kubelet", svc, svc, conf, conf))
 	if _, err := runner.RunCmd(startCmd); err != nil {
 		return errors.Wrap(err, "starting kubelet")
 	}

From d18cb6fe09ac2577749eaeb534e09f4c76281c7d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 13:26:47 -0700
Subject: [PATCH 247/668] install socat

---
 .github/workflows/main.yml                   | 6 ++++--
 hack/jenkins/linux_integration_tests_none.sh | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 79a9f0982e..44df941563 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -233,7 +233,8 @@ jobs:
     runs-on: ubuntu-16.04
     steps:
     # conntrack is required for kubernetes 1.18 and higher
-    - name: Install conntrack
+    # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
+    - name: Install tools for none
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -303,7 +304,8 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     # conntrack is required for kubernetes 1.18 and higher
-    - name: Install conntrack
+    # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
+    - name: Install tools for none
       shell: bash
       run: |
         sudo apt-get update -qq
diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index 9f45f2ad54..d6c99722c6 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -58,6 +58,12 @@ if ! conntrack --version &>/dev/null; then
   sudo apt-get -qq -y install conntrack
 fi
 
+ # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
+if ! which socat &>/dev/null; then
+  echo "WARNING: No socat is not installed"
+  sudo apt-get update -qq
+  sudo apt-get -qq -y install socat
+fi
 
 mkdir -p cron && gsutil -m rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
 sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"

From 23b4ec9df342b16a35fb92ea79b2c14f51bfe793 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 13:28:45 -0700
Subject: [PATCH 248/668] install socat gh actions

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 44df941563..4a0bd5b0aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -239,6 +239,7 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
+        sudo apt-get -qq -y install socat
     - name: Install gopogh
       shell: bash
       run: |
@@ -310,6 +311,7 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
+        sudo apt-get -qq -y install socat
     - name: Install gopogh
       shell: bash
       run: |

From 093b7c29be4272cfaaa2781c1e445dfba6088bb8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 13:30:08 -0700
Subject: [PATCH 249/668] improve comments

---
 hack/jenkins/linux_integration_tests_none.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index d6c99722c6..0549fde508 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -53,14 +53,14 @@ sudo systemctl is-active --quiet kubelet \
 
  # conntrack is required for kubernetes 1.18 and higher for none driver
 if ! conntrack --version &>/dev/null; then
-  echo "WARNING: No contrack is not installed"
+  echo "WARNING: contrack is not installed. will try to install."
   sudo apt-get update -qq
   sudo apt-get -qq -y install conntrack
 fi
 
  # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
 if ! which socat &>/dev/null; then
-  echo "WARNING: No socat is not installed"
+  echo "WARNING: socat is not installed. will try to install."
   sudo apt-get update -qq
   sudo apt-get -qq -y install socat
 fi

From ea9aa72984bddfbf29b3a4573c0eed483dc62c0f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 13:44:28 -0700
Subject: [PATCH 250/668] Retry addon application

---
 go.sum               |  2 --
 pkg/addons/addons.go | 17 +++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/go.sum b/go.sum
index d7d0bc3a61..15a7b48dae 100644
--- a/go.sum
+++ b/go.sum
@@ -421,8 +421,6 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345 h1:XP1VL9iOZu4yz/rq8zj+yvB23XEY5erXRzp8JYmkWu0=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index d644aafc88..a3b1600a3d 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/storageclass"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 // defaultStorageClassProvisioner is the name of the default storage class provisioner
@@ -211,13 +212,17 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
 	}
 
 	command := kubectlCommand(cc, deployFiles, enable)
-	glog.Infof("Running: %v", command)
-	rr, err := cmd.RunCmd(command)
-	if err != nil {
-		return errors.Wrapf(err, "addon apply")
+
+	// Retry, because sometimes we race against an apiserver restart
+	apply := func() error {
+		_, err := cmd.RunCmd(command)
+		if err != nil {
+			glog.Warningf("apply failed, will retry: %v", err)
+		}
+		return err
 	}
-	glog.Infof("output:\n%s", rr.Output())
-	return nil
+
+	return retry.Expo(apply, 1*time.Second, time.Second*30)
 }
 
 // enableOrDisableStorageClasses enables or disables storage classes

From c3fba065a9e97d48e616885f405e9ab15dbbfcee Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 25 Mar 2020 14:07:39 -0700
Subject: [PATCH 251/668] do not override hostname if extraConfig is specified

---
 pkg/minikube/bootstrapper/bsutil/kubelet.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index c2180838a3..4068deac21 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -62,7 +62,7 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 		extraOpts["node-ip"] = cp.IP
 	}
 	nodeName := KubeNodeName(mc, nc)
-	if nodeName != "" {
+	if _, ok := extraOpts["hostname-override"]; !ok {
 		extraOpts["hostname-override"] = nodeName
 	}
 

From 6417e85f5b1d78865372230fba6b21f2fac2ac8e Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 25 Mar 2020 14:40:40 -0700
Subject: [PATCH 252/668] fix ordering

---
 pkg/minikube/bootstrapper/bsutil/kubelet.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
index 4068deac21..1ed22d17c6 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubelet.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -61,8 +61,8 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := KubeNodeName(mc, nc)
 	if _, ok := extraOpts["hostname-override"]; !ok {
+		nodeName := KubeNodeName(mc, nc)
 		extraOpts["hostname-override"] = nodeName
 	}
 

From f84569aab05a7a7d5e2a929c1045d5a3a9e425fd Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 14:46:44 -0700
Subject: [PATCH 253/668] Make crazy cluster_test / mock_driver combination
 pass tests

---
 cmd/minikube/cmd/stop.go             |  7 ++++---
 pkg/minikube/constants/constants.go  |  4 ++++
 pkg/minikube/machine/cluster_test.go |  7 ++++++-
 pkg/minikube/machine/delete.go       |  6 ++----
 pkg/minikube/machine/fix.go          | 26 +++++++++++++-------------
 pkg/minikube/machine/stop.go         | 11 +++++++++--
 pkg/minikube/tests/driver_mock.go    | 16 +++++++++++-----
 7 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 6d79b0446f..1036a5d365 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -69,8 +69,9 @@ func runStop(cmd *cobra.Command, args []string) {
 
 func stop(api libmachine.API, cluster config.ClusterConfig, n config.Node) bool {
 	nonexistent := false
-	stop := func() (err error) {
-		machineName := driver.MachineName(cluster, n)
+	machineName := driver.MachineName(cluster, n)
+
+	tryStop := func() (err error) {
 		err = machine.StopHost(api, machineName)
 		if err == nil {
 			return nil
@@ -87,7 +88,7 @@ func stop(api libmachine.API, cluster config.ClusterConfig, n config.Node) bool
 		}
 	}
 
-	if err := retry.Expo(stop, 5*time.Second, 3*time.Minute, 5); err != nil {
+	if err := retry.Expo(tryStop, 1*time.Second, 30*time.Second, 3); err != nil {
 		exit.WithError("Unable to stop VM", err)
 	}
 
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 33ae576f48..af053eee32 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -17,6 +17,7 @@ limitations under the License.
 package constants
 
 import (
+	"errors"
 	"path/filepath"
 
 	"k8s.io/client-go/tools/clientcmd"
@@ -100,4 +101,7 @@ var (
 		"storage-gluster",
 		"istio-operator",
 	}
+
+	// ErrMachineMissing is returned when virtual machine does not exist due to user interrupt cancel(i.e. Ctrl + C)
+	ErrMachineMissing = errors.New("machine does not exist")
 )
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 0d0c16c64b..6d687d3825 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -17,11 +17,13 @@ limitations under the License.
 package machine
 
 import (
+	"flag"
 	"fmt"
 	"testing"
 	"time"
 
 	// Driver used by testdata
+	"k8s.io/minikube/pkg/minikube/constants"
 	_ "k8s.io/minikube/pkg/minikube/registry/drvs/virtualbox"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -41,6 +43,9 @@ func createMockDriverHost(c config.ClusterConfig, n config.Node) (interface{}, e
 }
 
 func RegisterMockDriver(t *testing.T) {
+	// Debugging this test is a nightmare.
+	flag.Lookup("logtostderr").Value.Set("true")
+
 	t.Helper()
 	if !registry.Driver(driver.Mock).Empty() {
 		return
@@ -163,7 +168,7 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 	// This should pass with creating host, while machine does not exist.
 	h, _, err = StartHost(api, mc, n)
 	if err != nil {
-		if err != ErrorMachineNotExist {
+		if err != constants.ErrMachineMissing {
 			t.Fatalf("Error starting host: %v", err)
 		}
 	}
diff --git a/pkg/minikube/machine/delete.go b/pkg/minikube/machine/delete.go
index 69b493ac26..2132d16737 100644
--- a/pkg/minikube/machine/delete.go
+++ b/pkg/minikube/machine/delete.go
@@ -94,7 +94,7 @@ func DeleteHost(api libmachine.API, machineName string) error {
 func delete(api libmachine.API, h *host.Host, machineName string) error {
 	if err := h.Driver.Remove(); err != nil {
 		glog.Warningf("remove failed, will retry: %v", err)
-		time.Sleep(2 * time.Second)
+		time.Sleep(1 * time.Second)
 
 		nerr := h.Driver.Remove()
 		if nerr != nil {
@@ -111,9 +111,7 @@ func delete(api libmachine.API, h *host.Host, machineName string) error {
 // demolish destroys a host by any means necessary - use only if state is inconsistent
 func demolish(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) {
 	machineName := driver.MachineName(cc, n)
-	glog.Infof("destroying %s ...", machineName)
-
-	// First try using the friendly API's.
+	glog.Infof("DEMOLISHING %s ...", machineName)
 
 	// This will probably fail
 	err := stop(h)
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index cc8e8e8271..dd1f927a65 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -47,11 +47,6 @@ const (
 	maxClockDesyncSeconds = 2.1
 )
 
-var (
-	// ErrorMachineNotExist is returned when virtual machine does not exist due to user interrupt cancel(i.e. Ctrl + C)
-	ErrorMachineNotExist = errors.New("machine does not exist")
-)
-
 // fixHost fixes up a previously configured VM so that it is ready to run Kubernetes
 func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, error) {
 	start := time.Now()
@@ -109,21 +104,26 @@ func recreateIfNeeded(api libmachine.API, cc config.ClusterConfig, n config.Node
 		// If virtual machine does not exist due to user interrupt cancel(i.e. Ctrl + C), recreate virtual machine
 		me, err := machineExists(h.Driver.DriverName(), s, serr)
 		glog.Infof("exists: %v err=%v", me, err)
+		glog.Infof("%q vs %q", err, constants.ErrMachineMissing)
 
-		if !me || err == ErrorMachineNotExist {
+		if !me || err == constants.ErrMachineMissing {
 			out.T(out.Shrug, `{{.driver_name}} "{{.cluster}}" {{.machine_type}} is missing, will recreate.`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
 			demolish(api, cc, n, h)
+
+			glog.Infof("Sleeping 1 second for extra luck!")
 			time.Sleep(1 * time.Second)
+
 			h, err = createHost(api, cc, n)
 			if err != nil {
 				return nil, errors.Wrap(err, "recreate")
 			}
+
 			recreated = true
 			s, serr = h.Driver.GetState()
 		}
 	}
 
-	if serr != ErrorMachineNotExist {
+	if serr != constants.ErrMachineMissing {
 		glog.Warningf("unexpected machine state, will restart: %v", serr)
 	}
 
@@ -219,7 +219,7 @@ func adjustGuestClock(h hostRunner, t time.Time) error {
 
 func machineExistsState(s state.State, err error) (bool, error) {
 	if s == state.None {
-		return false, ErrorMachineNotExist
+		return false, constants.ErrMachineMissing
 	}
 	return true, err
 }
@@ -228,7 +228,7 @@ func machineExistsError(s state.State, err error, drverr error) (bool, error) {
 	_ = s // not used
 	if err == drverr {
 		// if the error matches driver error
-		return false, ErrorMachineNotExist
+		return false, constants.ErrMachineMissing
 	}
 	return true, err
 }
@@ -236,7 +236,7 @@ func machineExistsError(s state.State, err error, drverr error) (bool, error) {
 func machineExistsMessage(s state.State, err error, msg string) (bool, error) {
 	if s == state.None || (err != nil && err.Error() == msg) {
 		// if the error contains the message
-		return false, ErrorMachineNotExist
+		return false, constants.ErrMachineMissing
 	}
 	return true, err
 }
@@ -244,10 +244,10 @@ func machineExistsMessage(s state.State, err error, msg string) (bool, error) {
 func machineExistsDocker(s state.State, err error) (bool, error) {
 	if s == state.Error {
 		// if the kic image is not present on the host machine, when user cancel `minikube start`, state.Error will be return
-		return false, ErrorMachineNotExist
+		return false, constants.ErrMachineMissing
 	} else if s == state.None {
 		// if the kic image is present on the host machine, when user cancel `minikube start`, state.None will be return
-		return false, ErrorMachineNotExist
+		return false, constants.ErrMachineMissing
 	}
 	return true, err
 }
@@ -279,7 +279,7 @@ func machineExists(d string, s state.State, err error) (bool, error) {
 		return machineExistsDocker(s, err)
 	case driver.Mock:
 		if s == state.Error {
-			return false, ErrorMachineNotExist
+			return false, constants.ErrMachineMissing
 		}
 		return true, err
 	default:
diff --git a/pkg/minikube/machine/stop.go b/pkg/minikube/machine/stop.go
index 5c4ba4e671..fafe09e446 100644
--- a/pkg/minikube/machine/stop.go
+++ b/pkg/minikube/machine/stop.go
@@ -17,6 +17,8 @@ limitations under the License.
 package machine
 
 import (
+	"time"
+
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/mcnerror"
@@ -30,6 +32,7 @@ import (
 
 // StopHost stops the host VM, saving state to disk.
 func StopHost(api libmachine.API, machineName string) error {
+	glog.Infof("StopHost: %v", machineName)
 	h, err := api.Load(machineName)
 	if err != nil {
 		return errors.Wrapf(err, "load")
@@ -41,6 +44,7 @@ func StopHost(api libmachine.API, machineName string) error {
 
 // stop forcibly stops a host without needing to load
 func stop(h *host.Host) error {
+	start := time.Now()
 	if h.DriverName == driver.HyperV {
 		glog.Infof("As there are issues with stopping Hyper-V VMs using API, trying to shut down using SSH")
 		if err := trySSHPowerOff(h); err != nil {
@@ -49,12 +53,15 @@ func stop(h *host.Host) error {
 	}
 
 	if err := h.Stop(); err != nil {
-		alreadyInStateError, ok := err.(mcnerror.ErrHostAlreadyInState)
-		if ok && alreadyInStateError.State == state.Stopped {
+		glog.Infof("stop err: %v", err)
+		st, ok := err.(mcnerror.ErrHostAlreadyInState)
+		if ok && st.State == state.Stopped {
+			glog.Infof("host is already stopped")
 			return nil
 		}
 		return &retry.RetriableError{Err: errors.Wrap(err, "stop")}
 	}
+	glog.Infof("stop complete within %s", time.Since(start))
 	return nil
 }
 
diff --git a/pkg/minikube/tests/driver_mock.go b/pkg/minikube/tests/driver_mock.go
index 14d5b2f59d..2b9dff6ad0 100644
--- a/pkg/minikube/tests/driver_mock.go
+++ b/pkg/minikube/tests/driver_mock.go
@@ -17,6 +17,7 @@ limitations under the License.
 package tests
 
 import (
+	"runtime"
 	"testing"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -24,6 +25,7 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/constants"
 )
 
 // MockDriver is a struct used to mock out libmachine.Driver
@@ -96,11 +98,14 @@ func (d *MockDriver) GetSSHKeyPath() string {
 
 // GetState returns the state of the driver
 func (d *MockDriver) GetState() (state.State, error) {
-	d.Logf("MockDriver.GetState: %v", d.CurrentState)
-	if d.NotExistError {
+	_, file, no, _ := runtime.Caller(2)
+	d.Logf("MockDriver.GetState called from %s#%d: returning %q", file, no, d.CurrentState)
+
+	// NOTE: this logic is questionable
+	if d.NotExistError && d.CurrentState != state.Stopped && d.CurrentState != state.None {
 		d.CurrentState = state.Error
-		// don't use cluster.ErrorMachineNotExist to avoid import cycle
-		return d.CurrentState, errors.New("machine does not exist")
+		d.Logf("mock NotExistError set, setting state=%s err=%v", d.CurrentState, constants.ErrMachineMissing)
+		return d.CurrentState, constants.ErrMachineMissing
 	}
 	return d.CurrentState, nil
 }
@@ -123,12 +128,13 @@ func (d *MockDriver) Remove() error {
 	if d.RemoveError {
 		return errors.New("error deleting machine")
 	}
+	d.NotExistError = false
 	return nil
 }
 
 // Restart restarts the machine
 func (d *MockDriver) Restart() error {
-	d.Logf("MockDriver.Restart")
+	d.Logf("MockDriver.Restart, setting CurrentState=%s", state.Running)
 	d.CurrentState = state.Running
 	return nil
 }

From 1ee125e68852ab592a9e7a26c954feafc59853e3 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 14:50:13 -0700
Subject: [PATCH 254/668] lint err

---
 go.sum                               | 2 --
 pkg/minikube/machine/cluster_test.go | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.sum b/go.sum
index d7d0bc3a61..15a7b48dae 100644
--- a/go.sum
+++ b/go.sum
@@ -421,8 +421,6 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345 h1:XP1VL9iOZu4yz/rq8zj+yvB23XEY5erXRzp8JYmkWu0=
-github.com/johanneswuerbach/nfsexports v0.0.0-20181204082207-1aa528dcb345/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index 6d687d3825..01c99de92e 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -44,7 +44,9 @@ func createMockDriverHost(c config.ClusterConfig, n config.Node) (interface{}, e
 
 func RegisterMockDriver(t *testing.T) {
 	// Debugging this test is a nightmare.
-	flag.Lookup("logtostderr").Value.Set("true")
+	if err := flag.Lookup("logtostderr").Value.Set("true"); err != nil {
+		t.Logf("unable to set logtostderr: %v", err)
+	}
 
 	t.Helper()
 	if !registry.Driver(driver.Mock).Empty() {

From 9597fcc1342414b9150faa0d9a971b6c06b1e41b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 14:52:51 -0700
Subject: [PATCH 255/668] validateMinikubeKubectl: Add --context to kubectl
 call to pass profile name

---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 5111590fe6..ba0af809d2 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -233,7 +233,7 @@ func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) {
 
 // validateMinikubeKubectl validates that the `minikube kubectl` command returns content
 func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string) {
-	kubectlArgs := []string{"kubectl", "--", "get", "pods"}
+	kubectlArgs := []string{"kubectl", "--", "--context", profile, "get", "pods"}
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), kubectlArgs...))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)

From 9089296f2ee805341abd8d2468ec51838fa19315 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 14:57:27 -0700
Subject: [PATCH 256/668] validateMinikubeKubectl: Add -p to minikube call to
 get Kubernetes version

---
 test/integration/functional_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index ba0af809d2..63b2a28c9c 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -233,7 +233,8 @@ func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) {
 
 // validateMinikubeKubectl validates that the `minikube kubectl` command returns content
 func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string) {
-	kubectlArgs := []string{"kubectl", "--", "--context", profile, "get", "pods"}
+	// Must set the profile so that it knows what version of Kubernetes to use
+	kubectlArgs := []string{"-p", profile, "kubectl", "--", "--context", profile, "get", "pods"}
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), kubectlArgs...))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)

From fd1897ddaecaf7fe9b1e508a620e699e2a45e090 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 25 Mar 2020 15:01:57 -0700
Subject: [PATCH 257/668] replace emoji with spacing issues

---
 pkg/minikube/out/style.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index 150a7af30d..bcae27ec87 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -92,7 +92,7 @@ var styles = map[StyleEnum]style{
 	Caching:          {Prefix: "🤹  "},
 	StartingVM:       {Prefix: "🔥  "},
 	StartingNone:     {Prefix: "🤹  "},
-	Provisioner:      {Prefix: "ℹ️   "},
+	Provisioner:      {Prefix: "ℹ️  "},
 	Resetting:        {Prefix: "🔄  "},
 	DeletingHost:     {Prefix: "🔥  "},
 	Copying:          {Prefix: "✨  "},
@@ -117,7 +117,7 @@ var styles = map[StyleEnum]style{
 	Unmount:          {Prefix: "🔥  "},
 	MountOptions:     {Prefix: "💾  "},
 	Fileserver:       {Prefix: "🚀  ", OmitNewline: true},
-	DryRun:           {Prefix: "🏜️   "},
+	DryRun:           {Prefix: "🌵  "},
 	AddonEnable:      {Prefix: "🌟  "},
 	AddonDisable:     {Prefix: "🌑  "},
 }

From f52df44fd5dcd5eaadfe709b249dc4d12ea26eca Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 25 Mar 2020 16:43:35 -0700
Subject: [PATCH 258/668] If preload fails on hot restart, log warning instead
 of erroring out

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 5de297a003..6091024d60 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -531,7 +531,7 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 	}
 
 	if err := r.Preload(cfg.KubernetesConfig); err != nil {
-		return errors.Wrap(err, "preloading")
+		glog.Infof("prelaoding failed, will try to load cached images: %v", err)
 	}
 
 	if cfg.KubernetesConfig.ShouldLoadCachedImages {

From dc3b842d4164dd96d4c9192833c22b769bd3f2f8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 25 Mar 2020 17:11:22 -0700
Subject: [PATCH 259/668] Avoid provision.Detector when possible

---
 pkg/minikube/machine/fix.go   | 23 +++++++++++++----------
 pkg/minikube/machine/info.go  | 22 +++++++++++-----------
 pkg/minikube/machine/start.go |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 9575f92294..05cbb8eec5 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -67,21 +67,24 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 		return h, errors.Wrap(err, "Error loading existing host. Please try running [minikube delete], then run [minikube start] again.")
 	}
 
+	driverName := h.Driver.DriverName()
+
 	// check if need to re-run docker-env
-	maybeWarnAboutEvalEnv(cc.Driver, cc.Name)
+	maybeWarnAboutEvalEnv(driverName, cc.Name)
 
 	h, err = recreateIfNeeded(api, cc, n, h)
 	if err != nil {
 		return h, err
 	}
 
-	// Technically, we should only have to call provision if Docker has changed,
-	// but who can predict what shape the existing VM is in.
-	e := engineOptions(cc)
-	h.HostOptions.EngineOptions.Env = e.Env
-	err = provisionDockerMachine(h)
-	if err != nil {
-		return h, errors.Wrap(err, "provision")
+	if !driver.BareMetal(h.Driver.DriverName()) {
+		glog.Infof("%s is local, skipping re-provision as it requires SSH", driverName)
+		e := engineOptions(cc)
+		h.HostOptions.EngineOptions.Env = e.Env
+		err = provisionDockerMachine(h)
+		if err != nil {
+			return h, errors.Wrap(err, "provision")
+		}
 	}
 
 	if driver.IsMock(h.DriverName) {
@@ -93,11 +96,11 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 	}
 
 	if driver.BareMetal(h.Driver.DriverName()) {
-		glog.Infof("%s is local, skipping auth/time setup (requires ssh)", h.Driver.DriverName())
+		glog.Infof("%s is local, skipping auth/time setup (requires ssh)", driverName)
 		return h, nil
 	}
 
-	return h, ensureSyncedGuestClock(h, cc.Driver)
+	return h, ensureSyncedGuestClock(h, driverName)
 }
 
 func recreateIfNeeded(api libmachine.API, cc config.ClusterConfig, n config.Node, h *host.Host) (*host.Host, error) {
diff --git a/pkg/minikube/machine/info.go b/pkg/minikube/machine/info.go
index 1bae7253e9..c3b4e06569 100644
--- a/pkg/minikube/machine/info.go
+++ b/pkg/minikube/machine/info.go
@@ -18,13 +18,14 @@ package machine
 
 import (
 	"io/ioutil"
+	"os/exec"
 
-	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/provision"
 	"github.com/golang/glog"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/mem"
+	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -80,18 +81,17 @@ func showLocalOsRelease() {
 }
 
 // logRemoteOsRelease shows systemd information about the current linux distribution, on the remote VM
-func logRemoteOsRelease(drv drivers.Driver) {
-	provisioner, err := provision.DetectProvisioner(drv)
+func logRemoteOsRelease(r command.Runner) {
+	rr, err := r.RunCmd(exec.Command("cat", "/etc/os-release"))
 	if err != nil {
-		glog.Errorf("DetectProvisioner: %v", err)
+		glog.Infof("remote release failed: %v", err)
+	}
+
+	osReleaseInfo, err := provision.NewOsRelease(rr.Stdout.Bytes())
+	if err != nil {
+		glog.Errorf("NewOsRelease: %v", err)
 		return
 	}
 
-	osReleaseInfo, err := provisioner.GetOsReleaseInfo()
-	if err != nil {
-		glog.Errorf("GetOsReleaseInfo: %v", err)
-		return
-	}
-
-	glog.Infof("Provisioned with %s", osReleaseInfo.PrettyName)
+	glog.Infof("Remote host: %s", osReleaseInfo.PrettyName)
 }
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
index c41b285a2f..e42fc9cf62 100644
--- a/pkg/minikube/machine/start.go
+++ b/pkg/minikube/machine/start.go
@@ -212,7 +212,7 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error {
 		showLocalOsRelease()
 	}
 	if driver.IsVM(mc.Driver) {
-		logRemoteOsRelease(h.Driver)
+		logRemoteOsRelease(r)
 	}
 	return syncLocalAssets(r)
 }

From cc0262ef55cbae4e0403943c7ae6b0068be2cb80 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 19:58:38 -0700
Subject: [PATCH 260/668] improve logging and fix some not logged errors

---
 test/integration/aaa_download_only_test.go | 18 +++---
 test/integration/addons_test.go            | 68 +++++++++++-----------
 test/integration/functional_test.go        | 36 ++++++------
 test/integration/version_upgrade_test.go   |  4 +-
 4 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 8be373a5dd..cf6239cd9c 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -67,7 +67,7 @@ func TestDownloadOnly(t *testing.T) {
 					}
 
 					if err != nil {
-						t.Errorf("%s failed: %v", args, err)
+						t.Errorf("failed to download only. args: %q %v", args, err)
 					}
 
 					// skip for none, as none driver does not have preload feature.
@@ -75,14 +75,14 @@ func TestDownloadOnly(t *testing.T) {
 						if download.PreloadExists(v, r) {
 							// Just make sure the tarball path exists
 							if _, err := os.Stat(download.TarballPath(v)); err != nil {
-								t.Errorf("preloaded tarball path doesn't exist: %v", err)
+								t.Errorf("failed to verify preloaded tarball file exists: %v", err)
 							}
 							return
 						}
 					}
 					imgs, err := images.Kubeadm("", v)
 					if err != nil {
-						t.Errorf("kubeadm images: %v %+v", v, err)
+						t.Errorf("failed to get kubeadm images for %v: %+v", v, err)
 					}
 
 					// skip verify for cache images if --driver=none
@@ -129,7 +129,7 @@ func TestDownloadOnly(t *testing.T) {
 				}
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all"))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed to delete all. args: %q : %v", rr.Args, err)
 				}
 			})
 			// Delete should always succeed, even if previously partially or fully deleted.
@@ -139,7 +139,7 @@ func TestDownloadOnly(t *testing.T) {
 				}
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed to delete. args: %q: %v", rr.Args, err)
 				}
 			})
 		})
@@ -158,22 +158,22 @@ func TestDownloadOnlyKic(t *testing.T) {
 	args = append(args, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v:\n%s", args, err, rr.Output())
+		t.Errorf("start with download only failed %q : %v:\n%s", args, err)
 	}
 
 	// Make sure the downloaded image tarball exists
 	tarball := download.TarballPath(constants.DefaultKubernetesVersion)
 	contents, err := ioutil.ReadFile(tarball)
 	if err != nil {
-		t.Errorf("reading tarball: %v", err)
+		t.Errorf("failed to read tarball file %q: %v", tarball, err)
 	}
 	// Make sure it has the correct checksum
 	checksum := md5.Sum(contents)
 	remoteChecksum, err := ioutil.ReadFile(download.PreloadChecksumPath(constants.DefaultKubernetesVersion))
 	if err != nil {
-		t.Errorf("reading checksum file: %v", err)
+		t.Errorf("failed to read checksum file %q : %v", download.PreloadChecksumPath(constants.DefaultKubernetesVersion), err)
 	}
 	if string(remoteChecksum) != string(checksum[:]) {
-		t.Errorf("checksum of %s does not match remote checksum (%s != %s)", tarball, string(remoteChecksum), string(checksum[:]))
+		t.Errorf("failed to verify checksum. checksum of %q does not match remote checksum (%q != %q)", tarball, string(remoteChecksum), string(checksum[:]))
 	}
 }
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 3e001cd072..43ad112651 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -69,15 +69,15 @@ func TestAddons(t *testing.T) {
 	// Assert that disable/enable works offline
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to stop minikube. args %q : %v", rr.Args, err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "dashboard", "-p", profile))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to enable dashboard addon: args %q : %v", rr.Args, err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "dashboard", "-p", profile))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to disable dashboard addon: args %q : %v", rr.Args, err)
 	}
 }
 
@@ -88,30 +88,30 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 
 	client, err := kapi.Client(profile)
 	if err != nil {
-		t.Fatalf("kubernetes client: %v", client)
+		t.Fatalf("failed to get kubernetes client: %v", client)
 	}
 
 	if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "nginx-ingress-controller", Minutes(6)); err != nil {
-		t.Errorf("waiting for ingress-controller deployment to stabilize: %v", err)
+		t.Errorf("failed waiting for ingress-controller deployment to stabilize: %v", err)
 	}
 	if _, err := PodWait(ctx, t, profile, "kube-system", "app.kubernetes.io/name=nginx-ingress-controller", Minutes(12)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waititing for nginx-ingress-controller : %v", err)
 	}
 
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-ing.yaml")))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to kubectl replace nginx-ing. args %q. %v", rr.Args, err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-pod-svc.yaml")))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to kubectl replace nginx-pod-svc. args %q. %v", rr.Args, err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx", Minutes(4)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for ngnix pod: %v", err)
 	}
 	if err := kapi.WaitForService(client, "default", "nginx", true, time.Millisecond*500, Minutes(10)); err != nil {
-		t.Errorf("Error waiting for nginx service to be up")
+		t.Errorf("failed waiting for nginx service to be up: %v", err)
 	}
 
 	want := "Welcome to nginx!"
@@ -121,7 +121,7 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 			return err
 		}
 		if rr.Stderr.String() != "" {
-			t.Logf("%v: unexpected stderr: %s", rr.Args, rr.Stderr)
+			t.Logf("%v: unexpected stderr: %s (may be temproary)", rr.Args, rr.Stderr)
 		}
 		if !strings.Contains(rr.Stdout.String(), want) {
 			return fmt.Errorf("%v stdout = %q, want %q", rr.Args, rr.Stdout, want)
@@ -130,32 +130,32 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 	}
 
 	if err := retry.Expo(checkIngress, 500*time.Millisecond, Seconds(90)); err != nil {
-		t.Errorf("ingress never responded as expected on 127.0.0.1:80: %v", err)
+		t.Errorf("failed to get response from ngninx ingress on 127.0.0.1:80: %v", err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "ingress", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to disable ingress addon. args %q : %v", rr.Args, err)
 	}
 }
 
 func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 	client, err := kapi.Client(profile)
 	if err != nil {
-		t.Fatalf("kubernetes client: %v", client)
+		t.Fatalf("failed to get kubernetes client for %s : %v", profile, err)
 	}
 
 	start := time.Now()
 	if err := kapi.WaitForRCToStabilize(client, "kube-system", "registry", Minutes(6)); err != nil {
-		t.Errorf("waiting for registry replicacontroller to stabilize: %v", err)
+		t.Errorf("failed waiting for registry replicacontroller to stabilize: %v", err)
 	}
 	t.Logf("registry stabilized in %s", time.Since(start))
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "actual-registry=true", Minutes(6)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for pod actual-registry: %v", err)
 	}
 	if _, err := PodWait(ctx, t, profile, "kube-system", "registry-proxy=true", Minutes(10)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for pod registry-proxy: %v", err)
 	}
 
 	// Test from inside the cluster (no curl available on busybox)
@@ -166,20 +166,20 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Args, err)
 	}
 	want := "HTTP/1.1 200"
 	if !strings.Contains(rr.Stdout.String(), want) {
-		t.Errorf("curl = %q, want *%s*", rr.Stdout.String(), want)
+		t.Errorf("expected curl response be %q, but got *%s*", want, rr.Stdout.String())
 	}
 
 	// Test from outside the cluster
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ip"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed run minikube ip. args %q : %v", rr.Args, err)
 	}
 	if rr.Stderr.String() != "" {
-		t.Errorf("%s: unexpected stderr: %s", rr.Args, rr.Stderr)
+		t.Errorf("expected stderr to be -empty- but got: *%q*", rr.Args, rr.Stderr)
 	}
 
 	endpoint := fmt.Sprintf("http://%s:%d", strings.TrimSpace(rr.Stdout.String()), 5000)
@@ -199,30 +199,30 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 		return nil
 	}
 
-	if err := retry.Expo(checkExternalAccess, 500*time.Millisecond, Minutes(2)); err != nil {
-		t.Errorf(err.Error())
+	if err := retry.Expo(checkExternalAccess, 500*time.Millisecond, Seconds(150)); err != nil {
+		t.Errorf("failed to check external access to %s: %v", u.String(), err.Error())
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "registry", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to disable registry addon. args %q: %v", rr.Args, err)
 	}
 }
 
 func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile string) {
 	client, err := kapi.Client(profile)
 	if err != nil {
-		t.Fatalf("kubernetes client: %v", client)
+		t.Fatalf("failed to get kubernetes client for %s: %v", profile, err)
 	}
 
 	start := time.Now()
 	if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "metrics-server", Minutes(6)); err != nil {
-		t.Errorf("waiting for metrics-server deployment to stabilize: %v", err)
+		t.Errorf("failed waiting for metrics-server deployment to stabilize: %v", err)
 	}
 	t.Logf("metrics-server stabilized in %s", time.Since(start))
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "k8s-app=metrics-server", Minutes(6)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for k8s-app=metrics-server pod: %v", err)
 	}
 
 	want := "CPU(cores)"
@@ -242,29 +242,29 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
 
 	// metrics-server takes some time to be able to collect metrics
 	if err := retry.Expo(checkMetricsServer, time.Second*3, Minutes(6)); err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("failed checking metric server: %v", err.Error())
 	}
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "metrics-server", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to disable metrics-server addon: args %q: %v", rr.Args, err)
 	}
 }
 
 func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string) {
 	client, err := kapi.Client(profile)
 	if err != nil {
-		t.Fatalf("kubernetes client: %v", client)
+		t.Fatalf("failed to get kubernetes client for %s: %v", profile, err)
 	}
 
 	start := time.Now()
 	if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "tiller-deploy", Minutes(6)); err != nil {
-		t.Errorf("waiting for tiller-deploy deployment to stabilize: %v", err)
+		t.Errorf("failed waiting for tiller-deploy deployment to stabilize: %v", err)
 	}
 	t.Logf("tiller-deploy stabilized in %s", time.Since(start))
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "app=helm", Minutes(6)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for helm pod: %v", err)
 	}
 
 	if NoneDriver() {
@@ -292,11 +292,11 @@ func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string)
 	}
 
 	if err := retry.Expo(checkHelmTiller, 500*time.Millisecond, Minutes(2)); err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("failed checking helm tiller: %v", err.Error())
 	}
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "helm-tiller", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed disabling helm-tiller addon. arg %q.s %v", rr.Args, err)
 	}
 }
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 63b2a28c9c..127ec9dd99 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -270,40 +270,40 @@ func validateComponentHealth(ctx context.Context, t *testing.T, profile string)
 func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%q failed: %v", rr.Args, err)
 	}
 
 	// Custom format
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%q failed: %v", rr.Args, err)
 	}
 	match, _ := regexp.MatchString(`host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`, rr.Stdout.String())
 	if !match {
-		t.Errorf("%s failed: %v. Output for custom format did not match", rr.Args, err)
+		t.Errorf("%q failed: %v. Output for custom format did not match", rr.Args, err)
 	}
 
 	// Json output
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-o", "json"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%q failed: %v", rr.Args, err)
 	}
 	var jsonObject map[string]interface{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%q failed: %v", rr.Args, err)
 	}
 	if _, ok := jsonObject["Host"]; !ok {
-		t.Errorf("%s failed: %v. Missing key %s in json object", rr.Args, err, "Host")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Host")
 	}
 	if _, ok := jsonObject["Kubelet"]; !ok {
-		t.Errorf("%s failed: %v. Missing key %s in json object", rr.Args, err, "Kubelet")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Kubelet")
 	}
 	if _, ok := jsonObject["APIServer"]; !ok {
-		t.Errorf("%s failed: %v. Missing key %s in json object", rr.Args, err, "APIServer")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "APIServer")
 	}
 	if _, ok := jsonObject["Kubeconfig"]; !ok {
-		t.Errorf("%s failed: %v. Missing key %s in json object", rr.Args, err, "Kubeconfig")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Kubeconfig")
 	}
 }
 
@@ -312,7 +312,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 	args := []string{"dashboard", "--url", "-p", profile, "--alsologtostderr", "-v=1"}
 	ss, err := Start(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", args, err)
+		t.Errorf("%q failed: %v", args, err)
 	}
 	defer func() {
 		ss.Stop(t)
@@ -334,7 +334,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 
 	resp, err := retryablehttp.Get(u.String())
 	if err != nil {
-		t.Errorf("failed get: %v", err)
+		t.Errorf("failed to http get %q : %v", u.String(), err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		body, err := ioutil.ReadAll(resp.Body)
@@ -349,12 +349,12 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 func validateDNS(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "busybox.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%q failed: %v", rr.Args, err)
 	}
 
 	names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4))
 	if err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for busybox pod : %v", err)
 	}
 
 	nslookup := func() error {
@@ -364,12 +364,12 @@ func validateDNS(ctx context.Context, t *testing.T, profile string) {
 
 	// If the coredns process was stable, this retry wouldn't be necessary.
 	if err = retry.Expo(nslookup, 1*time.Second, Minutes(1)); err != nil {
-		t.Errorf("nslookup failing: %v", err)
+		t.Errorf("failed to do nslookup on kubernetes.default: %v", err)
 	}
 
 	want := []byte("10.96.0.1")
 	if !bytes.Contains(rr.Stdout.Bytes(), want) {
-		t.Errorf("nslookup: got=%q, want=*%q*", rr.Stdout.Bytes(), want)
+		t.Errorf("failed nslookup: got=%q, want=*%q*", rr.Stdout.Bytes(), want)
 	}
 }
 
@@ -454,17 +454,17 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 			// make sure the image is deleted.
 			rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", "crictl", "inspecti", img))
 			if err == nil {
-				t.Errorf("expected the image be deleted and get  error but got nil error ! cmd: %q", rr.Command())
+				t.Errorf("expected an error. because image should not exist. but got *nil error* ! cmd: %q", rr.Command())
 			}
 			// minikube cache reload.
 			rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "reload"))
 			if err != nil {
-				t.Errorf("expected %q to run successfully but got error %v", rr.Command(), err)
+				t.Errorf("expected %q to run successfully but got error: %v", rr.Command(), err)
 			}
 			// make sure 'cache reload' brought back the manually deleted image.
 			rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", "crictl", "inspecti", img))
 			if err != nil {
-				t.Errorf("expected to get no error for %q but got %v", rr.Command(), err)
+				t.Errorf("expected %q to run successfully but got error: %v", rr.Command(), err)
 			}
 		})
 
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index a03676a335..20d131d5ef 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -97,7 +97,7 @@ func TestVersionUpgrade(t *testing.T) {
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to start minikube HEAD with newest k8s version. args: %s : %v", rr.Args, err)
 	}
 
 	s, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "version", "--output=json"))
@@ -127,6 +127,6 @@ func TestVersionUpgrade(t *testing.T) {
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("start and already started minikube failed. args: %q : %v", rr.Args, err)
 	}
 }

From a30ec2574cd9f6a7f596f3a1017b81275967cb91 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 20:18:05 -0700
Subject: [PATCH 261/668] improve logs for fn_mount_cmd tests'

---
 test/integration/docker_test.go  | 10 +++++-----
 test/integration/fn_mount_cmd.go | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go
index 05075fe579..da26300dd5 100644
--- a/test/integration/docker_test.go
+++ b/test/integration/docker_test.go
@@ -39,27 +39,27 @@ func TestDockerFlags(t *testing.T) {
 	args := append([]string{"start", "-p", profile, "--cache-images=false", "--memory=1800", "--install-addons=false", "--wait=false", "--docker-env=FOO=BAR", "--docker-env=BAZ=BAT", "--docker-opt=debug", "--docker-opt=icc=true", "--alsologtostderr", "-v=5"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to start minikube with args: %q : %v", rr.Args, err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo systemctl show docker --property=Environment --no-pager"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to 'systemctl show docker' inside minikube. args %q: %v", rr.Args, err)
 	}
 
 	for _, envVar := range []string{"FOO=BAR", "BAZ=BAT"} {
 		if !strings.Contains(rr.Stdout.String(), envVar) {
-			t.Errorf("env var %s missing: %s.", envVar, rr.Stdout)
+			t.Errorf("expected env key/value %q to be passed to minikube's docker and be included in: *%q*.", envVar, rr.Stdout)
 		}
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo systemctl show docker --property=ExecStart --no-pager"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed on the second 'systemctl show docker' inside minikube. args %q: %v", rr.Args, err)
 	}
 	for _, opt := range []string{"--debug", "--icc=true"} {
 		if !strings.Contains(rr.Stdout.String(), opt) {
-			t.Fatalf("%s = %q, want *%s*", rr.Command(), rr.Stdout, opt)
+			t.Fatalf("expected %q output to have include *%s* . output: %q", rr.Command(), opt, rr.Stdout)
 		}
 	}
 }
diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go
index 8a3a9f68ee..6e292af109 100644
--- a/test/integration/fn_mount_cmd.go
+++ b/test/integration/fn_mount_cmd.go
@@ -66,10 +66,10 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 
 	defer func() {
 		if t.Failed() {
-			t.Logf("%s failed, getting debug info...", t.Name())
+			t.Logf("%q failed, getting debug info...", t.Name())
 			rr, err := Run(t, exec.Command(Target(), "-p", profile, "ssh", "mount | grep 9p; ls -la /mount-9p; cat /mount-9p/pod-dates"))
 			if err != nil {
-				t.Logf("%s: %v", rr.Command(), err)
+				t.Logf("debugging command %q failed : %v", rr.Command(), err)
 			} else {
 				t.Logf("(debug) %s:\n%s", rr.Command(), rr.Stdout)
 			}
@@ -78,7 +78,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 		// Cleanup in advance of future tests
 		rr, err := Run(t, exec.Command(Target(), "-p", profile, "ssh", "sudo umount -f /mount-9p"))
 		if err != nil {
-			t.Logf("%s: %v", rr.Command(), err)
+			t.Logf("%q: %v", rr.Command(), err)
 		}
 		ss.Stop(t)
 		cancel()
@@ -117,7 +117,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	// Assert that we can access the mount without an error. Display for debugging.
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "--", "ls", "-la", guestMount))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed verifying accessing to the mount. args %q : %v", rr.Args, err)
 	}
 	t.Logf("guest mount directory contents\n%s", rr.Stdout)
 
@@ -125,7 +125,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	tp := filepath.Join("/mount-9p", testMarker)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "cat", tp))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to verify the mount contains unique test marked: args %q: %v", rr.Args, err)
 	}
 
 	if !bytes.Equal(rr.Stdout.Bytes(), wantFromTest) {
@@ -136,28 +136,28 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	// Start the "busybox-mount" pod.
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "busybox-mount-test.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to 'kubectl replace' for busybox-mount-test. args %q : %v", rr.Args, err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox-mount", Minutes(4)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for busybox-mount pod: %v", err)
 	}
 
 	// Read the file written by pod startup
 	p := filepath.Join(tempDir, createdByPod)
 	got, err := ioutil.ReadFile(p)
 	if err != nil {
-		t.Errorf("readfile %s: %v", p, err)
+		t.Errorf("failed to read file created by pod %q: %v", p, err)
 	}
 	wantFromPod := []byte("test\n")
 	if !bytes.Equal(got, wantFromPod) {
-		t.Errorf("%s = %q, want %q", p, got, wantFromPod)
+		t.Errorf("the content of the file %q is %q, but want it to be: *%q*", p, got, wantFromPod)
 	}
 
 	// test that file written from host was read in by the pod via cat /mount-9p/written-by-host;
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "logs", "busybox-mount"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to get kubectl logs for busybox-mount. args %q : %v", rr.Args, err)
 	}
 	if !bytes.Equal(rr.Stdout.Bytes(), wantFromTest) {
 		t.Errorf("busybox-mount logs = %q, want %q", rr.Stdout.Bytes(), wantFromTest)
@@ -169,27 +169,27 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 		// test that file written from host was read in by the pod via cat /mount-9p/fromhost;
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "stat", gp))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("failed to stat the file %q iniside minikube : args %q: %v", gp, rr.Args, err)
 		}
 
 		if runtime.GOOS == "windows" {
 			if strings.Contains(rr.Stdout.String(), "Access: 1970-01-01") {
-				t.Errorf("invalid access time: %v", rr.Stdout)
+				t.Errorf("expected to get valid access time but got: %q", rr.Stdout)
 			}
 		}
 
 		if strings.Contains(rr.Stdout.String(), "Modify: 1970-01-01") {
-			t.Errorf("invalid modify time: %v", rr.Stdout)
+			t.Errorf("expected to get valid modify time but got: %q", rr.Stdout)
 		}
 	}
 
 	p = filepath.Join(tempDir, createdByTestRemovedByPod)
 	if _, err := os.Stat(p); err == nil {
-		t.Errorf("expected file %s to be removed", p)
+		t.Errorf("expected file %q to be removed but exists !", p)
 	}
 
 	p = filepath.Join(tempDir, createdByPodRemovedByTest)
 	if err := os.Remove(p); err != nil {
-		t.Errorf("unexpected error removing file %s: %v", p, err)
+		t.Errorf("failed to remove file %q: %v", p, err)
 	}
 }

From 2ac46e8ba91754446b8a484d4086da7c55f70cd4 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 20:22:02 -0700
Subject: [PATCH 262/668] improve logs for fn_pvc

---
 test/integration/fn_pvc.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/fn_pvc.go b/test/integration/fn_pvc.go
index 785783fd80..c387a1750b 100644
--- a/test/integration/fn_pvc.go
+++ b/test/integration/fn_pvc.go
@@ -38,7 +38,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
 	defer cancel()
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "integration-test=storage-provisioner", Minutes(4)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for storage-provisioner: %v", err)
 	}
 
 	checkStorageClass := func() error {
@@ -58,13 +58,13 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
 
 	// Ensure the addon-manager has created the StorageClass before creating a claim, otherwise it won't be bound
 	if err := retry.Expo(checkStorageClass, time.Millisecond*500, Seconds(100)); err != nil {
-		t.Errorf("no default storage class after retry: %v", err)
+		t.Errorf("failed to check for storage class: %v", err)
 	}
 
 	// Now create a testpvc
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "pvc.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("kubectl apply pvc.yaml failed: args %q: %v", rr.Args, err)
 	}
 
 	checkStoragePhase := func() error {
@@ -84,6 +84,6 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
 	}
 
 	if err := retry.Expo(checkStoragePhase, 2*time.Second, Minutes(4)); err != nil {
-		t.Fatalf("PV Creation failed with error: %v", err)
+		t.Fatalf("failed to check storage phase: %v", err)
 	}
 }

From b63f0488546478dc07543d92065b3074996b925f Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 20:26:10 -0700
Subject: [PATCH 263/668] improve logs for fn_tunnel_cmd

---
 test/integration/fn_tunnel_cmd.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go
index e4598b3da7..dffb247fb4 100644
--- a/test/integration/fn_tunnel_cmd.go
+++ b/test/integration/fn_tunnel_cmd.go
@@ -50,7 +50,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 
 	client, err := kapi.Client(profile)
 	if err != nil {
-		t.Fatalf("client: %v", err)
+		t.Fatalf("failed to get kubernetes client for %q: %v", profile, err)
 	}
 
 	// Pre-Cleanup
@@ -62,7 +62,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 	args := []string{"-p", profile, "tunnel", "--alsologtostderr", "-v=1"}
 	ss, err := Start(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", args, err)
+		t.Errorf("failed to start a tunnel: args %q: %v", args, err)
 	}
 	defer ss.Stop(t)
 
@@ -99,7 +99,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 		if err != nil {
 			t.Errorf("%s failed: %v", rr.Args, err)
 		}
-		t.Logf("kubectl get svc nginx-svc:\n%s", rr.Stdout)
+		t.Logf("failed to kubectl get svc nginx-svc:\n%s", rr.Stdout)
 	}
 
 	got := []byte{}
@@ -120,11 +120,11 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 		return nil
 	}
 	if err = retry.Expo(fetch, time.Millisecond*500, Minutes(2), 13); err != nil {
-		t.Errorf("failed to contact nginx at %s: %v", nginxIP, err)
+		t.Errorf("failed to hit nginx at %q: %v", nginxIP, err)
 	}
 
 	want := "Welcome to nginx!"
 	if !strings.Contains(string(got), want) {
-		t.Errorf("body = %q, want *%s*", got, want)
+		t.Errorf("expected body to contain %q, but got *%q*", want, got)
 	}
 }

From 1f900e2bb583cf73f30ffc7df926bb5686f1df3e Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 25 Mar 2020 20:45:04 -0700
Subject: [PATCH 264/668] Add a tutorial for using AWS ECR with registry-creds
 addon

---
 .../configuring_creds_for_aws_ecr.md          | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md

diff --git a/site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md b/site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md
new file mode 100644
index 0000000000..2476394e0f
--- /dev/null
+++ b/site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md
@@ -0,0 +1,137 @@
+---
+title: "Configure credentials for AWS Elastic Container Registry using registry-creds addon"
+linkTitle: "Configure creds for AWS ECR using registry-creds"
+weight: 1
+date: 2020-03-25
+description: >
+  How to configure credentials for AWS ECR using the registry-creds addon for a minikube cluster
+---
+
+## Overview
+
+The minikube [registry-creds addon](https://github.com/kubernetes/minikube/tree/master/deploy/addons/registry-creds) enables developers to setup credentials for pulling images from AWS ECR from inside their minikube cluster.
+
+The addon automagically refreshes the service account token for the `default` service account in the `default` namespace.
+
+
+## Prerequisites
+
+- a working minikube cluster
+- a container image in AWS ECR that you would like to use
+- AWS access keys that can be used to pull the above image
+- AWS account number of the account hosting the registry
+
+
+## Configuring and enabling the registry-creds addon
+
+
+### Configure the registry-creds addon 
+
+Configure the minikube registry-creds addon with the following command: 
+
+Note: In this tutorial, we will focus only on the AWS ECR.
+
+```shell
+minikube addons configure registry-creds
+```
+
+Follow the prompt and enter `y` for AWS ECR. Provide the requested information. It should look like this -
+```shell
+$ minikube addons configure registry-creds
+
+Do you want to enable AWS Elastic Container Registry? [y/n]: y
+-- Enter AWS Access Key ID: <put_access_key_here>
+-- Enter AWS Secret Access Key: <put_secret_access_key_here>
+-- (Optional) Enter AWS Session Token:
+-- Enter AWS Region: us-west-2
+-- Enter 12 digit AWS Account ID (Comma separated list): <account_number>
+-- (Optional) Enter ARN of AWS role to assume:
+
+Do you want to enable Google Container Registry? [y/n]: n
+
+Do you want to enable Docker Registry? [y/n]: n
+
+Do you want to enable Azure Container Registry? [y/n]: n
+✅  registry-creds was successfully configured
+
+```
+
+### Enable the registry-creds addon 
+
+Enable the minikube registry-creds addon with the following command: 
+
+```shell
+minikube addons enable registry-creds
+```
+
+### Create a deployment that uses an image in AWS ECR
+
+This tutorial will use a vanilla alpine image that has been already uploaded into a repository in AWS ECR.
+
+Let's use this alpine deployment that is setup to use the alpine image from ECR. Make sure you update the `image` field with a valid URI.
+
+`alpine-deployment.yaml`
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alpine-deployment
+  labels:
+    app: alpine
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: alpine
+  template:
+    metadata:
+      labels:
+        app: alpine
+    spec:
+      containers:
+      - name: alpine
+        image: <<aws_account_number>>.dkr.ecr.<<aws_region>>.amazonaws.com/alpine:latest
+        command: ['sh', '-c', 'echo Container is Running ; sleep 3600']
+```
+
+Create a file called `alpine-deployment.yaml` and paste the contents above. Be sure to replace <<aws_account_number>> and <<aws_region>> with your actual account number and aws region. Then create the alpine deployment with the following command:
+
+```shell
+kubectl apply -f alpine-deployment.yaml
+```
+
+### Test your deployment
+
+Describe the pod and verify the image pull was successful:
+
+```shell
+kubectl describe pods << alpine-deployment-pod-name >>
+```
+
+You should see an event like this:
+
+```text
+Successfully pulled image "<<account_number>>.dkr.ecr.<<aws_region>>.amazonaws.com/alpine:latest"
+```
+
+If you do not see that event, look at the troubleshooting section.
+
+
+## Review
+
+In the above tutorial, we configured the `registry-creds` addon to refresh the credentials for AWS ECR so that we could pull private container images onto our minikube cluster. We ultimately created a deployment that used an image in a private AWS ECR repository.
+
+
+## Troubleshooting
+
+- Check if you have a secret called `awsecr-cred` in the `default` namespace by running `kubectl get secrets`.
+- Check if the image path is valid.
+- Check if the registry-creds addon is enabled by using `minikube addons list`.
+
+## Caveats
+
+The service account token for the `default` service account in the `default` namespace is kept updated by the addon. If you create your deployment in a different namespace, the image pull will not work.
+
+## Related articles
+
+- [registry-creds addon](https://github.com/kubernetes/minikube/tree/master/deploy/addons/registry-creds)

From 362254cfc541383d709985eaf5b6ff0ff94e4431 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 21:43:32 -0700
Subject: [PATCH 265/668] improve test log formatting for functional_test

---
 test/integration/functional_test.go | 148 ++++++++++++++--------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 127ec9dd99..f9c4b3b440 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -63,11 +63,11 @@ func TestFunctional(t *testing.T) {
 		}
 		p := localSyncTestPath()
 		if err := os.Remove(p); err != nil {
-			t.Logf("unable to remove %s: %v", p, err)
+			t.Logf("unable to remove %q: %v", p, err)
 		}
 		p = localTestCertPath()
 		if err := os.Remove(p); err != nil {
-			t.Logf("unable to remove %s: %v", p, err)
+			t.Logf("unable to remove %q: %v", p, err)
 		}
 		CleanupWithLogs(t, profile, cancel)
 	}()
@@ -137,7 +137,7 @@ func TestFunctional(t *testing.T) {
 func validateNodeLabels(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "nodes", "--output=go-template", "--template='{{range $k, $v := (index .items 0).metadata.labels}}{{$k}} {{end}}'"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to 'kubectl get nodes' with args %q: %v", rr.Args, err)
 	}
 	expectedLabels := []string{"minikube.k8s.io/commit", "minikube.k8s.io/version", "minikube.k8s.io/updated_at", "minikube.k8s.io/name"}
 	for _, el := range expectedLabels {
@@ -155,10 +155,10 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 	c := exec.CommandContext(mctx, "/bin/bash", "-c", "eval $("+Target()+" -p "+profile+" docker-env) && "+Target()+" status -p "+profile)
 	rr, err := Run(t, c)
 	if err != nil {
-		t.Fatalf("Failed to do minikube status after eval-ing docker-env %s", err)
+		t.Fatalf("failed to do minikube status after eval-ing docker-env %s", err)
 	}
 	if !strings.Contains(rr.Output(), "Running") {
-		t.Fatalf("Expected status output to include 'Running' after eval docker-env but got \n%s", rr.Output())
+		t.Fatalf("expected status output to include 'Running' after eval docker-env but got: *%q*", rr.Output())
 	}
 
 	mctx, cancel = context.WithTimeout(ctx, Seconds(13))
@@ -167,12 +167,12 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 	c = exec.CommandContext(mctx, "/bin/bash", "-c", "eval $("+Target()+" -p "+profile+" docker-env) && docker images")
 	rr, err = Run(t, c)
 	if err != nil {
-		t.Fatalf("Failed to test eval docker-evn %s", err)
+		t.Fatalf("failed to run minikube docker-env. args %q : %v ", rr.Args, err)
 	}
 
 	expectedImgInside := "gcr.io/k8s-minikube/storage-provisioner"
 	if !strings.Contains(rr.Output(), expectedImgInside) {
-		t.Fatalf("Expected 'docker ps' to have %q from docker-daemon inside minikube. the docker ps output is:\n%q\n", expectedImgInside, rr.Output())
+		t.Fatalf("expected 'docker images' to have %q inside minikube. but the output is: *%q*", expectedImgInside, rr.Output())
 	}
 
 }
@@ -180,11 +180,11 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 	srv, err := startHTTPProxy(t)
 	if err != nil {
-		t.Fatalf("Failed to set up the test proxy: %s", err)
+		t.Fatalf("failed to set up the test proxy: %s", err)
 	}
 
 	// Use more memory so that we may reliably fit MySQL and nginx
-	startArgs := append([]string{"start", "-p", profile, "--wait=true", "--memory", "2500MB"}, StartArgs()...)
+	startArgs := append([]string{"start", "-p", profile, "--wait=true"}, StartArgs()...)
 	c := exec.CommandContext(ctx, Target(), startArgs...)
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("HTTP_PROXY=%s", srv.Addr))
@@ -192,7 +192,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 	c.Env = env
 	rr, err := Run(t, c)
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed minikube start. args %q: %v", rr.Args, err)
 	}
 
 	want := "Found network options:"
@@ -210,10 +210,10 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 func validateKubeContext(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "config", "current-context"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to get current-context. args %q : %v", rr.Args, err)
 	}
 	if !strings.Contains(rr.Stdout.String(), profile) {
-		t.Errorf("current-context = %q, want %q", rr.Stdout.String(), profile)
+		t.Errorf("expected current-context = %q, but got *%q*", profile, rr.Stdout.String())
 	}
 }
 
@@ -221,13 +221,13 @@ func validateKubeContext(ctx context.Context, t *testing.T, profile string) {
 func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "po", "-A"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to get kubectl pods: args %q : %v", rr.Args, err)
 	}
 	if rr.Stderr.String() != "" {
-		t.Errorf("%s: got unexpected stderr: %s", rr.Command(), rr.Stderr)
+		t.Errorf("expected stderr to be empty but got *%q*: args %q", rr.Stderr, rr.Command())
 	}
 	if !strings.Contains(rr.Stdout.String(), "kube-system") {
-		t.Errorf("%s = %q, want *kube-system*", rr.Command(), rr.Stdout)
+		t.Errorf("expected stdout to include *kube-system* but got *%q*. args: %q", rr.Stdout, rr.Command())
 	}
 }
 
@@ -237,7 +237,7 @@ func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string)
 	kubectlArgs := []string{"-p", profile, "kubectl", "--", "--context", profile, "get", "pods"}
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), kubectlArgs...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to get pods. args %q: %v", rr.Args, err)
 	}
 }
 
@@ -245,12 +245,12 @@ func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string)
 func validateComponentHealth(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "cs", "-o=json"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to get components. args %q: %v", rr.Args, err)
 	}
 	cs := api.ComponentStatusList{}
 	d := json.NewDecoder(bytes.NewReader(rr.Stdout.Bytes()))
 	if err := d.Decode(&cs); err != nil {
-		t.Fatalf("decode: %v", err)
+		t.Fatalf("failed to decode kubectl json output: args %q : %v", rr.Args, err)
 	}
 
 	for _, i := range cs.Items {
@@ -270,28 +270,29 @@ func validateComponentHealth(ctx context.Context, t *testing.T, profile string)
 func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status"))
 	if err != nil {
-		t.Errorf("%q failed: %v", rr.Args, err)
+		t.Errorf("failed to run minikube status. args %q : %v", rr.Args, err)
 	}
 
 	// Custom format
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}"))
 	if err != nil {
-		t.Errorf("%q failed: %v", rr.Args, err)
+		t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Args, err)
 	}
-	match, _ := regexp.MatchString(`host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`, rr.Stdout.String())
+	re := `host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`
+	match, _ := regexp.MatchString(re, rr.Stdout.String())
 	if !match {
-		t.Errorf("%q failed: %v. Output for custom format did not match", rr.Args, err)
+		t.Errorf("failed to match regex %q for minikube status with custom format. args %q. output %q", re, rr.Args, rr.Output())
 	}
 
 	// Json output
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-o", "json"))
 	if err != nil {
-		t.Errorf("%q failed: %v", rr.Args, err)
+		t.Errorf("failed to run minikube status with json output. args %q : %v", rr.Args, err)
 	}
 	var jsonObject map[string]interface{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 	if err != nil {
-		t.Errorf("%q failed: %v", rr.Args, err)
+		t.Errorf("failed to decode json from minikube status. args %q. %v", rr.Args, err)
 	}
 	if _, ok := jsonObject["Host"]; !ok {
 		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Host")
@@ -312,7 +313,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 	args := []string{"dashboard", "--url", "-p", profile, "--alsologtostderr", "-v=1"}
 	ss, err := Start(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%q failed: %v", args, err)
+		t.Errorf("failed to run minikube dashboard. args %q : %v", args, err)
 	}
 	defer func() {
 		ss.Stop(t)
@@ -339,7 +340,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 	if resp.StatusCode != http.StatusOK {
 		body, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
-			t.Errorf("Unable to read http response body: %v", err)
+			t.Errorf("failed to read http response body from dashboard %q: %v", u.String(), err)
 		}
 		t.Errorf("%s returned status code %d, expected %d.\nbody:\n%s", u, resp.StatusCode, http.StatusOK, body)
 	}
@@ -349,7 +350,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 func validateDNS(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "busybox.yaml")))
 	if err != nil {
-		t.Fatalf("%q failed: %v", rr.Args, err)
+		t.Fatalf("failed to kubectl replace busybox : args %q: %v", rr.Args, err)
 	}
 
 	names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4))
@@ -407,29 +408,29 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 	t.Run("cache", func(t *testing.T) {
 		t.Run("add", func(t *testing.T) {
 			for _, img := range []string{"busybox:latest", "busybox:1.28.4-glibc", "k8s.gcr.io/pause:latest"} {
-				_, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img))
+				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img))
 				if err != nil {
-					t.Errorf("Failed to cache image %q", img)
+					t.Errorf("failed to cache add image %q. args %q err %v", img, rr.Args, err)
 				}
 			}
 		})
 		t.Run("delete_busybox:1.28.4-glibc", func(t *testing.T) {
-			_, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", "busybox:1.28.4-glibc"))
+			rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", "busybox:1.28.4-glibc"))
 			if err != nil {
-				t.Errorf("failed to delete image busybox:1.28.4-glibc from cache: %v", err)
+				t.Errorf("failed to delete image busybox:1.28.4-glibc from cache. args %q: %v", rr.Args, err)
 			}
 		})
 
 		t.Run("list", func(t *testing.T) {
 			rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "list"))
 			if err != nil {
-				t.Errorf("cache list failed: %v", err)
+				t.Errorf("failed to do cache list. args %q: %v", rr.Args, err)
 			}
 			if !strings.Contains(rr.Output(), "k8s.gcr.io/pause") {
-				t.Errorf("cache list did not include k8s.gcr.io/pause")
+				t.Errorf("expected 'cache list' output to include 'k8s.gcr.io/pause' but got:\n ***%q***", rr.Output())
 			}
 			if strings.Contains(rr.Output(), "busybox:1.28.4-glibc") {
-				t.Errorf("cache list should not include busybox:1.28.4-glibc")
+				t.Errorf("expected 'cache list' output not to include busybox:1.28.4-glibc but got:\n ***%q***", rr.Output())
 			}
 		})
 
@@ -439,7 +440,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 				t.Errorf("failed to get images by %q ssh %v", rr.Command(), err)
 			}
 			if !strings.Contains(rr.Output(), "1.28.4-glibc") {
-				t.Errorf("expected '1.28.4-glibc' to be in the output: %s", rr.Output())
+				t.Errorf("expected '1.28.4-glibc' to be in the output but got %q", rr.Output())
 			}
 
 		})
@@ -490,16 +491,16 @@ func validateConfigCmd(ctx context.Context, t *testing.T, profile string) {
 		args := append([]string{"-p", profile, "config"}, tc.args...)
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 		if err != nil && tc.wantErr == "" {
-			t.Errorf("unexpected failure: %s failed: %v", rr.Args, err)
+			t.Errorf("failed to config minikube. args %q : %v", rr.Args, err)
 		}
 
 		got := strings.TrimSpace(rr.Stdout.String())
 		if got != tc.wantOut {
-			t.Errorf("%s stdout got: %q, want: %q", rr.Command(), got, tc.wantOut)
+			t.Errorf("expected config output for %q to be -%q- but got *%q*", rr.Command(), tc.wantOut, got)
 		}
 		got = strings.TrimSpace(rr.Stderr.String())
 		if got != tc.wantErr {
-			t.Errorf("%s stderr got: %q, want: %q", rr.Command(), got, tc.wantErr)
+			t.Errorf("expected config error for %q to be -%q- but got *%q*", rr.Command(), tc.wantErr, got)
 		}
 	}
 }
@@ -512,7 +513,7 @@ func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {
 	}
 	for _, word := range []string{"Docker", "apiserver", "Linux", "kubelet"} {
 		if !strings.Contains(rr.Stdout.String(), word) {
-			t.Errorf("minikube logs missing expected word: %q", word)
+			t.Errorf("excpeted minikube logs to include word: -%q- but got \n***%q***\n", word, rr.Output())
 		}
 	}
 }
@@ -549,7 +550,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 		// List profiles
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list"))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("failed to list profiles: args %q : %v", rr.Args, err)
 		}
 
 		// Table output
@@ -563,21 +564,20 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 			}
 		}
 		if !profileExists {
-			t.Errorf("%s failed: Missing profile '%s'. Got '\n%s\n'", rr.Args, profile, rr.Stdout.String())
+			t.Errorf("expected 'profile list' output to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Args)
 		}
-
 	})
 
 	t.Run("profile_json_output", func(t *testing.T) {
 		// Json output
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("failed to list profiles with json format. args %q: %v", rr.Args, err)
 		}
 		var jsonObject map[string][]map[string]interface{}
 		err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("failed to decode json from profile list: args %q: %v", rr.Args, err)
 		}
 		validProfiles := jsonObject["valid"]
 		profileExists := false
@@ -588,7 +588,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 			}
 		}
 		if !profileExists {
-			t.Errorf("%s failed: Missing profile '%s'. Got '\n%s\n'", rr.Args, profile, rr.Stdout.String())
+			t.Errorf("expected the json of 'profile list' to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Args)
 		}
 
 	})
@@ -598,7 +598,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "deployment", "hello-node", "--image=gcr.io/hello-minikube-zero-install/hello-node"))
 	if err != nil {
-		t.Logf("%s failed: %v (may not be an error)", rr.Args, err)
+		t.Logf("% failed: %v (may not be an error)", rr.Args, err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "expose", "deployment", "hello-node", "--type=NodePort", "--port=8080"))
 	if err != nil {
@@ -606,48 +606,48 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", Minutes(10)); err != nil {
-		t.Fatalf("wait: %v", err)
+		t.Fatalf("failed waiting for hello-node pod: %v", err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "list"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to do service list. args %q : %v", rr.Args, err)
 	}
 	if !strings.Contains(rr.Stdout.String(), "hello-node") {
-		t.Errorf("service list got %q, wanted *hello-node*", rr.Stdout.String())
+		t.Errorf("expected 'service list' to contain *hello-node* but got -%q-", rr.Stdout.String())
 	}
 
 	// Test --https --url mode
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "--namespace=default", "--https", "--url", "hello-node"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to get service url. args %q : %v", rr.Args, err)
 	}
 	if rr.Stderr.String() != "" {
-		t.Errorf("unexpected stderr output: %s", rr.Stderr)
+		t.Errorf("expected stderr to be empty but got *%q*", rr.Stderr)
 	}
 
 	endpoint := strings.TrimSpace(rr.Stdout.String())
 	u, err := url.Parse(endpoint)
 	if err != nil {
-		t.Fatalf("failed to parse %q: %v", endpoint, err)
+		t.Fatalf("failed to parse service url endpoint %q: %v", endpoint, err)
 	}
 	if u.Scheme != "https" {
-		t.Errorf("got scheme: %q, expected: %q", u.Scheme, "https")
+		t.Errorf("expected scheme to be 'https' but got %q", u.Scheme)
 	}
 
 	// Test --format=IP
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "hello-node", "--url", "--format={{.IP}}"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to get service url with custom format. args %q: %v", rr.Args, err)
 	}
 	if strings.TrimSpace(rr.Stdout.String()) != u.Hostname() {
-		t.Errorf("%s = %q, wanted %q", rr.Args, rr.Stdout.String(), u.Hostname())
+		t.Errorf("expected 'service --format={{.IP}}' output to be -%q- but got *%q* . args %q.", u.Hostname(), rr.Stdout.String(), rr.Args)
 	}
 
 	// Test a regular URLminikube
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "hello-node", "--url"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to get service url. args: %q: %v", rr.Args, err)
 	}
 
 	endpoint = strings.TrimSpace(rr.Stdout.String())
@@ -656,7 +656,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("failed to parse %q: %v", endpoint, err)
 	}
 	if u.Scheme != "http" {
-		t.Fatalf("got scheme: %q, expected: %q", u.Scheme, "http")
+		t.Fatalf("expected scheme to be -'http'- got scheme: *%q*", "http", u.Scheme)
 	}
 
 	t.Logf("url: %s", endpoint)
@@ -665,7 +665,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("get failed: %v\nresp: %v", err, resp)
 	}
 	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("%s = status code %d, want %d", u, resp.StatusCode, http.StatusOK)
+		t.Fatalf("expeced status code for %q to be -%q- but got *%q*", endpoint, http.StatusOK, resp.StatusCode)
 	}
 }
 
@@ -674,23 +674,23 @@ func validateAddonsCmd(ctx context.Context, t *testing.T, profile string) {
 	// Table output
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to do addon list: args %q : %v", rr.Args, err)
 	}
 	for _, a := range []string{"dashboard", "ingress", "ingress-dns"} {
 		if !strings.Contains(rr.Output(), a) {
-			t.Errorf("addon list expected to include %q but didn't output: %q", a, rr.Output())
+			t.Errorf("expected 'addon list' output to include -%q- but got *%q*", a, rr.Output())
 		}
 	}
 
 	// Json output
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list", "-o", "json"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to do addon list with json output. args %q: %v", rr.Args, err)
 	}
 	var jsonObject map[string]interface{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to decode addon list json output : %v", err)
 	}
 }
 
@@ -702,10 +702,10 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
 	want := "hello\n"
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("echo hello")))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to run an ssh command. args %q : %v", rr.Args, err)
 	}
 	if rr.Stdout.String() != want {
-		t.Errorf("%v = %q, want = %q", rr.Args, rr.Stdout.String(), want)
+		t.Errorf("expected minikube ssh command output to be -%q- but got *%q*. args %q", want, rr.Stdout.String(), rr.Args)
 	}
 }
 
@@ -713,12 +713,12 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
 func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "mysql.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to kubectl replace mysql: args %q failed: %v", rr.Args, err)
 	}
 
 	names, err := PodWait(ctx, t, profile, "default", "app=mysql", Minutes(10))
 	if err != nil {
-		t.Fatalf("podwait: %v", err)
+		t.Fatalf("failed waiting for mysql pod: %v", err)
 	}
 
 	// Retry, as mysqld first comes up without users configured. Scan for names in case of a reschedule.
@@ -726,8 +726,8 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 		rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;"))
 		return err
 	}
-	if err = retry.Expo(mysql, 2*time.Second, Seconds(180)); err != nil {
-		t.Errorf("mysql failing: %v", err)
+	if err = retry.Expo(mysql, 1*time.Second, Seconds(200)); err != nil {
+		t.Errorf("failed to exec 'mysql -ppassword -e show databases;': %v", err)
 	}
 }
 
@@ -757,12 +757,12 @@ func setupFileSync(ctx context.Context, t *testing.T, profile string) {
 	t.Logf("local sync path: %s", p)
 	err := copy.Copy("./testdata/sync.test", p)
 	if err != nil {
-		t.Fatalf("copy: %v", err)
+		t.Fatalf("failed to copy ./testdata/sync.test : %v", err)
 	}
 
 	err = copy.Copy("./testdata/minikube_test.pem", localTestCertPath())
 	if err != nil {
-		t.Fatalf("copy: %v", err)
+		t.Fatalf("failed to copy ./testdata/minikube_test.pem : %v", err)
 	}
 }
 
@@ -783,7 +783,7 @@ func validateFileSync(ctx context.Context, t *testing.T, profile string) {
 
 	expected, err := ioutil.ReadFile("./testdata/sync.test")
 	if err != nil {
-		t.Errorf("test file not found: %v", err)
+		t.Errorf("failed to read test file '/testdata/sync.test' : %v", err)
 	}
 
 	if diff := cmp.Diff(string(expected), got); diff != "" {
@@ -813,13 +813,13 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 		t.Logf("Checking for existence of %s within VM", vp)
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("failed to check existance of %q inside minikube. args %q: %v", vp, rr.Args, err)
 		}
 
 		// Strip carriage returned by ssh
 		got := strings.Replace(rr.Stdout.String(), "\r", "", -1)
 		if diff := cmp.Diff(string(want), got); diff != "" {
-			t.Errorf("minikube_test.pem -> %s mismatch (-want +got):\n%s", vp, diff)
+			t.Errorf("failed verify pem file. minikube_test.pem -> %s mismatch (-want +got):\n%s", vp, diff)
 		}
 	}
 }
@@ -828,7 +828,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 func validateUpdateContextCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "update-context", "--alsologtostderr", "-v=2"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to run minikube update-context: args %q: %v", rr.Args, err)
 	}
 
 	want := []byte("IP was already correctly configured")

From 90cac63b8517b9eca2470d995486236374a37d98 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 21:48:36 -0700
Subject: [PATCH 266/668] improve formatting for TestGuestEnvironment

---
 test/integration/guest_env_test.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go
index 41344ccbc8..e59284df60 100644
--- a/test/integration/guest_env_test.go
+++ b/test/integration/guest_env_test.go
@@ -27,6 +27,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
+// TestGuestEnvironment verifies files and packges installed inside minikube ISO/Base image
 func TestGuestEnvironment(t *testing.T) {
 	MaybeParallel(t)
 
@@ -37,18 +38,18 @@ func TestGuestEnvironment(t *testing.T) {
 	args := append([]string{"start", "-p", profile, "--install-addons=false", "--memory=1800", "--wait=false"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed to start minikube: args %q: %v", rr.Args, err)
 	}
 
 	// Run as a group so that our defer doesn't happen as tests are runnings
 	t.Run("Binaries", func(t *testing.T) {
-		for _, pkg := range []string{"git", "rsync", "curl", "wget", "socat", "iptables", "VBoxControl", "VBoxService"} {
+		for _, pkg := range []string{"git", "rsync", "curl", "wget", "socat", "iptables", "VBoxControl", "VBoxService", "crictl", "podman", "docker"} {
 			pkg := pkg
 			t.Run(pkg, func(t *testing.T) {
 				t.Parallel()
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("which %s", pkg)))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed to verify existance of %q binary : args %q: %v", pkg, rr.Args, err)
 				}
 			})
 		}
@@ -67,9 +68,9 @@ func TestGuestEnvironment(t *testing.T) {
 			mount := mount
 			t.Run(mount, func(t *testing.T) {
 				t.Parallel()
-				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("df -t ext4 %s | grep %s", mount, mount)))
+				rr, err := Run(t, exec.CommandContext(ctx, Targt(), "-p", profile, "ssh", fmt.Sprintf("df -t ext4 %s | grep %s", mount, mount)))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed to verify existance of %q mount. args %q: %v", mount, rr.Args, err)
 				}
 			})
 		}

From 73a9653c80a5ec2b5efbcf9c9b72245c3dcc1c91 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 21:52:00 -0700
Subject: [PATCH 267/668] improve logging for gvisor test

---
 test/integration/gvisor_addon_test.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go
index d69f1d205b..6e20c249c6 100644
--- a/test/integration/gvisor_addon_test.go
+++ b/test/integration/gvisor_addon_test.go
@@ -50,7 +50,7 @@ func TestGvisorAddon(t *testing.T) {
 	startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed to start minikube: args %q: %v", rr.Args, err)
 	}
 
 	// If it exists, include a locally built gvisor image
@@ -65,7 +65,7 @@ func TestGvisorAddon(t *testing.T) {
 	}
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
-		t.Fatalf("waiting for gvisor controller to be up: %v", err)
+		t.Fatalf("failed waiting for 'gvisor controller' pod: %v", err)
 	}
 
 	// Create an untrusted workload
@@ -80,29 +80,29 @@ func TestGvisorAddon(t *testing.T) {
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", Minutes(4)); err != nil {
-		t.Errorf("nginx: %v", err)
+		t.Errorf("failed waiting for nginx pod: %v", err)
 	}
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", Minutes(4)); err != nil {
-		t.Errorf("nginx: %v", err)
+		t.Errorf("failed waitinf for gvisor pod: %v", err)
 	}
 
 	// Ensure that workloads survive a restart
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("faild stopping minikube. args %q : %v", rr.Args, err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("failed starting minikube after a stop. args %q, %v", rr.Args, err)
 	}
 	if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
-		t.Errorf("waiting for gvisor controller to be up: %v", err)
+		t.Errorf("failed waiting for 'gvisor controller' pod : %v", err)
 	}
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", Minutes(4)); err != nil {
-		t.Errorf("nginx: %v", err)
+		t.Errorf("failed waiting for 'nginx' pod : %v", err)
 	}
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", Minutes(4)); err != nil {
-		t.Errorf("nginx: %v", err)
+		t.Errorf("failed waiting for 'gvisor' pod : %v", err)
 	}
 }

From acc951033b9a3a8a86b65659ee6c54ec578fe6d0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 22:10:32 -0700
Subject: [PATCH 268/668] improve test logs for start_stop_delete

---
 test/integration/start_stop_delete_test.go | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index e948f4b6ef..8c6ab2232f 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -92,7 +92,7 @@ func TestStartStop(t *testing.T) {
 
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 				if err != nil {
-					t.Fatalf("%s failed: %v", rr.Args, err)
+					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Args, err)
 				}
 
 				if !strings.Contains(tc.name, "cni") {
@@ -101,43 +101,43 @@ func TestStartStop(t *testing.T) {
 
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile, "--alsologtostderr", "-v=3"))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed stopping minikube - first stop-. args %q : %v", rr.Args, err)
 				}
 
 				// The none driver never really stops
 				if !NoneDriver() {
 					got := Status(ctx, t, Target(), profile, "Host")
 					if got != state.Stopped.String() {
-						t.Errorf("post-stop host status = %q; want = %q", got, state.Stopped)
+						t.Errorf("expected post-stop host status to be -%q- but got *%q*", state.Stopped, got)
 					}
 				}
 
 				// Enable an addon to assert it comes up afterwards
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "dashboard", "-p", profile))
 				if err != nil {
-					t.Errorf("%s failed: %v", rr.Args, err)
+					t.Errorf("failed to enable an addon while minikube is stopped. args %q:  ", rr.Args, err)
 				}
 
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 				if err != nil {
 					// Explicit fatal so that failures don't move directly to deletion
-					t.Fatalf("%s failed: %v", rr.Args, err)
+					t.Fatalf("Failed to start minikube after stop -Second Start-. args %q: %v", rr.Args, err)
 				}
 
 				if strings.Contains(tc.name, "cni") {
 					t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(")
 				} else {
 					if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4)); err != nil {
-						t.Fatalf("post-stop-start pod wait: %v", err)
+						t.Fatalf("failed waiting for pod 'busybox' post-stop-start: %v", err)
 					}
 					if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(4)); err != nil {
-						t.Fatalf("post-stop-start addon wait: %v", err)
+						t.Fatalf("failed waiting for 'addon dashboard' pod post-stop-start: %v", err)
 					}
 				}
 
 				got := Status(ctx, t, Target(), profile, "Host")
 				if got != state.Running.String() {
-					t.Errorf("post-start host status = %q; want = %q", got, state.Running)
+					t.Errorf("expected host status after start-stop-start to be -%q- but got *%q*", state.Running, got)
 				}
 
 				if !NoneDriver() {
@@ -150,7 +150,7 @@ func TestStartStop(t *testing.T) {
 					// Normally handled by cleanuprofile, but not fatal there
 					rr, err = Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
 					if err != nil {
-						t.Errorf("%s failed: %v", rr.Args, err)
+						t.Errorf("failed to clean up: args %q: %v", rr.Args, err)
 					}
 
 					rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "config", "get-contexts", profile))
@@ -158,7 +158,7 @@ func TestStartStop(t *testing.T) {
 						t.Logf("config context error: %v (may be ok)", err)
 					}
 					if rr.ExitCode != 1 {
-						t.Errorf("wanted exit code 1, got %d. output: %s", rr.ExitCode, rr.Output())
+						t.Errorf("expected exit code 1, got %d. output: %s", rr.ExitCode, rr.Output())
 					}
 				}
 			})
@@ -250,14 +250,14 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "sudo crictl images -o json"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("failed tp get images inside minikube. args %q: %v", rr.Args, err)
 	}
 	jv := map[string][]struct {
 		Tags []string `json:"repoTags"`
 	}{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jv)
 	if err != nil {
-		t.Errorf("images unmarshal: %v", err)
+		t.Errorf("failed to decode images json %v. output: %q", err, rr.Output())
 	}
 	found := map[string]bool{}
 	for _, img := range jv["images"] {
@@ -274,7 +274,7 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 	}
 	want, err := images.Kubeadm("", version)
 	if err != nil {
-		t.Errorf("kubeadm images: %v", version)
+		t.Errorf("failed to get kubeadm images for %s : %v", version, err)
 	}
 	gotImages := []string{}
 	for k := range found {

From dc5dd62b58f029609e6cfa38c503d21f379bf5b0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 22:15:24 -0700
Subject: [PATCH 269/668] lint

---
 test/integration/aaa_download_only_test.go |  6 +++---
 test/integration/addons_test.go            |  2 +-
 test/integration/functional_test.go        | 10 +++++-----
 test/integration/start_stop_delete_test.go |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index cf6239cd9c..2c75e0d47e 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -156,9 +156,9 @@ func TestDownloadOnlyKic(t *testing.T) {
 
 	args := []string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr"}
 	args = append(args, StartArgs()...)
-	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
-	if err != nil {
-		t.Errorf("start with download only failed %q : %v:\n%s", args, err)
+
+	if _, err := Run(t, exec.CommandContext(ctx, Target(), args...)); err != nil {
+		t.Errorf("start with download only failed %q : %v", args, err)
 	}
 
 	// Make sure the downloaded image tarball exists
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 43ad112651..3fa3a63d4c 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -179,7 +179,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("failed run minikube ip. args %q : %v", rr.Args, err)
 	}
 	if rr.Stderr.String() != "" {
-		t.Errorf("expected stderr to be -empty- but got: *%q*", rr.Args, rr.Stderr)
+		t.Errorf("expected stderr to be -empty- but got: *%q* .  args %q", rr.Stderr, rr.Args)
 	}
 
 	endpoint := fmt.Sprintf("http://%s:%d", strings.TrimSpace(rr.Stdout.String()), 5000)
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index f9c4b3b440..aa9ac58eb0 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -598,11 +598,11 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "deployment", "hello-node", "--image=gcr.io/hello-minikube-zero-install/hello-node"))
 	if err != nil {
-		t.Logf("% failed: %v (may not be an error)", rr.Args, err)
+		t.Logf("%q failed: %v (may not be an error).", rr.Args, err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "expose", "deployment", "hello-node", "--type=NodePort", "--port=8080"))
 	if err != nil {
-		t.Logf("%s failed: %v (may not be an error)", rr.Args, err)
+		t.Logf("%q failed: %v (may not be an error)", rr.Args, err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", Minutes(10)); err != nil {
@@ -656,7 +656,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("failed to parse %q: %v", endpoint, err)
 	}
 	if u.Scheme != "http" {
-		t.Fatalf("expected scheme to be -'http'- got scheme: *%q*", "http", u.Scheme)
+		t.Fatalf("expected scheme to be -%q- got scheme: *%q*", "http", u.Scheme)
 	}
 
 	t.Logf("url: %s", endpoint)
@@ -665,7 +665,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("get failed: %v\nresp: %v", err, resp)
 	}
 	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("expeced status code for %q to be -%q- but got *%q*", endpoint, http.StatusOK, resp.StatusCode)
+		t.Fatalf("expected status code for %q to be -%q- but got *%q*", endpoint, http.StatusOK, resp.StatusCode)
 	}
 }
 
@@ -813,7 +813,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 		t.Logf("Checking for existence of %s within VM", vp)
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
 		if err != nil {
-			t.Errorf("failed to check existance of %q inside minikube. args %q: %v", vp, rr.Args, err)
+			t.Errorf("failed to check existence of %q inside minikube. args %q: %v", vp, rr.Args, err)
 		}
 
 		// Strip carriage returned by ssh
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 8c6ab2232f..21ca1d57ed 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -115,13 +115,13 @@ func TestStartStop(t *testing.T) {
 				// Enable an addon to assert it comes up afterwards
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "dashboard", "-p", profile))
 				if err != nil {
-					t.Errorf("failed to enable an addon while minikube is stopped. args %q:  ", rr.Args, err)
+					t.Errorf("failed to enable an addon post-stop. args %q: %v", rr.Args, err)
 				}
 
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 				if err != nil {
 					// Explicit fatal so that failures don't move directly to deletion
-					t.Fatalf("Failed to start minikube after stop -Second Start-. args %q: %v", rr.Args, err)
+					t.Fatalf("failed to start minikube post-stop. args %q: %v", rr.Args, err)
 				}
 
 				if strings.Contains(tc.name, "cni") {

From 2e64eb795227911aee5535f81534245be34807ce Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 22:21:19 -0700
Subject: [PATCH 270/668] convert all rr.Args to rr.Command()

---
 test/integration/aaa_download_only_test.go |  4 +-
 test/integration/aab_offline_test.go       |  2 +-
 test/integration/addons_test.go            | 40 +++++-----
 test/integration/docker_test.go            |  6 +-
 test/integration/fn_mount_cmd.go           | 10 +--
 test/integration/fn_pvc.go                 |  2 +-
 test/integration/fn_tunnel_cmd.go          |  4 +-
 test/integration/functional_test.go        | 92 +++++++++++-----------
 test/integration/guest_env_test.go         |  6 +-
 test/integration/gvisor_addon_test.go      | 14 ++--
 test/integration/none_test.go              |  8 +-
 test/integration/start_stop_delete_test.go | 26 +++---
 test/integration/version_upgrade_test.go   |  8 +-
 13 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
index 2c75e0d47e..27442b31cf 100644
--- a/test/integration/aaa_download_only_test.go
+++ b/test/integration/aaa_download_only_test.go
@@ -129,7 +129,7 @@ func TestDownloadOnly(t *testing.T) {
 				}
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all"))
 				if err != nil {
-					t.Errorf("failed to delete all. args: %q : %v", rr.Args, err)
+					t.Errorf("failed to delete all. args: %q : %v", rr.Command(), err)
 				}
 			})
 			// Delete should always succeed, even if previously partially or fully deleted.
@@ -139,7 +139,7 @@ func TestDownloadOnly(t *testing.T) {
 				}
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
 				if err != nil {
-					t.Errorf("failed to delete. args: %q: %v", rr.Args, err)
+					t.Errorf("failed to delete. args: %q: %v", rr.Command(), err)
 				}
 			})
 		})
diff --git a/test/integration/aab_offline_test.go b/test/integration/aab_offline_test.go
index fb1cdb710f..c635ef09ef 100644
--- a/test/integration/aab_offline_test.go
+++ b/test/integration/aab_offline_test.go
@@ -53,7 +53,7 @@ func TestOffline(t *testing.T) {
 				rr, err := Run(t, c)
 				if err != nil {
 					// Fatal so that we may collect logs before stop/delete steps
-					t.Fatalf("%s failed: %v", rr.Args, err)
+					t.Fatalf("%s failed: %v", rr.Command(), err)
 				}
 			})
 		}
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 3fa3a63d4c..e90249a49e 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -43,7 +43,7 @@ func TestAddons(t *testing.T) {
 	args := append([]string{"start", "-p", profile, "--wait=false", "--memory=2600", "--alsologtostderr", "-v=1", "--addons=ingress", "--addons=registry", "--addons=metrics-server", "--addons=helm-tiller"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	// Parallelized tests
@@ -69,15 +69,15 @@ func TestAddons(t *testing.T) {
 	// Assert that disable/enable works offline
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile))
 	if err != nil {
-		t.Errorf("failed to stop minikube. args %q : %v", rr.Args, err)
+		t.Errorf("failed to stop minikube. args %q : %v", rr.Command(), err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "dashboard", "-p", profile))
 	if err != nil {
-		t.Errorf("failed to enable dashboard addon: args %q : %v", rr.Args, err)
+		t.Errorf("failed to enable dashboard addon: args %q : %v", rr.Command(), err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "dashboard", "-p", profile))
 	if err != nil {
-		t.Errorf("failed to disable dashboard addon: args %q : %v", rr.Args, err)
+		t.Errorf("failed to disable dashboard addon: args %q : %v", rr.Command(), err)
 	}
 }
 
@@ -100,11 +100,11 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-ing.yaml")))
 	if err != nil {
-		t.Errorf("failed to kubectl replace nginx-ing. args %q. %v", rr.Args, err)
+		t.Errorf("failed to kubectl replace nginx-ing. args %q. %v", rr.Command(), err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-pod-svc.yaml")))
 	if err != nil {
-		t.Errorf("failed to kubectl replace nginx-pod-svc. args %q. %v", rr.Args, err)
+		t.Errorf("failed to kubectl replace nginx-pod-svc. args %q. %v", rr.Command(), err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx", Minutes(4)); err != nil {
@@ -121,10 +121,10 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 			return err
 		}
 		if rr.Stderr.String() != "" {
-			t.Logf("%v: unexpected stderr: %s (may be temproary)", rr.Args, rr.Stderr)
+			t.Logf("%v: unexpected stderr: %s (may be temproary)", rr.Command(), rr.Stderr)
 		}
 		if !strings.Contains(rr.Stdout.String(), want) {
-			return fmt.Errorf("%v stdout = %q, want %q", rr.Args, rr.Stdout, want)
+			return fmt.Errorf("%v stdout = %q, want %q", rr.Command(), rr.Stdout, want)
 		}
 		return nil
 	}
@@ -135,7 +135,7 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "ingress", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("failed to disable ingress addon. args %q : %v", rr.Args, err)
+		t.Errorf("failed to disable ingress addon. args %q : %v", rr.Command(), err)
 	}
 }
 
@@ -161,12 +161,12 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 	// Test from inside the cluster (no curl available on busybox)
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "delete", "po", "-l", "run=registry-test", "--now"))
 	if err != nil {
-		t.Logf("pre-cleanup %s failed: %v (not a problem)", rr.Args, err)
+		t.Logf("pre-cleanup %s failed: %v (not a problem)", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
 	if err != nil {
-		t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Args, err)
+		t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Command(), err)
 	}
 	want := "HTTP/1.1 200"
 	if !strings.Contains(rr.Stdout.String(), want) {
@@ -176,10 +176,10 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 	// Test from outside the cluster
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ip"))
 	if err != nil {
-		t.Fatalf("failed run minikube ip. args %q : %v", rr.Args, err)
+		t.Fatalf("failed run minikube ip. args %q : %v", rr.Command(), err)
 	}
 	if rr.Stderr.String() != "" {
-		t.Errorf("expected stderr to be -empty- but got: *%q* .  args %q", rr.Stderr, rr.Args)
+		t.Errorf("expected stderr to be -empty- but got: *%q* .  args %q", rr.Stderr, rr.Command())
 	}
 
 	endpoint := fmt.Sprintf("http://%s:%d", strings.TrimSpace(rr.Stdout.String()), 5000)
@@ -205,7 +205,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "registry", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("failed to disable registry addon. args %q: %v", rr.Args, err)
+		t.Errorf("failed to disable registry addon. args %q: %v", rr.Command(), err)
 	}
 }
 
@@ -232,10 +232,10 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
 			return err
 		}
 		if rr.Stderr.String() != "" {
-			t.Logf("%v: unexpected stderr: %s", rr.Args, rr.Stderr)
+			t.Logf("%v: unexpected stderr: %s", rr.Command(), rr.Stderr)
 		}
 		if !strings.Contains(rr.Stdout.String(), want) {
-			return fmt.Errorf("%v stdout = %q, want %q", rr.Args, rr.Stdout, want)
+			return fmt.Errorf("%v stdout = %q, want %q", rr.Command(), rr.Stdout, want)
 		}
 		return nil
 	}
@@ -247,7 +247,7 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "metrics-server", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("failed to disable metrics-server addon: args %q: %v", rr.Args, err)
+		t.Errorf("failed to disable metrics-server addon: args %q: %v", rr.Command(), err)
 	}
 }
 
@@ -283,10 +283,10 @@ func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string)
 			return err
 		}
 		if rr.Stderr.String() != "" {
-			t.Logf("%v: unexpected stderr: %s", rr.Args, rr.Stderr)
+			t.Logf("%v: unexpected stderr: %s", rr.Command(), rr.Stderr)
 		}
 		if !strings.Contains(rr.Stdout.String(), want) {
-			return fmt.Errorf("%v stdout = %q, want %q", rr.Args, rr.Stdout, want)
+			return fmt.Errorf("%v stdout = %q, want %q", rr.Command(), rr.Stdout, want)
 		}
 		return nil
 	}
@@ -297,6 +297,6 @@ func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string)
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "helm-tiller", "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Errorf("failed disabling helm-tiller addon. arg %q.s %v", rr.Args, err)
+		t.Errorf("failed disabling helm-tiller addon. arg %q.s %v", rr.Command(), err)
 	}
 }
diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go
index da26300dd5..dd0a27de06 100644
--- a/test/integration/docker_test.go
+++ b/test/integration/docker_test.go
@@ -39,12 +39,12 @@ func TestDockerFlags(t *testing.T) {
 	args := append([]string{"start", "-p", profile, "--cache-images=false", "--memory=1800", "--install-addons=false", "--wait=false", "--docker-env=FOO=BAR", "--docker-env=BAZ=BAT", "--docker-opt=debug", "--docker-opt=icc=true", "--alsologtostderr", "-v=5"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("failed to start minikube with args: %q : %v", rr.Args, err)
+		t.Errorf("failed to start minikube with args: %q : %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo systemctl show docker --property=Environment --no-pager"))
 	if err != nil {
-		t.Errorf("failed to 'systemctl show docker' inside minikube. args %q: %v", rr.Args, err)
+		t.Errorf("failed to 'systemctl show docker' inside minikube. args %q: %v", rr.Command(), err)
 	}
 
 	for _, envVar := range []string{"FOO=BAR", "BAZ=BAT"} {
@@ -55,7 +55,7 @@ func TestDockerFlags(t *testing.T) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo systemctl show docker --property=ExecStart --no-pager"))
 	if err != nil {
-		t.Errorf("failed on the second 'systemctl show docker' inside minikube. args %q: %v", rr.Args, err)
+		t.Errorf("failed on the second 'systemctl show docker' inside minikube. args %q: %v", rr.Command(), err)
 	}
 	for _, opt := range []string{"--debug", "--icc=true"} {
 		if !strings.Contains(rr.Stdout.String(), opt) {
diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go
index 6e292af109..915262a833 100644
--- a/test/integration/fn_mount_cmd.go
+++ b/test/integration/fn_mount_cmd.go
@@ -117,7 +117,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	// Assert that we can access the mount without an error. Display for debugging.
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "--", "ls", "-la", guestMount))
 	if err != nil {
-		t.Fatalf("failed verifying accessing to the mount. args %q : %v", rr.Args, err)
+		t.Fatalf("failed verifying accessing to the mount. args %q : %v", rr.Command(), err)
 	}
 	t.Logf("guest mount directory contents\n%s", rr.Stdout)
 
@@ -125,7 +125,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	tp := filepath.Join("/mount-9p", testMarker)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "cat", tp))
 	if err != nil {
-		t.Fatalf("failed to verify the mount contains unique test marked: args %q: %v", rr.Args, err)
+		t.Fatalf("failed to verify the mount contains unique test marked: args %q: %v", rr.Command(), err)
 	}
 
 	if !bytes.Equal(rr.Stdout.Bytes(), wantFromTest) {
@@ -136,7 +136,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	// Start the "busybox-mount" pod.
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "busybox-mount-test.yaml")))
 	if err != nil {
-		t.Fatalf("failed to 'kubectl replace' for busybox-mount-test. args %q : %v", rr.Args, err)
+		t.Fatalf("failed to 'kubectl replace' for busybox-mount-test. args %q : %v", rr.Command(), err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox-mount", Minutes(4)); err != nil {
@@ -157,7 +157,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 	// test that file written from host was read in by the pod via cat /mount-9p/written-by-host;
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "logs", "busybox-mount"))
 	if err != nil {
-		t.Errorf("failed to get kubectl logs for busybox-mount. args %q : %v", rr.Args, err)
+		t.Errorf("failed to get kubectl logs for busybox-mount. args %q : %v", rr.Command(), err)
 	}
 	if !bytes.Equal(rr.Stdout.Bytes(), wantFromTest) {
 		t.Errorf("busybox-mount logs = %q, want %q", rr.Stdout.Bytes(), wantFromTest)
@@ -169,7 +169,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
 		// test that file written from host was read in by the pod via cat /mount-9p/fromhost;
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "stat", gp))
 		if err != nil {
-			t.Errorf("failed to stat the file %q iniside minikube : args %q: %v", gp, rr.Args, err)
+			t.Errorf("failed to stat the file %q iniside minikube : args %q: %v", gp, rr.Command(), err)
 		}
 
 		if runtime.GOOS == "windows" {
diff --git a/test/integration/fn_pvc.go b/test/integration/fn_pvc.go
index c387a1750b..9cca92cc47 100644
--- a/test/integration/fn_pvc.go
+++ b/test/integration/fn_pvc.go
@@ -64,7 +64,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
 	// Now create a testpvc
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "pvc.yaml")))
 	if err != nil {
-		t.Fatalf("kubectl apply pvc.yaml failed: args %q: %v", rr.Args, err)
+		t.Fatalf("kubectl apply pvc.yaml failed: args %q: %v", rr.Command(), err)
 	}
 
 	checkStoragePhase := func() error {
diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go
index dffb247fb4..8f43a9a5fd 100644
--- a/test/integration/fn_tunnel_cmd.go
+++ b/test/integration/fn_tunnel_cmd.go
@@ -69,7 +69,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 	// Start the "nginx" pod.
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "testsvc.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx-svc", Minutes(4)); err != nil {
 		t.Fatalf("wait: %v", err)
@@ -97,7 +97,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
 
 		rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "svc", "nginx-svc"))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("%s failed: %v", rr.Command(), err)
 		}
 		t.Logf("failed to kubectl get svc nginx-svc:\n%s", rr.Stdout)
 	}
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index aa9ac58eb0..a5ee68aa73 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -137,7 +137,7 @@ func TestFunctional(t *testing.T) {
 func validateNodeLabels(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "nodes", "--output=go-template", "--template='{{range $k, $v := (index .items 0).metadata.labels}}{{$k}} {{end}}'"))
 	if err != nil {
-		t.Errorf("failed to 'kubectl get nodes' with args %q: %v", rr.Args, err)
+		t.Errorf("failed to 'kubectl get nodes' with args %q: %v", rr.Command(), err)
 	}
 	expectedLabels := []string{"minikube.k8s.io/commit", "minikube.k8s.io/version", "minikube.k8s.io/updated_at", "minikube.k8s.io/name"}
 	for _, el := range expectedLabels {
@@ -167,7 +167,7 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 	c = exec.CommandContext(mctx, "/bin/bash", "-c", "eval $("+Target()+" -p "+profile+" docker-env) && docker images")
 	rr, err = Run(t, c)
 	if err != nil {
-		t.Fatalf("failed to run minikube docker-env. args %q : %v ", rr.Args, err)
+		t.Fatalf("failed to run minikube docker-env. args %q : %v ", rr.Command(), err)
 	}
 
 	expectedImgInside := "gcr.io/k8s-minikube/storage-provisioner"
@@ -192,7 +192,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 	c.Env = env
 	rr, err := Run(t, c)
 	if err != nil {
-		t.Errorf("failed minikube start. args %q: %v", rr.Args, err)
+		t.Errorf("failed minikube start. args %q: %v", rr.Command(), err)
 	}
 
 	want := "Found network options:"
@@ -210,7 +210,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 func validateKubeContext(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "config", "current-context"))
 	if err != nil {
-		t.Errorf("failed to get current-context. args %q : %v", rr.Args, err)
+		t.Errorf("failed to get current-context. args %q : %v", rr.Command(), err)
 	}
 	if !strings.Contains(rr.Stdout.String(), profile) {
 		t.Errorf("expected current-context = %q, but got *%q*", profile, rr.Stdout.String())
@@ -221,7 +221,7 @@ func validateKubeContext(ctx context.Context, t *testing.T, profile string) {
 func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "po", "-A"))
 	if err != nil {
-		t.Errorf("failed to get kubectl pods: args %q : %v", rr.Args, err)
+		t.Errorf("failed to get kubectl pods: args %q : %v", rr.Command(), err)
 	}
 	if rr.Stderr.String() != "" {
 		t.Errorf("expected stderr to be empty but got *%q*: args %q", rr.Stderr, rr.Command())
@@ -237,7 +237,7 @@ func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string)
 	kubectlArgs := []string{"-p", profile, "kubectl", "--", "--context", profile, "get", "pods"}
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), kubectlArgs...))
 	if err != nil {
-		t.Fatalf("failed to get pods. args %q: %v", rr.Args, err)
+		t.Fatalf("failed to get pods. args %q: %v", rr.Command(), err)
 	}
 }
 
@@ -245,12 +245,12 @@ func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string)
 func validateComponentHealth(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "cs", "-o=json"))
 	if err != nil {
-		t.Fatalf("failed to get components. args %q: %v", rr.Args, err)
+		t.Fatalf("failed to get components. args %q: %v", rr.Command(), err)
 	}
 	cs := api.ComponentStatusList{}
 	d := json.NewDecoder(bytes.NewReader(rr.Stdout.Bytes()))
 	if err := d.Decode(&cs); err != nil {
-		t.Fatalf("failed to decode kubectl json output: args %q : %v", rr.Args, err)
+		t.Fatalf("failed to decode kubectl json output: args %q : %v", rr.Command(), err)
 	}
 
 	for _, i := range cs.Items {
@@ -270,41 +270,41 @@ func validateComponentHealth(ctx context.Context, t *testing.T, profile string)
 func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status"))
 	if err != nil {
-		t.Errorf("failed to run minikube status. args %q : %v", rr.Args, err)
+		t.Errorf("failed to run minikube status. args %q : %v", rr.Command(), err)
 	}
 
 	// Custom format
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}"))
 	if err != nil {
-		t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Args, err)
+		t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Command(), err)
 	}
 	re := `host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`
 	match, _ := regexp.MatchString(re, rr.Stdout.String())
 	if !match {
-		t.Errorf("failed to match regex %q for minikube status with custom format. args %q. output %q", re, rr.Args, rr.Output())
+		t.Errorf("failed to match regex %q for minikube status with custom format. args %q. output %q", re, rr.Command(), rr.Output())
 	}
 
 	// Json output
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-o", "json"))
 	if err != nil {
-		t.Errorf("failed to run minikube status with json output. args %q : %v", rr.Args, err)
+		t.Errorf("failed to run minikube status with json output. args %q : %v", rr.Command(), err)
 	}
 	var jsonObject map[string]interface{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 	if err != nil {
-		t.Errorf("failed to decode json from minikube status. args %q. %v", rr.Args, err)
+		t.Errorf("failed to decode json from minikube status. args %q. %v", rr.Command(), err)
 	}
 	if _, ok := jsonObject["Host"]; !ok {
-		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Host")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Command(), err, "Host")
 	}
 	if _, ok := jsonObject["Kubelet"]; !ok {
-		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Kubelet")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Command(), err, "Kubelet")
 	}
 	if _, ok := jsonObject["APIServer"]; !ok {
-		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "APIServer")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Command(), err, "APIServer")
 	}
 	if _, ok := jsonObject["Kubeconfig"]; !ok {
-		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Args, err, "Kubeconfig")
+		t.Errorf("%q failed: %v. Missing key %s in json object", rr.Command(), err, "Kubeconfig")
 	}
 }
 
@@ -350,7 +350,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 func validateDNS(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "busybox.yaml")))
 	if err != nil {
-		t.Fatalf("failed to kubectl replace busybox : args %q: %v", rr.Args, err)
+		t.Fatalf("failed to kubectl replace busybox : args %q: %v", rr.Command(), err)
 	}
 
 	names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4))
@@ -410,21 +410,21 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 			for _, img := range []string{"busybox:latest", "busybox:1.28.4-glibc", "k8s.gcr.io/pause:latest"} {
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img))
 				if err != nil {
-					t.Errorf("failed to cache add image %q. args %q err %v", img, rr.Args, err)
+					t.Errorf("failed to cache add image %q. args %q err %v", img, rr.Command(), err)
 				}
 			}
 		})
 		t.Run("delete_busybox:1.28.4-glibc", func(t *testing.T) {
 			rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", "busybox:1.28.4-glibc"))
 			if err != nil {
-				t.Errorf("failed to delete image busybox:1.28.4-glibc from cache. args %q: %v", rr.Args, err)
+				t.Errorf("failed to delete image busybox:1.28.4-glibc from cache. args %q: %v", rr.Command(), err)
 			}
 		})
 
 		t.Run("list", func(t *testing.T) {
 			rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "list"))
 			if err != nil {
-				t.Errorf("failed to do cache list. args %q: %v", rr.Args, err)
+				t.Errorf("failed to do cache list. args %q: %v", rr.Command(), err)
 			}
 			if !strings.Contains(rr.Output(), "k8s.gcr.io/pause") {
 				t.Errorf("expected 'cache list' output to include 'k8s.gcr.io/pause' but got:\n ***%q***", rr.Output())
@@ -491,7 +491,7 @@ func validateConfigCmd(ctx context.Context, t *testing.T, profile string) {
 		args := append([]string{"-p", profile, "config"}, tc.args...)
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 		if err != nil && tc.wantErr == "" {
-			t.Errorf("failed to config minikube. args %q : %v", rr.Args, err)
+			t.Errorf("failed to config minikube. args %q : %v", rr.Command(), err)
 		}
 
 		got := strings.TrimSpace(rr.Stdout.String())
@@ -509,7 +509,7 @@ func validateConfigCmd(ctx context.Context, t *testing.T, profile string) {
 func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "logs"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 	for _, word := range []string{"Docker", "apiserver", "Linux", "kubelet"} {
 		if !strings.Contains(rr.Stdout.String(), word) {
@@ -525,16 +525,16 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 		nonexistentProfile := "lis"
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", nonexistentProfile))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("%s failed: %v", rr.Command(), err)
 		}
 		rr, err = Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("%s failed: %v", rr.Command(), err)
 		}
 		var profileJSON map[string][]map[string]interface{}
 		err = json.Unmarshal(rr.Stdout.Bytes(), &profileJSON)
 		if err != nil {
-			t.Errorf("%s failed: %v", rr.Args, err)
+			t.Errorf("%s failed: %v", rr.Command(), err)
 		}
 		for profileK := range profileJSON {
 			for _, p := range profileJSON[profileK] {
@@ -550,7 +550,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 		// List profiles
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list"))
 		if err != nil {
-			t.Errorf("failed to list profiles: args %q : %v", rr.Args, err)
+			t.Errorf("failed to list profiles: args %q : %v", rr.Command(), err)
 		}
 
 		// Table output
@@ -564,7 +564,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 			}
 		}
 		if !profileExists {
-			t.Errorf("expected 'profile list' output to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Args)
+			t.Errorf("expected 'profile list' output to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Command())
 		}
 	})
 
@@ -572,12 +572,12 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 		// Json output
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
 		if err != nil {
-			t.Errorf("failed to list profiles with json format. args %q: %v", rr.Args, err)
+			t.Errorf("failed to list profiles with json format. args %q: %v", rr.Command(), err)
 		}
 		var jsonObject map[string][]map[string]interface{}
 		err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
 		if err != nil {
-			t.Errorf("failed to decode json from profile list: args %q: %v", rr.Args, err)
+			t.Errorf("failed to decode json from profile list: args %q: %v", rr.Command(), err)
 		}
 		validProfiles := jsonObject["valid"]
 		profileExists := false
@@ -588,7 +588,7 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 			}
 		}
 		if !profileExists {
-			t.Errorf("expected the json of 'profile list' to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Args)
+			t.Errorf("expected the json of 'profile list' to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Command())
 		}
 
 	})
@@ -598,11 +598,11 @@ func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
 func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "deployment", "hello-node", "--image=gcr.io/hello-minikube-zero-install/hello-node"))
 	if err != nil {
-		t.Logf("%q failed: %v (may not be an error).", rr.Args, err)
+		t.Logf("%q failed: %v (may not be an error).", rr.Command(), err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "expose", "deployment", "hello-node", "--type=NodePort", "--port=8080"))
 	if err != nil {
-		t.Logf("%q failed: %v (may not be an error)", rr.Args, err)
+		t.Logf("%q failed: %v (may not be an error)", rr.Command(), err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", Minutes(10)); err != nil {
@@ -611,7 +611,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "list"))
 	if err != nil {
-		t.Errorf("failed to do service list. args %q : %v", rr.Args, err)
+		t.Errorf("failed to do service list. args %q : %v", rr.Command(), err)
 	}
 	if !strings.Contains(rr.Stdout.String(), "hello-node") {
 		t.Errorf("expected 'service list' to contain *hello-node* but got -%q-", rr.Stdout.String())
@@ -620,7 +620,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	// Test --https --url mode
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "--namespace=default", "--https", "--url", "hello-node"))
 	if err != nil {
-		t.Fatalf("failed to get service url. args %q : %v", rr.Args, err)
+		t.Fatalf("failed to get service url. args %q : %v", rr.Command(), err)
 	}
 	if rr.Stderr.String() != "" {
 		t.Errorf("expected stderr to be empty but got *%q*", rr.Stderr)
@@ -638,16 +638,16 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 	// Test --format=IP
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "hello-node", "--url", "--format={{.IP}}"))
 	if err != nil {
-		t.Errorf("failed to get service url with custom format. args %q: %v", rr.Args, err)
+		t.Errorf("failed to get service url with custom format. args %q: %v", rr.Command(), err)
 	}
 	if strings.TrimSpace(rr.Stdout.String()) != u.Hostname() {
-		t.Errorf("expected 'service --format={{.IP}}' output to be -%q- but got *%q* . args %q.", u.Hostname(), rr.Stdout.String(), rr.Args)
+		t.Errorf("expected 'service --format={{.IP}}' output to be -%q- but got *%q* . args %q.", u.Hostname(), rr.Stdout.String(), rr.Command())
 	}
 
 	// Test a regular URLminikube
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "hello-node", "--url"))
 	if err != nil {
-		t.Errorf("failed to get service url. args: %q: %v", rr.Args, err)
+		t.Errorf("failed to get service url. args: %q: %v", rr.Command(), err)
 	}
 
 	endpoint = strings.TrimSpace(rr.Stdout.String())
@@ -674,7 +674,7 @@ func validateAddonsCmd(ctx context.Context, t *testing.T, profile string) {
 	// Table output
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list"))
 	if err != nil {
-		t.Errorf("failed to do addon list: args %q : %v", rr.Args, err)
+		t.Errorf("failed to do addon list: args %q : %v", rr.Command(), err)
 	}
 	for _, a := range []string{"dashboard", "ingress", "ingress-dns"} {
 		if !strings.Contains(rr.Output(), a) {
@@ -685,7 +685,7 @@ func validateAddonsCmd(ctx context.Context, t *testing.T, profile string) {
 	// Json output
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list", "-o", "json"))
 	if err != nil {
-		t.Errorf("failed to do addon list with json output. args %q: %v", rr.Args, err)
+		t.Errorf("failed to do addon list with json output. args %q: %v", rr.Command(), err)
 	}
 	var jsonObject map[string]interface{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jsonObject)
@@ -702,10 +702,10 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
 	want := "hello\n"
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("echo hello")))
 	if err != nil {
-		t.Errorf("failed to run an ssh command. args %q : %v", rr.Args, err)
+		t.Errorf("failed to run an ssh command. args %q : %v", rr.Command(), err)
 	}
 	if rr.Stdout.String() != want {
-		t.Errorf("expected minikube ssh command output to be -%q- but got *%q*. args %q", want, rr.Stdout.String(), rr.Args)
+		t.Errorf("expected minikube ssh command output to be -%q- but got *%q*. args %q", want, rr.Stdout.String(), rr.Command())
 	}
 }
 
@@ -713,7 +713,7 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
 func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "mysql.yaml")))
 	if err != nil {
-		t.Fatalf("failed to kubectl replace mysql: args %q failed: %v", rr.Args, err)
+		t.Fatalf("failed to kubectl replace mysql: args %q failed: %v", rr.Command(), err)
 	}
 
 	names, err := PodWait(ctx, t, profile, "default", "app=mysql", Minutes(10))
@@ -776,7 +776,7 @@ func validateFileSync(ctx context.Context, t *testing.T, profile string) {
 	t.Logf("Checking for existence of %s within VM", vp)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 	got := rr.Stdout.String()
 	t.Logf("file sync test content: %s", got)
@@ -813,7 +813,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 		t.Logf("Checking for existence of %s within VM", vp)
 		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
 		if err != nil {
-			t.Errorf("failed to check existence of %q inside minikube. args %q: %v", vp, rr.Args, err)
+			t.Errorf("failed to check existence of %q inside minikube. args %q: %v", vp, rr.Command(), err)
 		}
 
 		// Strip carriage returned by ssh
@@ -828,7 +828,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 func validateUpdateContextCmd(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "update-context", "--alsologtostderr", "-v=2"))
 	if err != nil {
-		t.Errorf("failed to run minikube update-context: args %q: %v", rr.Args, err)
+		t.Errorf("failed to run minikube update-context: args %q: %v", rr.Command(), err)
 	}
 
 	want := []byte("IP was already correctly configured")
diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go
index e59284df60..201d188ec2 100644
--- a/test/integration/guest_env_test.go
+++ b/test/integration/guest_env_test.go
@@ -38,7 +38,7 @@ func TestGuestEnvironment(t *testing.T) {
 	args := append([]string{"start", "-p", profile, "--install-addons=false", "--memory=1800", "--wait=false"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("failed to start minikube: args %q: %v", rr.Args, err)
+		t.Errorf("failed to start minikube: args %q: %v", rr.Command(), err)
 	}
 
 	// Run as a group so that our defer doesn't happen as tests are runnings
@@ -49,7 +49,7 @@ func TestGuestEnvironment(t *testing.T) {
 				t.Parallel()
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("which %s", pkg)))
 				if err != nil {
-					t.Errorf("failed to verify existance of %q binary : args %q: %v", pkg, rr.Args, err)
+					t.Errorf("failed to verify existance of %q binary : args %q: %v", pkg, rr.Command(), err)
 				}
 			})
 		}
@@ -70,7 +70,7 @@ func TestGuestEnvironment(t *testing.T) {
 				t.Parallel()
 				rr, err := Run(t, exec.CommandContext(ctx, Targt(), "-p", profile, "ssh", fmt.Sprintf("df -t ext4 %s | grep %s", mount, mount)))
 				if err != nil {
-					t.Errorf("failed to verify existance of %q mount. args %q: %v", mount, rr.Args, err)
+					t.Errorf("failed to verify existance of %q mount. args %q: %v", mount, rr.Command(), err)
 				}
 			})
 		}
diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go
index 6e20c249c6..d5744eeafe 100644
--- a/test/integration/gvisor_addon_test.go
+++ b/test/integration/gvisor_addon_test.go
@@ -50,18 +50,18 @@ func TestGvisorAddon(t *testing.T) {
 	startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("failed to start minikube: args %q: %v", rr.Args, err)
+		t.Fatalf("failed to start minikube: args %q: %v", rr.Command(), err)
 	}
 
 	// If it exists, include a locally built gvisor image
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", "gcr.io/k8s-minikube/gvisor-addon:2"))
 	if err != nil {
-		t.Logf("%s failed: %v (won't test local image)", rr.Args, err)
+		t.Logf("%s failed: %v (won't test local image)", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "enable", "gvisor"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
@@ -71,12 +71,12 @@ func TestGvisorAddon(t *testing.T) {
 	// Create an untrusted workload
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-untrusted.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 	// Create gvisor workload
 	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "replace", "--force", "-f", filepath.Join(*testdataDir, "nginx-gvisor.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", Minutes(4)); err != nil {
@@ -89,12 +89,12 @@ func TestGvisorAddon(t *testing.T) {
 	// Ensure that workloads survive a restart
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile))
 	if err != nil {
-		t.Fatalf("faild stopping minikube. args %q : %v", rr.Args, err)
+		t.Fatalf("faild stopping minikube. args %q : %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("failed starting minikube after a stop. args %q, %v", rr.Args, err)
+		t.Fatalf("failed starting minikube after a stop. args %q, %v", rr.Command(), err)
 	}
 	if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
 		t.Errorf("failed waiting for 'gvisor controller' pod : %v", err)
diff --git a/test/integration/none_test.go b/test/integration/none_test.go
index 873465d5ef..ed77814dee 100644
--- a/test/integration/none_test.go
+++ b/test/integration/none_test.go
@@ -46,22 +46,22 @@ func TestChangeNoneUser(t *testing.T) {
 	startArgs := append([]string{"CHANGE_MINIKUBE_NONE_USER=true", Target(), "start", "--wait=false"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, "/usr/bin/env", startArgs...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "delete"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, "/usr/bin/env", startArgs...))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "status"))
 	if err != nil {
-		t.Errorf("%s failed: %v", rr.Args, err)
+		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 
 	username := os.Getenv("SUDO_USER")
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 21ca1d57ed..dd106484c9 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -92,7 +92,7 @@ func TestStartStop(t *testing.T) {
 
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 				if err != nil {
-					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Args, err)
+					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Command(), err)
 				}
 
 				if !strings.Contains(tc.name, "cni") {
@@ -101,7 +101,7 @@ func TestStartStop(t *testing.T) {
 
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile, "--alsologtostderr", "-v=3"))
 				if err != nil {
-					t.Errorf("failed stopping minikube - first stop-. args %q : %v", rr.Args, err)
+					t.Errorf("failed stopping minikube - first stop-. args %q : %v", rr.Command(), err)
 				}
 
 				// The none driver never really stops
@@ -115,13 +115,13 @@ func TestStartStop(t *testing.T) {
 				// Enable an addon to assert it comes up afterwards
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "dashboard", "-p", profile))
 				if err != nil {
-					t.Errorf("failed to enable an addon post-stop. args %q: %v", rr.Args, err)
+					t.Errorf("failed to enable an addon post-stop. args %q: %v", rr.Command(), err)
 				}
 
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 				if err != nil {
 					// Explicit fatal so that failures don't move directly to deletion
-					t.Fatalf("failed to start minikube post-stop. args %q: %v", rr.Args, err)
+					t.Fatalf("failed to start minikube post-stop. args %q: %v", rr.Command(), err)
 				}
 
 				if strings.Contains(tc.name, "cni") {
@@ -150,7 +150,7 @@ func TestStartStop(t *testing.T) {
 					// Normally handled by cleanuprofile, but not fatal there
 					rr, err = Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile))
 					if err != nil {
-						t.Errorf("failed to clean up: args %q: %v", rr.Args, err)
+						t.Errorf("failed to clean up: args %q: %v", rr.Command(), err)
 					}
 
 					rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "config", "get-contexts", profile))
@@ -182,14 +182,14 @@ func TestStartStopWithPreload(t *testing.T) {
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	// Now, pull the busybox image into the VMs docker daemon
 	image := "busybox"
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "pull", image))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	// Restart minikube with v1.17.3, which has a preloaded tarball
@@ -199,11 +199,11 @@ func TestStartStopWithPreload(t *testing.T) {
 	startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 	if !strings.Contains(rr.Output(), image) {
 		t.Fatalf("Expected to find %s in output of `docker images`, instead got %s", image, rr.Output())
@@ -217,7 +217,7 @@ func testPodScheduling(ctx context.Context, t *testing.T, profile string) {
 	// schedule a pod to assert persistence
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "-f", filepath.Join(*testdataDir, "busybox.yaml")))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	// 8 minutes, because 4 is not enough for images to pull in all cases.
@@ -250,7 +250,7 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "sudo crictl images -o json"))
 	if err != nil {
-		t.Errorf("failed tp get images inside minikube. args %q: %v", rr.Args, err)
+		t.Errorf("failed tp get images inside minikube. args %q: %v", rr.Command(), err)
 	}
 	jv := map[string][]struct {
 		Tags []string `json:"repoTags"`
@@ -293,7 +293,7 @@ func testPause(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "pause", "-p", profile, "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	got := Status(ctx, t, Target(), profile, "APIServer")
@@ -308,7 +308,7 @@ func testPause(ctx context.Context, t *testing.T, profile string) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "unpause", "-p", profile, "--alsologtostderr", "-v=1"))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	got = Status(ctx, t, Target(), profile, "APIServer")
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index 20d131d5ef..2eb4eaabb6 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -82,7 +82,7 @@ func TestVersionUpgrade(t *testing.T) {
 
 	rr, err = Run(t, exec.CommandContext(ctx, tf.Name(), "stop", "-p", profile))
 	if err != nil {
-		t.Fatalf("%s failed: %v", rr.Args, err)
+		t.Fatalf("%s failed: %v", rr.Command(), err)
 	}
 
 	rr, err = Run(t, exec.CommandContext(ctx, tf.Name(), "-p", profile, "status", "--format={{.Host}}"))
@@ -97,7 +97,7 @@ func TestVersionUpgrade(t *testing.T) {
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("failed to start minikube HEAD with newest k8s version. args: %s : %v", rr.Args, err)
+		t.Errorf("failed to start minikube HEAD with newest k8s version. args: %s : %v", rr.Command(), err)
 	}
 
 	s, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "version", "--output=json"))
@@ -121,12 +121,12 @@ func TestVersionUpgrade(t *testing.T) {
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	if rr, err := Run(t, exec.CommandContext(ctx, tf.Name(), args...)); err == nil {
-		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Args)
+		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Command())
 	}
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("start and already started minikube failed. args: %q : %v", rr.Args, err)
+		t.Errorf("start and already started minikube failed. args: %q : %v", rr.Command(), err)
 	}
 }

From fffac252628281898b757119d3d88e0978c0deea Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 22:45:29 -0700
Subject: [PATCH 271/668] indent test outputs

---
 test/integration/helpers.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index bac683ea87..02298b3a8e 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -63,14 +63,26 @@ func (rr RunResult) Command() string {
 	return sb.String()
 }
 
+// indentLines indents every line in a bytes.Buffer and returns it as string
+func indentLines(b *bytes.Buffer) string {
+	scanner := bufio.NewScanner(b)
+	var lines string
+	for scanner.Scan() {
+		lines = lines + "\t" + scanner.Text() + "\n"
+	}
+	return lines
+}
+
 // Output returns human-readable output for an execution result
 func (rr RunResult) Output() string {
 	var sb strings.Builder
+
 	if rr.Stdout.Len() > 0 {
-		sb.WriteString(fmt.Sprintf("-- stdout --\n%s\n-- /stdout --", rr.Stdout.Bytes()))
+		sb.WriteString(fmt.Sprintf("-- stdout --\n%s\n-- /stdout --", indentLines(rr.Stdout)))
 	}
+
 	if rr.Stderr.Len() > 0 {
-		sb.WriteString(fmt.Sprintf("\n** stderr ** \n%s\n** /stderr **", rr.Stderr.Bytes()))
+		sb.WriteString(fmt.Sprintf("\n** stderr ** \n%s\n** /stderr **", indentLines(rr.Stderr)))
 	}
 	return sb.String()
 }

From 2ced39c74561b3e327e11263817e3b71010ca5fa Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 22:54:43 -0700
Subject: [PATCH 272/668] add \n for stdout too

---
 test/integration/helpers.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 02298b3a8e..8ac021862a 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -76,11 +76,9 @@ func indentLines(b *bytes.Buffer) string {
 // Output returns human-readable output for an execution result
 func (rr RunResult) Output() string {
 	var sb strings.Builder
-
 	if rr.Stdout.Len() > 0 {
-		sb.WriteString(fmt.Sprintf("-- stdout --\n%s\n-- /stdout --", indentLines(rr.Stdout)))
+		sb.WriteString(fmt.Sprintf("\n-- stdout --\n%s\n-- /stdout --", indentLines(rr.Stdout)))
 	}
-
 	if rr.Stderr.Len() > 0 {
 		sb.WriteString(fmt.Sprintf("\n** stderr ** \n%s\n** /stderr **", indentLines(rr.Stderr)))
 	}

From 0dc9c2af70f5df7024740ef515395ce41e4b6109 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 23:14:10 -0700
Subject: [PATCH 273/668] install kubectl on github action machines

---
 .github/workflows/main.yml | 48 +++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a0bd5b0aa..d5feef452d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -81,13 +81,26 @@ jobs:
       GOPOGH_RESULT: ""
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
-    steps:
+    steps:    
+    - name: Install kubectl
+      shell: bash
+      run: |
+        curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
+        sudo install kubectl /usr/local/bin/kubectl
     - name: Docker Info
       shell: bash
       run: |
-        docker info || true
+        echo "--------------------------"
         docker version || true
+        echo "--------------------------"
+        docker info || true
+        echo "--------------------------"
+        docker system df || true
+        echo "--------------------------"
+        docker system info || true
+        echo "--------------------------"
         docker ps || true
+        echo "--------------------------"
     - name: Install lz4
       shell: bash
       run: |
@@ -157,6 +170,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     needs: [build_minikube]
     steps:
+    - name: Install kubectl
+      shell: bash
+      run: |
+        curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
+        sudo install kubectl /usr/local/bin/kubectl
     - name: Install lz4
       shell: bash
       run: |
@@ -165,9 +183,17 @@ jobs:
     - name: Docker Info
       shell: bash
       run: |
-        docker info || true
+        echo "--------------------------"
         docker version || true
+        echo "--------------------------"
+        docker info || true
+        echo "--------------------------"
+        docker system df || true
+        echo "--------------------------"
+        docker system info || true
+        echo "--------------------------"
         docker ps || true
+        echo "--------------------------"
     - name: Install gopogh
       shell: bash
       run: |
@@ -232,6 +258,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
+    - name: Install kubectl
+      shell: bash
+      run: |
+        curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
+        sudo install kubectl /usr/local/bin/kubectl
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -304,6 +335,11 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
+    - name: Install kubectl
+      shell: bash
+      run: |
+        curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
+        sudo install kubectl /usr/local/bin/kubectl
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -376,11 +412,11 @@ jobs:
         SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
       runs-on: ubuntu-18.04
       steps:
-      - name: Install lz4
+      - name: Install kubectl
         shell: bash
         run: |
-          sudo apt-get update -qq
-          sudo apt-get -qq -y install liblz4-tool
+          curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
+          sudo install kubectl /usr/local/bin/kubectl
       - name: Install podman
         shell: bash
         run: |

From 9229b35da97211504477fb8356e07fdb36db200c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 23:34:05 -0700
Subject: [PATCH 274/668] print kubectl version to make sure it is installed

---
 .github/workflows/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d5feef452d..0fb9d83185 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,6 +87,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
+        kubectl version
     - name: Docker Info
       shell: bash
       run: |
@@ -175,6 +176,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
+        kubectl version
     - name: Install lz4
       shell: bash
       run: |
@@ -263,6 +265,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
+        kubectl version
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -340,6 +343,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
+        kubectl version
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -417,6 +421,7 @@ jobs:
         run: |
           curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
           sudo install kubectl /usr/local/bin/kubectl
+          kubectl version
       - name: Install podman
         shell: bash
         run: |

From d2a7b8b748d10bd1ea64670d7853804e3504b76f Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 25 Mar 2020 23:45:27 -0700
Subject: [PATCH 275/668] kubectl version

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0fb9d83185..1ce020cbbe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,7 +87,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
-        kubectl version
+        kubectl version --client=true
     - name: Docker Info
       shell: bash
       run: |
@@ -176,7 +176,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
-        kubectl version
+        kubectl version --client=true
     - name: Install lz4
       shell: bash
       run: |
@@ -265,7 +265,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
-        kubectl version
+        kubectl version --client=true
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -343,7 +343,7 @@ jobs:
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
         sudo install kubectl /usr/local/bin/kubectl
-        kubectl version
+        kubectl version --client=true
     # conntrack is required for kubernetes 1.18 and higher
     # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon
     - name: Install tools for none
@@ -421,7 +421,7 @@ jobs:
         run: |
           curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
           sudo install kubectl /usr/local/bin/kubectl
-          kubectl version
+          kubectl version --client=true
       - name: Install podman
         shell: bash
         run: |

From 1c8d5806825ecbaeeb752080fd89824450699815 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:14:07 -0700
Subject: [PATCH 276/668] add docs for docker driver

---
 .../en/docs/Reference/Drivers/docker.md       | 21 ++++--------
 .../en/docs/Reference/Drivers/hyperv.md       |  1 -
 .../Drivers/includes/check_baremetal.inc      |  7 ++++
 .../Drivers/includes/check_container.inc      |  9 ++++++
 .../includes/check_virtualization_linux.inc   | 11 +++++++
 .../includes/check_virtualization_windows.inc | 19 +++++++++++
 .../Drivers/includes/docker_usage.inc         | 16 ++++++++++
 .../content/en/docs/Reference/Drivers/kvm2.md |  5 +++
 site/content/en/docs/Start/linux.md           | 28 +++++++++-------
 site/content/en/docs/Start/macos.md           |  3 ++
 site/content/en/docs/Start/windows.md         | 32 ++++++-------------
 11 files changed, 102 insertions(+), 50 deletions(-)
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/check_container.inc
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/docker_usage.inc

diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index f44261fbad..2fcd751123 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -4,28 +4,19 @@ linkTitle: "docker"
 weight: 3
 date: 2020-02-05
 description: >
-  Docker driver (EXPERIMENTAL)
+  Docker driver 
 ---
 
 ## Overview
 
-The Docker driver is an experimental VM-free driver that ships with minikube v1.7.
+The Docker driver is a VM-free driver.
+
+{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
 
-This driver was inspired by the [kind project](https://kind.sigs.k8s.io/), and uses a modified version of its base image.
 
 ## Special features
 
-No hypervisor required when run on Linux.
+- Cross platform (linux, macos, windows)
+- No hypervisor required when run on Linux.
 
-## Limitations
 
-As an experimental driver, not all commands are supported on all platforms. Notably: `mount,` `service`, `tunnel`, and others. Most of these limitations will be addressed by minikube v1.8 (March 2020)
-
-## Issues
-
-* [Full list of open 'kic-driver' issues](https://github.com/kubernetes/minikube/labels/co%2Fkic-driver)
-
-## Troubleshooting
-
-* Run `minikube start --alsologtostderr -v=1` to debug crashes
-* If your docker is too slow on mac os try [Improving docker performance](https://docs.docker.com/docker-for-mac/osxfs-caching/)
diff --git a/site/content/en/docs/Reference/Drivers/hyperv.md b/site/content/en/docs/Reference/Drivers/hyperv.md
index 909f1e03f8..3595a2bb9d 100644
--- a/site/content/en/docs/Reference/Drivers/hyperv.md
+++ b/site/content/en/docs/Reference/Drivers/hyperv.md
@@ -7,7 +7,6 @@ date: 2018-08-05
 description: >
   Microsoft Hyper-V driver
 ---
-
 ## Overview
 
 Hyper-V is a native hypervisor built in to modern versions of Microsoft Windows.
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc b/site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc
new file mode 100644
index 0000000000..da6797ff8c
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc
@@ -0,0 +1,7 @@
+To use baremetal driver (none driver). verify that your operating system is Linux and also have 'systemd' installed.
+
+```shell
+pidof systemd && echo "yes" || echo "no"
+```
+If the above command outputs "no":
+Your system is not suitable for none driver.
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_container.inc b/site/content/en/docs/Reference/Drivers/includes/check_container.inc
new file mode 100644
index 0000000000..c189d8a2ac
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/check_container.inc
@@ -0,0 +1,9 @@
+To use container drivers, verify that your system has either have 'docker' or 'podman' installed.
+```shell
+docker version
+```
+or
+
+```shell
+podman version
+```
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc b/site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc
new file mode 100644
index 0000000000..3f60068016
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc
@@ -0,0 +1,11 @@
+To use VM drivers, verify that your system has virtualization support enabled:
+
+```shell
+egrep -q 'vmx|svm' /proc/cpuinfo && echo yes || echo no
+```
+
+If the above command outputs "no":
+
+- If you are running within a VM, your hypervisor does not allow nested virtualization. You will need to use the *None (bare-metal)* driver
+- If you are running on a physical machine, ensure that your BIOS has hardware virtualization enabled
+
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc b/site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc
new file mode 100644
index 0000000000..14812b61ec
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc
@@ -0,0 +1,19 @@
+To check if virtualization is supported, run the following command on your Windows terminal or command prompt.
+
+```shell
+systeminfo
+```
+If you see the following output, virtualization is supported:
+
+```shell
+Hyper-V Requirements:     VM Monitor Mode Extensions: Yes
+                          Virtualization Enabled In Firmware: Yes
+                          Second Level Address Translation: Yes
+                          Data Execution Prevention Available: Yes
+```
+
+If you see the following output, your system already has a Hypervisor installed and you can skip the next step.
+
+```shell
+Hyper-V Requirements:     A hypervisor has been detected.
+```
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Drivers/includes/docker_usage.inc b/site/content/en/docs/Reference/Drivers/includes/docker_usage.inc
new file mode 100644
index 0000000000..df96d517ec
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/docker_usage.inc
@@ -0,0 +1,16 @@
+## Install Docker
+
+- [Docker Desktop](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc)
+
+## Usage
+
+Start a cluster using the docker driver:
+
+```shell
+minikube start --driver=docker
+```
+To make docker the default driver:
+
+```shell
+minikube config set driver docker
+```
diff --git a/site/content/en/docs/Reference/Drivers/kvm2.md b/site/content/en/docs/Reference/Drivers/kvm2.md
index df13a3f95d..7e7c80a081 100644
--- a/site/content/en/docs/Reference/Drivers/kvm2.md
+++ b/site/content/en/docs/Reference/Drivers/kvm2.md
@@ -8,12 +8,17 @@ description: >
   Linux KVM (Kernel-based Virtual Machine) driver
 ---
 
+
 ## Overview
 
 [KVM (Kernel-based Virtual Machine)](https://www.linux-kvm.org/page/Main_Page) is a full virtualization solution for Linux on x86 hardware containing virtualization extensions. To work with KVM, minikube uses the [libvirt virtualization API](https://libvirt.org/)
 
 {{% readfile file="/docs/Reference/Drivers/includes/kvm2_usage.inc" %}}
 
+## Check virtualization support
+
+{{% readfile file="/docs/Reference/Drivers/includes/virtualization_check_linux.inc" %}}
+
 ## Special features
 
 The `minikube start` command supports 3 additional kvm specific flags:
diff --git a/site/content/en/docs/Start/linux.md b/site/content/en/docs/Start/linux.md
index b52b1690d8..8534cff5e2 100644
--- a/site/content/en/docs/Start/linux.md
+++ b/site/content/en/docs/Start/linux.md
@@ -39,28 +39,32 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< la
 {{% /tab %}}
 {{% /tabs %}}
 
-## Hypervisor Setup
-
-Verify that your system has virtualization support enabled:
-
-```shell
-egrep -q 'vmx|svm' /proc/cpuinfo && echo yes || echo no
-```
-
-If the above command outputs "no":
-
-- If you are running within a VM, your hypervisor does not allow nested virtualization. You will need to use the *None (bare-metal)* driver
-- If you are running on a physical machine, ensure that your BIOS has hardware virtualization enabled
+## Driver Setup
 
 {{% tabs %}}
+{{% tab "Docker" %}}
+## Check container support
+{{% readfile file="/docs/Reference/Drivers/includes/check_container.inc" %}}
+
+{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
 
 {{% tab "KVM" %}}
+## Check virtualization support
+{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
+
 {{% readfile file="/docs/Reference/Drivers/includes/kvm2_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VirtualBox" %}}
+## Check virtualization support
+{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
+
 {{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
 {{% /tab %}}
 {{% tab "None (bare-metal)" %}}
+## Check baremetal support
+{{% readfile file="/docs/Reference/Drivers/includes/check_baremetal_linux.inc" %}}
+
 If you are already running minikube from inside a VM, it is possible to skip the creation of an additional VM layer by using the `none` driver.
 
 {{% readfile file="/docs/Reference/Drivers/includes/none_usage.inc" %}}
diff --git a/site/content/en/docs/Start/macos.md b/site/content/en/docs/Start/macos.md
index 3c41e3a9b9..1051d8a1a1 100644
--- a/site/content/en/docs/Start/macos.md
+++ b/site/content/en/docs/Start/macos.md
@@ -50,6 +50,9 @@ brew upgrade minikube
 ## Hypervisor Setup
 
 {{% tabs %}}
+{{% tab "Docker" %}}
+{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
 {{% tab "Hyperkit" %}}
 {{% readfile file="/docs/Reference/Drivers/includes/hyperkit_usage.inc" %}}
 {{% /tab %}}
diff --git a/site/content/en/docs/Start/windows.md b/site/content/en/docs/Start/windows.md
index 02ff403f99..2fe1d79a5f 100644
--- a/site/content/en/docs/Start/windows.md
+++ b/site/content/en/docs/Start/windows.md
@@ -7,8 +7,6 @@ weight: 3
 ### Prerequisites
 
 * Windows 8 or above
-* A hypervisor, such as Hyper-V or VirtualBox
-* Hardware virtualization support must be enabled in BIOS
 * 4GB of RAM
 
 ### Installation
@@ -30,33 +28,23 @@ After it has installed, close the current CLI session and reopen it. minikube sh
 {{% /tab %}}
 {{% /tabs %}}
 
-## Hypervisor Setup
 
-To check if virtualization is supported, run the following command on your Windows terminal or command prompt.
-
-```shell
-systeminfo
-```
-If you see the following output, virtualization is supported:
-
-```shell
-Hyper-V Requirements:     VM Monitor Mode Extensions: Yes
-                          Virtualization Enabled In Firmware: Yes
-                          Second Level Address Translation: Yes
-                          Data Execution Prevention Available: Yes
-```
-
-If you see the following output, your system already has a Hypervisor installed and you can skip the next step.
-
-```shell
-Hyper-V Requirements:     A hypervisor has been detected.
-```
 
 {{% tabs %}}
+{{% tab "Docker" %}}
+{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
+
 {{% tab "Hyper-V" %}}
+## Check Hypervisor 
+{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_windows.inc" %}}
+
 {{% readfile file="/docs/Reference/Drivers/includes/hyperv_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VirtualBox" %}}
+## Check Hypervisor 
+{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_windows.inc" %}}
+
 {{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
 {{% /tab %}}
 {{% /tabs %}}

From 4f2d3de0552ca435d868f7aafbc15a3b37ae86dd Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:16:16 -0700
Subject: [PATCH 277/668] rename inc page

---
 .../includes/{check_baremetal.inc => check_baremetal_linux.inc}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename site/content/en/docs/Reference/Drivers/includes/{check_baremetal.inc => check_baremetal_linux.inc} (100%)

diff --git a/site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc b/site/content/en/docs/Reference/Drivers/includes/check_baremetal_linux.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/check_baremetal.inc
rename to site/content/en/docs/Reference/Drivers/includes/check_baremetal_linux.inc

From 6006e1416f49096ac859d9a64cc8a19b12b0908a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:17:52 -0700
Subject: [PATCH 278/668] rename broken link

---
 site/content/en/docs/Reference/Drivers/kvm2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/Reference/Drivers/kvm2.md b/site/content/en/docs/Reference/Drivers/kvm2.md
index 7e7c80a081..52102bb83e 100644
--- a/site/content/en/docs/Reference/Drivers/kvm2.md
+++ b/site/content/en/docs/Reference/Drivers/kvm2.md
@@ -17,7 +17,7 @@ description: >
 
 ## Check virtualization support
 
-{{% readfile file="/docs/Reference/Drivers/includes/virtualization_check_linux.inc" %}}
+{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
 
 ## Special features
 

From 7d9d62bef690f13cc4055f14c7c39952c0690283 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:21:30 -0700
Subject: [PATCH 279/668] fix the heading sizer

---
 .../docs/Reference/Drivers/includes/check_container.inc  | 9 ---------
 site/content/en/docs/Start/includes/post_install.inc     | 2 +-
 site/content/en/docs/Start/linux.md                      | 2 --
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 site/content/en/docs/Reference/Drivers/includes/check_container.inc

diff --git a/site/content/en/docs/Reference/Drivers/includes/check_container.inc b/site/content/en/docs/Reference/Drivers/includes/check_container.inc
deleted file mode 100644
index c189d8a2ac..0000000000
--- a/site/content/en/docs/Reference/Drivers/includes/check_container.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-To use container drivers, verify that your system has either have 'docker' or 'podman' installed.
-```shell
-docker version
-```
-or
-
-```shell
-podman version
-```
\ No newline at end of file
diff --git a/site/content/en/docs/Start/includes/post_install.inc b/site/content/en/docs/Start/includes/post_install.inc
index 5f28d307cf..595eda57d8 100644
--- a/site/content/en/docs/Start/includes/post_install.inc
+++ b/site/content/en/docs/Start/includes/post_install.inc
@@ -1,4 +1,4 @@
-### Getting to know Kubernetes
+## Getting to know Kubernetes
 
 Once started, you can use any regular Kubernetes command to interact with your minikube cluster. For example, you can see the pod states by running:
 
diff --git a/site/content/en/docs/Start/linux.md b/site/content/en/docs/Start/linux.md
index 8534cff5e2..454c7c4fe5 100644
--- a/site/content/en/docs/Start/linux.md
+++ b/site/content/en/docs/Start/linux.md
@@ -44,8 +44,6 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< la
 {{% tabs %}}
 {{% tab "Docker" %}}
 ## Check container support
-{{% readfile file="/docs/Reference/Drivers/includes/check_container.inc" %}}
-
 {{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
 {{% /tab %}}
 

From 6654d4e033fbfa357a2b66622d2d46fb9293e531 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:27:23 -0700
Subject: [PATCH 280/668] update docs about memory auto select

---
 site/content/en/docs/Start/includes/post_install.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/content/en/docs/Start/includes/post_install.inc b/site/content/en/docs/Start/includes/post_install.inc
index 595eda57d8..03ed41bb61 100644
--- a/site/content/en/docs/Start/includes/post_install.inc
+++ b/site/content/en/docs/Start/includes/post_install.inc
@@ -6,16 +6,16 @@ Once started, you can use any regular Kubernetes command to interact with your m
  kubectl get po -A
 ```
 
-### Increasing memory allocation
+## Increasing memory allocation
 
-minikube only allocates 2GB of RAM by default, which is only enough for trivial deployments. For larger 
+minikube auto-selects the memory size based on your system up to 6000mb. For larger 
 deployments, increase the memory allocation using the `--memory` flag, or make the setting persistent using:
 
 ```shell
-minikube config set memory 4096
+minikube config set memory 8096
 ```
 
-### Where to go next?
+## Where to go next?
 
 Visit the [examples](/docs/examples) page to get an idea of what you can do with minikube.
 

From 844e1a083dfdf387fb05d829e5b95aaf9419df38 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:41:20 -0700
Subject: [PATCH 281/668] add podman driver docs

---
 .../en/docs/Reference/Drivers/docker.md       |  3 +--
 .../Drivers/includes/podman_usage.inc         | 16 ++++++++++++
 .../en/docs/Reference/Drivers/podman.md       | 26 +++++++++++++++++++
 site/content/en/docs/Start/linux.md           |  5 ++++
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
 create mode 100644 site/content/en/docs/Reference/Drivers/podman.md

diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index 2fcd751123..17f3782504 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -9,13 +9,12 @@ description: >
 
 ## Overview
 
-The Docker driver is a VM-free driver.
+The Docker driver is the newest minikube driver, which runs kubernetes in container with full feature parity with VM minikube.
 
 {{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
 
 
 ## Special features
-
 - Cross platform (linux, macos, windows)
 - No hypervisor required when run on Linux.
 
diff --git a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
new file mode 100644
index 0000000000..9327e9d901
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
@@ -0,0 +1,16 @@
+## Install Podman
+
+- [Podman](https://podman.io/getting-started/installation.html)
+
+## Usage
+
+Start a cluster using the docker driver:
+
+```shell
+minikube start --driver=podman
+```
+To make docker the default driver:
+
+```shell
+minikube config set driver podman
+```
diff --git a/site/content/en/docs/Reference/Drivers/podman.md b/site/content/en/docs/Reference/Drivers/podman.md
new file mode 100644
index 0000000000..7ef9657c1d
--- /dev/null
+++ b/site/content/en/docs/Reference/Drivers/podman.md
@@ -0,0 +1,26 @@
+---
+title: "podman"
+linkTitle: "podman"
+weight: 3
+date: 2020-03-26
+description: >
+  Podman driver 
+---
+
+## Overview
+
+The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](docs/reference/drivers/docker) driver.
+podman driver is currently experimental. 
+and only supported on Linux and MacOs (with a remote podman server)
+
+
+## try with CRI-O run time.
+```shell
+minikube start --driver=podman --container-runtime=cri-o
+```
+
+
+{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+
+
+
diff --git a/site/content/en/docs/Start/linux.md b/site/content/en/docs/Start/linux.md
index 454c7c4fe5..1e4fd4a9b1 100644
--- a/site/content/en/docs/Start/linux.md
+++ b/site/content/en/docs/Start/linux.md
@@ -67,6 +67,11 @@ If you are already running minikube from inside a VM, it is possible to skip the
 
 {{% readfile file="/docs/Reference/Drivers/includes/none_usage.inc" %}}
 {{% /tab %}}
+{{% tab "Podman (experimental)" %}}
+{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+{{% /tab %}}
+
+
 {{% /tabs %}}
 
 {{% readfile file="/docs/Start/includes/post_install.inc" %}}

From 2635b4b0d759fc2cf24cfd1e0915b776da677780 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:44:48 -0700
Subject: [PATCH 282/668] fix wording

---
 site/content/en/docs/Reference/Drivers/docker.md             | 2 +-
 .../en/docs/Reference/Drivers/includes/podman_usage.inc      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index 17f3782504..afd0a970b7 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -9,7 +9,7 @@ description: >
 
 ## Overview
 
-The Docker driver is the newest minikube driver, which runs kubernetes in container with full feature parity with VM minikube.
+The Docker driver is the newest minikube driver. which runs kubernetes in container VM-free ! with full feature parity with minikube in VM.
 
 {{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
 
diff --git a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
index 9327e9d901..76720f262a 100644
--- a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
+++ b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
@@ -1,3 +1,8 @@
+## experimental
+
+This is an experimental driver. please use it only for experimental reasons.
+for a better kubernetes in container experience, use docker [driver](https://5e7c6ab90d754e000860cdfd--kubernetes-sigs-minikube.netlify.com/docs/reference/drivers/docker/).
+
 ## Install Podman
 
 - [Podman](https://podman.io/getting-started/installation.html)

From b7742190ab45a94204f90a7f95e1722d3ff64662 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 01:46:56 -0700
Subject: [PATCH 283/668] podman wording

---
 site/content/en/docs/Reference/Drivers/podman.md | 2 +-
 site/content/en/docs/Start/macos.md              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/Reference/Drivers/podman.md b/site/content/en/docs/Reference/Drivers/podman.md
index 7ef9657c1d..2b83cf3ea6 100644
--- a/site/content/en/docs/Reference/Drivers/podman.md
+++ b/site/content/en/docs/Reference/Drivers/podman.md
@@ -14,7 +14,7 @@ podman driver is currently experimental.
 and only supported on Linux and MacOs (with a remote podman server)
 
 
-## try with CRI-O run time.
+## Try it with CRI-O container runtime.
 ```shell
 minikube start --driver=podman --container-runtime=cri-o
 ```
diff --git a/site/content/en/docs/Start/macos.md b/site/content/en/docs/Start/macos.md
index 1051d8a1a1..b23a81cf13 100644
--- a/site/content/en/docs/Start/macos.md
+++ b/site/content/en/docs/Start/macos.md
@@ -65,6 +65,9 @@ brew upgrade minikube
 {{% tab "VMware" %}}
 {{% readfile file="/docs/Reference/Drivers/includes/vmware_macos_usage.inc" %}}
 {{% /tab %}}
+{{% tab "Podman (experimental)" %}}
+{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+{{% /tab %}}
 
 {{% /tabs %}}
 

From 26bdbfe11de823abb7c5c7da3d2aefc3aadf2ff5 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 02:01:57 -0700
Subject: [PATCH 284/668] update references to docker podman

---
 site/content/en/_index.html                               | 8 +++++---
 site/content/en/docs/Contributing/triage.md               | 1 +
 .../en/docs/Reference/Drivers/includes/podman_usage.inc   | 2 +-
 site/content/en/docs/Reference/Drivers/podman.md          | 2 +-
 site/content/en/docs/Reference/disk_cache.md              | 2 +-
 site/content/en/docs/Reference/persistent_volumes.md      | 2 +-
 site/content/en/docs/Tutorials/continuous_integration.md  | 8 ++++++--
 site/content/en/docs/Tutorials/nvidia_gpu.md              | 2 +-
 .../en/docs/Tutorials/untrusted_root_certificate.md       | 6 +++---
 9 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/site/content/en/_index.html b/site/content/en/_index.html
index 8687b84c25..05ade99efe 100644
--- a/site/content/en/_index.html
+++ b/site/content/en/_index.html
@@ -83,12 +83,14 @@ A single command away from reproducing your production environment, from the com
 {{% /blocks/feature %}}
 
 {{% blocks/feature icon="fa-thumbs-up" title="Cross-platform" %}}
-- Bare-metal
-- HyperKit
-- Hyper-V
 - KVM
+- Docker
+- HyperKit
+- Bare-metal
 - VirtualBox
+- Hyper-V
 - VMware
+- Podman
 {{% /blocks/feature %}}
 {{< /blocks/section >}}
 
diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md
index 318312107b..93b3c403e5 100644
--- a/site/content/en/docs/Contributing/triage.md
+++ b/site/content/en/docs/Contributing/triage.md
@@ -62,6 +62,7 @@ If the issue is specific to an operating system, hypervisor, container, addon, o
   - `co/kvm2`
   - `co/none-driver`
   - `co/docker-driver`
+  - `co/podman-driver`
   - `co/virtualbox`
 
 **co/[kubernetes component]**  - When the issue appears specific to a k8s component
diff --git a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
index 76720f262a..9962043165 100644
--- a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
+++ b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
@@ -1,7 +1,7 @@
 ## experimental
 
 This is an experimental driver. please use it only for experimental reasons.
-for a better kubernetes in container experience, use docker [driver](https://5e7c6ab90d754e000860cdfd--kubernetes-sigs-minikube.netlify.com/docs/reference/drivers/docker/).
+for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/docs/reference/drivers/docker).
 
 ## Install Podman
 
diff --git a/site/content/en/docs/Reference/Drivers/podman.md b/site/content/en/docs/Reference/Drivers/podman.md
index 2b83cf3ea6..17425b1e58 100644
--- a/site/content/en/docs/Reference/Drivers/podman.md
+++ b/site/content/en/docs/Reference/Drivers/podman.md
@@ -9,7 +9,7 @@ description: >
 
 ## Overview
 
-The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](docs/reference/drivers/docker) driver.
+The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker/) driver.
 podman driver is currently experimental. 
 and only supported on Linux and MacOs (with a remote podman server)
 
diff --git a/site/content/en/docs/Reference/disk_cache.md b/site/content/en/docs/Reference/disk_cache.md
index 84d43112ef..24590727d5 100644
--- a/site/content/en/docs/Reference/disk_cache.md
+++ b/site/content/en/docs/Reference/disk_cache.md
@@ -4,7 +4,7 @@ linkTitle: "Disk cache"
 weight: 6
 date: 2019-08-01
 description: >
-  Cache Rules Everything Around Minikube
+  Cache Rules Everything Around minikube
 ---
 
 minikube has built-in support for caching downloaded resources into `$MINIKUBE_HOME/cache`. Here are the important file locations:
diff --git a/site/content/en/docs/Reference/persistent_volumes.md b/site/content/en/docs/Reference/persistent_volumes.md
index 6b7a38b83b..02e90bc703 100644
--- a/site/content/en/docs/Reference/persistent_volumes.md
+++ b/site/content/en/docs/Reference/persistent_volumes.md
@@ -7,7 +7,7 @@ description: >
   About persistent volumes (hostPath)
 ---
 
-minikube supports [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) of type `hostPath` out of the box.  These PersistentVolumes are mapped to a directory inside the running Minikube instance (usually a VM, unless you use `--driver=none`, `--driver=docker`, or `--driver=podman`).  For more information on how this works, read the Dynamic Provisioning section below.
+minikube supports [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) of type `hostPath` out of the box.  These PersistentVolumes are mapped to a directory inside the running minikube instance (usually a VM, unless you use `--driver=none`, `--driver=docker`, or `--driver=podman`).  For more information on how this works, read the Dynamic Provisioning section below.
 
 ## A note on mounts, persistence, and minikube hosts
 
diff --git a/site/content/en/docs/Tutorials/continuous_integration.md b/site/content/en/docs/Tutorials/continuous_integration.md
index 4dad6cc9ed..1a55a58150 100644
--- a/site/content/en/docs/Tutorials/continuous_integration.md
+++ b/site/content/en/docs/Tutorials/continuous_integration.md
@@ -9,13 +9,13 @@ description: >
 
 ## Overview
 
-Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case.
+Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. or you could alternatively use the [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker).
 
 ## Prerequisites
 
 - VM running a systemd based Linux distribution
 
-## Tutorial
+## using none driver
 
  Here is an example, that runs minikube from a non-root user, and ensures that the latest stable kubectl is installed:
 
@@ -39,3 +39,7 @@ touch $KUBECONFIG
 
 sudo -E minikube start --driver=none
 ```
+
+##  Alternative ways
+
+you could alternatively use minikube's container drivers such as [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker) or [Podman](https://minikube.sigs.k8s.io/docs/reference/drivers/podman).
\ No newline at end of file
diff --git a/site/content/en/docs/Tutorials/nvidia_gpu.md b/site/content/en/docs/Tutorials/nvidia_gpu.md
index 68846ae15b..4e9f561490 100644
--- a/site/content/en/docs/Tutorials/nvidia_gpu.md
+++ b/site/content/en/docs/Tutorials/nvidia_gpu.md
@@ -98,7 +98,7 @@ to expose GPUs with `--driver=kvm2`. Please don't mix these instructions.
 
 ## Why does minikube not support NVIDIA GPUs on macOS?
 
-VM drivers supported by minikube for macOS doesn't support GPU passthrough:
+drivers supported by minikube for macOS doesn't support GPU passthrough:
 
 - [mist64/xhyve#108](https://github.com/mist64/xhyve/issues/108)
 - [moby/hyperkit#159](https://github.com/moby/hyperkit/issues/159)
diff --git a/site/content/en/docs/Tutorials/untrusted_root_certificate.md b/site/content/en/docs/Tutorials/untrusted_root_certificate.md
index 77093d76f3..d1b857aa73 100644
--- a/site/content/en/docs/Tutorials/untrusted_root_certificate.md
+++ b/site/content/en/docs/Tutorials/untrusted_root_certificate.md
@@ -11,7 +11,7 @@ description: >
 
 Most organizations deploy their own Root Certificate and CA service inside the corporate networks.
 Internal websites, image repositories and other resources may install SSL server certificates issued by this CA service for security and privacy concerns.
-You may install the Root Certificate into the minikube VM to access these corporate resources within the cluster.
+You may install the Root Certificate into the minikube cluster to access these corporate resources within the cluster.
 
 ## Prerequisites
 
@@ -26,13 +26,13 @@ You may install the Root Certificate into the minikube VM to access these corpor
 openssl x509 -inform der -in my_company.cer -out my_company.pem
 ```
 
-* You may need to delete existing minikube VM
+* You may need to delete existing minikube cluster
 
 ```shell
 minikube delete
 ```
 
-* Copy the certificate before creating the minikube VM
+* Copy the certificate before creating the minikube cluster
 
 ```shell
 mkdir -p $HOME/.minikube/certs

From 132d1459eb6de47e72a6f60bc95b443f9b2636d9 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 02:09:09 -0700
Subject: [PATCH 285/668] try local search for the site

---
 site/config.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/config.toml b/site/config.toml
index 091e83fe83..23f8db88b6 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -112,7 +112,10 @@ github_project_repo = ""
 github_subdir = "site"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
-gcs_engine_id = "005331096405080631692:s7c4yfpw9sy"
+# gcs_engine_id = "005331096405080631692:s7c4yfpw9sy"
+
+# enabling local search https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
+offlineSearch = true
 
 # User interface configuration
 [params.ui]

From 78c8d0245cb8c5a6dcea389f9bb3c88468e67736 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 02:45:01 -0700
Subject: [PATCH 286/668] update docsy theme submodule

---
 site/themes/docsy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/themes/docsy b/site/themes/docsy
index 493bb1a0af..3123298f5b 160000
--- a/site/themes/docsy
+++ b/site/themes/docsy
@@ -1 +1 @@
-Subproject commit 493bb1a0af92d1242f8396aeb1661dcd3a010db7
+Subproject commit 3123298f5b0f56b3315b55319e17a8fa6c9d98f9

From 7e799c6be34eb434fc17e6de7fed4732b0d1275b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 26 Mar 2020 03:00:56 -0700
Subject: [PATCH 287/668] add comment to Makefile for updating docsy

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f7b45a07ed..43bb6b9cf2 100755
--- a/Makefile
+++ b/Makefile
@@ -625,7 +625,7 @@ release-kvm-driver: install-kvm-driver checksum  ## Release KVM Driver
 	gsutil cp $(GOBIN)/docker-machine-driver-kvm2 gs://minikube/drivers/kvm/$(VERSION)/
 	gsutil cp $(GOBIN)/docker-machine-driver-kvm2.sha256 gs://minikube/drivers/kvm/$(VERSION)/
 
-site/themes/docsy/assets/vendor/bootstrap/package.js:
+site/themes/docsy/assets/vendor/bootstrap/package.js: ## update the website docsy theme git submodule 
 	git submodule update -f --init --recursive
 
 out/hugo/hugo:

From c73d4ca32b26facb62f7dee27630dc376ea86ced Mon Sep 17 00:00:00 2001
From: Yang Keao <keao.yang@yahoo.com>
Date: Thu, 26 Mar 2020 18:51:25 +0800
Subject: [PATCH 288/668] add TBF and IPSET filter to kernel config

Signed-off-by: Yang Keao <keao.yang@yahoo.com>
---
 .../iso/minikube-iso/board/coreos/minikube/linux_defconfig   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
index ebf694f191..a766017e78 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
@@ -1,4 +1,5 @@
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZ4=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_AUDIT=y
@@ -25,10 +26,10 @@ CONFIG_CPUSETS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BPF_SYSCALL=y
-CONFIG_CGROUP_BPF=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_SMP=y
@@ -270,12 +271,14 @@ CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BRIDGE=m
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_TBF=y
 CONFIG_NET_SCH_NETEM=y
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=m
 CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_IPSET=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_BPF=m

From cd3283d5c8d0777d91a01c6bcd2c9f4cbdc398c2 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 08:18:08 -0500
Subject: [PATCH 289/668] give some love to actions

---
 .github/workflows/main.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a36dfb1a19..8d6a7f8b82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,15 +211,21 @@ jobs:
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
-  docker_windows_NT:
+  docker_windows_shell:
     needs: [build_minikube]
     env:
       TIME_ELAPSED: time
-      JOB_NAME: "Docker_windows_NT"
+      JOB_NAME: "Docker_windows_shell"
       COMMIT_STATUS: ""
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Docker Info
+      shell: bash
+      run: |
+        docker info || true
+        docker version || true
+        docker ps || true
     - name: Download gopogh
       run: |
         curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe
@@ -235,7 +241,7 @@ jobs:
         mkdir -p report
         mkdir -p testhome
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
         min=$((${TIME_ELAPSED}/60))
@@ -256,7 +262,7 @@ jobs:
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
-        name: docker_windows_NT
+        name: docker_windows_shell
         path: report
     - name: The End Result
       run: |
@@ -265,6 +271,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "--------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
       shell: bash
   none_ubuntu16_04:

From 1520b592768096fb620e20fce7ba8c97275a8e93 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 08:19:48 -0500
Subject: [PATCH 290/668] update stage name

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8d6a7f8b82..31be5e710c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -499,15 +499,15 @@ jobs:
       run: |
         mkdir -p all_reports
         cp -r docker_ubuntu_18_04 ./all_reports/
-    - name: download results docker_windows_NT
+    - name: download results docker_windows_shell
       uses: actions/download-artifact@v1
       with:
-        name: docker_windows_NT
+        name: docker_windows_shell
     - name: cp to all_report
       shell: bash
       run: |
         mkdir -p all_reports
-        cp -r docker_windows_NT ./all_reports/
+        cp -r docker_windows_shell ./all_reports/
     - name: Download Results none_ubuntu16_04
       uses: actions/download-artifact@v1
       with:

From 3adfa8304c945773e91b07a249930743e3a29c60 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 06:30:20 -0700
Subject: [PATCH 291/668] Turn log message back into comment

---
 pkg/minikube/machine/fix.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 05cbb8eec5..9a96df2afb 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -77,8 +77,8 @@ func fixHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.
 		return h, err
 	}
 
+	// Avoid reprovisioning "none" driver because provision.Detect requires SSH
 	if !driver.BareMetal(h.Driver.DriverName()) {
-		glog.Infof("%s is local, skipping re-provision as it requires SSH", driverName)
 		e := engineOptions(cc)
 		h.HostOptions.EngineOptions.Env = e.Env
 		err = provisionDockerMachine(h)

From 42a28d014e5167b9ce453a08b4038ecdb4986517 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 08:32:59 -0500
Subject: [PATCH 292/668] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 31be5e710c..c6bf2a4574 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -241,7 +241,7 @@ jobs:
         mkdir -p report
         mkdir -p testhome
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=docker -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
         min=$((${TIME_ELAPSED}/60))

From 4f1ae0cd4fe50e5ffb924ece8b1b1947966c3c8f Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 08:47:00 -0500
Subject: [PATCH 293/668] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c6bf2a4574..4eb9b9706a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -241,7 +241,7 @@ jobs:
         mkdir -p report
         mkdir -p testhome
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=docker -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
         min=$((${TIME_ELAPSED}/60))

From d2c71b5363bc02b37f1e89ddc6f78a35e0d40512 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 08:11:39 -0700
Subject: [PATCH 294/668] Fix testing regression which broke stdout reads

---
 test/integration/helpers.go              | 8 ++++----
 test/integration/version_upgrade_test.go | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 8ac021862a..89eef10dc2 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -64,8 +64,8 @@ func (rr RunResult) Command() string {
 }
 
 // indentLines indents every line in a bytes.Buffer and returns it as string
-func indentLines(b *bytes.Buffer) string {
-	scanner := bufio.NewScanner(b)
+func indentLines(b []byte) string {
+	scanner := bufio.NewScanner(bytes.NewReader(b))
 	var lines string
 	for scanner.Scan() {
 		lines = lines + "\t" + scanner.Text() + "\n"
@@ -77,10 +77,10 @@ func indentLines(b *bytes.Buffer) string {
 func (rr RunResult) Output() string {
 	var sb strings.Builder
 	if rr.Stdout.Len() > 0 {
-		sb.WriteString(fmt.Sprintf("\n-- stdout --\n%s\n-- /stdout --", indentLines(rr.Stdout)))
+		sb.WriteString(fmt.Sprintf("\n-- stdout --\n%s\n-- /stdout --", indentLines(rr.Stdout.Bytes())))
 	}
 	if rr.Stderr.Len() > 0 {
-		sb.WriteString(fmt.Sprintf("\n** stderr ** \n%s\n** /stderr **", indentLines(rr.Stderr)))
+		sb.WriteString(fmt.Sprintf("\n** stderr ** \n%s\n** /stderr **", indentLines(rr.Stderr.Bytes())))
 	}
 	return sb.String()
 }
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index 2eb4eaabb6..fa6a4d4653 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -89,9 +89,10 @@ func TestVersionUpgrade(t *testing.T) {
 	if err != nil {
 		t.Logf("status error: %v (may be ok)", err)
 	}
+
 	got := strings.TrimSpace(rr.Stdout.String())
 	if got != state.Stopped.String() {
-		t.Errorf("status = %q; want = %q", got, state.Stopped.String())
+		t.Errorf("FAILED: status = %q; want = %q", got, state.Stopped.String())
 	}
 
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
@@ -119,14 +120,16 @@ func TestVersionUpgrade(t *testing.T) {
 		t.Fatalf("expected server version %s is not the same with latest version %s", cv.ServerVersion.GitVersion, constants.NewestKubernetesVersion)
 	}
 
+	t.Logf("Attempting to downgrade Kubernetes (should fail)")
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	if rr, err := Run(t, exec.CommandContext(ctx, tf.Name(), args...)); err == nil {
 		t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Command())
 	}
 
+	t.Logf("Attempting restart after unsuccessful downgrade")
 	args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
-		t.Errorf("start and already started minikube failed. args: %q : %v", rr.Command(), err)
+		t.Errorf("start after failed upgrade: %v", err)
 	}
 }

From daffae3793b51921b8c74958a48c6446d1e7856b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 09:07:14 -0700
Subject: [PATCH 295/668] Wait for control-plane to upgrade before proceeding

---
 .../bootstrapper/bsutil/kverify/kverify.go    | 35 ++++++++++-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  | 63 ++++++++++++++++---
 2 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 39cd1ea169..04156f2e13 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -30,9 +30,11 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
@@ -61,6 +63,7 @@ func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 		if _, ierr := apiServerPID(cr); ierr != nil {
 			return false, nil
 		}
+
 		return true, nil
 	})
 	if err != nil {
@@ -180,7 +183,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 }
 
 // WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, ip string, port int, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
 
@@ -208,7 +211,35 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
 		return fmt.Errorf("apiserver healthz never reported healthy")
 	}
-	glog.Infof("duration metric: took %s to wait for apiserver healthz status ...", time.Since(hStart))
+
+	vcheck := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during version check")
+		}
+		if err := APIServerVersionMatch(client, cfg.KubernetesConfig.KubernetesVersion); err != nil {
+			glog.Warningf("api server version match failed: %v", err)
+			return false, nil
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, vcheck); err != nil {
+		return fmt.Errorf("controlPlane never updated to %s", cfg.KubernetesConfig.KubernetesVersion)
+	}
+
+	glog.Infof("duration metric: took %s to wait for apiserver health ...", time.Since(hStart))
+	return nil
+}
+
+func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
+	vi, err := client.ServerVersion()
+	if err != nil {
+		return errors.Wrap(err, "server version")
+	}
+	glog.Infof("control plane version: %s", vi)
+	if version.CompareKubeAwareVersionStrings(vi.String(), expected) != 0 {
+		return fmt.Errorf("controlPane = %q, expected: %q", vi.String(), expected)
+	}
 	return nil
 }
 
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 4ccc402698..ea2c15f6f2 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -56,6 +56,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
+	"k8s.io/minikube/pkg/util/retry"
 	"k8s.io/minikube/pkg/version"
 )
 
@@ -251,6 +252,27 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 	return nil
 }
 
+// unpause unpauses any Kubernetes backplane components
+func (k *Bootstrapper) unpause(cfg config.ClusterConfig) error {
+
+	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
+	if err != nil {
+		return err
+	}
+
+	ids, err := cr.ListContainers(cruntime.ListOptions{State: cruntime.Paused, Namespaces: []string{"kube-system"}})
+	if err != nil {
+		return errors.Wrap(err, "list paused")
+	}
+
+	if len(ids) > 0 {
+		if err := cr.UnpauseContainers(ids); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // StartCluster starts the cluster
 func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	start := time.Now()
@@ -259,6 +281,11 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		glog.Infof("StartCluster complete in %s", time.Since(start))
 	}()
 
+	// Before we start, ensure that no paused components are lurking around
+	if err := k.unpause(cfg); err != nil {
+		glog.Warningf("unpause failed: %v", err)
+	}
+
 	if err := bsutil.ExistingConfig(k.c); err == nil {
 		glog.Infof("found existing configuration files, will attempt cluster restart")
 		rerr := k.restartCluster(cfg)
@@ -349,23 +376,23 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return err
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, start, ip, port, timeout); err != nil {
-		return err
-	}
-
-	c, err := k.client(ip, port)
+	client, err := k.client(ip, port)
 	if err != nil {
 		return errors.Wrap(err, "get k8s client")
 	}
 
-	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, c, start, timeout); err != nil {
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, ip, port, timeout); err != nil {
+		return err
+	}
+
+	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
 		return errors.Wrap(err, "waiting for system pods")
 	}
 	return nil
 }
 
 // needsReset returns whether or not the cluster needs to be reconfigured
-func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kubernetes.Clientset) bool {
+func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kubernetes.Clientset, version string) bool {
 	if rr, err := k.c.RunCmd(exec.Command("sudo", "diff", "-u", conf, conf+".new")); err != nil {
 		glog.Infof("needs reset: configs differ:\n%s", rr.Output())
 		return true
@@ -386,6 +413,12 @@ func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kube
 		glog.Infof("needs reset: %v", err)
 		return true
 	}
+
+	if err := kverify.APIServerVersionMatch(client, version); err != nil {
+		glog.Infof("needs reset: %v", err)
+		return true
+	}
+
 	return false
 }
 
@@ -426,7 +459,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 
 	// If the cluster is running, check if we have any work to do.
 	conf := bsutil.KubeadmYamlPath
-	if !k.needsReset(conf, ip, port, client) {
+	if !k.needsReset(conf, ip, port, client, cfg.KubernetesConfig.KubernetesVersion) {
 		glog.Infof("Taking a shortcut, as the cluster seems to be properly configured")
 		return nil
 	}
@@ -466,12 +499,22 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, time.Now(), ip, port, kconst.DefaultControlPlaneTimeout); err != nil {
+		return errors.Wrap(err, "apiserver health")
+	}
+
 	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "system pods")
 	}
 
-	if rr, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, conf))); err != nil {
-		return errors.Wrapf(err, fmt.Sprintf("addon phase cmd:%q", rr.Command()))
+	// This can fail during upgrades if the old pods have not shut down yet
+	addonPhase := func() error {
+		_, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, conf)))
+		return err
+	}
+	if err = retry.Expo(addonPhase, 1*time.Second, 30*time.Second); err != nil {
+		glog.Warningf("addon install failed, wil retry: %v", err)
+		return errors.Wrap(err, "addons")
 	}
 
 	if err := bsutil.AdjustResourceLimits(k.c); err != nil {

From 974d45dfd31722df88f3e3a2ced80f0a4c1f76fd Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 26 Mar 2020 10:01:55 -0700
Subject: [PATCH 296/668] make http error test fatal to avoid nil pointer

---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index a5ee68aa73..6623f1f362 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -335,7 +335,7 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 
 	resp, err := retryablehttp.Get(u.String())
 	if err != nil {
-		t.Errorf("failed to http get %q : %v", u.String(), err)
+		t.Fatalf("failed to http get %q : %v", u.String(), err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		body, err := ioutil.ReadAll(resp.Body)

From efbe113a94fb37d880aaee006ee729c7b6ac4896 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:13:26 -0700
Subject: [PATCH 297/668] Add more logging to preload

---
 hack/preload-images/upload.go    | 4 ++--
 pkg/minikube/download/preload.go | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go
index a2181294e6..b903f3cc11 100644
--- a/hack/preload-images/upload.go
+++ b/hack/preload-images/upload.go
@@ -30,13 +30,13 @@ func uploadTarball(tarballFilename string) error {
 	hostPath := path.Join("out/", tarballFilename)
 	gcsDest := fmt.Sprintf("gs://%s", download.PreloadBucket)
 	cmd := exec.Command("gsutil", "cp", hostPath, gcsDest)
-	if output, err := cmd.Output(); err != nil {
+	if output, err := cmd.CombinedOutput(); err != nil {
 		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
 	}
 	// Make tarball public to all users
 	gcsPath := fmt.Sprintf("%s/%s", gcsDest, tarballFilename)
 	cmd = exec.Command("gsutil", "acl", "ch", "-u", "AllUsers:R", gcsPath)
-	if output, err := cmd.Output(); err != nil {
+	if output, err := cmd.CombinedOutput(); err != nil {
 		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
 	}
 	return nil
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 44b2f81749..dc834fb7f0 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -77,6 +77,7 @@ func remoteTarballURL(k8sVersion string) string {
 
 // PreloadExists returns true if there is a preloaded tarball that can be used
 func PreloadExists(k8sVersion, containerRuntime string) bool {
+	glog.Infof("Checking if preload exists for k8s version %s and runtime %s", k8sVersion, containerRuntime)
 	if !viper.GetBool("preload") {
 		return false
 	}
@@ -85,6 +86,7 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 	// and https://github.com/kubernetes/minikube/issues/6934
 	// to track status of adding containerd & crio
 	if containerRuntime != "docker" {
+		glog.Info("Container runtime isn't docker, skipping preload")
 		return false
 	}
 

From 27685523611e514429d2c26f1c5d93871e1a700b Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:23:30 -0700
Subject: [PATCH 298/668] Use download.TarballExists to make sure tarball is
 publicly accessible in script generator

---
 hack/preload-images/preload_images.go | 9 +--------
 hack/preload-images/upload.go         | 7 +++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 60b6bc9e2a..948918d8f9 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -62,7 +62,7 @@ func main() {
 	for _, kv := range k8sVersions {
 		for _, cr := range containerRuntimes {
 			tf := download.TarballName(kv)
-			if tarballExists(tf) {
+			if download.PreloadExists(kv, cr) {
 				fmt.Printf("A preloaded tarball for k8s version %s already exists, skipping generation.\n", kv)
 				continue
 			}
@@ -77,13 +77,6 @@ func main() {
 	}
 }
 
-func tarballExists(tarballFilename string) bool {
-	fmt.Println("Checking if tarball already exists...")
-	gcsPath := fmt.Sprintf("gs://%s/%s", download.PreloadBucket, tarballFilename)
-	cmd := exec.Command("gsutil", "stat", gcsPath)
-	return cmd.Run() == nil
-}
-
 func verifyDockerStorage() error {
 	cmd := exec.Command("docker", "info", "-f", "{{.Info.Driver}}")
 	var stderr bytes.Buffer
diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go
index b903f3cc11..f6235a38f4 100644
--- a/hack/preload-images/upload.go
+++ b/hack/preload-images/upload.go
@@ -37,6 +37,13 @@ func uploadTarball(tarballFilename string) error {
 	gcsPath := fmt.Sprintf("%s/%s", gcsDest, tarballFilename)
 	cmd = exec.Command("gsutil", "acl", "ch", "-u", "AllUsers:R", gcsPath)
 	if output, err := cmd.CombinedOutput(); err != nil {
+		fmt.Printf(`Failed to update ACLs on this tarball in GCS. Please run
+		
+gsutil acl ch -u AllUsers:R %s
+
+manually to make this link public, or rerun this script to rebuild and reupload the tarball.
+		
+		`, gcsPath)
 		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
 	}
 	return nil

From 2a1ee510837ae5d870275dfa89c8acc4ded28ac2 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:31:46 -0700
Subject: [PATCH 299/668] add logging

---
 hack/preload-images/upload.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go
index f6235a38f4..1a6c02af75 100644
--- a/hack/preload-images/upload.go
+++ b/hack/preload-images/upload.go
@@ -30,12 +30,14 @@ func uploadTarball(tarballFilename string) error {
 	hostPath := path.Join("out/", tarballFilename)
 	gcsDest := fmt.Sprintf("gs://%s", download.PreloadBucket)
 	cmd := exec.Command("gsutil", "cp", hostPath, gcsDest)
+	fmt.Printf("Running: %v", cmd.Args)
 	if output, err := cmd.CombinedOutput(); err != nil {
 		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
 	}
 	// Make tarball public to all users
 	gcsPath := fmt.Sprintf("%s/%s", gcsDest, tarballFilename)
 	cmd = exec.Command("gsutil", "acl", "ch", "-u", "AllUsers:R", gcsPath)
+	fmt.Printf("Running: %v", cmd.Args)
 	if output, err := cmd.CombinedOutput(); err != nil {
 		fmt.Printf(`Failed to update ACLs on this tarball in GCS. Please run
 		

From c9c324242ce6f768cd5ac924c628ec68ca634dd8 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:37:29 -0700
Subject: [PATCH 300/668] add newlines

---
 hack/preload-images/upload.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go
index 1a6c02af75..89bbd8004b 100644
--- a/hack/preload-images/upload.go
+++ b/hack/preload-images/upload.go
@@ -30,14 +30,14 @@ func uploadTarball(tarballFilename string) error {
 	hostPath := path.Join("out/", tarballFilename)
 	gcsDest := fmt.Sprintf("gs://%s", download.PreloadBucket)
 	cmd := exec.Command("gsutil", "cp", hostPath, gcsDest)
-	fmt.Printf("Running: %v", cmd.Args)
+	fmt.Printf("Running: %v\n", cmd.Args)
 	if output, err := cmd.CombinedOutput(); err != nil {
 		return errors.Wrapf(err, "uploading %s to GCS bucket: %v\n%s", hostPath, err, string(output))
 	}
 	// Make tarball public to all users
 	gcsPath := fmt.Sprintf("%s/%s", gcsDest, tarballFilename)
 	cmd = exec.Command("gsutil", "acl", "ch", "-u", "AllUsers:R", gcsPath)
-	fmt.Printf("Running: %v", cmd.Args)
+	fmt.Printf("Running: %v\n", cmd.Args)
 	if output, err := cmd.CombinedOutput(); err != nil {
 		fmt.Printf(`Failed to update ACLs on this tarball in GCS. Please run
 		

From e293b384311b7653922031b5951364150e583033 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:42:45 -0700
Subject: [PATCH 301/668] Set --preload flag to true so that
 download.PreloadExists doesn't immeditely return false

---
 hack/preload-images/preload_images.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index 948918d8f9..928cd44821 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -23,6 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
+	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
@@ -45,6 +46,7 @@ func init() {
 	if k8sVersion != "" {
 		k8sVersions = append(k8sVersions, k8sVersion)
 	}
+	viper.Set("preload", "true")
 }
 
 func main() {

From bbe64aa712ca01f55020ac81ae02cfcb4bb7b4da Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 10:55:24 -0700
Subject: [PATCH 302/668] Upgrade to v1.9.0 and add release notes

---
 CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++
 Makefile     |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe559157a9..376ef4e7f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Release Notes
 
+## Version 1.9.0- 2020-03-26
+
+New features & improvements
+
+* Update DefaultKubernetesVersion to v1.18.0 [#7235](https://github.com/kubernetes/minikube/pull/7235)
+* Add --vm flag for users who want to autoselect only VM's [#7068](https://github.com/kubernetes/minikube/pull/7068)
+* Add 'stable' and 'latest' as valid kubernetes-version values [#7212](https://github.com/kubernetes/minikube/pull/7212)
+
+* gpu addon: privileged mode no longer required [#7149](https://github.com/kubernetes/minikube/pull/7149)
+* Add sch_tbf and extend filter ipset kernel module for bandwidth shaping [#7255](https://github.com/kubernetes/minikube/pull/7255)
+* Parse --disk-size and --memory sizes with binary suffixes [#7206](https://github.com/kubernetes/minikube/pull/7206)
+* local search for the site [#7253](https://github.com/kubernetes/minikube/pull/7253)
+
+
+Bug Fixes
+
+* Re-initalize failed Kubernetes clusters [#7234](https://github.com/kubernetes/minikube/pull/7234)
+* do not override hostname if extraConfig is specified [#7238](https://github.com/kubernetes/minikube/pull/7238)
+* Enable HW_RANDOM_VIRTIO to fix sshd startup delays [#7208](https://github.com/kubernetes/minikube/pull/7208)
+* hyperv Delete: call StopHost before removing VM [#7160](https://github.com/kubernetes/minikube/pull/7160)
+
+Huge thank you for this release towards our contributors: 
+
+- Anders F Björklund
+- Medya Ghazizadeh
+- Priya Wadhwa
+- Sharif Elgamal
+- Thomas Strömberg
+- Tom
+- Vincent Link
+- Yang Keao
+- Zhongcheng Lao
+- vikkyomkar
+
+
 ## Version 1.9.0-beta.2 - 2020-03-21
 
 New features & improvements
diff --git a/Makefile b/Makefile
index 43bb6b9cf2..049427610c 100755
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 9
-VERSION_BUILD ?= 0-beta.2
+VERSION_BUILD ?= 0
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 

From 46f31480dfd964a7fbc3b41b2e806fae7936c72b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 14:03:22 -0700
Subject: [PATCH 303/668] Make slow command detection consistent across kic/oci

---
 go.sum                         | 24 ++++++++++++
 pkg/drivers/kic/kic.go         | 17 ++-------
 pkg/drivers/kic/oci/oci.go     | 68 ++++++++++++++++++----------------
 pkg/drivers/kic/oci/volumes.go | 29 ++-------------
 4 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/go.sum b/go.sum
index 15a7b48dae..c997562aea 100644
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,10 @@ github.com/Parallels/docker-machine-parallels v1.3.0 h1:RG1fyf3v1GwXMCeHRiZkB4tL
 github.com/Parallels/docker-machine-parallels v1.3.0/go.mod h1:HCOMm3Hulq/xuEVQMyZOuQlA+dSZpFY5kdCTZWjMVis=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
@@ -107,6 +109,7 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b h1:T4nWG1TXIxeor8mAu5bFguPJgSIGhZqv/f0z55KCrJM=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
@@ -156,6 +159,7 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
@@ -197,7 +201,9 @@ github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
@@ -206,6 +212,7 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -233,11 +240,13 @@ github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
@@ -251,6 +260,7 @@ github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nA
 github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
@@ -260,6 +270,7 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
@@ -329,6 +340,7 @@ github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAO
 github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
 github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/cadvisor v0.35.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -372,6 +384,7 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
@@ -423,6 +436,7 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
@@ -476,7 +490,9 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LE
 github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
 github.com/libvirt/libvirt-go v3.4.0+incompatible h1:Cpyalgj1x8JIeTlL6SDYZBo7j8nY3+5XHqmi8DaunCk=
 github.com/libvirt/libvirt-go v3.4.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
@@ -498,6 +514,7 @@ github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -559,6 +576,7 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
 github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
@@ -604,6 +622,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
 github.com/pelletier/go-toml v1.1.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
@@ -1023,11 +1042,13 @@ honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 k8s.io/api v0.17.3 h1:XAm3PZp3wnEdzekNkcmj/9Y1zdmQYJ1I4GKSBBZ8aG0=
 k8s.io/api v0.17.3/go.mod h1:YZ0OTkuw7ipbe305fMpIdf3GLXZKRigjtZaV5gzC2J0=
+k8s.io/apiextensions-apiserver v0.17.3 h1:WDZWkPcbgvchEdDd7ysL21GGPx3UKZQLDZXEkevT6n4=
 k8s.io/apiextensions-apiserver v0.17.3/go.mod h1:CJbCyMfkKftAd/X/V6OTHYhVn7zXnDdnkUjS1h0GTeY=
 k8s.io/apimachinery v0.17.3 h1:f+uZV6rm4/tHE7xXgLyToprg6xWairaClGVkm2t8omg=
 k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
 k8s.io/apiserver v0.17.3 h1:faZbSuFtJ4dx09vctKZGHms/7bp3qFtbqb10Swswqfs=
 k8s.io/apiserver v0.17.3/go.mod h1:iJtsPpu1ZpEnHaNawpSV0nYTGBhhX2dUlnn7/QS7QiY=
+k8s.io/cli-runtime v0.17.3 h1:0ZlDdJgJBKsu77trRUynNiWsRuAvAVPBNaQfnt/1qtc=
 k8s.io/cli-runtime v0.17.3/go.mod h1:X7idckYphH4SZflgNpOOViSxetiMj6xI0viMAjM81TA=
 k8s.io/client-go v0.17.3 h1:deUna1Ksx05XeESH6XGCyONNFfiQmDdqeqUvicvP6nU=
 k8s.io/client-go v0.17.3/go.mod h1:cLXlTMtWHkuK4tD360KpWz2gG2KtdWEr/OT02i3emRQ=
@@ -1062,6 +1083,7 @@ k8s.io/kubelet v0.17.3/go.mod h1:Nh8owUHZcUXtnDAtmGnip36Nw+X6c4rbmDQlVyIhwMQ=
 k8s.io/kubernetes v1.17.3 h1:zWCppkLfHM+hoLqfbsrQ0cJnYw+4vAvedI92oQnjo/Q=
 k8s.io/kubernetes v1.17.3/go.mod h1:gt28rfzaskIzJ8d82TSJmGrJ0XZD0BBy8TcQvTuCI3w=
 k8s.io/legacy-cloud-providers v0.17.3/go.mod h1:ujZML5v8efVQxiXXTG+nck7SjP8KhMRjUYNIsoSkYI0=
+k8s.io/metrics v0.17.3 h1:IqXkNK+5E3vnobFD923Mn1QJEt3fb6+sK0wIjtBzOvw=
 k8s.io/metrics v0.17.3/go.mod h1:HEJGy1fhHOjHggW9rMDBJBD3YuGroH3Y1pnIRw9FFaI=
 k8s.io/repo-infra v0.0.1-alpha.1/go.mod h1:wO1t9WaB99V80ljbeENTnayuEEwNZt7gECYh/CEyOJ8=
 k8s.io/sample-apiserver v0.17.3/go.mod h1:cn/rvFIttGNqy1v88B5ZlDAbyyqDOoF7JHSwPiqNCNQ=
@@ -1079,6 +1101,7 @@ mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIa
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
 sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.0+incompatible h1:qV3eFdgCp7Cp/ORjkJI9VBBEOntT+z385jLqdBtmgHA=
 sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.0+incompatible/go.mod h1:qhqLyNwJC49PoUalmtzYb4s9fT8HOMBTLbTY1QoVOqI=
@@ -1087,4 +1110,5 @@ sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=
 vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 75f80e5c7d..692bcdf485 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -17,7 +17,6 @@ limitations under the License.
 package kic
 
 import (
-	"context"
 	"fmt"
 	"net"
 	"os/exec"
@@ -220,20 +219,12 @@ func (d *Driver) GetURL() (string, error) {
 
 // GetState returns the state that the host is in (running, stopped, etc)
 func (d *Driver) GetState() (state.State, error) {
-	// allow no more than 2 seconds for this. when this takes long this means deadline passed
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, d.NodeConfig.OCIBinary, "inspect", "-f", "{{.State.Status}}", d.MachineName)
-	out, err := cmd.CombinedOutput()
-	if ctx.Err() == context.DeadlineExceeded {
-		glog.Errorf("GetState for %s took longer than normal. Restarting your %s daemon might fix this issue.", d.MachineName, d.OCIBinary)
-		return state.Error, fmt.Errorf("inspect %s timeout", d.MachineName)
-	}
-	o := strings.TrimSpace(string(out))
+	out, err := oci.WarnIfSlow(d.NodeConfig.OCIBinary, "inspect", "-f", "{{.State.Status}}", d.MachineName)
 	if err != nil {
-		return state.Error, errors.Wrapf(err, "%s: %s", strings.Join(cmd.Args, " "), o)
+		return state.Error, err
 	}
+
+	o := strings.TrimSpace(string(out))
 	switch o {
 	case "running":
 		return state.Running, nil
diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 5885b0e1cf..bfa1d0233c 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -29,6 +29,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util/retry"
 
 	"fmt"
@@ -232,19 +233,39 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 	return string(out), err
 }
 
-// ContainerExists checks if container name exists (either running or exited)
-func ContainerExists(ociBin string, name string) (bool, error) {
-	// allow no more than 3 seconds for this.
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+// WarnIfSlow runs an oci command, warning about performance issues
+func WarnIfSlow(arg ...string) ([]byte, error) {
+	killTime := 3 * time.Millisecond
+	warnTime := 1 * time.Millisecond
+
+	ctx, cancel := context.WithTimeout(context.Background(), killTime)
 	defer cancel()
 
-	cmd := exec.CommandContext(ctx, ociBin, "ps", "-a", "--format", "{{.Names}}")
-	out, err := cmd.CombinedOutput()
-
-	if ctx.Err() == context.DeadlineExceeded {
-		return false, fmt.Errorf("time out running %s ps -a", ociBin)
+	start := time.Now()
+	glog.Infof("executing with %s timeout: %v", arg, killTime)
+	cmd := exec.CommandContext(ctx, arg[0], arg[1:]...)
+	stdout, err := cmd.Output()
+	d := time.Since(start)
+	if d > warnTime {
+		out.WarningT(`Executing "{{.command}}" took an unusually long time: {{.duration}}`, out.V{"command": strings.Join(cmd.Args, " "), "duration": d})
+		out.T(out.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": arg[0]})
 	}
 
+	if ctx.Err() == context.DeadlineExceeded {
+		return stdout, fmt.Errorf("%q timed out after %s", strings.Join(cmd.Args, " "), killTime)
+	}
+	if err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			return stdout, fmt.Errorf("%q failed: %v: %s", strings.Join(cmd.Args, " "), exitErr, exitErr.Stderr)
+		}
+		return stdout, fmt.Errorf("%q failed: %v", strings.Join(cmd.Args, " "), err)
+	}
+	return stdout, nil
+}
+
+// ContainerExists checks if container name exists (either running or exited)
+func ContainerExists(ociBin string, name string) (bool, error) {
+	out, err := WarnIfSlow(ociBin, "ps", "-a", "--format", "{{.Names}}")
 	if err != nil {
 		return false, errors.Wrapf(err, string(out))
 	}
@@ -410,12 +431,10 @@ func withPortMappings(portMappings []PortMapping) createOpt {
 
 // listContainersByLabel returns all the container names with a specified label
 func listContainersByLabel(ociBinary string, label string) ([]string, error) {
-
-	// allow no more than 5 seconds for docker ps
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	cmd := exec.CommandContext(ctx, ociBinary, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}")
-	stdout, err := cmd.Output()
+	stdout, err := WarnIfSlow(ociBinary, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}")
+	if err != nil {
+		return nil, err
+	}
 	s := bufio.NewScanner(bytes.NewReader(stdout))
 	var names []string
 	for s.Scan() {
@@ -448,21 +467,6 @@ func PointToHostDockerDaemon() error {
 
 // ContainerStatus returns status of a container running,exited,...
 func ContainerStatus(ociBin string, name string) (string, error) {
-	// allow no more than 2 seconds for this. when this takes long this means deadline passed
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, ociBin, "inspect", name, "--format={{.State.Status}}")
-	out, err := cmd.CombinedOutput()
-
-	if ctx.Err() == context.DeadlineExceeded {
-		glog.Warningf("%s inspect %s took longer than normal. Restarting your %s daemon might fix this issue.", ociBin, name, ociBin)
-		return strings.TrimSpace(string(out)), fmt.Errorf("inspect %s timeout", name)
-	}
-
-	if err != nil {
-		return string(out), errors.Wrapf(err, "inspecting container: output %s", out)
-	}
-
-	return strings.TrimSpace(string(out)), nil
+	out, err := WarnIfSlow(ociBin, "inspect", name, "--format={{.State.Status}}")
+	return strings.TrimSpace(string(out)), err
 }
diff --git a/pkg/drivers/kic/oci/volumes.go b/pkg/drivers/kic/oci/volumes.go
index 58c13b9621..2fbd9f32b0 100644
--- a/pkg/drivers/kic/oci/volumes.go
+++ b/pkg/drivers/kic/oci/volumes.go
@@ -19,11 +19,9 @@ package oci
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"fmt"
 	"os/exec"
 	"strings"
-	"time"
 
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
@@ -42,16 +40,8 @@ func DeleteAllVolumesByLabel(ociBin string, label string) []error {
 	}
 
 	for _, v := range vs {
-		// allow no more than 3 seconds for this. when this takes long this means deadline passed
-		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		cmd := exec.CommandContext(ctx, ociBin, "volume", "rm", "--force", v)
-		if ctx.Err() == context.DeadlineExceeded {
-			glog.Warningf("removing volume with label %s took longer than normal. Restarting your %s daemon might fix this issue.", label, ociBin)
-			deleteErrs = append(deleteErrs, fmt.Errorf("delete deadline exceeded for %s", label))
-		}
-		if out, err := cmd.CombinedOutput(); err != nil {
-			deleteErrs = append(deleteErrs, fmt.Errorf("deleting volume %s: output: %s", v, string(out)))
+		if _, err := WarnIfSlow(ociBin, "volume", "rm", "--force", v); err != nil {
+			deleteErrs = append(deleteErrs, fmt.Errorf("deleting %q", v))
 		}
 	}
 
@@ -65,19 +55,8 @@ func PruneAllVolumesByLabel(ociBin string, label string) []error {
 	var deleteErrs []error
 	glog.Infof("trying to prune all %s volumes with label %s", ociBin, label)
 
-	// allow no more than 3 seconds for this. when this takes long this means deadline passed
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	// try to prune afterwards just in case delete didn't go through
-	cmd := exec.CommandContext(ctx, ociBin, "volume", "prune", "-f", "--filter", "label="+label)
-	if out, err := cmd.CombinedOutput(); err != nil {
-		deleteErrs = append(deleteErrs, errors.Wrapf(err, "prune volume by label %s: %s", label, string(out)))
-	}
-
-	if ctx.Err() == context.DeadlineExceeded {
-		glog.Warningf("pruning volume with label %s took longer than normal. Restarting your %s daemon might fix this issue.", label, ociBin)
-		deleteErrs = append(deleteErrs, fmt.Errorf("prune deadline exceeded for %s", label))
+	if _, err := WarnIfSlow(ociBin, "volume", "prune", "-f", "--filter", "label="+label); err != nil {
+		deleteErrs = append(deleteErrs, errors.Wrapf(err, "prune volume by label %s", label))
 	}
 
 	return deleteErrs

From 2f2dccd30c733676252838941ac9108fb89a92ae Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 14:05:02 -0700
Subject: [PATCH 304/668] Remove test values

---
 pkg/drivers/kic/oci/oci.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index bfa1d0233c..af6cd19c50 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -235,8 +235,8 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 
 // WarnIfSlow runs an oci command, warning about performance issues
 func WarnIfSlow(arg ...string) ([]byte, error) {
-	killTime := 3 * time.Millisecond
-	warnTime := 1 * time.Millisecond
+	killTime := 15 * time.Second
+	warnTime := 2 * time.Second
 
 	ctx, cancel := context.WithTimeout(context.Background(), killTime)
 	defer cancel()

From 11ba7c6eb3634010b07ca97dcaabc4b203550844 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 14:27:51 -0700
Subject: [PATCH 305/668] Set minLogCheckTime to 60 until we can  cut down on
 spam

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 04156f2e13..6f47fc3204 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -45,7 +45,7 @@ import (
 )
 
 // minLogCheckTime how long to wait before spamming error logs to console
-const minLogCheckTime = 30 * time.Second
+const minLogCheckTime = 60 * time.Second
 
 // WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
 func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, timeout time.Duration) error {

From c6bca4d1051e061d4c0aa474663290489666ee17 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 14:53:05 -0700
Subject: [PATCH 306/668] Add more debugging for certificate issues

---
 pkg/minikube/bootstrapper/certs.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index de938082cc..cbd9d27b86 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -117,6 +117,7 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 	}
 
 	for _, f := range copyableFiles {
+		glog.Infof("copying: %s/%s", f.GetTargetDir(), f.GetTargetName())
 		if err := cmd.Copy(f); err != nil {
 			return nil, errors.Wrapf(err, "Copy %s", f.GetAssetName())
 		}
@@ -325,6 +326,7 @@ func collectCACerts() (map[string]string, error) {
 		if info != nil && !info.IsDir() {
 			ext := strings.ToLower(filepath.Ext(hostpath))
 			if ext == ".crt" || ext == ".pem" {
+				glog.Infof("found cert: %s (%d bytes)", info.Name(), info.Size())
 				validPem, err := isValidPEMCertificate(hostpath)
 				if err != nil {
 					return err
@@ -360,9 +362,16 @@ func collectCACerts() (map[string]string, error) {
 
 // getSubjectHash calculates Certificate Subject Hash for creating certificate symlinks
 func getSubjectHash(cr command.Runner, filePath string) (string, error) {
+	lrr, err := cr.RunCmd(exec.Command("ls", "-la", filePath))
+	if err != nil {
+		return "", err
+	}
+	glog.Infof("hashing: %s", lrr.Stdout.String())
+
 	rr, err := cr.RunCmd(exec.Command("openssl", "x509", "-hash", "-noout", "-in", filePath))
 	if err != nil {
-		return "", errors.Wrapf(err, rr.Command())
+		crr, _ := cr.RunCmd(exec.Command("cat", filePath))
+		return "", errors.Wrapf(err, "cert:\n%s\n---\n%s", lrr.Output(), crr.Stdout.String())
 	}
 	stringHash := strings.TrimSpace(rr.Stdout.String())
 	return stringHash, nil

From eb0e6f7b61618c4c9ad66ec81d3391a5ec34cd90 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 15:07:39 -0700
Subject: [PATCH 307/668] update changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 376ef4e7f6..f0829a83f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,6 @@ New features & improvements
 * gpu addon: privileged mode no longer required [#7149](https://github.com/kubernetes/minikube/pull/7149)
 * Add sch_tbf and extend filter ipset kernel module for bandwidth shaping [#7255](https://github.com/kubernetes/minikube/pull/7255)
 * Parse --disk-size and --memory sizes with binary suffixes [#7206](https://github.com/kubernetes/minikube/pull/7206)
-* local search for the site [#7253](https://github.com/kubernetes/minikube/pull/7253)
 
 
 Bug Fixes

From fc262fff0487374c7bb0ec145c7a189ba9123deb Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 15:56:40 -0700
Subject: [PATCH 308/668] Add crictl to github none CI

---
 .github/workflows/main.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1ce020cbbe..cf6ed4730b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -274,6 +274,9 @@ jobs:
         sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
         sudo apt-get -qq -y install socat
+        VERSION="v1.17.0"
+        curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz
+        sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
     - name: Install gopogh
       shell: bash
       run: |
@@ -352,6 +355,9 @@ jobs:
         sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
         sudo apt-get -qq -y install socat
+        VERSION="v1.17.0"
+        curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz
+        sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
     - name: Install gopogh
       shell: bash
       run: |

From 479525e4b0f4c862b3cffcb83e563d389a98f1c0 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 26 Mar 2020 16:03:04 -0700
Subject: [PATCH 309/668] Update releases.json to include v1.9.0

---
 deploy/minikube/releases.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json
index bc2e1d5181..2bb7364fcf 100644
--- a/deploy/minikube/releases.json
+++ b/deploy/minikube/releases.json
@@ -1,4 +1,12 @@
 [
+  {
+      "name": "v1.9.0",
+      "checksums": {
+          "darwin": "2a074b0d842e3d9272444990374c6ffc51878c2d11c0434f54e15269b59593f9",
+          "linux": "81d77d1babe63be393e0a3204aac7825eb35e0fdf58ffefd9f66508a43864866",
+          "windows": "d11a957704c23670eac453a47897449a2aaab13b7dcd6424307f8932ac9f81bb"
+      }
+  },
   {
       "name": "v1.8.2",
       "checksums": {

From 323dba4bc9e23b632ce6ae368eaa3921bba84d30 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 26 Mar 2020 16:14:55 -0700
Subject: [PATCH 310/668] Update docs to reflect release of v1.9.0

---
 site/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/config.toml b/site/config.toml
index 23f8db88b6..c241a41581 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -95,7 +95,7 @@ weight = 1
 [params]
 copyright = "The Kubernetes Authors -- "
 # The latest release of minikube
-latest_release = "1.8.1"
+latest_release = "1.9.0"
 
 privacy_policy = ""
 

From e3472b6da0ff94a553d5d8b817e53eec20d08f97 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Thu, 26 Mar 2020 16:23:53 -0700
Subject: [PATCH 311/668] Add files missing for FreeBSD  compilation

---
 pkg/minikube/constants/constants_freebsd.go |  26 +++
 pkg/minikube/driver/driver_freebsd.go       |  32 +++
 pkg/minikube/tunnel/route_freebsd.go        | 168 ++++++++++++++
 third_party/go9p/srv_pipe_freebsd.go        |  41 ++++
 third_party/go9p/ufs_freebsd.go             | 239 ++++++++++++++++++++
 5 files changed, 506 insertions(+)
 create mode 100644 pkg/minikube/constants/constants_freebsd.go
 create mode 100644 pkg/minikube/driver/driver_freebsd.go
 create mode 100644 pkg/minikube/tunnel/route_freebsd.go
 create mode 100644 third_party/go9p/srv_pipe_freebsd.go
 create mode 100644 third_party/go9p/ufs_freebsd.go

diff --git a/pkg/minikube/constants/constants_freebsd.go b/pkg/minikube/constants/constants_freebsd.go
new file mode 100644
index 0000000000..77a47a765f
--- /dev/null
+++ b/pkg/minikube/constants/constants_freebsd.go
@@ -0,0 +1,26 @@
+// +build linux, !gendocs
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package constants
+
+import (
+	"k8s.io/client-go/util/homedir"
+)
+
+// DefaultMountDir is the default mount dir
+var DefaultMountDir = homedir.HomeDir()
diff --git a/pkg/minikube/driver/driver_freebsd.go b/pkg/minikube/driver/driver_freebsd.go
new file mode 100644
index 0000000000..21b8761649
--- /dev/null
+++ b/pkg/minikube/driver/driver_freebsd.go
@@ -0,0 +1,32 @@
+/*
+Copyright 2019 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package driver
+
+import "os/exec"
+
+// supportedDrivers is a list of supported drivers on Darwin.
+var supportedDrivers = []string{
+	VirtualBox,
+}
+
+func VBoxManagePath() string {
+	cmd := "VBoxManage"
+	if path, err := exec.LookPath(cmd); err == nil {
+		return path
+	}
+	return cmd
+}
diff --git a/pkg/minikube/tunnel/route_freebsd.go b/pkg/minikube/tunnel/route_freebsd.go
new file mode 100644
index 0000000000..d88d5301ca
--- /dev/null
+++ b/pkg/minikube/tunnel/route_freebsd.go
@@ -0,0 +1,168 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tunnel
+
+import (
+	"fmt"
+	"net"
+	"os/exec"
+	"regexp"
+	"strings"
+
+	"github.com/golang/glog"
+)
+
+func (router *osRouter) EnsureRouteIsAdded(route *Route) error {
+	exists, err := isValidToAddOrDelete(router, route)
+	if err != nil {
+		return err
+	}
+	if exists {
+		return nil
+	}
+
+	serviceCIDR := route.DestCIDR.String()
+	gatewayIP := route.Gateway.String()
+
+	glog.Infof("Adding route for CIDR %s to gateway %s", serviceCIDR, gatewayIP)
+	command := exec.Command("sudo", "route", "-n", "add", serviceCIDR, gatewayIP)
+	glog.Infof("About to run command: %s", command.Args)
+	stdInAndOut, err := command.CombinedOutput()
+	message := fmt.Sprintf("%s", stdInAndOut)
+	re := regexp.MustCompile(fmt.Sprintf("add net (.*): gateway %s\n", gatewayIP))
+	if !re.MatchString(message) {
+		return fmt.Errorf("error adding Route: %s, %d", message, len(strings.Split(message, "\n")))
+	}
+	glog.Infof("%s", stdInAndOut)
+
+	return err
+}
+
+func (router *osRouter) Inspect(route *Route) (exists bool, conflict string, overlaps []string, err error) {
+	cmd := exec.Command("netstat", "-nr", "-f", "inet")
+	cmd.Env = append(cmd.Env, "LC_ALL=C")
+	stdInAndOut, err := cmd.CombinedOutput()
+	if err != nil {
+		err = fmt.Errorf("error running '%v': %s", cmd, err)
+		return
+	}
+
+	rt := router.parseTable(stdInAndOut)
+
+	exists, conflict, overlaps = rt.Check(route)
+
+	return
+}
+
+func (router *osRouter) parseTable(table []byte) routingTable {
+	t := routingTable{}
+	skip := true
+	for _, line := range strings.Split(string(table), "\n") {
+		// header
+		if strings.HasPrefix(line, "Destination") {
+			skip = false
+			continue
+		}
+		// don't care about the 0.0.0.0 routes
+		if skip || strings.HasPrefix(line, "default") {
+			continue
+		}
+		fields := strings.Fields(line)
+
+		if len(fields) <= 2 {
+			continue
+		}
+		dstCIDRString := router.padCIDR(fields[0])
+		gatewayIPString := fields[1]
+		gatewayIP := net.ParseIP(gatewayIPString)
+
+		_, ipNet, err := net.ParseCIDR(dstCIDRString)
+		if err != nil {
+			glog.V(4).Infof("skipping line: can't parse CIDR from routing table: %s", dstCIDRString)
+		} else if gatewayIP == nil {
+			glog.V(4).Infof("skipping line: can't parse IP from routing table: %s", gatewayIPString)
+		} else {
+			tableLine := routingTableLine{
+				route: &Route{
+					DestCIDR: ipNet,
+					Gateway:  gatewayIP,
+				},
+				line: line,
+			}
+			t = append(t, tableLine)
+		}
+	}
+
+	return t
+}
+
+func (router *osRouter) padCIDR(origCIDR string) string {
+	s := ""
+	dots := 0
+	slash := false
+	for i, c := range origCIDR {
+		if c == '.' {
+			dots++
+		}
+		if c == '/' {
+			for dots < 3 {
+				s += ".0"
+				dots++
+			}
+			slash = true
+		}
+		if i == len(origCIDR)-1 {
+			s += string(c)
+			bits := 32 - 8*(3-dots)
+			for dots < 3 {
+				s += ".0"
+				dots++
+			}
+			if !slash {
+				s += fmt.Sprintf("/%d", bits)
+			}
+		} else {
+			s += string(c)
+		}
+	}
+	return s
+}
+
+func (router *osRouter) Cleanup(route *Route) error {
+	glog.V(3).Infof("Cleaning up %s\n", route)
+	exists, err := isValidToAddOrDelete(router, route)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return nil
+	}
+	cmd := exec.Command("sudo", "route", "-n", "delete", route.DestCIDR.String())
+	stdInAndOut, err := cmd.CombinedOutput()
+	if err != nil {
+		return err
+	}
+	msg := fmt.Sprintf("%s", stdInAndOut)
+	glog.V(4).Infof("%s", msg)
+	re := regexp.MustCompile("^delete net ([^:]*)$")
+	if !re.MatchString(msg) {
+		return fmt.Errorf("error deleting route: %s, %d", msg, len(strings.Split(msg, "\n")))
+	}
+	return nil
+}
+
+
diff --git a/third_party/go9p/srv_pipe_freebsd.go b/third_party/go9p/srv_pipe_freebsd.go
new file mode 100644
index 0000000000..453c52fec1
--- /dev/null
+++ b/third_party/go9p/srv_pipe_freebsd.go
@@ -0,0 +1,41 @@
+// Copyright 2009 The go9p Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package go9p
+
+import (
+	"fmt"
+	"os"
+	"syscall"
+)
+
+func (dir *pipeDir) dotu(path string, d os.FileInfo, upool Users, sysMode *syscall.Stat_t) {
+	u := upool.Uid2User(int(sysMode.Uid))
+	g := upool.Gid2Group(int(sysMode.Gid))
+	dir.Uid = u.Name()
+	if dir.Uid == "" {
+		dir.Uid = "none"
+	}
+
+	dir.Gid = g.Name()
+	if dir.Gid == "" {
+		dir.Gid = "none"
+	}
+	dir.Muid = "none"
+	dir.Ext = ""
+	dir.Uidnum = uint32(u.Id())
+	dir.Gidnum = uint32(g.Id())
+	dir.Muidnum = NOUID
+	if d.Mode()&os.ModeSymlink != 0 {
+		var err error
+		dir.Ext, err = os.Readlink(path)
+		if err != nil {
+			dir.Ext = ""
+		}
+	} else if isBlock(d) {
+		dir.Ext = fmt.Sprintf("b %d %d", sysMode.Rdev>>24, sysMode.Rdev&0xFFFFFF)
+	} else if isChar(d) {
+		dir.Ext = fmt.Sprintf("c %d %d", sysMode.Rdev>>24, sysMode.Rdev&0xFFFFFF)
+	}
+}
diff --git a/third_party/go9p/ufs_freebsd.go b/third_party/go9p/ufs_freebsd.go
new file mode 100644
index 0000000000..da9a10fae2
--- /dev/null
+++ b/third_party/go9p/ufs_freebsd.go
@@ -0,0 +1,239 @@
+// Copyright 2009 The go9p Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package go9p
+
+import (
+	"fmt"
+	"os"
+	"os/user"
+	"path"
+	"strconv"
+	"strings"
+	"syscall"
+	"time"
+)
+
+func atime(stat *syscall.Stat_t) time.Time {
+	return time.Unix(stat.Atimespec.Unix())
+}
+
+// IsBlock reports if the file is a block device
+func isBlock(d os.FileInfo) bool {
+	stat := d.Sys().(*syscall.Stat_t)
+	return (stat.Mode & syscall.S_IFMT) == syscall.S_IFBLK
+}
+
+// IsChar reports if the file is a character device
+func isChar(d os.FileInfo) bool {
+	stat := d.Sys().(*syscall.Stat_t)
+	return (stat.Mode & syscall.S_IFMT) == syscall.S_IFCHR
+}
+
+func dir2Qid(d os.FileInfo) *Qid {
+	var qid Qid
+
+	qid.Path = d.Sys().(*syscall.Stat_t).Ino
+	qid.Version = uint32(d.ModTime().UnixNano() / 1000000)
+	qid.Type = dir2QidType(d)
+
+	return &qid
+}
+
+func dir2Dir(path string, d os.FileInfo, dotu bool, upool Users) (*Dir, error) {
+	if r := recover(); r != nil {
+		fmt.Print("stat failed: ", r)
+		return nil, &os.PathError{"dir2Dir", path, nil}
+	}
+	sysif := d.Sys()
+	if sysif == nil {
+		return nil, &os.PathError{"dir2Dir: sysif is nil", path, nil}
+	}
+	sysMode := sysif.(*syscall.Stat_t)
+
+	dir := new(ufsDir)
+	dir.Qid = *dir2Qid(d)
+	dir.Mode = dir2Npmode(d, dotu)
+	dir.Atime = uint32(0 /*atime(sysMode).Unix()*/)
+	dir.Mtime = uint32(d.ModTime().Unix())
+	dir.Length = uint64(d.Size())
+	dir.Name = path[strings.LastIndex(path, "/")+1:]
+
+	if dotu {
+		dir.dotu(path, d, upool, sysMode)
+		return &dir.Dir, nil
+	}
+
+	unixUid := int(sysMode.Uid)
+	unixGid := int(sysMode.Gid)
+	dir.Uid = strconv.Itoa(unixUid)
+	dir.Gid = strconv.Itoa(unixGid)
+
+	// BUG(akumar): LookupId will never find names for
+	// groups, as it only operates on user ids.
+	u, err := user.LookupId(dir.Uid)
+	if err == nil {
+		dir.Uid = u.Username
+	}
+	g, err := user.LookupId(dir.Gid)
+	if err == nil {
+		dir.Gid = g.Username
+	}
+
+	/* For Akaros, we use the Muid as the link value. */
+	if *Akaros && (d.Mode()&os.ModeSymlink != 0) {
+		dir.Muid, err = os.Readlink(path)
+		if err == nil {
+			dir.Mode |= DMSYMLINK
+		}
+	}
+	return &dir.Dir, nil
+}
+
+func (dir *ufsDir) dotu(path string, d os.FileInfo, upool Users, sysMode *syscall.Stat_t) {
+	u := upool.Uid2User(int(sysMode.Uid))
+	g := upool.Gid2Group(int(sysMode.Gid))
+	dir.Uid = u.Name()
+	if dir.Uid == "" {
+		dir.Uid = "none"
+	}
+
+	dir.Gid = g.Name()
+	if dir.Gid == "" {
+		dir.Gid = "none"
+	}
+	dir.Muid = "none"
+	dir.Ext = ""
+	dir.Uidnum = uint32(u.Id())
+	dir.Gidnum = uint32(g.Id())
+	dir.Muidnum = NOUID
+	if d.Mode()&os.ModeSymlink != 0 {
+		var err error
+		dir.Ext, err = os.Readlink(path)
+		if err != nil {
+			dir.Ext = ""
+		}
+	} else if isBlock(d) {
+		dir.Ext = fmt.Sprintf("b %d %d", sysMode.Rdev>>24, sysMode.Rdev&0xFFFFFF)
+	} else if isChar(d) {
+		dir.Ext = fmt.Sprintf("c %d %d", sysMode.Rdev>>24, sysMode.Rdev&0xFFFFFF)
+	}
+}
+
+func (u *Ufs) Wstat(req *SrvReq) {
+	fid := req.Fid.Aux.(*ufsFid)
+	err := fid.stat()
+	if err != nil {
+		req.RespondError(err)
+		return
+	}
+
+	dir := &req.Tc.Dir
+	if dir.Mode != 0xFFFFFFFF {
+		mode := dir.Mode & 0777
+		if req.Conn.Dotu {
+			if dir.Mode&DMSETUID > 0 {
+				mode |= syscall.S_ISUID
+			}
+			if dir.Mode&DMSETGID > 0 {
+				mode |= syscall.S_ISGID
+			}
+		}
+		e := os.Chmod(fid.path, os.FileMode(mode))
+		if e != nil {
+			req.RespondError(toError(e))
+			return
+		}
+	}
+
+	uid, gid := NOUID, NOUID
+	if req.Conn.Dotu {
+		uid = dir.Uidnum
+		gid = dir.Gidnum
+	}
+
+	// Try to find local uid, gid by name.
+	if (dir.Uid != "" || dir.Gid != "") && !req.Conn.Dotu {
+		uid, err = lookup(dir.Uid, false)
+		if err != nil {
+			req.RespondError(err)
+			return
+		}
+
+		// BUG(akumar): Lookup will never find gids
+		// corresponding to group names, because
+		// it only operates on user names.
+		gid, err = lookup(dir.Gid, true)
+		if err != nil {
+			req.RespondError(err)
+			return
+		}
+	}
+
+	if uid != NOUID || gid != NOUID {
+		e := os.Chown(fid.path, int(uid), int(gid))
+		if e != nil {
+			req.RespondError(toError(e))
+			return
+		}
+	}
+
+	if dir.Name != "" {
+		fmt.Printf("Rename %s to %s\n", fid.path, dir.Name)
+		// if first char is / it is relative to root, else relative to
+		// cwd.
+		var destpath string
+		if dir.Name[0] == '/' {
+			destpath = path.Join(u.Root, dir.Name)
+			fmt.Printf("/ results in %s\n", destpath)
+		} else {
+			fiddir, _ := path.Split(fid.path)
+			destpath = path.Join(fiddir, dir.Name)
+			fmt.Printf("rel  results in %s\n", destpath)
+		}
+		err := os.Rename(fid.path, destpath)
+		fmt.Printf("rename %s to %s gets %v\n", fid.path, destpath, err)
+		if err != nil {
+			req.RespondError(toError(err))
+			return
+		}
+		fid.path = destpath
+	}
+
+	if dir.Length != 0xFFFFFFFFFFFFFFFF {
+		e := os.Truncate(fid.path, int64(dir.Length))
+		if e != nil {
+			req.RespondError(toError(e))
+			return
+		}
+	}
+
+	// If either mtime or atime need to be changed, then
+	// we must change both.
+	if dir.Mtime != ^uint32(0) || dir.Atime != ^uint32(0) {
+		mt, at := time.Unix(int64(dir.Mtime), 0), time.Unix(int64(dir.Atime), 0)
+		if cmt, cat := (dir.Mtime == ^uint32(0)), (dir.Atime == ^uint32(0)); cmt || cat {
+			st, e := os.Stat(fid.path)
+			if e != nil {
+				req.RespondError(toError(e))
+				return
+			}
+			switch cmt {
+			case true:
+				mt = st.ModTime()
+			default:
+				// at = time.Time(0)//atime(st.Sys().(*syscall.Stat_t))
+			}
+		}
+		// macOS filesystem st_mtime values are only accurate to the second
+		// this ensures, 9p will only write mtime to the second #1375
+		e := os.Chtimes(fid.path, at.Truncate(time.Second), mt.Truncate(time.Second))
+		if e != nil {
+			req.RespondError(toError(e))
+			return
+		}
+	}
+
+	req.RespondRwstat()
+}

From 5a3d4f2870a8d16f6fbcc3dbc939a94cdbd55a01 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 17:01:30 -0700
Subject: [PATCH 312/668] Fix StartHost error formatting mistake, improve err
 msg

---
 pkg/minikube/node/start.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 5f7b131a6e..eede1db480 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -348,7 +348,8 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 	out.T(out.Workaround, `Run: "{{.delete}}", then "{{.start}} --alsologtostderr -v=1" to try again with more logging`,
 		out.V{"delete": mustload.ExampleCmd(cc.Name, "delete"), "start": mustload.ExampleCmd(cc.Name, "start")})
 
-	exit.WithError("Unable to start VM after repeated tries. Please try {{'minikube delete' if possible", err)
+	drv := host.Driver.DriverName()
+	exit.WithError(fmt.Sprintf(`Failed to start %s %s. "%s" may fix it.`, drv, driver.MachineType(drv), mustload.ExampleCmd(cc.Name, "start")), err)
 	return host, exists
 }
 

From c9a6d8dcf40f674821bc5dc31ea6d224f33afbb0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 17:33:56 -0700
Subject: [PATCH 313/668] Improve display of host startup errors

---
 pkg/minikube/exit/exit.go       |  6 +++---
 pkg/minikube/node/start.go      | 10 +++-------
 pkg/minikube/problem/problem.go |  7 ++++++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go
index 4ed989d2a6..221001f86e 100644
--- a/pkg/minikube/exit/exit.go
+++ b/pkg/minikube/exit/exit.go
@@ -61,16 +61,16 @@ func WithCodeT(code int, format string, a ...out.V) {
 func WithError(msg string, err error) {
 	p := problem.FromError(err, runtime.GOOS)
 	if p != nil {
-		WithProblem(msg, p)
+		WithProblem(msg, err, p)
 	}
 	displayError(msg, err)
 	os.Exit(Software)
 }
 
 // WithProblem outputs info related to a known problem and exits.
-func WithProblem(msg string, p *problem.Problem) {
+func WithProblem(msg string, err error, p *problem.Problem) {
 	out.ErrT(out.Empty, "")
-	out.FatalT(msg)
+	out.ErrT(out.FailureType, "[{{.id}}] {{.msg}} {{.error}}", out.V{"msg": msg, "id": p.ID, "error": p.Err})
 	p.Display()
 	if p.ShowIssueLink {
 		out.ErrT(out.Empty, "")
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index eede1db480..e983e43c83 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -48,7 +48,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/util"
@@ -344,12 +343,9 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 		return host, exists
 	}
 
-	out.T(out.FailureType, "StartHost failed again: {{.error}}", out.V{"error": err})
-	out.T(out.Workaround, `Run: "{{.delete}}", then "{{.start}} --alsologtostderr -v=1" to try again with more logging`,
-		out.V{"delete": mustload.ExampleCmd(cc.Name, "delete"), "start": mustload.ExampleCmd(cc.Name, "start")})
-
-	drv := host.Driver.DriverName()
-	exit.WithError(fmt.Sprintf(`Failed to start %s %s. "%s" may fix it.`, drv, driver.MachineType(drv), mustload.ExampleCmd(cc.Name, "start")), err)
+	// Don't use host.Driver to avoid nil pointer deref
+	drv := cc.Driver
+	exit.WithError(fmt.Sprintf(`%s %s start failed`, drv, driver.MachineType(drv)), err)
 	return host, exists
 }
 
diff --git a/pkg/minikube/problem/problem.go b/pkg/minikube/problem/problem.go
index 1de611b0a7..d5465a1830 100644
--- a/pkg/minikube/problem/problem.go
+++ b/pkg/minikube/problem/problem.go
@@ -57,7 +57,6 @@ type match struct {
 
 // Display problem metadata to the console
 func (p *Problem) Display() {
-	out.ErrT(out.FailureType, "Error: [{{.id}}] {{.error}}", out.V{"id": p.ID, "error": p.Err})
 	out.ErrT(out.Tip, "Suggestion: {{.advice}}", out.V{"advice": translate.T(p.Advice)})
 	if p.URL != "" {
 		out.ErrT(out.Documentation, "Documentation: {{.url}}", out.V{"url": p.URL})
@@ -65,6 +64,12 @@ func (p *Problem) Display() {
 	if len(p.Issues) == 0 {
 		return
 	}
+
+	if len(p.Issues) == 1 {
+		out.ErrT(out.Issues, "Related issue: {{.url}}", out.V{"url": fmt.Sprintf("%s/%d", issueBase, p.Issues[0])})
+		return
+	}
+
 	out.ErrT(out.Issues, "Related issues:")
 	issues := p.Issues
 	if len(issues) > 3 {

From f00ac2c05a08a91e09757e8eb85b7bdc3359ff16 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 26 Mar 2020 17:36:05 -0700
Subject: [PATCH 314/668] Fix null deref in start host err

---
 pkg/minikube/node/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index eede1db480..44ff9bb1cc 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -348,7 +348,7 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 	out.T(out.Workaround, `Run: "{{.delete}}", then "{{.start}} --alsologtostderr -v=1" to try again with more logging`,
 		out.V{"delete": mustload.ExampleCmd(cc.Name, "delete"), "start": mustload.ExampleCmd(cc.Name, "start")})
 
-	drv := host.Driver.DriverName()
+	drv := cc.Driver
 	exit.WithError(fmt.Sprintf(`Failed to start %s %s. "%s" may fix it.`, drv, driver.MachineType(drv), mustload.ExampleCmd(cc.Name, "start")), err)
 	return host, exists
 }

From 2d825d649831bedbef0c6eafb03cb1cee9d4fa2d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 26 Mar 2020 18:04:49 -0700
Subject: [PATCH 315/668] translations facelift

---
 pkg/minikube/extract/extract.go               |  16 +-
 pkg/minikube/translate/translate.go           |  20 ++-
 .../en/docs/Contributing/translations.md      |  84 ++++++++-
 translations/de.json                          | 146 +++++++++-------
 translations/es.json                          | 145 ++++++++-------
 translations/fr.json                          | 165 +++++++++---------
 translations/ja.json                          | 144 ++++++++-------
 translations/ko.json                          | 117 +++++++++----
 translations/pl.json                          | 140 ++++++++-------
 translations/zh-CN.json                       | 119 ++++++++-----
 10 files changed, 673 insertions(+), 423 deletions(-)

diff --git a/pkg/minikube/extract/extract.go b/pkg/minikube/extract/extract.go
index 8453d53ea5..584acd827e 100644
--- a/pkg/minikube/extract/extract.go
+++ b/pkg/minikube/extract/extract.go
@@ -29,6 +29,10 @@ import (
 	"strconv"
 	"strings"
 
+	// initflag must be imported before any other minikube pkg.
+	// Fix for https://github.com/kubernetes/minikube/issues/4866
+	_ "k8s.io/minikube/pkg/initflag"
+
 	"github.com/golang-collections/collections/stack"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/util/lock"
@@ -45,6 +49,7 @@ var blacklist = []string{
 	"env {{.docker_env}}",
 	"\\n",
 	"==\u003e {{.name}} \u003c==",
+	"- {{.profile}}",
 }
 
 // ErrMapFile is a constant to refer to the err_map file, which contains the Advice strings.
@@ -450,14 +455,17 @@ func writeStringsToFiles(e *state, output string) error {
 			return nil
 		}
 		fmt.Printf("Writing to %s\n", filepath.Base(path))
-		var currentTranslations map[string]interface{}
+		currentTranslations := make(map[string]interface{})
 		f, err := ioutil.ReadFile(path)
 		if err != nil {
 			return errors.Wrap(err, "reading translation file")
 		}
-		err = json.Unmarshal(f, &currentTranslations)
-		if err != nil {
-			return errors.Wrap(err, "unmarshalling current translations")
+		// Unmarhsal nonempty files
+		if len(f) > 0 {
+			err = json.Unmarshal(f, &currentTranslations)
+			if err != nil {
+				return errors.Wrap(err, "unmarshalling current translations")
+			}
 		}
 
 		// Make sure to not overwrite already translated strings
diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go
index 960352da82..4a6092515a 100644
--- a/pkg/minikube/translate/translate.go
+++ b/pkg/minikube/translate/translate.go
@@ -18,6 +18,8 @@ package translate
 
 import (
 	"encoding/json"
+	"fmt"
+	"path"
 	"strings"
 
 	"github.com/cloudfoundry-attic/jibber_jabber"
@@ -73,11 +75,23 @@ func DetermineLocale() {
 	}
 
 	// Load translations for preferred language into memory.
-	translationFile := "translations/" + preferredLanguage.String() + ".json"
+	p := preferredLanguage.String()
+	translationFile := path.Join("translations", fmt.Sprintf("%s.json", p))
 	t, err := Asset(translationFile)
 	if err != nil {
-		glog.Infof("Failed to load translation file for %s: %v", preferredLanguage.String(), err)
-		return
+		// Attempt to find a more broad locale, e.g. fr instead of fr-FR.
+		if strings.Contains(p, "-") {
+			p = strings.Split(p, "-")[0]
+			translationFile := path.Join("translations", fmt.Sprintf("%s.json", p))
+			t, err = Asset(translationFile)
+			if err != nil {
+				glog.Infof("Failed to load translation file for %s: %v", p, err)
+				return
+			}
+		} else {
+			glog.Infof("Failed to load translation file for %s: %v", preferredLanguage.String(), err)
+			return
+		}
 	}
 
 	err = json.Unmarshal(t, &Translations)
diff --git a/site/content/en/docs/Contributing/translations.md b/site/content/en/docs/Contributing/translations.md
index 40f7cfdee1..aa1f8b8c8d 100644
--- a/site/content/en/docs/Contributing/translations.md
+++ b/site/content/en/docs/Contributing/translations.md
@@ -8,14 +8,82 @@ description: >
 
 All translations are stored in the top-level `translations` directory.
 
+### Adding a New Language
+* Add a new json file in the translations directory with the locale code of the language you want to add
+  translations for, e.g. fr for French.
+	```
+	~/minikube$ touch translations/ar.json
+	~/minikube$ ls translations/
+	de.json		es.json		fr.json		ja.json		ko.json		pl.json		zh-CN.json
+	```
+* Run `make extract` from root to populate that file with the strings to translate in json
+  form.
+	```
+	~/minikube$ make extract
+	go run cmd/extract/extract.go
+	Compiling translation strings...
+	Writing to de.json
+	Writing to es.json
+	Writing to fr.json
+	Writing to ja.json
+	Writing to ko.json
+	Writing to pl.json
+	Writing to zh-CN.json
+	Done!
+	```
+* Add translated strings as the value of the map where the English phrase is the key.
+	* The file will be json file with all of the English phrases as the keys of a map
+	```
+	~/minikube$ head translations/fr.json 
+	{
+		"\"The '{{.minikube_addon}}' addon is disabled": "",
+		"\"{{.machineName}}\" does not exist, nothing to stop": "",
+		"\"{{.name}}\" profile does not exist, trying anyways.": "",
+		"'none' driver does not support 'minikube docker-env' command": "",
+		"'none' driver does not support 'minikube mount' command": "",
+		"'none' driver does not support 'minikube podman-env' command": "",
+		"'none' driver does not support 'minikube ssh' command": "",
+		"'{{.driver}}' driver reported an issue: {{.error}}": "",
+	```
+	* Add the translations as the values of the map, keeping in mind that anything in double braces `{{}}` are variable names describing what gets injected and should not be translated.
+	```
+	~/minikube$ vi translations/ar.json
+	{
+                "\"The '{{.minikube_addon}}' addon is disabled": "",
+                "\"{{.machineName}}\" does not exist, nothing to stop": "\""{{.machineName}} n'exist pas, rien a arrêter.",
+                "\"{{.name}}\" profile does not exist, trying anyways.": "",
+                "'none' driver does not support 'minikube docker-env' command": "",
+                "'none' driver does not support 'minikube mount' command": "",
+                "'none' driver does not support 'minikube podman-env' command": "",
+                "'none' driver does not support 'minikube ssh' command": "",
+                "'{{.driver}}' driver reported an issue: {{.error}}": "",
+        ```
+	
 ### Adding Translations To an Existing Language
 * Run `make extract` to make sure all strings are up to date
-* Add translated strings to the appropriate json files in the 'translations'
-  directory.
+* Edit the appropriate json file in the 'translations' directory, in the same way described above.
 
-### Adding a New Language
-* Add a new json file with the locale code of the language you want to add
-  translations for, e.g. en for English.
-* Run `make extract` to populate that file with the strings to translate in json
-  form.
-* Add translations to as many strings as you'd like.
+### Testing translations
+* Once you have all the translations you want, save the file and rebuild the minikube from scratch to pick up your new translations:
+	```
+	~/minikube$ make clean
+	rm -rf ./out
+	rm -f pkg/minikube/assets/assets.go
+	rm -f pkg/minikube/translate/translations.go
+	rm -rf ./vendor
+	~/minikube$ make
+	```
+	Note: the clean is required to regenerate the embedded `translations.go` file
+
+* You now have a fresh minikube binary in the `out` directory. If your system locale is that of the language you added translations for, a simple `out/minikube start` will work as a test, assuming you translated phrases from `minikube start`. You can use whatever command you'd like in that way. 
+
+* If you have a different system locale, you can override the printed language using the LANG environment variable:
+	```
+	~/minikube$ LANG=fr out/minikube start
+	😄  minikube v1.9.0-beta.2 sur Darwin 10.14.6
+	✨  Choix automatique du driver hyperkit
+	🔥  Création de VM hyperkit (CPUs=2, Mémoire=4000MB, Disque=20000MB)...
+	🐳  Préparation de Kubernetes v1.18.0 sur Docker 19.03.8...
+	🌟  Installation des addons: default-storageclass, storage-provisioner
+	🏄  Terminé ! kubectl est maintenant configuré pour utiliser "minikube".
+	```
diff --git a/translations/de.json b/translations/de.json
index 6f179495a3..248328d176 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -1,16 +1,12 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
-	"\"{{.name}}\" profile does not exist": "",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
-	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -32,12 +28,11 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Alternatives Bild-Repository zum Abrufen von Docker-Images. Dies ist hilfreich, wenn Sie nur eingeschränkten Zugriff auf gcr.io haben. Stellen Sie \\\"auto\\\" ein, dann wählt minikube eins für sie aus. Nutzer vom chinesischen Festland können einen lokalen gcr.io-Mirror wie registry.cn-hangzhou.aliyuncs.com/google_containers verwenden.",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "Größe des der minikube-VM zugewiesenen Arbeitsspeichers (Format: \u003cNummer\u003e [\u003cEinheit\u003e], wobei Einheit = b, k, m oder g)",
-	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
@@ -48,6 +43,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -66,9 +62,9 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "Ländercode des zu verwendenden Image Mirror. Lassen Sie dieses Feld leer, um den globalen zu verwenden. Nutzer vom chinesischen Festland stellen cn ein.",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "Bereitstellung {{.name}} wird erstellt...",
-	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "",
 	"Default user id used for the mount": "",
@@ -97,10 +93,9 @@
 	"Done! kubectl is now configured to use \"{{.name}}\"": "",
 	"Done! kubectl is now configured to use \"{{.name}}__1": "Fertig! kubectl ist jetzt für die Verwendung von \"{{.name}}\" konfiguriert",
 	"Download complete!": "Download abgeschlossen!",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
-	"Downloading {{.name}} {{.version}}": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -109,7 +104,6 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "Experimentellen NVIDIA GPU-Support in minikube aktivieren",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "Host Resolver für NAT DNS-Anfragen aktivieren (nur Virtualbox-Treiber)",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "Proxy für NAT-DNS-Anforderungen aktivieren (nur Virtualbox-Treiber)",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "Standard-CNI-Plugin-in (/etc/cni/net.d/k8s.conf) aktivieren. Wird in Verbindung mit \"--network-plugin = cni\" verwendet",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
@@ -131,45 +125,29 @@
 	"Error finding port for mount": "",
 	"Error generating set output": "",
 	"Error generating unset output": "",
-	"Error getting IP": "",
-	"Error getting client": "",
-	"Error getting client: {{.error}}": "",
-	"Error getting cluster": "",
 	"Error getting cluster bootstrapper": "",
 	"Error getting cluster config": "",
-	"Error getting config": "",
-	"Error getting control plane": "",
 	"Error getting host": "",
-	"Error getting host IP": "",
-	"Error getting host status": "",
-	"Error getting machine logs": "",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
-	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
-	"Error loading api": "",
-	"Error loading profile config": "",
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "Fehler beim Laden des Profils {{.name}}: {{.error}}",
 	"Error opening service": "",
 	"Error parsing Driver version: {{.error}}": "Fehler beim Parsen der Driver-Version: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "Fehler beim Parsen der minikube-Version: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error retrieving node": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Fehler: Sie haben Kubernetes v{{.new}} ausgewählt, aber auf dem vorhandenen Cluster für Ihr Profil wird Kubernetes v{{.old}} ausgeführt. Zerstörungsfreie Downgrades werden nicht unterstützt. Sie können jedoch mit einer der folgenden Optionen fortfahren:\n* Erstellen Sie den Cluster mit Kubernetes v{{.new}} neu: Führen Sie \"minikube delete {{.profile}}\" und dann \"minikube start {{.profile}} - kubernetes-version = {{.new}}\" aus.\n* Erstellen Sie einen zweiten Cluster mit Kubernetes v{{.new}}: Führen Sie \"minikube start -p \u003cnew name\u003e --kubernetes-version = {{.new}}\" aus.\n* Verwenden Sie den vorhandenen Cluster mit Kubernetes v {{.old}} oder höher: Führen Sie \"minikube start {{.profile}} --kubernetes-version = {{.old}}\" aus.",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Wird beendet",
 	"Exiting.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -177,38 +155,38 @@
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "",
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Fehler beim Ändern der Berechtigungen für {{.minikube_dir_path}}: {{.error}}",
-	"Failed to check if machine exists": "",
 	"Failed to check main repository and mirrors for images for images": "",
 	"Failed to delete cluster: {{.error}}": "Fehler beim Löschen des Clusters: {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "Fehler beim Löschen des Clusters: {{.error}}",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
-	"Failed to delete node {{.name}}": "",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "",
 	"Failed to get command runner": "",
-	"Failed to get driver URL": "",
 	"Failed to get image map": "",
 	"Failed to get machine client": "",
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Fehler beim Beenden des Bereitstellungsprozesses: {{.error}}",
 	"Failed to list cached images": "",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY Env konnte nicht festgelegt werden. Benutzen Sie `export NO_PROXY = $ NO_PROXY, {{. Ip}}",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
 	"Failed to setup kubeconfig": "",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Für beste Ergebnisse installieren Sie kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -218,13 +196,16 @@
 	"Force minikube to perform possibly dangerous operations": "minikube zwingen, möglicherweise gefährliche Operationen durchzuführen",
 	"Found network options:": "Gefundene Netzwerkoptionen:",
 	"Found {{.number}} invalid profile(s) !": "",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting machine config failed": "",
+	"Getting bootstrapper": "",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -235,6 +216,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -251,8 +233,9 @@
 	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Unsichere Docker-Registrys, die an den Docker-Daemon übergeben werden. Der CIDR-Bereich des Standarddienstes wird automatisch hinzugefügt.",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -267,7 +250,7 @@
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "Lokale Ordner, die über NFS-Bereitstellungen für Gast freigegeben werden (nur Hyperkit-Treiber)",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "Speicherort des VPNKit-Sockets, der für das Netzwerk verwendet wird. Wenn leer, wird Hyperkit VPNKitSock deaktiviert. Wenn 'auto' die Docker for Mac VPNKit-Verbindung verwendet, wird andernfalls der angegebene VSock verwendet (nur Hyperkit-Treiber).",
 	"Location of the minikube iso": "Speicherort der minikube-ISO",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -285,15 +268,18 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "Keines der bekannten Repositories an Ihrem Standort ist zugänglich. {{.image_repository_name}} wird als Fallback verwendet.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "Keines der bekannten Repositories ist zugänglich. Erwägen Sie, ein alternatives Image-Repository mit der Kennzeichnung --image-repository anzugeben",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "Anzahl der CPUs, die der minikube-VM zugeordnet sind",
-	"Number of CPUs allocated to the minikube VM.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -314,6 +300,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "Aktualisieren Sie '{{.driver_executable}}'. {{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -327,10 +314,10 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Geben Sie die VM-UUID an, um die MAC-Adresse wiederherzustellen (nur Hyperkit-Treiber)",
+	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "Registry-Mirror, die an den Docker-Daemon übergeben werden",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
@@ -341,7 +328,10 @@
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "Die angeforderte Festplattengröße {{.requested_size}} liegt unter dem Mindestwert von {{.minimum_size}}.",
 	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "Die angeforderte Speicherzuordnung ({{.memory}} MB) ist geringer als die Standardspeicherzuordnung von {{.default_memorysize}} MB. Beachten Sie, dass minikube möglicherweise nicht richtig funktioniert oder unerwartet abstürzt.",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "Die angeforderte Speicherzuweisung {{.requested_size}} liegt unter dem zulässigen Mindestwert von {{.minimum_size}}.",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -354,8 +344,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -381,8 +373,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "Startet einen lokalen Kubernetes-Cluster",
 	"Starts a node.": "",
@@ -395,7 +387,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
@@ -427,12 +418,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "Der DNS-Domänenname des Clusters, der im Kubernetes-Cluster verwendet wird",
 	"The container runtime to be used (docker, crio, containerd)": "Die zu verwendende Container-Laufzeit (Docker, Crio, Containerd)",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used": "Der zu verwendende Cri-Socket-Pfad",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "Der Treiber '{{.driver}}' wird auf {{.os}} nicht unterstützt",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "Der Name des virtuellen Hyperv-Switch. Standardmäßig zuerst gefunden. (nur Hyperv-Treiber)",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -444,10 +439,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -456,19 +455,24 @@
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "Der Treiber {{.driver_name}} sollte nicht mit Root-Rechten verwendet werden.",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "Es gibt eine neue Version für '{{.driver_executable}}'. Bitte erwägen Sie ein Upgrade. {{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Dies kann auch automatisch erfolgen, indem Sie die env var CHANGE_MINIKUBE_NONE_USER = true setzen",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Dadurch wird der vorhandene Kubectl-Kontext beibehalten und ein minikube-Kontext erstellt.",
 	"This will start the mount daemon and automatically mount files into minikube": "Dadurch wird der Mount-Daemon gestartet und die Dateien werden automatisch in minikube geladen",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Tipp: Um diesen Root-Cluster zu entfernen, führen Sie Folgendes aus: sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Möglicherweise müssen Sie Kubectl- oder minikube-Befehle verschieben, um sie als eigenen Nutzer zu verwenden. Um beispielsweise Ihre eigenen Einstellungen zu überschreiben, führen Sie aus:",
@@ -478,24 +482,31 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
 	"Unable to get bootstrapper: {{.error}}": "Bootstrapper kann nicht abgerufen werden: {{.error}}",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
-	"Unable to get the status of the {{.name}} cluster.": "",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "Zwischengespeicherte Bilder können nicht aus der Konfigurationsdatei geladen werden.",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "Konfig kann nicht geladen werden: {{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "\"{{.Kubernetes_version}}\" kann nicht geparst werden: {{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
 	"Unable to pull images, which may be OK: {{.error}}": "Bilder können nicht abgerufen werden, was möglicherweise kein Problem darstellt: {{.error}}",
-	"Unable to remove machine directory: %v": "",
-	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -506,6 +517,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Upgrade von Kubernetes {{.old}} auf {{.new}}",
 	"Usage": "",
@@ -526,11 +539,11 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "Verwenden des Image-Repositorys {{.name}}",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "VM-Treiber ist einer von: %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
 	"Verifying dashboard health ...": "",
@@ -545,11 +558,12 @@
 	"Wait failed": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Warten Sie vor dem Beenden, bis die Kerndienste von Kubernetes fehlerfrei arbeiten",
-	"Waiting for cluster to come online ...": "",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Als Root für die NFS-Freigaben wird standardmäßig /nfsshares verwendet (nur Hyperkit-Treiber)",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Sie scheinen einen Proxy zu verwenden, aber Ihre NO_PROXY-Umgebung enthält keine minikube-IP ({{.ip_address}}). Weitere Informationen finden Sie unter {{.documentation_url}}",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Möglicherweise müssen Sie die VM \"{{.name}}\" manuell von Ihrem Hypervisor entfernen",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
@@ -558,45 +572,43 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Konfiguration von Kubectl und minikube wird in {{.home_folder}} gespeichert",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
@@ -605,14 +617,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -637,17 +651,17 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
-	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "",
 	"{{.name}}\" profile does not exist": "Profil \"{{.name}}\" existiert nicht",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} auf {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
diff --git a/translations/es.json b/translations/es.json
index 53f8e3f3f5..ee0814d4a0 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -1,16 +1,13 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist": "El perfil \"{{.name}}\" no existe",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
-	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -32,12 +29,11 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Repositorio de imágenes alternativo del que extraer imágenes de Docker. Puedes usarlo cuando tengas acceso limitado a gcr.io. Si quieres que minikube elija uno por ti, solo tienes que definir el valor como \"auto\". Los usuarios de China continental pueden utilizar réplicas locales de gcr.io, como registry.cn-hangzhou.aliyuncs.com/google_containers",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "Cantidad de RAM asignada a la VM de minikube (formato: \u003cnúmero\u003e[\u003cunidad\u003e], donde unidad = b, k, m o g)",
-	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
@@ -48,6 +44,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -66,9 +63,9 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "Código de país de la réplica de imagen que quieras utilizar. Déjalo en blanco para usar el valor global. Los usuarios de China continental deben definirlo como cn.",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "Creando la activación {{.name}}...",
-	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "",
 	"Default user id used for the mount": "",
@@ -97,10 +94,9 @@
 	"Done! kubectl is now configured to use \"{{.name}}\"": "",
 	"Done! kubectl is now configured to use \"{{.name}}__1": "¡Listo! Se ha configurado kubectl para que use \"{{.name}}",
 	"Download complete!": "Se ha completado la descarga",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
-	"Downloading {{.name}} {{.version}}": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -109,7 +105,6 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "Permite habilitar la compatibilidad experimental con GPUs NVIDIA en minikube",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "Permite habilitar la resolución del host en las solicitudes DNS con traducción de direcciones de red (NAT) aplicada (solo con el controlador de Virtualbox)",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "Permite habilitar el uso de proxies en las solicitudes de DNS con traducción de direcciones de red (NAT) aplicada (solo con el controlador de Virtualbox)",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "Permite habilitar el complemento CNI predeterminado (/etc/cni/net.d/k8s.conf). Se utiliza junto con \"--network-plugin=cni",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
@@ -131,45 +126,29 @@
 	"Error finding port for mount": "",
 	"Error generating set output": "",
 	"Error generating unset output": "",
-	"Error getting IP": "",
-	"Error getting client": "",
-	"Error getting client: {{.error}}": "",
-	"Error getting cluster": "",
 	"Error getting cluster bootstrapper": "",
 	"Error getting cluster config": "",
-	"Error getting config": "",
-	"Error getting control plane": "",
 	"Error getting host": "",
-	"Error getting host IP": "",
-	"Error getting host status": "",
-	"Error getting machine logs": "",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
-	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
-	"Error loading api": "",
-	"Error loading profile config": "",
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "No se ha podido cargar el perfil {{.name}}: {{.error}}",
 	"Error opening service": "",
 	"Error parsing Driver version: {{.error}}": "No se ha podido analizar la versión de Driver: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "No se ha podido analizar la versión de minikube: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error retrieving node": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Error: Has seleccionado Kubernetes {{.new}}, pero el clúster de tu perfil utiliza la versión {{.old}}. No se puede cambiar a una versión inferior sin eliminar todos los datos y recursos pertinentes, pero dispones de las siguientes opciones para continuar con la operación:\n* Volver a crear el clúster con Kubernetes {{.new}}: ejecuta \"minikube delete {{.profile}}\" y, luego, \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Crear un segundo clúster con Kubernetes {{.new}}: ejecuta \"minikube start -p \u003cnuevo nombre\u003e --kubernetes-version={{.new}}\"\n* Reutilizar el clúster actual con Kubernetes {{.old}} o una versión posterior: ejecuta \"minikube start {{.profile}} --kubernetes-version={{.old}}",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Saliendo",
 	"Exiting.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -177,38 +156,38 @@
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "",
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "No se han podido cambiar los permisos de {{.minikube_dir_path}}: {{.error}}",
-	"Failed to check if machine exists": "",
 	"Failed to check main repository and mirrors for images for images": "",
 	"Failed to delete cluster: {{.error}}": "No se ha podido eliminar el clúster: {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "No se ha podido eliminar el clúster: {{.error}}",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
-	"Failed to delete node {{.name}}": "",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "",
 	"Failed to get command runner": "",
-	"Failed to get driver URL": "",
 	"Failed to get image map": "",
 	"Failed to get machine client": "",
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "No se ha podido detener el proceso de activación: {{.error}}",
 	"Failed to list cached images": "",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "No se ha podido definir la variable de entorno NO_PROXY. Utiliza export NO_PROXY=$NO_PROXY,{{.ip}}",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
 	"Failed to setup kubeconfig": "",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Para disfrutar de un funcionamiento óptimo, instala kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -218,13 +197,16 @@
 	"Force minikube to perform possibly dangerous operations": "Permite forzar minikube para que realice operaciones potencialmente peligrosas",
 	"Found network options:": "Se han encontrado las siguientes opciones de red:",
 	"Found {{.number}} invalid profile(s) !": "",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting machine config failed": "",
+	"Getting bootstrapper": "",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -235,6 +217,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -251,8 +234,9 @@
 	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Registros de Docker que no son seguros y que se transferirán al daemon de Docker. Se añadirá automáticamente el intervalo CIDR de servicio predeterminado.",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -267,7 +251,7 @@
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "Carpetas locales que se compartirán con el invitado mediante activaciones de NFS (solo con el controlador de hyperkit)",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "Ubicación del socket de VPNKit que se utiliza para ofrecer funciones de red. Si se deja en blanco, se inhabilita VPNKitSock de Hyperkit; si se define como \"auto\", se utiliza Docker para las conexiones de VPNKit en Mac. Con cualquier otro valor, se utiliza el VSock especificado (solo con el controlador de hyperkit)",
 	"Location of the minikube iso": "Ubicación de la ISO de minikube",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -285,15 +269,18 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "No se puede acceder a ninguno de los repositorios conocidos de tu ubicación. Se utilizará {{.image_repository_name}} como alternativa.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "No se puede acceder a ninguno de los repositorios conocidos. Plantéate indicar un repositorio de imágenes alternativo con la marca --image-repository.",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "Número de CPU asignadas a la VM de minikube",
-	"Number of CPUs allocated to the minikube VM.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -314,6 +301,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "Actualiza \"{{.driver_executable}}\". {{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -327,10 +315,10 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Permite especificar un UUID de VM para restaurar la dirección MAC (solo con el controlador de hyperkit)",
+	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "Réplicas del registro que se transferirán al daemon de Docker",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
@@ -341,7 +329,10 @@
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "El tamaño de disco de {{.requested_size}} que se ha solicitado es inferior al tamaño mínimo de {{.minimum_size}}",
 	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "El valor de la asignación de memoria ({{.memory}} MB) solicitada es inferior a la asignación de memoria predeterminada de {{.default_memorysize}} MB. minikube podría no funcionar correctamente o fallar de manera inesperada.",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "El valor de la asignación de memoria de {{.requested_size}} solicitada es inferior al valor mínimo de {{.minimum_size}}",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -354,8 +345,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -381,8 +374,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "Inicia un clúster de Kubernetes local",
 	"Starts a node.": "",
@@ -395,7 +388,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
@@ -427,12 +419,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "El nombre de dominio de DNS del clúster de Kubernetes",
 	"The container runtime to be used (docker, crio, containerd)": "El entorno de ejecución del contenedor (Docker, cri-o, containerd)",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used": "La ruta del socket de cri",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "El controlador \"{{.driver}}\" no se puede utilizar en {{.os}}",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "El nombre del conmutador virtual de hyperv. El valor predeterminado será el primer nombre que se encuentre (solo con el controlador de hyperv).",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -444,10 +440,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -456,19 +456,24 @@
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "El controlador {{.driver_name}} no se debe utilizar con privilegios de raíz.",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "Hay una nueva versión de \"{{.driver_executable}}\". Te recomendamos que realices la actualización. {{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "El proceso se puede automatizar si se define la variable de entorno CHANGE_MINIKUBE_NONE_USER=true",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Se conservará el contexto de kubectl actual y se creará uno de minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Se iniciará el daemon de activación y se activarán automáticamente los archivos en minikube",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Para eliminar este clúster de raíz, ejecuta: sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Para conectarte a este clúster, usa: kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Para conectarte a este clúster, usa: kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Para usar comandos de kubectl o minikube como tu propio usuario, puede que debas reubicarlos. Por ejemplo, para sobrescribir tu configuración, ejecuta:",
@@ -478,24 +483,31 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
 	"Unable to get bootstrapper: {{.error}}": "No se ha podido obtener el programa previo: {{.error}}",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
-	"Unable to get the status of the {{.name}} cluster.": "",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "No se han podido cargar las imágenes almacenadas en caché del archivo de configuración.",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "No se ha podido cargar la configuración: {{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "No se ha podido analizar la versión \"{{.kubernetes_version}}\": {{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
 	"Unable to pull images, which may be OK: {{.error}}": "No se ha podido recuperar imágenes, que podrían estar en buen estado: {{.error}}",
-	"Unable to remove machine directory: %v": "",
-	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -506,6 +518,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Actualizando la versión de Kubernetes de {{.old}} a {{.new}}",
 	"Usage": "",
@@ -526,11 +540,11 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "El controlador de la VM es uno de los siguientes: %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
 	"Verifying dashboard health ...": "",
@@ -545,11 +559,12 @@
 	"Wait failed": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Espera hasta que los servicios principales de Kubernetes se encuentren en buen estado antes de salir",
-	"Waiting for cluster to come online ...": "",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Ruta en la raíz de los recursos compartidos de NFS. Su valor predeterminado es /nfsshares (solo con el controlador de hyperkit)",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Parece que estás usando un proxy, pero tu entorno NO_PROXY no incluye la dirección IP de minikube ({{.ip_address}}). Consulta {{.documentation_url}} para obtener más información",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Puede que tengas que retirar manualmente la VM \"{{.name}}\" de tu hipervisor",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
@@ -558,45 +573,43 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "La configuración de kubectl y de minikube se almacenará en {{.home_folder}}",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
@@ -605,14 +618,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -637,16 +652,16 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
-	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} en {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
diff --git a/translations/fr.json b/translations/fr.json
index 7dd081da10..3148fd8a0a 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -1,17 +1,12 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
-	"\"{{.name}}\" profile does not exist": "Le profil \"{{.name}}\" n'existe pas.",
-	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
-	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "",
-	"\"{{.profile_name}}\" stopped.": "\"{{.profile_name}}\" est arrêté.",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "\"{{.machineName}} n'exist pas, rien a arrêter.",
+	"\"{{.name}}\" profile does not exist, trying anyways.": "Le profil \"{{.name}}\" n'existe pas, tentative de suppression quand même.",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -33,22 +28,22 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Autre dépôt d'images d'où extraire des images Docker. Il peut être utilisé en cas d'accès limité à gcr.io. Définissez-le sur \\\"auto\\\" pour permettre à minikube de choisir la valeur à votre place. Pour les utilisateurs situés en Chine continentale, vous pouvez utiliser des miroirs gcr.io locaux tels que registry.cn-hangzhou.aliyuncs.com/google_containers.",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "Quantité de mémoire RAM allouée à la VM minikube (format : \u003cnombre\u003e[\u003cunité\u003e], où \"unité\" = b, k, m ou g).",
-	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
-	"Automatically selected the {{.driver}} driver": "",
-	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
+	"Automatically selected the {{.driver}} driver": "Choix automatique du driver {{.driver}}",
+	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du driver {{.driver}}. Autres choix: {{.alternatives}}",
 	"Available Commands": "",
 	"Basic Commands:": "",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -68,16 +63,15 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "Code pays du miroir d'images à utiliser. Laissez ce paramètre vide pour utiliser le miroir international. Pour les utilisateurs situés en Chine continentale, définissez sa valeur sur \"cn\".",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "Création de l'installation {{.name}}…",
-	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Création d'une VM {{.driver_name}} (CPUs={{.number_of_cpus}}, Mémoire={{.memory_size}}MB, Disque={{.disk_size}}MB)...",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Création de {{.machine_type}} {{.driver_name}} (CPUs={{.number_of_cpus}}, Mémoire={{.memory_size}}MB, Disque={{.disk_size}}MB)...",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "",
 	"Default user id used for the mount": "",
 	"Delete an image from the local cache.": "",
 	"Deletes a local kubernetes cluster": "",
-	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "",
-	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "Supprime le cluster Kubernetes local. Cette commande supprime la VM ainsi que tous les fichiers associés.",
+	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "Supprime le cluster Kubernetes local. Cette commande supprime la VM ainsi que tous les fichiers associés.",
 	"Deletes a node from a cluster.": "",
 	"Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "Suppression de \"{{.profile_name}}\" dans {{.driver_name}}...",
 	"Deleting node {{.name}} from cluster {{.cluster}}": "Suppression de noeuds {{.name}} de cluster {{.cluster}}",
@@ -90,18 +84,15 @@
 	"Display dashboard URL instead of opening a browser": "",
 	"Display the kubernetes addons URL in the CLI instead of opening it in the default browser": "",
 	"Display the kubernetes service URL in the CLI instead of opening it in the default browser": "",
-	"Display values currently set in the minikube config file": "",
 	"Display values currently set in the minikube config file.": "",
 	"Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "",
 	"Docs have been saved at - {{.path}}": "",
 	"Documentation: {{.url}}": "",
-	"Done! kubectl is now configured to use \"{{.name}}": "Terminé ! kubectl est maintenant configuré pour utiliser \"{{.name}}\".",
-	"Done! kubectl is now configured to use \"{{.name}}\"": "",
+	"Done! kubectl is now configured to use \"{{.name}}\"": "Terminé ! kubectl est maintenant configuré pour utiliser \"{{.name}}\".",
 	"Download complete!": "Téléchargement terminé !",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
-	"Downloading {{.name}} {{.version}}": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -110,13 +101,12 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "Active l'assistance expérimentale du GPU NVIDIA dans minikube.",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "Active le résolveur d'hôte pour les requêtes DNS NAT (pilote VirtualBox uniquement).",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "Active le proxy pour les requêtes DNS NAT (pilote VirtualBox uniquement).",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "Active le plug-in CNI par défaut (/etc/cni/net.d/k8s.conf). Utilisé en association avec \\\"--network-plugin=cni\\\".",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
 	"Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "",
 	"Enabling '{{.name}}' returned an error: {{.error}}": "",
-	"Enabling addons: {{.addons}}": "",
+	"Enabling addons: {{.addons}}": "Installation des addons: {{.addons}}",
 	"Enabling dashboard ...": "",
 	"Ensure that CRI-O is installed and healthy: Run 'sudo systemctl start crio' and 'journalctl -u crio'. Alternatively, use --container-runtime=docker": "",
 	"Ensure that Docker is installed and healthy: Run 'sudo systemctl start docker' and 'journalctl -u docker'. Alternatively, select another value for --driver": "",
@@ -132,45 +122,29 @@
 	"Error finding port for mount": "",
 	"Error generating set output": "",
 	"Error generating unset output": "",
-	"Error getting IP": "",
-	"Error getting client": "",
-	"Error getting client: {{.error}}": "",
-	"Error getting cluster": "",
 	"Error getting cluster bootstrapper": "",
 	"Error getting cluster config": "",
-	"Error getting config": "",
-	"Error getting control plane": "",
 	"Error getting host": "",
-	"Error getting host IP": "",
-	"Error getting host status": "",
-	"Error getting machine logs": "",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
-	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
-	"Error loading api": "",
-	"Error loading profile config": "",
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "Erreur lors du chargement du profil {{.name}} : {{.error}}",
 	"Error opening service": "",
 	"Error parsing Driver version: {{.error}}": "Erreur lors de l'analyse de la version du pilote de la VM : {{.error}}",
 	"Error parsing minikube version: {{.error}}": "Erreur lors de l'analyse de la version de minikube : {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error retrieving node": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Fermeture…",
 	"Exiting.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -178,38 +152,38 @@
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "",
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Échec de la modification des autorisations pour {{.minikube_dir_path}} : {{.error}}",
-	"Failed to check if machine exists": "",
 	"Failed to check main repository and mirrors for images for images": "",
 	"Failed to delete cluster: {{.error}}": "Échec de la suppression du cluster : {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "Échec de la suppression du cluster : {{.error}}",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
-	"Failed to delete node {{.name}}": "",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "",
 	"Failed to get command runner": "",
-	"Failed to get driver URL": "",
 	"Failed to get image map": "",
 	"Failed to get machine client": "",
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Échec de l'arrêt du processus d'installation : {{.error}}",
 	"Failed to list cached images": "",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "Échec de la définition de NO_PROXY Env. Veuillez utiliser `export NO_PROXY=$NO_PROXY,{{.ip}}.",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
 	"Failed to setup kubeconfig": "",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Pour des résultats optimaux, installez kubectl à l'adresse suivante : https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -219,13 +193,16 @@
 	"Force minikube to perform possibly dangerous operations": "Oblige minikube à réaliser des opérations possiblement dangereuses.",
 	"Found network options:": "Options de réseau trouvées :",
 	"Found {{.number}} invalid profile(s) !": "",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting machine config failed": "",
+	"Getting bootstrapper": "",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -236,6 +213,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -252,8 +230,9 @@
 	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Registres Docker non sécurisés à transmettre au daemon Docker. La plage CIDR par défaut du service sera ajoutée automatiquement.",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -268,7 +247,7 @@
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "Dossiers locaux à partager avec l'invité par des installations NFS (pilote hyperkit uniquement).",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "Emplacement du socket VPNKit exploité pour la mise en réseau. Si la valeur est vide, désactive Hyperkit VPNKitSock. Si la valeur affiche \"auto\", utilise la connexion VPNKit de Docker pour Mac. Sinon, utilise le VSock spécifié (pilote hyperkit uniquement).",
 	"Location of the minikube iso": "Emplacement de l'ISO minikube.",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -286,15 +265,18 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "Le noeud \"{{.node_name}}\" est arrêté.",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "Aucun dépôt connu dans votre emplacement n'est accessible. {{.image_repository_name}} est utilisé comme dépôt de remplacement.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "Aucun dépôt connu n'est accessible. Pensez à spécifier un autre dépôt d'images à l'aide de l'indicateur \"--image-repository\".",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "Nombre de processeurs alloués à la VM minikube.",
-	"Number of CPUs allocated to the minikube VM.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -315,6 +297,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "Veuillez mettre à niveau l'exécutable \"{{.driver_executable}}\". {{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -328,22 +311,25 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Fournit l'identifiant unique universel (UUID) de la VM pour restaurer l'adresse MAC (pilote hyperkit uniquement).",
+	"Pulling base image ...": "",
 	"Pulling images ...": "Extraction des images... ",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "Miroirs de dépôt à transmettre au daemon Docker.",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
 	"Related issues:": "",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "Redémarrage de Kubernetes à l'aide de {{.bootstrapper}}…",
-	"Removed all traces of the \"{{.name}}\" cluster.": "",
+	"Removed all traces of the \"{{.name}}\" cluster.": "Le cluster \"{{.name}}\" a été supprimé.",
 	"Removing {{.directory}} ...": "Suppression du répertoire {{.directory}}…",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "La taille de disque demandée ({{.requested_size}}) est inférieure à la taille minimale ({{.minimum_size}}).",
 	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "L'allocation de mémoire demandée ({{.memory}} Mo) est inférieure à l'allocation de mémoire par défaut ({{.default_memorysize}} Mo). Sachez que minikube pourrait ne pas fonctionner correctement ou planter de manière inattendue.",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "L'allocation de mémoire demandée ({{.requested_size}}) est inférieure au minimum autorisé ({{.minimum_size}}).",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -356,8 +342,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -383,8 +371,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "Démarre un cluster Kubernetes local.",
 	"Starts a node.": "",
@@ -397,7 +385,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
@@ -405,7 +392,6 @@
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "Le pilote \"{{.driver_name}}\" nécessite de disposer de droits racine. Veuillez exécuter minikube à l'aide de \"sudo minikube --vm-driver={{.driver_name}}\".",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
-	"The \"{{.name}}\" cluster has been deleted.": "Le cluster \"{{.name}}\" a été supprimé.",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "L'isolation fournie par le pilote \"none\" (aucun) est limitée, ce qui peut diminuer la sécurité et la fiabilité du système.",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
@@ -428,12 +414,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "Nom du domaine DNS du cluster utilisé dans le cluster Kubernetes.",
 	"The container runtime to be used (docker, crio, containerd)": "environment d'exécution du conteneur à utiliser (docker, crio, containerd).",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used": "Chemin d'accès au socket CRI à utiliser.",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "Le pilote \"{{.driver}}\" n'est pas compatible avec {{.os}}.",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "Nom du commutateur virtuel hyperv. La valeur par défaut affiche le premier commutateur trouvé (pilote hyperv uniquement).",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -445,10 +435,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -457,19 +451,24 @@
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "Le pilote {{.driver_name}} ne doit pas être utilisé avec des droits racine.",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "Une nouvelle version de \"{{.driver_executable}}\" est disponible. Pensez à effectuer la mise à niveau. {{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Cela permet de conserver le contexte kubectl existent et de créer un contexte minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Cela permet de lancer le daemon d'installation et d'installer automatiquement les fichiers dans minikube.",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Conseil : Pour supprimer ce cluster appartenant à la racine, exécutez la commande \"sudo {{.cmd}} delete\".",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Pour vous connecter à ce cluster, utilisez la commande \"kubectl --context={{.name}}\".",
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Pour vous connecter à ce cluster, utilisez la commande \"kubectl --context={{.name}}\".",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Pour utiliser les commandes kubectl ou minikube sous votre propre nom d'utilisateur, vous devrez peut-être les déplacer. Par exemple, pour écraser vos propres paramètres, exécutez la commande suivante :",
@@ -479,24 +478,31 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
 	"Unable to get bootstrapper: {{.error}}": "Impossible d'obtenir l'amorceur : {{.error}}",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
-	"Unable to get the status of the {{.name}} cluster.": "",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "Impossible de charger les images mises en cache depuis le fichier de configuration.",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "Impossible de charger la configuration : {{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "Impossible d'analyser la version \"{{.kubernetes_version}}\" : {{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
 	"Unable to pull images, which may be OK: {{.error}}": "Impossible d'extraire des images, qui sont peut-être au bon format : {{.error}}",
-	"Unable to remove machine directory: %v": "",
-	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -507,6 +513,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Mise à niveau de Kubernetes de la version {{.old}} à la version {{.new}}…",
 	"Usage": "Usage",
@@ -527,11 +535,11 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "Utilisation du dépôt d'images {{.name}}…",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "Le pilote de la VM appartient à : %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
 	"Verifying dashboard health ...": "",
@@ -548,12 +556,13 @@
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Avant de quitter, veuillez patienter jusqu'à ce que les principaux services Kubernetes soient opérationnels.",
 	"Waiting for SSH access ...": "En attente de l'accès SSH...",
-	"Waiting for cluster to come online ...": "",
 	"Waiting for:": "En attente de :",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Emplacement permettant d'accéder aux partages NFS en mode root, la valeur par défaut affichant /nfsshares (pilote hyperkit uniquement).",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Il semble que vous utilisiez un proxy, mais votre environment NO_PROXY n'inclut pas l'adresse IP ({{.ip_address}}) de minikube. Consultez la documentation à l'adresse {{.documentation_url}} pour en savoir plus.",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Vous devrez peut-être supprimer la VM \"{{.name}}\" manuellement de votre hyperviseur.",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
@@ -562,45 +571,43 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Les configurations kubectl et minikube seront stockées dans le dossier {{.home_folder}}.",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
@@ -609,14 +616,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -641,16 +650,16 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
-	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} sur {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
diff --git a/translations/ja.json b/translations/ja.json
index 9df68fb233..ae49a12ff5 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -1,12 +1,11 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.minikube_addon}}\" was successfully disabled": "「{{.minikube_addon}}」が無効化されました",
 	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "「{{.name}}」というクラスターは存在しません。クリーンアップ処理を続行します。",
 	"\"{{.name}}\" profile does not exist": "「{{.name}}」というプロファイルは存在しません",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
 	"\"{{.profile_name}}\" VM does not exist, nothing to stop": "「{{.profile_name}}」というVMは存在しません。停止すべき対象がありません",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
 	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "「{{.profile_name}}」というホストは存在しません。IPを表示できません",
 	"\"{{.profile_name}}\" stopped.": "「{{.profile_name}}」が停止しました。",
 	"'none' driver does not support 'minikube docker-env' command": "「none」ドライバーは「minikube docker-env」コマンドをサポートしていません",
@@ -14,7 +13,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "「none」ドライバーは「minikube ssh」コマンドをサポートしていません",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "「{{.driver}}」ドライバーがエラーを報告しました: {{.error}}",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -36,12 +34,11 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Docker イメージの pull 元の代替イメージ リポジトリ。これは、gcr.io へのアクセスが制限されている場合に使用できます。これを \\\"auto\\\" に設定すると、minikube によって自動的に指定されるようになります。中国本土のユーザーの場合、registry.cn-hangzhou.aliyuncs.com/google_containers などのローカル gcr.io ミラーを使用できます。",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "minikube VM に割り当てられた RAM 容量（形式: \u003cnumber\u003e[\u003cunit\u003e]、unit = b、k、m、g）",
-	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
@@ -52,6 +49,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -70,9 +68,9 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "使用するイメージミラーの国コード。グローバルのものを使用する場合は空のままにします。中国本土のユーザーの場合は、「cn」に設定します。",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "マウント {{.name}} を作成しています...",
-	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "",
 	"Default user id used for the mount": "",
@@ -101,10 +99,9 @@
 	"Done! kubectl is now configured to use \"{{.name}}\"": "",
 	"Done! kubectl is now configured to use \"{{.name}}__1": "完了しました。kubectl が「{{.name}}」を使用するよう構成されました",
 	"Download complete!": "ダウンロードが完了しました。",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
-	"Downloading {{.name}} {{.version}}": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -113,7 +110,6 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "minikube での試験運用版 NVIDIA GPU の対応を有効にします",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "NAT DNS リクエスト用のホストリゾルバを有効にします（virtualbox ドライバのみ）",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "NAT DNS リクエスト用のプロキシを有効にします（virtualbox ドライバのみ）",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "デフォルトの CNI プラグイン（/etc/cni/net.d/k8s.conf）を有効にします。\\\"--network-plugin=cni\\\" と組み合わせて使用されます。",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
@@ -135,45 +131,29 @@
 	"Error finding port for mount": "",
 	"Error generating set output": "",
 	"Error generating unset output": "",
-	"Error getting IP": "",
-	"Error getting client": "",
-	"Error getting client: {{.error}}": "",
-	"Error getting cluster": "",
 	"Error getting cluster bootstrapper": "",
 	"Error getting cluster config": "",
-	"Error getting config": "",
-	"Error getting control plane": "",
 	"Error getting host": "",
-	"Error getting host IP": "",
-	"Error getting host status": "",
-	"Error getting machine logs": "",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
-	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
-	"Error loading api": "",
-	"Error loading profile config": "",
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "プロファイル {{.name}} の読み込み中にエラーが発生しました。{{.error}}",
 	"Error opening service": "",
 	"Error parsing Driver version: {{.error}}": "Driver バージョンの解析中にエラーが発生しました。{{.error}}",
 	"Error parsing minikube version: {{.error}}": "minikube バージョンの解析中にエラーが発生しました。{{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error retrieving node": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "エラー: Kubernetes v{{.new}} が選択されましたが、使用しているプロファイルの既存クラスタで実行されているのは Kubernetes v{{.old}} です。非破壊的なダウングレードはサポートされていませんが、以下のいずれかの方法で続行できます。\n* Kubernetes v{{.new}} を使用してクラスタを再作成する: 「minikube delete {{.profile}}」を実行してから、「minikube start {{.profile}} --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.new}} を使用して 2 つ目のクラスタを作成する: 「minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.old}} 以降を使用して既存のクラスタを再利用する: 「minikube start {{.profile}} --kubernetes-version={{.old}}」を実行します。",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "終了しています",
 	"Exiting.": "終了しています。",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -181,38 +161,38 @@
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "",
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "{{.minikube_dir_path}} に対する権限を変更できませんでした。{{.error}}",
-	"Failed to check if machine exists": "",
 	"Failed to check main repository and mirrors for images for images": "",
 	"Failed to delete cluster: {{.error}}": "クラスタを削除できませんでした。{{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "クラスタを削除できませんでした。{{.error}}",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
-	"Failed to delete node {{.name}}": "",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "",
 	"Failed to get command runner": "",
-	"Failed to get driver URL": "",
 	"Failed to get image map": "",
 	"Failed to get machine client": "",
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "マウント プロセスを強制終了できませんでした。{{.error}}",
 	"Failed to list cached images": "",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY 環境変数を設定できませんでした。「export NO_PROXY=$NO_PROXY,{{.ip}}」を使用してください。",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
 	"Failed to setup kubeconfig": "",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "最適な結果を得るには、kubectl を次のサイト https://kubernetes.io/docs/tasks/tools/install-kubectl/ からインストールしてください",
@@ -222,13 +202,16 @@
 	"Force minikube to perform possibly dangerous operations": "minikube で危険な可能性のある操作を強制的に実行します",
 	"Found network options:": "ネットワーク オプションが見つかりました。",
 	"Found {{.number}} invalid profile(s) !": "",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting machine config failed": "",
+	"Getting bootstrapper": "",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -239,6 +222,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -255,8 +239,9 @@
 	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Docker デーモンに渡す Docker レジストリが安全ではありません。デフォルトのサービス CIDR 範囲が自動的に追加されます。",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -271,7 +256,7 @@
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "NFS マウントを介してゲストと共有するローカル フォルダ（hyperkit ドライバのみ）",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "ネットワーキングに使用する VPNKit ソケットのロケーション。空の場合、Hyperkit VPNKitSock が無効になり、「auto」の場合、Mac VPNKit 接続に Docker が使用され、それ以外の場合、指定された VSock が使用されます（hyperkit ドライバのみ）",
 	"Location of the minikube iso": "minikube iso のロケーション",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -289,15 +274,18 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "使用しているロケーション内で既知のいずれのリポジトリにもアクセスできません。フォールバックとして {{.image_repository_name}} を使用します。",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "既知のいずれのリポジトリにもアクセスできません。--image-repository フラグとともに代替のイメージ リポジトリを指定することを検討してください。",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "minikube VM に割り当てられた CPU の数",
-	"Number of CPUs allocated to the minikube VM.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -318,6 +306,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "「{{.driver_executable}}」をアップグレードしてください。{{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -331,10 +320,10 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "MAC アドレスを復元するための VM UUID を指定します（hyperkit ドライバのみ）",
+	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "Docker デーモンに渡すレジストリ ミラー",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
@@ -345,7 +334,10 @@
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "リクエストされたディスクサイズ {{.requested_size}} が最小値 {{.minimum_size}} 未満です",
 	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "リクエストされたメモリ割り当て（{{.memory}} MB）がデフォルトのメモリ割り当て {{.default_memorysize}} MB 未満です。minikube が正常に動作しないか、予期せずクラッシュする可能性があることに注意してください。",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "リクエストされたメモリ割り当て {{.requested_size}} が許可される最小値 {{.minimum_size}} 未満です",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -358,8 +350,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -385,8 +379,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "ローカルの Kubernetes クラスタを起動します",
 	"Starts a node.": "",
@@ -399,7 +393,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
@@ -431,12 +424,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスタで使用されるクラスタ DNS ドメイン名",
 	"The container runtime to be used (docker, crio, containerd)": "使用されるコンテナ ランタイム（docker、crio、containerd）",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used": "使用される CRI ソケットパス",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "ドライバ「{{.driver}}」は、{{.os}} ではサポートされていません",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "hyperv 仮想スイッチ名。最初に見つかったものにデフォルト設定されます（hyperv ドライバのみ）",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -448,10 +445,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -460,19 +461,24 @@
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "{{.driver_name}} ドライバをルート権限で使用しないでください。",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "「{{.driver_executable}}」の新しいバージョンがあります。アップグレードを検討してください。{{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。",
 	"This will start the mount daemon and automatically mount files into minikube": "これによりマウント デーモンが起動し、ファイルが minikube に自動的にマウントされます",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "ヒント: この root 所有のクラスタを削除するには、「sudo {{.cmd}} delete」を実行します",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "このクラスタに接続するには、「kubectl --context={{.name}}」を使用します",
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "このクラスタに接続するには、「kubectl --context={{.name}}」を使用します",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "kubectl か minikube コマンドを独自のユーザーとして使用するには、そのコマンドの再配置が必要な場合があります。たとえば、独自の設定を上書きするには、以下を実行します。",
@@ -482,24 +488,31 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
 	"Unable to get bootstrapper: {{.error}}": "ブートストラッパを取得できません。{{.error}}",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
-	"Unable to get the status of the {{.name}} cluster.": "",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "キャッシュに保存されているイメージを構成ファイルから読み込むことができません。",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "構成を読み込むことができません。{{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "「{{.kubernetes_version}}」を解析できません。{{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
 	"Unable to pull images, which may be OK: {{.error}}": "イメージを pull できませんが、問題ありません。{{.error}}",
-	"Unable to remove machine directory: %v": "",
-	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -510,6 +523,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Kubernetes を {{.old}} から {{.new}} にアップグレードしています",
 	"Usage": "",
@@ -530,11 +545,11 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "イメージ リポジトリ {{.name}} を使用しています",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "VM ドライバは次のいずれかです。%v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
 	"Verifying dashboard health ...": "",
@@ -549,11 +564,12 @@
 	"Wait failed": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Kubernetes コアサービスが正常になるまで待機してから終了してください",
-	"Waiting for cluster to come online ...": "",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "NFS 共有のルートに指定する場所。デフォルトは /nfsshares（hyperkit ドライバのみ）",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "プロキシを使用しようとしていますが、現在の NO_PROXY 環境に minikube IP（{{.ip_address}}）は含まれていません。詳細については、{{.documentation_url}} をご覧ください",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザから「{{.name}}」VM を手動で削除することが必要な可能性があります",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
@@ -562,45 +578,43 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl と minikube の構成は {{.home_folder}} に保存されます",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
@@ -609,14 +623,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -641,16 +657,16 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
-	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.platform}} 上の {{.prefix}}minikube {{.version}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
diff --git a/translations/ko.json b/translations/ko.json
index 784b8736a1..9fdde65376 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "\"The '{{.minikube_addon}}' 이 비활성화되었습니다",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist": "\"{{.name}}\" 프로필이 존재하지 않습니다",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "\"{{.name}}\" 프로필이 존재하지 않습니다, 그럼에도 불구하고 시도합니다",
 	"\"{{.node_name}}\" stopped.": "\"{{.node_name}}\" 이 중단되었습니다",
@@ -29,11 +30,11 @@
 	"Adds a node to the given cluster config, and starts it.": "노드 하나를 주어진 클러스터 컨피그에 추가하고 시작합니다",
 	"Adds a node to the given cluster.": "노드 하나를 주어진 클러스터에 추가합니다",
 	"Advanced Commands:": "고급 커맨드:",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "많은 정보를 위해 사용자 프롬프트를 허가합니다",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "",
-	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "minikube 가상 머신에 할당할 RAM 의 용량 (format: <number>[<unit>], where unit = b, k, m or g)",
+	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "minikube 가상 머신에 할당할 RAM 의 용량 (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "VirtualBox 와 같은 또 다른 하이퍼바이저가 KVM 과 충돌이 발생합니다. 다른 하이퍼바이저를 중단하거나 --driver 로 변경하세요",
@@ -44,6 +45,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "apiserver 가 API 요청을 서비스할 때까지 막습니다",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "마운트하기 위한 디렉토리 {{.path}} 를 찾을 수 없습니다",
 	"Cannot use both --output and --format options": "--output 과 --format 옵션을 함께 사용할 수 없습니다",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -62,9 +64,10 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "",
 	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "{{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) 를 생성하는 중 ...",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "DEPRECATED 되었습니다, 'driver' 를 사용하세요",
 	"Default group id used for the mount": "마운트를 위한 디폴트 group id",
 	"Default user id used for the mount": "마운트를 위한 디폴트 user id",
@@ -89,9 +92,9 @@
 	"Documentation: {{.url}}": "문서: {{.url}}",
 	"Done! kubectl is now configured to use \"{{.name}}\"": "끝났습니다! 이제 kubectl 이 \"{{.name}}\" 를 사용할 수 있도록 설정되었습니다",
 	"Download complete!": "다운로드가 성공하였습니다!",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "가상 머신 부트 이미지 다운로드 중 ...",
 	"Downloading driver {{.driver}}:": "드라이버 {{.driver}} 다운로드 중 :",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
 	"Downloading {{.name}} {{.version}}": "{{.name}} {{.version}} 다운로드 중",
 	"ERROR creating `registry-creds-acr` secret": "registry-creds-acr` secret 생성 오류",
 	"ERROR creating `registry-creds-dpr` secret": "`registry-creds-dpr` secret 생성 오류",
@@ -101,7 +104,6 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
 	"Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "",
@@ -128,19 +130,16 @@
 	"Error getting cluster bootstrapper": "클러스터 부트스트래퍼 조회 오류",
 	"Error getting cluster config": "클러스터 컨피그 조회 오류",
 	"Error getting config": "컨피그 조회 오류",
-	"Error getting control plane": "",
 	"Error getting host": "호스트 조회 오류",
 	"Error getting host IP": "호스트 IP 조회 오류",
 	"Error getting host status": "호스트 상태 조회 오류",
 	"Error getting machine logs": "머신 로그 조회 오류",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
 	"Error getting service status": "서비스 상태 조회 오류",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "ssh 클라이언트 조회 오류",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
 	"Error loading api": "api 로딩 오류",
 	"Error loading profile config": "프로필 컨피그 로딩 오류",
@@ -148,15 +147,14 @@
 	"Error opening service": "",
 	"Error parsing minikube version: {{.error}}": "minikube 버전 파싱 오류: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error retrieving node": "",
 	"Error starting cluster": "클러스터 시작 오류",
 	"Error starting mount": "마운트 시작 오류",
 	"Error starting node": "노드 시작 오류",
 	"Error while setting kubectl current context :  {{.error}}": "kubectl current context 설정 오류 : {{.error}}",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "예시",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "",
 	"Exiting.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -164,6 +162,7 @@
 	"Failed to cache ISO": "ISO 캐싱에 실패하였습니다",
 	"Failed to cache and load images": "이미지 캐싱 및 로딩에 실패하였습니다",
 	"Failed to cache binaries": "바이너리 캐싱에 실패하였습니다",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "이미지를 tar 로 캐싱하는 데 실패하였습니다",
 	"Failed to cache kubectl": "kubectl 캐싱에 실패하였습니다",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "{{.minikube_dir_path}} 의 권한 변경에 실패하였습니다: {{.error}}",
@@ -175,6 +174,7 @@
 	"Failed to delete node {{.name}}": "노드 {{.name}} 제거에 실패하였습니다",
 	"Failed to enable container runtime": "컨테이너 런타임 활성화에 실패하였습니다",
 	"Failed to generate config": "컨피그 생성에 실패하였습니다",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "부트스트래퍼 조회에 실패하였습니다",
 	"Failed to get command runner": "",
 	"Failed to get driver URL": "드라이버 URL 조회에 실패하였습니다",
@@ -183,6 +183,7 @@
 	"Failed to get service URL: {{.error}}": "서비스 URL 조회에 실패하였습니다: {{.error}}",
 	"Failed to kill mount process: {{.error}}": "마운트 프로세스 중지에 실패하였습니다: {{.error}}",
 	"Failed to list cached images": "캐시된 이미지를 조회하는 데 실패하였습니다",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "캐시된 이미지를 다시 불러오는 데 실패하였습니다",
 	"Failed to save config": "컨피그 저장에 실패하였습니다",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
@@ -194,6 +195,7 @@
 	"Failed to update config": "컨피그를 수정하는 데 실패하였습니다",
 	"Failed unmount: {{.error}}": "마운트 해제에 실패하였습니다: {{.error}}",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
@@ -202,13 +204,17 @@
 	"Force minikube to perform possibly dangerous operations": "",
 	"Found network options:": "네트워크 옵션을 찾았습니다",
 	"Found {{.number}} invalid profile(s) !": "{{.number}} 개의 무효한 프로필을 찾았습니다",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
+	"Getting bootstrapper": "",
 	"Getting machine config failed": "머신 컨피그 조회 실패",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -219,6 +225,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -233,8 +240,9 @@
 	"Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.": "",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -248,7 +256,7 @@
 	"Lists the URLs for the services in your local cluster": "",
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -266,14 +274,17 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
-	"Number of CPUs allocated to the minikube VM.": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -294,6 +305,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Populates the specified folder with documentation in markdown about minikube": "",
 	"Powering off \"{{.profile_name}}\" via SSH ...": "",
@@ -306,10 +318,10 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "",
+	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
@@ -318,8 +330,9 @@
 	"Removing {{.directory}} ...": "",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
-	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "",
-	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -332,8 +345,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "minikube 명령어를 관리자 권한으로 실행합니다",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "설정이 실패하였습니다",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -359,7 +374,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting node": "노드를 시작하는 중",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "로컬 쿠버네티스 클러스터를 시작합니다",
@@ -373,7 +389,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "{{.name}} 를 {{.cluster}} 에 성공적으로 추가하였습니다!",
 	"Successfully deleted all profiles": "모든 프로필이 성공적으로 삭제되었습니다",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
@@ -399,24 +414,32 @@
 	"The argument to pass the minikube mount command on start.": "",
 	"The cluster dns domain name used in the kubernetes cluster": "",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
+	"The driver '{{.driver}}' is not supported on {{.os}}": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
-	"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "",
 	"The machine-driver specified is failing to start. Try running 'docker-machine-driver-\u003ctype\u003e version'": "",
 	"The minikube VM is offline. Please run 'minikube start' to start it again.": "",
 	"The name of the network plugin.": "",
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -424,16 +447,20 @@
 	"The value passed to --format is invalid": "",
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
-	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
@@ -443,21 +470,31 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "대시보드를 활성화할 수 없습니다",
 	"Unable to fetch latest version info": "최신 버전 정보를 가져올 수 없습니다",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "문서를 생성할 수 없습니다",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "가상 머신 IP 주소를 조회할 수 없습니다",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "현재 사용자를 조회할 수 없습니다",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "런타임을 조회할 수 없습니다",
 	"Unable to get the status of the {{.name}} cluster.": "{{.name}} 클러스터의 상태를 조회할 수 없습니다",
 	"Unable to kill mount process: {{.error}}": "마운트 프로세스를 중지할 수 없습니다: {{.error}}",
 	"Unable to load cached images from config file.": "컨피그 파일로부터 캐시된 이미지를 로드할 수 없습니다",
 	"Unable to load cached images: {{.error}}": "캐시된 이미지를 로드할 수 없습니다: {{.error}}",
 	"Unable to load config: {{.error}}": "컨피그를 로드할 수 없습니다: {{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": " \"{{.kubernetes_version}}\" 를 파싱할 수 없습니다: {{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to remove machine directory": "",
 	"Unable to remove machine directory: %v": "머신 디렉토리를 제거할 수 없습니다: %v",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "가상 머신을 시작할 수 없습니다. 확인 후 가능하면 'minikube delete' 를 실행하세요",
 	"Unable to stop VM": "가상 머신을 중지할 수 없습니다",
 	"Unable to update {{.driver}} driver: {{.error}}": "{{.driver}} 를 수정할 수 없습니다: {{.error}}",
@@ -469,6 +506,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Usage": "",
 	"Usage: minikube completion SHELL": "",
@@ -488,10 +527,10 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
 	"Verifying dashboard health ...": "",
@@ -509,7 +548,9 @@
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "다음 커맨드(들)을 사용하여 제거할 수 있습니다",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "service 이름을 명시해야 합니다",
@@ -518,17 +559,17 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "minikube config 가 미지원 드라이버를 참조하고 있습니다. ~/.minikube 를 제거한 후, 다시 시도하세요",
 	"Your minikube vm is not running, try minikube start.": "minikube 가상 머신이 실행 중이 아닙니다, minikube start 를 시도하세요",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "bash 자동 완성이 실패하였습니다",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "config view 가 실패하였습니다",
 	"creating api client": "api 클라이언트 생성 중",
 	"dashboard service is not running: {{.error}}": "대시보드 서비스가 실행 중이지 않습니다: {{.error}}",
+	"deleting node": "",
 	"disable failed": "비활성화가 실패하였습니다",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "dry-run 검증 완료!",
@@ -541,14 +582,17 @@
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
+	"generating join token": "",
 	"getting config": "컨피그 조회 중",
-	"getting primary control plane": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "프로필을 생성하려면 다음 커맨드를 입력하세요: minikube start -p {{.profile_name}}\"",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl 과 minikube 환경 정보는 {{.home_folder}} 에 저장될 것입니다",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "kubectl 이 PATH 에 없습니다, 하지만 이는 대시보드에서 필요로 합니다. 설치 가이드:https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"kubectl proxy": "kubectl 프록시",
+	"libmachine failed": "",
 	"loading config": "컨피그 로딩 중",
 	"logdir set failed": "logdir 설정이 실패하였습니다",
 	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "머신 '{{.name}}' 이 존재하지 않습니다. 진행하기 앞서 가상 머신을 재생성합니다",
@@ -556,7 +600,7 @@
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
@@ -565,14 +609,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -597,16 +643,17 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "{{.driver}} 가 설치되지 않았습니다",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
 	"{{.name}} cluster does not exist": "{{.name}} 클러스터가 존재하지 않습니다",
 	"{{.name}} has no available configuration options": "{{.driver}} 이 사용 가능한 환경 정보 옵션이 없습니다",
 	"{{.name}} is already running": "{{.driver}} 이 이미 실행 중입니다",
 	"{{.name}} was successfully configured": "{{.driver}} 이 성공적으로 설정되었습니다",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": "{{.url}} 이 접근 불가능합니다: {{.error}}"
diff --git a/translations/pl.json b/translations/pl.json
index 2cfee9621b..0a0d296553 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -1,11 +1,10 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.minikube_addon}}\" was successfully disabled": "\"{{.minikube_addon}}\" został wyłaczony",
 	"\"{{.name}}\" profile does not exist": "Profil \"{{.name}}\" nie istnieje",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
 	"\"{{.profile_name}}\" VM does not exist, nothing to stop": "Maszyna wirtualna \"{{.profile_name}}\" nie istnieje. Nie można zatrzymać",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
 	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "Profil \"{{.profile_name}}\" nie istnieje. Nie można wyświetlić adresu IP ",
 	"\"{{.profile_name}}\" stopped.": "Zatrzymano \"{{.profile_name}}\"",
 	"'none' driver does not support 'minikube docker-env' command": "sterownik 'none' nie wspiera komendy 'minikube docker-env'",
@@ -13,7 +12,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "sterownik 'none' nie wspiera komendy 'minikube ssh'",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -32,12 +30,12 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "Zaawansowane komendy",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "Aliasy",
 	"Allow user prompts for more information": "",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "Ilość zarezerwowanej pamieci RAM dla maszyny wirtualnej minikube (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or )",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "Ilość zarezerwowanej pamieci RAM dla maszyny wirtualnej minikube (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or )",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "Czas oczekiwania na serwis w sekundach",
 	"Amount of time to wait for service in seconds": "Czas oczekiwania na servis w sekundach",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
@@ -48,6 +46,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "Nie można odnoleść folderu {{.path}} do zamontowania",
 	"Cannot use both --output and --format options": "",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
@@ -68,10 +67,11 @@
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "",
 	"Created a new profile : {{.profile_name}}": "Stworzono nowy profil : {{.profile_name}}",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating a new profile failed": "Tworzenie nowego profilu nie powiodło się",
 	"Creating mount {{.name}} ...": "",
 	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Tworzenie {{.driver_name}} (CPUs={{.number_of_cpus}}, Pamięć={{.memory_size}}MB, Dysk={{.disk_size}}MB)...",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "Domyślne id groupy użyte dla montowania",
 	"Default user id used for the mount": "Domyślne id użytkownia użyte dla montowania ",
@@ -98,9 +98,9 @@
 	"Done! kubectl is now configured to use \"{{.name}}": "Gotowe! kubectl jest skonfigurowany do użycia z \"{{.name}}\".",
 	"Done! kubectl is now configured to use \"{{.name}}\"": "Gotowe! kubectl jest skonfigurowany do użycia z \"{{.name}}\".",
 	"Download complete!": "Pobieranie zakończone!",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "Pobieranie obrazu maszyny wirtualnej ...",
 	"Downloading driver {{.driver}}:": "",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
 	"Downloading {{.name}} {{.version}}": "Pobieranie {{.name}} {{.version}}",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
@@ -110,7 +110,6 @@
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "aktywuj eksperymentalne wsparcie minikube dla NVIDIA GPU",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "",
-	"Enable istio needs {{.minMem}} MB of memory and {{.minCpus}} CPUs.": "",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
 	"Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "",
@@ -131,46 +130,30 @@
 	"Error finding port for mount": "",
 	"Error generating set output": "",
 	"Error generating unset output": "",
-	"Error getting IP": "",
-	"Error getting client": "",
-	"Error getting client: {{.error}}": "",
-	"Error getting cluster": "",
 	"Error getting cluster bootstrapper": "",
 	"Error getting cluster config": "",
-	"Error getting config": "",
-	"Error getting control plane": "",
 	"Error getting host": "",
-	"Error getting host IP": "",
-	"Error getting host status": "",
-	"Error getting machine logs": "",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
-	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error host driver ip status": "",
 	"Error killing mount process": "",
-	"Error loading api": "",
-	"Error loading profile config": "",
 	"Error loading profile config: {{.error}}": "",
 	"Error opening service": "",
 	"Error parsing Driver version: {{.error}}": "Błąd parsowania wersji Driver: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "Bład parsowania wersji minikube: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "Błąd odczytu {{.path}} {{.error}}",
 	"Error restarting cluster": "Błąd podczas restartowania klastra",
-	"Error retrieving node": "",
 	"Error setting shell variables": "Błąd podczas ustawiania zmiennych powłoki(shell)",
 	"Error starting cluster": "Błąd podczas uruchamiania klastra",
 	"Error starting mount": "",
-	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "Błąd podczas ustawiania kontekstu kubectl: {{.error}}",
 	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "Przykłady",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "",
 	"Exiting.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
@@ -178,38 +161,38 @@
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
+	"Failed to cache images": "",
 	"Failed to cache images to tar": "",
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Nie udało się zmienić uprawnień pliku {{.minikube_dir_path}}: {{.error}}",
-	"Failed to check if machine exists": "",
 	"Failed to check main repository and mirrors for images for images": "",
 	"Failed to delete cluster: {{.error}}": "",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
-	"Failed to delete node {{.name}}": "",
 	"Failed to download kubectl": "Pobieranie kubectl nie powiodło się",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "",
 	"Failed to get command runner": "",
-	"Failed to get driver URL": "",
 	"Failed to get image map": "",
 	"Failed to get machine client": "",
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Zabicie procesu nie powiodło się: {{.error}}",
 	"Failed to list cached images": "",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to remove profile": "Usunięcie profilu nie powiodło się",
 	"Failed to save config": "Zapisywanie konfiguracji nie powiodło się",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "Konfiguracja certyfikatów nie powiodła się",
 	"Failed to setup kubeconfig": "Konfiguracja kubeconfig nie powiodła się",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "Aktualizacja klastra nie powiodła się",
 	"Failed to update config": "Aktualizacja konfiguracji nie powiodła się",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
+	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
@@ -218,13 +201,16 @@
 	"Force minikube to perform possibly dangerous operations": "Wymuś wykonanie potencjalnie niebezpiecznych operacji",
 	"Found network options:": "Wykryto opcje sieciowe:",
 	"Found {{.number}} invalid profile(s) !": "Wykryto {{.number}} nieprawidłowych profili ! ",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "Pobiera logi z aktualnie uruchomionej instancji. Przydatne do debugowania kodu który nie należy do aplikacji użytkownika",
 	"Gets the status of a local kubernetes cluster": "Pobiera aktualny status klastra kubernetesa",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting machine config failed": "",
+	"Getting bootstrapper": "",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -235,6 +221,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -251,6 +238,8 @@
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
 	"Invalid size passed in argument: {{.error}}": "Nieprawidłowy rozmiar przekazany w argumencie: {{.error}}",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
@@ -266,6 +255,7 @@
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "",
 	"Location of the minikube iso": "Ścieżka do obrazu iso minikube",
 	"Location of the minikube iso.": "Ścieżka do obrazu iso minikube",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "Zaloguj się i wykonaj polecenie w maszynie za pomocą ssh. Podobne do 'docker-machine ssh'",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "Zaloguj się i wykonaj polecenie w maszynie za pomocą ssh. Podobne do 'docker-machine ssh'",
 	"Message Size: {{.size}}": "",
@@ -283,13 +273,17 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "Liczba procesorów przypisana do maszyny wirtualnej minikube",
 	"Number of CPUs allocated to the minikube VM.": "Liczba procesorów przypisana do maszyny wirtualnej minikube",
 	"Number of lines back to go within the log": "",
@@ -312,6 +306,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "Proszę upewnij się, że serwis którego szukasz znajduje się w prawidłowej przestrzeni nazw",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "Proszę zaktualizować '{{.driver_executable}}'. {{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -325,11 +320,11 @@
 	"Profile gets or sets the current minikube profile": "Pobiera lub ustawia aktywny profil minikube",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "",
+	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, and verify that VirtualBox is not blocked by your system": "Uruchom ponownie komputer aby zakończyć instalacje VirtualBox'a i upewnij się że nie jest on blokowany przez twój system",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
-	"Reconfiguring existing host ...": "",
 	"Registry mirrors to pass to the Docker daemon": "",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
@@ -338,8 +333,9 @@
 	"Removing {{.directory}} ...": "",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
-	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "",
-	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "Pozyskuje ścieżkę do klucza ssh dla wyspecyfikowanego klastra",
 	"Retrieve the ssh identity key path of the specified cluster.": "Pozyskuje ścieżkę do klucza ssh dla wyspecyfikowanego klastra.",
 	"Retrieves the IP address of the running cluster": "Pobiera adres IP aktualnie uruchomionego klastra",
@@ -352,8 +348,10 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -379,8 +377,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "Uruchamianie lokalnego klastra kubernetesa",
 	"Starts a node.": "",
@@ -393,7 +391,6 @@
 	"Successfully added {{.name}} to {{.cluster}}!": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "Pomyślnie zamontowano {{.sourcePath}} do {{.destinationPath}}",
-	"Successfully powered off Hyper-V. minikube driver -- {{.driver}}": "",
 	"Successfully purged minikube directory located at - [{{.minikubeDirectory}}]": "",
 	"Suggestion: {{.advice}}": "Sugestia: {{.advice}}",
 	"Suggestion: {{.fix}}": "",
@@ -423,12 +420,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "Domena dns clastra użyta przez kubernetesa",
 	"The container runtime to be used (docker, crio, containerd)": "Runtime konteneryzacji (docker, crio, containerd).",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used.": "",
 	"The docker service is currently not active": "Serwis docker jest nieaktywny",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "Sterownik '{{.driver}} jest niewspierany przez system {{.os}}",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -440,10 +441,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -452,17 +457,21 @@
 	"The value passed to --format is invalid: {{.error}}": "Wartość przekazana do --format jest nieprawidłowa: {{.error}}",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "{{.driver_name}} nie powinien byc używany z przywilejami root'a.",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
-	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Aby połączyć się z klastrem użyj: kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "Aby połaczyć się z klastem uzyj: kubectl --context={{.profile_name}}",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'": "Aby wyłączyć te notyfikację, użyj: 'minikube config set WantUpdateNotification false'",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "Aby uruchomić minikube z HyperV Powershell musi znajdować się w zmiennej PATH",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
@@ -472,23 +481,30 @@
 	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
-	"Unable to get the status of the {{.name}} cluster.": "",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
-	"Unable to remove machine directory: %v": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
 	"Unable to start VM": "Nie można uruchomić maszyny wirtualnej",
-	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "Nie można zatrzymać maszyny wirtualnej",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -499,6 +515,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Usage": "",
 	"Usage: minikube completion SHELL": "",
@@ -518,11 +536,11 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "Sterownik wirtualnej maszyny to jeden z: %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "Weryfikuję czy zmienne HTTP_PROXY i HTTPS_PROXY sa ustawione poprawnie",
 	"Verify the IP address of the running cluster in kubeconfig.": "Weryfikuję adres IP działającego klastra w kubeconfig",
 	"Verifying dashboard health ...": "Weryfikuję status dashboardu",
@@ -538,12 +556,13 @@
 	"Wait failed": "",
 	"Wait failed: {{.error}}": "",
 	"Waiting for SSH access ...": "Oczekiwanie na połaczenie SSH...",
-	"Waiting for cluster to come online ...": "",
 	"Waiting for:": "Oczekiwanie na :",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "Musisz podać nazwę serwisu",
@@ -552,45 +571,43 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "Nie udało się otworzyć przeglądarki: {{.error}}",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "konfiguracja minikube i kubectl będzie przechowywana w katalogu {{.home_dir}}",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "kubectl nie zostało odnaleźione w zmiennej środowiskowej ${PATH}. Instrukcja instalacji:  https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} jest dostępne! Pobierz je z: {{.url}}",
@@ -599,14 +616,16 @@
 	"mount failed": "Montowanie się nie powiodło",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -633,16 +652,17 @@
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
 	"{{.addonName}} was successfully enabled": "{{.addonName}} został aktywowany pomyślnie",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
 	"{{.name}} cluster does not exist": "Klaster {{.name}} nie istnieje",
 	"{{.name}} has no available configuration options": "{{.name}} nie posiada opcji configuracji",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "{{.name}} skonfigurowano pomyślnie",
-	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} na {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} nie jest wspierany przez system plików. I tak spróbujemy!",
 	"{{.url}} is not accessible: {{.error}}": ""
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 1973fd0f72..10d574dc6e 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -1,12 +1,11 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.minikube_addon}}\" was successfully disabled": "已成功禁用 \"{{.minikube_addon}}\"",
 	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "\"{{.name}}\" 集群不存在，将继续清理",
 	"\"{{.name}}\" profile does not exist": "“{{.name}}”配置文件不存在",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
-	"\"{{.node_name}}\" stopped.": "",
 	"\"{{.profile_name}}\" VM does not exist, nothing to stop": "\"{{.profile_name}}\" 虚拟机不存在，没有什么可供停止的",
-	"\"{{.profile_name}}\" does not exist, nothing to stop": "",
 	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "\"{{.profile_name}}\" 主机不存在，无法显示其IP",
 	"\"{{.profile_name}}\" stopped.": "\"{{.profile_name}}\" 已停止",
 	"'none' driver does not support 'minikube docker-env' command": "'none' 驱动不支持 'minikube docker-env' 命令",
@@ -14,7 +13,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "'none' 驱动不支持 'minikube ssh' 命令",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 驱动程序报告了一个问题： {{.error}}",
-	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN 或者防火墙正在干扰对 minikube 虚拟机的 HTTP 访问。或者，您可以使用其它的虚拟机驱动：https://minikube.sigs.k8s.io/docs/start/",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网。您可能需要对其进行配置为使用代理",
@@ -37,12 +35,12 @@
 	"Adds a node to the given cluster config, and starts it.": "",
 	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "高级命令：",
-	"After minikube restart the dockerd ports might have changed. To ensure docker-env works properly.\nPlease re-eval the docker-env command:\n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Aliases": "别名",
 	"Allow user prompts for more information": "允许用户提示以获取更多信息",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "用于从中拉取 docker 镜像的备选镜像存储库。如果您对 gcr.io 的访问受到限制，则可以使用该镜像存储库。将镜像存储库设置为“auto”可让 minikube 为您选择一个存储库。对于中国大陆用户，您可以使用本地 gcr.io 镜像，例如 registry.cn-hangzhou.aliyuncs.com/google_containers",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "为 minikube 虚拟机分配的 RAM 容量（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "为 minikube 虚拟机分配的 RAM 容量（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）。",
+	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "等待服务的时间（单位秒）",
 	"Amount of time to wait for service in seconds": "等待服务的时间（单位秒）",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
@@ -56,6 +54,7 @@
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
 	"Block until the apiserver is servicing API requests": "阻塞直到 apiserver 为 API 请求提供服务",
+	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "找不到用来挂载的 {{.path}} 目录",
 	"Cannot use both --output and --format options": "不能同时使用 --output 和 --format 选项",
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "检查 'journalctl -xeu kubelet' 的输出，尝试启动 minikube 时添加参数 --extra-config=kubelet.cgroup-driver=systemd",
@@ -80,11 +79,12 @@
 	"Could not process errors from failed deletion": "无法处理删除失败的错误",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "需要使用的镜像镜像的国家/地区代码。留空以使用全球代码。对于中国大陆用户，请将其设置为 cn。",
 	"Created a new profile : {{.profile_name}}": "创建了新的配置文件：{{.profile_name}}",
-	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "正在 {{.driver_name}} 容器中 创建 Kubernetes，(CPUs={{.number_of_cpus}}), 内存={{.memory_size}}MB ({{.host_memory_size}}MB 可用",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating a new profile failed": "创建新的配置文件失败",
 	"Creating mount {{.name}} ...": "正在创建装载 {{.name}}…",
 	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在创建 {{.driver_name}} 虚拟机（CPUs={{.number_of_cpus}}，Memory={{.memory_size}}MB, Disk={{.disk_size}}MB）...",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"DEPRECATED, use `driver` instead.": "",
 	"Default group id used for the mount": "用于挂载默认的 group id",
 	"Default user id used for the mount": "用于挂载默认的 user id",
@@ -112,9 +112,9 @@
 	"Done! kubectl is now configured to use \"{{.name}}\"": "完成！kubectl 已经配置至 \"{{.name}}\"",
 	"Done! kubectl is now configured to use {{.name}}": "完成！kubectl已经配置至{{.name}}",
 	"Download complete!": "下载完成！",
+	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "正在下载 VM boot image...",
 	"Downloading driver {{.driver}}:": "正在下载驱动 {{.driver}}:",
-	"Downloading preloaded images tarball for k8s {{.version}} ...": "",
 	"Downloading {{.name}} {{.version}}": "正在下载 {{.name}} {{.version}}",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "创建 `registry-creds-dpr` secret 时出错",
@@ -162,21 +162,17 @@
 	"Error getting cluster bootstrapper": "获取 cluster bootstrapper 时出错",
 	"Error getting cluster config": "",
 	"Error getting config": "获取 config 时出错",
-	"Error getting control plane": "",
 	"Error getting host": "获取 host 时出错",
-	"Error getting host IP": "",
 	"Error getting host status": "获取 host status 时出错",
 	"Error getting machine logs": "获取 machine logs 时出错",
 	"Error getting machine status": "获取 machine status 时出错",
 	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
 	"Error getting primary control plane": "",
-	"Error getting primary cp": "",
 	"Error getting profiles to delete": "获取待删除配置文件时出错",
 	"Error getting service status": "获取 service status 时出错",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "使用 namespace: {{.namespace}} 和 labels {{.labelName}}:{{.addonName}} 获取 service 时出错：{{.error}}",
 	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "从虚拟机中获取 host IP 地址时出错",
-	"Error host driver ip status": "",
 	"Error killing mount process": "杀死 mount 进程时出错",
 	"Error loading api": "加载 api 时出错",
 	"Error loading profile config": "加载配置文件的配置时出错",
@@ -187,11 +183,9 @@
 	"Error parsing minikube version: {{.error}}": "解析 minikube 版本时出错：{{.error}}",
 	"Error reading {{.path}}: {{.error}}": "读取 {{.path}} 时出错：{{.error}}",
 	"Error restarting cluster": "重启 cluster 时出错",
-	"Error retrieving node": "",
 	"Error setting shell variables": "设置 shell 变量时出错",
 	"Error starting cluster": "开启 cluster 时出错",
 	"Error starting mount": "开启 mount 时出错",
-	"Error starting node": "",
 	"Error unsetting shell variables": "取消设置 shell 变量时出错",
 	"Error while setting kubectl current context :  {{.error}}": "设置 kubectl 上下文时出错 ：{{.error}}",
 	"Error writing mount pid": "写入 mount pid 时出错",
@@ -199,6 +193,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "错误：您已选择 Kubernetes v{{.new}}，但您的配置文件的现有集群正在运行 Kubernetes v{{.old}}。非破坏性降级不受支持，但若要继续操作，您可以执行以下选项之一：\n* 使用 Kubernetes v{{.new}} 重新创建现有集群：运行“minikube delete {{.profile}}”，然后运行“minikube start {{.profile}} --kubernetes-version={{.new}}”\n* 使用 Kubernetes v{{.new}} 再创建一个集群：运行“minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}”\n* 通过 Kubernetes v{{.old}} 或更高版本重复使用现有集群：运行“minikube start {{.profile}} --kubernetes-version={{.old}}”",
 	"Error: [{{.id}}] {{.error}}": "错误：[{{.id}}] {{.error}}",
 	"Examples": "示例",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "正在退出",
 	"Exiting due to driver incompatibility": "由于驱动程序不兼容而退出",
 	"Exiting.": "正在退出。",
@@ -217,10 +212,10 @@
 	"Failed to delete cluster: {{.error}}__1": "未能删除集群：{{.error}}",
 	"Failed to delete images": "删除镜像时失败",
 	"Failed to delete images from config": "无法删除配置的镜像",
-	"Failed to delete node {{.name}}": "",
 	"Failed to download kubectl": "下载 kubectl 失败",
 	"Failed to enable container runtime": "",
 	"Failed to generate config": "无法生成配置",
+	"Failed to get API Server URL": "",
 	"Failed to get bootstrapper": "获取 bootstrapper 失败",
 	"Failed to get command runner": "",
 	"Failed to get driver URL": "获取 driver URL 失败",
@@ -229,6 +224,7 @@
 	"Failed to get service URL: {{.error}}": "获取 service URL 失败：{{.error}}",
 	"Failed to kill mount process: {{.error}}": "未能终止装载进程：{{.error}}",
 	"Failed to list cached images": "无法列出缓存镜像",
+	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "重新加载缓存镜像失败",
 	"Failed to remove profile": "无法删除配置文件",
 	"Failed to save config": "无法保存配置",
@@ -236,12 +232,12 @@
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "未能设置 NO_PROXY 环境变量。请使用“export NO_PROXY=$NO_PROXY,{{.ip}}”。",
 	"Failed to setup certs": "设置 certs 失败",
 	"Failed to setup kubeconfig": "设置 kubeconfig 失败",
-	"Failed to start node {{.name}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "更新 cluster 失败",
 	"Failed to update config": "更新 config 失败",
 	"Failed unmount: {{.error}}": "unmount 失败：{{.error}}",
 	"File permissions used for the mount": "用于 mount 的文件权限",
+	"Filter to use only VM Drivers": "",
 	"Flags": "标志",
 	"Follow": "跟踪",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -251,13 +247,17 @@
 	"Force minikube to perform possibly dangerous operations": "强制 minikube 执行可能有风险的操作",
 	"Found network options:": "找到的网络选项：",
 	"Found {{.number}} invalid profile(s) !": "找到 {{.number}} 个无效的配置文件！",
+	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
+	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster": "获取本地集群中指定服务的 kubernetes URL",
 	"Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "获取本地集群中指定服务的 kubernetes URL。如果有多个 URL，他们将一次打印一个",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "获取正在运行的实例日志，用于调试 minikube，不是用户代码",
 	"Gets the status of a local kubernetes cluster": "获取本地 kubernetes 集群状态",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
+	"Getting bootstrapper": "",
 	"Getting machine config failed": "获取机器配置失败",
+	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -270,6 +270,7 @@
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "Hyperkit 的网络挂了。升级到最新的 hyperkit 版本以及/或者 Docker 桌面版。或者，你可以通过 --vm-driver 切换其他选项",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "如果设置了，将自动更新驱动到最新版本。默认为 true。",
+	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
@@ -286,12 +287,12 @@
 	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "传递给 Docker 守护进程的不安全 Docker 注册表。系统会自动添加默认服务 CIDR 范围。",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid size passed in argument: {{.error}}": "",
 	"IsEnabled failed": "",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "Kubernetes {{.new}} 现在可用了。如果您想升级，请指定 --kubernetes-version={{.new}}",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "当前版本的 minukube 不支持 Kubernetes {{.version}}",
-	"Launching Kubernetes ...": "",
 	"Launching Kubernetes ... ": "正在启动 Kubernetes ... ",
 	"Launching proxy ...": "",
 	"List all available images from the local cache.": "",
@@ -303,7 +304,7 @@
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "通过 NFS 装载与访客共享的本地文件夹（仅限 hyperkit 驱动程序）",
 	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "用于网络连接的 VPNKit 套接字的位置。如果为空，则停用 Hyperkit VPNKitSock；如果为“auto”，则将 Docker 用于 Mac VPNKit 连接；否则使用指定的 VSock（仅限 hyperkit 驱动程序）",
 	"Location of the minikube iso": "minikube iso 的位置",
-	"Location of the minikube iso.": "",
+	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
@@ -321,15 +322,18 @@
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "网络和连接命令：",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
+	"Node \"{{.node_name}}\" stopped.": "",
 	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
+	"Node {{.nodeName}} does not exist.": "",
+	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "您所在位置的已知存储库都无法访问。正在将 {{.image_repository_name}} 用作后备存储库。",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "已知存储库都无法访问。请考虑使用 --image-repository 标志指定备选镜像存储库",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
-	"Noticed that you are using minikube docker-env:": "",
+	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
+	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "分配给 minikube 虚拟机的 CPU 的数量",
-	"Number of CPUs allocated to the minikube VM.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
 	"Open the addons URL with https instead of http": "",
@@ -350,6 +354,7 @@
 	"Please install the minikube hyperkit VM driver, or select an alternative --driver": "",
 	"Please install the minikube kvm2 VM driver, or select an alternative --driver": "",
 	"Please make sure the service you are looking for is deployed or is in the correct namespace.": "",
+	"Please re-eval your docker-env, To ensure your environment variables have updated ports: \n\n\t'minikube -p {{.profile_name}} docker-env'": "",
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "请升级“{{.driver_executable}}”。{{.documentation_url}}",
 	"Populates the specified folder with documentation in markdown about minikube": "",
@@ -363,6 +368,7 @@
 	"Profile gets or sets the current minikube profile": "获取或设置当前的 minikube 配置文件",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "配置文件名称 \"{{.profilename}}\" 是 minikube 的一个关键字。使用 minikube delete -p \u003cprofile name\u003e 命令 删除配置文件",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "提供虚拟机 UUID 以恢复 MAC 地址（仅限 hyperkit 驱动程序）",
+	"Pulling base image ...": "",
 	"Pulling images ...": "拉取镜像 ...",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "重启以完成 VirtualBox 安装，检查 VirtualBox 未被您的操作系统禁用，或者使用其他的管理程序。",
 	"Rebuild libvirt with virt-network support": "",
@@ -378,7 +384,10 @@
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "请求的 CPU 数量 {{.requested_cpus}} 小于允许的最小值 {{.minimum_cpus}}",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "请求的磁盘大小 {{.requested_size}} 小于最小值 {{.minimum_size}}",
 	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "请求的内存分配 ({{.memory}}MB) 小于默认内存分配 {{.default_memorysize}}MB。请注意 minikube 可能无法正常运行或可能会意外崩溃。",
+	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "请求的内存分配 {{.requested_size}} 小于允许的 {{.minimum_size}} 最小值",
+	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Retrieve the ssh identity key path of the specified cluster": "检索指定集群的 ssh 密钥路径",
 	"Retrieve the ssh identity key path of the specified cluster.": "检索指定集群的 ssh 密钥路径。",
 	"Retrieves the IP address of the running cluster": "检索正在运行的群集的 IP 地址",
@@ -391,10 +400,12 @@
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "",
+	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "执行 'chmod 600 $HOME/.kube/config'",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Selecting '{{.driver}}' driver from existing profile (alternates: {{.alternates}})": "从现有配置文件中选择 '{{.driver}}' 驱动程序 （可选：{{.alternates}}）",
 	"Selecting '{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "从用户配置中选择 {{.driver}}' 驱动程序（可选：{{.alternates}}）",
+	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "设置标志以删除所有配置文件",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "设置这个标志来删除您用户目录下的 '.minikube' 文件夹。",
@@ -420,8 +431,8 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
-	"Starting node": "",
+	"StartHost failed again: {{.error}}": "",
+	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "启动本地 kubernetes 集群",
 	"Starts a node.": "",
@@ -469,12 +480,16 @@
 	"The cluster dns domain name used in the kubernetes cluster": "kubernetes 集群中使用的集群 dns 域名",
 	"The container runtime to be used (docker, crio, containerd)": "需要使用的容器运行时（docker、crio、containerd）",
 	"The container runtime to be used (docker, crio, containerd).": "",
+	"The control plane for \"{{.name}}\" is paused!": "",
+	"The control plane node \"{{.name}}\" does not exist.": "",
+	"The control plane node is not running (state={{.state}})": "",
+	"The control plane node must be running for this command": "",
 	"The cri socket path to be used": "需要使用的 cri 套接字路径",
 	"The cri socket path to be used.": "",
-	"The docker service within '{{.profile}}' is not active": "",
+	"The docker service within '{{.name}}' is not active": "",
+	"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "{{.os}} 不支持驱动程序“{{.driver}}”",
-	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
-	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
+	"The existing \"{{.name}}\" VM was created using the \"{{.old}}\" driver, and is incompatible with the \"{{.new}}\" driver.": "",
 	"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "hyperv 虚拟交换机名称。默认为找到的第一个 hyperv 虚拟交换机。（仅限 hyperv 驱动程序）",
 	"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "管理程序似乎配置的不正确。执行 'minikube start --alsologtostderr -v=1' 并且检查错误代码",
 	"The initial time interval for each check that wait performs in seconds": "",
@@ -486,10 +501,14 @@
 	"The name of the node to delete": "",
 	"The name of the node to start": "",
 	"The node to get logs from. Defaults to the primary control plane.": "",
+	"The node to ssh into. Defaults to the primary control plane.": "",
+	"The none driver is not compatible with multi-node clusters.": "",
+	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
+	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "输出的格式。'json' 或者 'table'",
 	"The path on the file system where the docs in markdown need to be saved": "",
-	"The podman service within '{{.profile}}' is not active": "",
+	"The podman service within '{{.cluster}}' is not active": "",
 	"The service namespace": "",
 	"The service {{.service}} requires privileged ports to be exposed: {{.ports}}": "",
 	"The services namespace": "",
@@ -498,19 +517,24 @@
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
 	"The {{.driver_name}} driver should not be used with root privileges.": "不应以根权限使用 {{.driver_name}} 驱动程序。",
+	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "“{{.driver_executable}}”有一个新版本。请考虑升级。{{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "此操作还可通过设置环境变量 CHANGE_MINIKUBE_NONE_USER=true 自动完成",
+	"This control plane is not running! (state={{.state}})": "",
+	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "这将保留现有 kubectl 上下文并创建 minikube 上下文。",
 	"This will start the mount daemon and automatically mount files into minikube": "这将启动装载守护进程并将文件自动装载到 minikube 中",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "提示：要移除这个由根用户拥有的集群，请运行 sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "如需连接到此集群，请使用 kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "如需连接到此集群，请使用 kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To proceed, either:\n\n    1) Delete the existing \"{{.profile_name}}\" cluster using: '{{.command}} delete'\n\n    * or *\n\n    2) Start the existing \"{{.profile_name}}\" cluster using: '{{.command}} start --driver={{.old_driver}}'": "",
+	"To fix this, run: {{.command}}": "",
+	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "如需以您自己的用户身份使用 kubectl 或 minikube 命令，您可能需要重新定位该命令。例如，如需覆盖您的自定义设置，请运行：",
@@ -521,23 +545,32 @@
 	"Unable to determine a default driver to use. Try specifying --vm-driver, or see https://minikube.sigs.k8s.io/docs/start/": "无法确定要使用的默认驱动。尝试通过 --vm-dirver 指定，或者查阅 https://minikube.sigs.k8s.io/docs/start/",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
+	"Unable to find control plane": "",
 	"Unable to generate docs": "",
 	"Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "",
 	"Unable to get VM IP address": "",
 	"Unable to get addon status for {{.name}}: {{.error}}": "",
 	"Unable to get bootstrapper: {{.error}}": "无法获取引导程序：{{.error}}",
+	"Unable to get command runner": "",
+	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
+	"Unable to get driver IP": "",
+	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to get the status of the {{.name}} cluster.": "无法获取 {{.name}} 集群状态。",
 	"Unable to kill mount process: {{.error}}": "",
 	"Unable to load cached images from config file.": "无法从配置文件中加载缓存的镜像。",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "无法加载配置：{{.error}}",
+	"Unable to load host": "",
 	"Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "无法解析“{{.kubernetes_version}}”：{{.error}}",
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "无法从常量中解析默认的 Kubernetes 版本号： {{.error}}",
+	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "无法从常量中解析最旧的 Kubernetes 版本号： {{.error}}",
 	"Unable to pull images, which may be OK: {{.error}}": "无法拉取镜像，有可能是正常状况：{{.error}}",
-	"Unable to remove machine directory: %v": "",
+	"Unable to remove machine directory": "",
+	"Unable to restart cluster, will reset it: {{.error}}": "",
+	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "无法启动虚拟机。可能的话请检查后执行 'minikube delete'",
 	"Unable to stop VM": "无法停止虚拟机",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
@@ -549,6 +582,8 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
+	"Updating node": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "正在从 Kubernetes {{.old}} 升级到 {{.new}}",
 	"Usage": "使用方法",
@@ -575,6 +610,7 @@
 	"VM driver is one of: %v": "虚拟机驱动程序是以下项之一：%v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "虚拟机无权访问 {{.repository}}，或许您需要配置代理或者设置 --image-repository",
 	"VM may be unable to resolve external DNS records": "虚拟机可能无法解析外部 DNS 记录",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "验证是否正确设置了 HTTP_PROXY 和 HTTPS_PROXY 环境变量。",
 	"Verify the IP address of the running cluster in kubeconfig.": "在 kubeconfig 中验证正在运行的集群 IP 地址。",
 	"Verifying dashboard health ...": "正在验证 dashboard 运行情况 ...",
@@ -597,7 +633,9 @@
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "NFS 共享的根目录位置，默认为 /nfsshares（仅限 hyperkit 驱动程序）",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "您似乎正在使用代理，但您的 NO_PROXY 环境不包含 minikube IP ({{.ip_address}})。如需了解详情，请参阅 {{.documentation_url}}",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "您可能需要从管理程序中手动移除“{{.name}}”虚拟机",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
@@ -606,46 +644,44 @@
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addon enable failed": "启用插件失败",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "插件使用诸如 \"minikube addons enable dashboard\" 的子命令修改 minikube 的插件文件",
-	"api load": "",
 	"bash completion failed": "",
 	"call with cleanup=true to remove old tunnels": "",
-	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
-	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
+	"deleting node": "",
 	"disable failed": "禁用失败",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
 	"dry-run validation complete!": "",
 	"enable failed": "开启失败",
 	"error creating clientset": "",
-	"error creating machine client": "",
 	"error getting primary control plane": "",
 	"error getting ssh port": "",
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
 	"failed to open browser: {{.error}}": "",
-	"getting config": "",
-	"getting primary control plane": "",
+	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"initialization failed, will try again: {{.error}}": "",
+	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "kubeadm 检测一个到与其他进程的 TCP 端口冲突：或许是另外的本地安装的 Kubernetes 导致。执行 lsof -p\u003cport\u003e  查找并杀死这些进程",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl 和 minikube 配置将存储在 {{.home_folder}} 中",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
-	"loading config": "",
+	"libmachine failed": "",
 	"logdir set failed": "",
-	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "每个 Kubernetes 核心服务保持健康所需的最长时间。",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "由于出错 minikube 正在退出。如果以上信息没有帮助，请提交问题反馈：",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --driver\n\t- Use --force to override this connectivity check": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\nThis is likely due to one of two reasons:\n\n- VPN or firewall interference\n- {{.hypervisor}} network configuration issue\n\nSuggested workarounds:\n\n- Disable your local VPN or firewall software\n- Configure your local VPN or firewall to allow access to {{.ip}}\n- Restart or reinstall {{.hypervisor}}\n- Use an alternative --vm-driver": "minikube 无法连接到虚拟机：{{.error}}\n\n可能是由于以下两个原因之一导致：\n\n-VPN 或防火墙冲突\n- {{.hypervisor}} 网络配置问题\n建议的方案：\n\n- 禁用本地的 VPN 或者防火墙软件\n- 配置本地 VPN 或防火墙软件，放行 {{.ip}}\n- 重启或者重装 {{.hypervisor}}\n- 使用另外的 --vm-driver",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
@@ -655,14 +691,16 @@
 	"mount failed": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
+	"none driver does not support multi-node clusters": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
 	"pause containers": "暂停容器",
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"profile {{.name}} is not running.": "",
 	"reload cached images.": "重新加载缓存的镜像",
 	"reloads images previously added using the 'cache add' subcommand": "重新加载之前通过子命令 'cache add' 添加的镜像",
 	"retrieving node": "",
+	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"setting up certs": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -687,16 +725,17 @@
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
 	"zsh completion failed": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "似乎并未安装 {{.driver}}",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "似乎并未安装 {{.driver}}，但已被当前的配置文件指定。请执行 'minikube delete' 或者安装 {{.driver}}",
 	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.machine}} IP has been updated to point at {{.ip}}": "",
-	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
-	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
 	"{{.name}} is already running": "",
 	"{{.name}} was successfully configured": "",
 	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "{{.path}} 的版本是 {{.client_version}}，且与 Kubernetes {{.cluster_version}} 不兼容。您需要更新 {{.path}} 或者使用 'minikube kubectl' 连接到这个集群",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.platform}} 上的 {{.prefix}}minikube {{.version}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""

From 798c007d999ed67921b361f27d36d1e1f192713f Mon Sep 17 00:00:00 2001
From: "re;i" <contrib@razmkhah.fr>
Date: Fri, 27 Mar 2020 01:06:50 +0000
Subject: [PATCH 316/668] commit FAQ

---
 site/content/en/docs/FAQ/_index.md       |  8 ++++++++
 site/content/en/docs/FAQ/sudo_prompts.md | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 site/content/en/docs/FAQ/_index.md
 create mode 100644 site/content/en/docs/FAQ/sudo_prompts.md

diff --git a/site/content/en/docs/FAQ/_index.md b/site/content/en/docs/FAQ/_index.md
new file mode 100644
index 0000000000..4c22c42c78
--- /dev/null
+++ b/site/content/en/docs/FAQ/_index.md
@@ -0,0 +1,8 @@
+---
+title: "FAQ"
+linkTitle: "FAQ"
+weight: 5
+description: >
+  Questions that come up regularly
+---
+
diff --git a/site/content/en/docs/FAQ/sudo_prompts.md b/site/content/en/docs/FAQ/sudo_prompts.md
new file mode 100644
index 0000000000..a78b9d141d
--- /dev/null
+++ b/site/content/en/docs/FAQ/sudo_prompts.md
@@ -0,0 +1,20 @@
+---
+title: "Sudo prompts"
+linkTitle: "Sudo prompts"
+weight: 1
+date: 2020-03-26
+description: >
+  Disabling sudo prompts when using minikude start/stop/status, kubectl cluster-info, ... 
+---
+
+## Use the `docker` driver
+
+Use the `docker` driver rather than the `none` driver. `docker` driver should be used unless it does not meet requirements for some reason.
+
+## For `none` users
+
+For `none` users, `CHANGE_MINIKUBE_NONE_USER=true`, kubectl and such will still work: [see environment variables](https://minikube.sigs.k8s.io/docs/reference/environment_variables/)
+
+## Otherwise deal with `sudo`
+
+Configure `sudo` to never prompt for the commands issued by minikube.

From da578b8727ef257052e3b77ec19a182083d0fb91 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 21:00:45 -0500
Subject: [PATCH 317/668] change continue on error to false

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4eb9b9706a..f94d59a89b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -100,7 +100,7 @@ jobs:
       with:
         name: minikube_binaries
     - name: Run Integration Test
-      continue-on-error: true
+      continue-on-error: false
       # bash {0} to allow test to continue to next step. in case of
       shell: bash {0}
       run: |

From d8cf3339abd9e71f0ce6e2b389327fcc97a85253 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 21:38:07 -0500
Subject: [PATCH 318/668] test old file

---
 .github/workflows/main.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f94d59a89b..f19cf8b641 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,21 +211,15 @@ jobs:
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
-  docker_windows_shell:
+  docker_windows_NT:
     needs: [build_minikube]
     env:
       TIME_ELAPSED: time
-      JOB_NAME: "Docker_windows_shell"
+      JOB_NAME: "Docker_windows_NT"
       COMMIT_STATUS: ""
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Docker Info
-      shell: bash
-      run: |
-        docker info || true
-        docker version || true
-        docker ps || true
     - name: Download gopogh
       run: |
         curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe
@@ -262,7 +256,7 @@ jobs:
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
-        name: docker_windows_shell
+        name: docker_windows_NT
         path: report
     - name: The End Result
       run: |
@@ -271,8 +265,6 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "--------------------------------------------"
-        numPass=$(echo $STAT | jq '.NumberOfPass')
-        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
       shell: bash
   none_ubuntu16_04:

From 0bc5adee14bd5b45ef04b76ac78764719611b79b Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 21:45:22 -0500
Subject: [PATCH 319/668] change to new file

---
 .github/workflows/main.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f19cf8b641..dcdc6d15a3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,11 +211,11 @@ jobs:
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
-  docker_windows_NT:
+  docker_windows_shell:
     needs: [build_minikube]
     env:
       TIME_ELAPSED: time
-      JOB_NAME: "Docker_windows_NT"
+      JOB_NAME: "Docker_windows_shell"
       COMMIT_STATUS: ""
     runs-on: windows-latest
     steps:
@@ -256,7 +256,7 @@ jobs:
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
-        name: docker_windows_NT
+        name: docker_windows_shell
         path: report
     - name: The End Result
       run: |
@@ -265,6 +265,8 @@ jobs:
         echo "----------------${numFail} Failures----------------------------"
         echo $STAT | jq '.FailedTests' || true
         echo "--------------------------------------------"
+        numPass=$(echo $STAT | jq '.NumberOfPass')
+        echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
       shell: bash
   none_ubuntu16_04:

From b7bcda88180f632eb69050e5863cafa4e573ea69 Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 21:58:39 -0500
Subject: [PATCH 320/668] delete expected-default-driver

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcdc6d15a3..6854bcb1f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -235,7 +235,7 @@ jobs:
         mkdir -p report
         mkdir -p testhome
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe --expected-default-driver=hyperv -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
         min=$((${TIME_ELAPSED}/60))

From 5466cbf4ac1b1ad09713e21d64f5a0340b67a51a Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Thu, 26 Mar 2020 22:10:17 -0500
Subject: [PATCH 321/668] rename the stage

---
 .github/workflows/main.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6854bcb1f2..cd3d6844fc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,15 +211,21 @@ jobs:
         echo $STAT | jq '.FailedTests' || true
         echo "-------------------------------------------------------"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
-  docker_windows_shell:
+  docker_on_windows:
     needs: [build_minikube]
     env:
       TIME_ELAPSED: time
-      JOB_NAME: "Docker_windows_shell"
+      JOB_NAME: "Docker_on_windows"
       COMMIT_STATUS: ""
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Docker Info
+      shell: bash
+      run: |
+        docker info || true
+        docker version || true
+        docker ps || true
     - name: Download gopogh
       run: |
         curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh.exe
@@ -256,7 +262,7 @@ jobs:
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
-        name: docker_windows_shell
+        name: docker_on_windows
         path: report
     - name: The End Result
       run: |
@@ -493,15 +499,15 @@ jobs:
       run: |
         mkdir -p all_reports
         cp -r docker_ubuntu_18_04 ./all_reports/
-    - name: download results docker_windows_shell
+    - name: download results docker_on_windows
       uses: actions/download-artifact@v1
       with:
-        name: docker_windows_shell
+        name: docker_on_windows
     - name: cp to all_report
       shell: bash
       run: |
         mkdir -p all_reports
-        cp -r docker_windows_shell ./all_reports/
+        cp -r docker_on_windows ./all_reports/
     - name: Download Results none_ubuntu16_04
       uses: actions/download-artifact@v1
       with:

From 3f74cb61ef6e2bc4f323bab71508e96f14f50b9e Mon Sep 17 00:00:00 2001
From: Eberhard Wolff <eberhard.wolff@gmail.com>
Date: Fri, 27 Mar 2020 08:16:48 +0100
Subject: [PATCH 322/668] Fixed typo

---
 pkg/minikube/machine/fix.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index c86c89b306..7323b33089 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -138,7 +138,7 @@ func recreateIfNeeded(api libmachine.API, cc config.ClusterConfig, n config.Node
 	}
 
 	if !recreated {
-		out.T(out.Restarting, `Retarting existing {{.driver_name}} {{.machine_type}} for "{{.cluster}}" ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
+		out.T(out.Restarting, `Restarting existing {{.driver_name}} {{.machine_type}} for "{{.cluster}}" ...`, out.V{"driver_name": cc.Driver, "cluster": cc.Name, "machine_type": machineType})
 	}
 	if err := h.Driver.Start(); err != nil {
 		return h, errors.Wrap(err, "driver start")

From d2f3e18d3ac842483a251bd0a03b2400021a6828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Fri, 27 Mar 2020 09:33:21 +0100
Subject: [PATCH 323/668] Fix misspelling of existence in integration test

---
 test/integration/guest_env_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go
index 201d188ec2..0b4958ad4c 100644
--- a/test/integration/guest_env_test.go
+++ b/test/integration/guest_env_test.go
@@ -49,7 +49,7 @@ func TestGuestEnvironment(t *testing.T) {
 				t.Parallel()
 				rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("which %s", pkg)))
 				if err != nil {
-					t.Errorf("failed to verify existance of %q binary : args %q: %v", pkg, rr.Command(), err)
+					t.Errorf("failed to verify existence of %q binary : args %q: %v", pkg, rr.Command(), err)
 				}
 			})
 		}
@@ -70,7 +70,7 @@ func TestGuestEnvironment(t *testing.T) {
 				t.Parallel()
 				rr, err := Run(t, exec.CommandContext(ctx, Targt(), "-p", profile, "ssh", fmt.Sprintf("df -t ext4 %s | grep %s", mount, mount)))
 				if err != nil {
-					t.Errorf("failed to verify existance of %q mount. args %q: %v", mount, rr.Command(), err)
+					t.Errorf("failed to verify existence of %q mount. args %q: %v", mount, rr.Command(), err)
 				}
 			})
 		}

From 7c9068c991fcb5b80fb22a59984c219817f9a56d Mon Sep 17 00:00:00 2001
From: Ruben Baez <rubenbaez1995@gmail.com>
Date: Fri, 27 Mar 2020 08:53:49 -0500
Subject: [PATCH 324/668] change driver

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd3d6844fc..168b01261e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -241,7 +241,7 @@ jobs:
         mkdir -p report
         mkdir -p testhome
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=hyperv -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome minikube_binaries/e2e-windows-amd64.exe -minikube-start-args=--vm-driver=docker -binary=minikube_binaries/minikube-windows-amd64.exe -test.v -test.timeout=65m 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME)) 
         min=$((${TIME_ELAPSED}/60))

From 47858bf92b6227a6003647a6412b99aa0d0fe3ef Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 27 Mar 2020 10:05:58 -0700
Subject: [PATCH 325/668] More translation documentation updates

---
 .../en/docs/Contributing/translations.md      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/site/content/en/docs/Contributing/translations.md b/site/content/en/docs/Contributing/translations.md
index aa1f8b8c8d..15aafb2748 100644
--- a/site/content/en/docs/Contributing/translations.md
+++ b/site/content/en/docs/Contributing/translations.md
@@ -12,7 +12,7 @@ All translations are stored in the top-level `translations` directory.
 * Add a new json file in the translations directory with the locale code of the language you want to add
   translations for, e.g. fr for French.
 	```
-	~/minikube$ touch translations/ar.json
+	~/minikube$ touch translations/fr.json
 	~/minikube$ ls translations/
 	de.json		es.json		fr.json		ja.json		ko.json		pl.json		zh-CN.json
 	```
@@ -31,8 +31,7 @@ All translations are stored in the top-level `translations` directory.
 	Writing to zh-CN.json
 	Done!
 	```
-* Add translated strings as the value of the map where the English phrase is the key.
-	* The file will be json file with all of the English phrases as the keys of a map
+* Add translated strings to the json file as the value of the map where the English phrase is the key.
 	```
 	~/minikube$ head translations/fr.json 
 	{
@@ -47,21 +46,24 @@ All translations are stored in the top-level `translations` directory.
 	```
 	* Add the translations as the values of the map, keeping in mind that anything in double braces `{{}}` are variable names describing what gets injected and should not be translated.
 	```
-	~/minikube$ vi translations/ar.json
+	~/minikube$ vi translations/fr.json
 	{
-                "\"The '{{.minikube_addon}}' addon is disabled": "",
-                "\"{{.machineName}}\" does not exist, nothing to stop": "\""{{.machineName}} n'exist pas, rien a arrêter.",
-                "\"{{.name}}\" profile does not exist, trying anyways.": "",
-                "'none' driver does not support 'minikube docker-env' command": "",
-                "'none' driver does not support 'minikube mount' command": "",
-                "'none' driver does not support 'minikube podman-env' command": "",
-                "'none' driver does not support 'minikube ssh' command": "",
-                "'{{.driver}}' driver reported an issue: {{.error}}": "",
+                \[...\]
+		"Amount of time to wait for a service in seconds": "",
+        	"Amount of time to wait for service in seconds": "",
+        	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+        	"Automatically selected the {{.driver}} driver": "Choix automatique du driver {{.driver}}",
+        	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du driver {{.driver}}. Autres choix: {{.alternatives}}",
+        	"Available Commands": "",
+        	"Basic Commands:": "",
+        	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
+		\[...\]
+	}
         ```
 	
 ### Adding Translations To an Existing Language
 * Run `make extract` to make sure all strings are up to date
-* Edit the appropriate json file in the 'translations' directory, in the same way described above.
+* Edit the appropriate json file in the 'translations' directory, in the same way as described above.
 
 ### Testing translations
 * Once you have all the translations you want, save the file and rebuild the minikube from scratch to pick up your new translations:

From 969c90f5fb6835dfd8bbe83feead75cd78975d3d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 27 Mar 2020 10:14:27 -0700
Subject: [PATCH 326/668] spacing

---
 site/content/en/docs/Contributing/translations.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/content/en/docs/Contributing/translations.md b/site/content/en/docs/Contributing/translations.md
index 15aafb2748..244cbc8ac0 100644
--- a/site/content/en/docs/Contributing/translations.md
+++ b/site/content/en/docs/Contributing/translations.md
@@ -48,8 +48,8 @@ All translations are stored in the top-level `translations` directory.
 	```
 	~/minikube$ vi translations/fr.json
 	{
-                \[...\]
-		"Amount of time to wait for a service in seconds": "",
+                [...]
+        	"Amount of time to wait for a service in seconds": "",
         	"Amount of time to wait for service in seconds": "",
         	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
         	"Automatically selected the {{.driver}} driver": "Choix automatique du driver {{.driver}}",
@@ -57,7 +57,7 @@ All translations are stored in the top-level `translations` directory.
         	"Available Commands": "",
         	"Basic Commands:": "",
         	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
-		\[...\]
+        	[...]
 	}
         ```
 	

From 339960589be38413e8caa849256cc4a734ffea8c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 27 Mar 2020 10:28:01 -0700
Subject: [PATCH 327/668] spacing 2 electric boogaloo

---
 site/content/en/docs/Contributing/translations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/Contributing/translations.md b/site/content/en/docs/Contributing/translations.md
index 244cbc8ac0..0fb40d0b10 100644
--- a/site/content/en/docs/Contributing/translations.md
+++ b/site/content/en/docs/Contributing/translations.md
@@ -48,7 +48,7 @@ All translations are stored in the top-level `translations` directory.
 	```
 	~/minikube$ vi translations/fr.json
 	{
-                [...]
+        	[...]
         	"Amount of time to wait for a service in seconds": "",
         	"Amount of time to wait for service in seconds": "",
         	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",

From 2420bb1f3a3e5327a13ac017a3d355425e21850a Mon Sep 17 00:00:00 2001
From: Vincent Link <mail@linkvt.de>
Date: Fri, 27 Mar 2020 21:06:22 +0100
Subject: [PATCH 328/668] Show all global flags in cli options help

Before this fix the flags shown in `minikube options` were taken from a
list of options (`viperWhiteList`) which seems arbitrary.
I still don't know for sure why this is done but taking all
PersistentFlags (persistent=apply to all sub commands) from the root
command seems like the correct way.
---
 cmd/minikube/cmd/options.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmd/minikube/cmd/options.go b/cmd/minikube/cmd/options.go
index cc07420d6c..80f97606d1 100644
--- a/cmd/minikube/cmd/options.go
+++ b/cmd/minikube/cmd/options.go
@@ -37,10 +37,9 @@ var optionsCmd = &cobra.Command{
 // runOptions handles the executes the flow of "minikube options"
 func runOptions(cmd *cobra.Command, args []string) {
 	out.String("The following options can be passed to any command:\n\n")
-	for _, flagName := range viperWhiteList {
-		f := pflag.Lookup(flagName)
-		out.String(flagUsage(f))
-	}
+	cmd.Root().PersistentFlags().VisitAll(func(flag *pflag.Flag) {
+		out.String(flagUsage(flag))
+	})
 }
 
 func flagUsage(flag *pflag.Flag) string {

From 31c6c5f36eb4390d671792cb90ccde015d0179a8 Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sat, 28 Mar 2020 12:11:41 +1100
Subject: [PATCH 329/668] use table testing for property testing

---
 pkg/minikube/localpath/localpath_test.go | 50 ++++++++++++++++++++----
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 81b40722dc..bd78eb2ef7 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -67,13 +67,6 @@ func TestHasWindowsDriveLetter(t *testing.T) {
 	}
 }
 
-func TestConfigFile(t *testing.T) {
-	configFile := ConfigFile()
-	if !strings.Contains(configFile, "config.json") {
-		t.Errorf("ConfigFile returned path without 'config.json': %s", configFile)
-	}
-}
-
 func TestMiniPath(t *testing.T) {
 	var testCases = []struct {
 		env, basePath string
@@ -100,3 +93,46 @@ func TestMiniPath(t *testing.T) {
 		})
 	}
 }
+
+type propertyFnWithArg func(string) string
+type propertyFnWithoutArg func() string
+
+func TestPropertyWithNameArg(t *testing.T) {
+	var testCases = []struct {
+		propertyFunc propertyFnWithArg
+	}{
+		{Profile},
+		{ClientCert},
+		{ClientKey},
+	}
+	miniPath := MiniPath()
+	mockedName := "foo"
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("%v", tc.propertyFunc), func(t *testing.T) {
+			if !strings.Contains(tc.propertyFunc(mockedName), MiniPath()) {
+				t.Errorf("Propert %v doesn't contain miniPat %v", tc.propertyFunc, miniPath)
+			}
+			if !strings.Contains(tc.propertyFunc(mockedName), mockedName) {
+				t.Errorf("Propert %v doesn't contain passed name inpath %v", tc.propertyFunc, mockedName)
+			}
+		})
+
+	}
+}
+
+func TestPropertyWithoutNameArg(t *testing.T) {
+	var testCases = []struct {
+		propertyFunc propertyFnWithoutArg
+	}{
+		{ConfigFile},
+		{CACert},
+	}
+	miniPath := MiniPath()
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("%v", tc.propertyFunc), func(t *testing.T) {
+			if !strings.Contains(tc.propertyFunc(), MiniPath()) {
+				t.Errorf("Propert %v doesn't contain miniPat %v", tc.propertyFunc, miniPath)
+			}
+		})
+	}
+}

From c985a7287a08b5c35d32613eb15f87019820ac7f Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sat, 28 Mar 2020 13:46:16 +1100
Subject: [PATCH 330/668] test properties

---
 pkg/minikube/localpath/localpath_test.go | 46 +++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index bd78eb2ef7..7ce6d68a3e 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -83,7 +83,7 @@ func TestMiniPath(t *testing.T) {
 				t.Fatalf("Error reverting env %s to its original value (%s) var after test ", MinikubeHome, originalEnv)
 			}
 		}()
-		t.Run(fmt.Sprintf("%s", tc.env), func(t *testing.T) {
+		t.Run(tc.env, func(t *testing.T) {
 			expectedPath := filepath.Join(tc.basePath, ".minikube")
 			os.Setenv(MinikubeHome, tc.env)
 			path := MiniPath()
@@ -94,44 +94,66 @@ func TestMiniPath(t *testing.T) {
 	}
 }
 
+func TestMachinePath(t *testing.T) {
+	var testCases = []struct {
+		miniHome []string
+		contains string
+	}{
+		{[]string{"tmp", "foo", "bar", "baz"}, "tmp"},
+		{[]string{"tmp"}, "tmp"},
+		{[]string{}, MiniPath()},
+	}
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("%s", tc.miniHome), func(t *testing.T) {
+			machinePath := MachinePath("foo", tc.miniHome...)
+			if !strings.Contains(machinePath, tc.contains) {
+				t.Errorf("Function MachinePath returned (%v) which doesn't contain expected (%v)", machinePath, tc.contains)
+			}
+		})
+	}
+}
+
 type propertyFnWithArg func(string) string
-type propertyFnWithoutArg func() string
 
 func TestPropertyWithNameArg(t *testing.T) {
 	var testCases = []struct {
 		propertyFunc propertyFnWithArg
+		name         string
 	}{
-		{Profile},
-		{ClientCert},
-		{ClientKey},
+		{Profile, "Profile"},
+		{ClientCert, "ClientCert"},
+		{ClientKey, "ClientKey"},
 	}
 	miniPath := MiniPath()
 	mockedName := "foo"
 	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("%v", tc.propertyFunc), func(t *testing.T) {
+		t.Run(tc.name, func(t *testing.T) {
 			if !strings.Contains(tc.propertyFunc(mockedName), MiniPath()) {
-				t.Errorf("Propert %v doesn't contain miniPat %v", tc.propertyFunc, miniPath)
+				t.Errorf("Propert %s(%v) doesn't contain miniPat %v", tc.name, tc.propertyFunc, miniPath)
 			}
 			if !strings.Contains(tc.propertyFunc(mockedName), mockedName) {
-				t.Errorf("Propert %v doesn't contain passed name inpath %v", tc.propertyFunc, mockedName)
+				t.Errorf("Propert %s(%v) doesn't contain passed name inpath %v", tc.name, tc.propertyFunc, mockedName)
 			}
 		})
 
 	}
 }
 
+type propertyFnWithoutArg func() string
+
 func TestPropertyWithoutNameArg(t *testing.T) {
 	var testCases = []struct {
 		propertyFunc propertyFnWithoutArg
+		name         string
 	}{
-		{ConfigFile},
-		{CACert},
+		{ConfigFile, "ConfigFile"},
+		{CACert, "CACert"},
 	}
 	miniPath := MiniPath()
 	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("%v", tc.propertyFunc), func(t *testing.T) {
+		t.Run(tc.name, func(t *testing.T) {
 			if !strings.Contains(tc.propertyFunc(), MiniPath()) {
-				t.Errorf("Propert %v doesn't contain miniPat %v", tc.propertyFunc, miniPath)
+				t.Errorf("Propert %s(%v) doesn't contain miniPat %v", tc.name, tc.propertyFunc, miniPath)
 			}
 		})
 	}

From 93d6829905446838def9f3e9ee9e24361663937b Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sat, 28 Mar 2020 13:49:39 +1100
Subject: [PATCH 331/668] typofix

---
 pkg/minikube/localpath/localpath_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 7ce6d68a3e..6a4ee4e51b 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -129,10 +129,10 @@ func TestPropertyWithNameArg(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			if !strings.Contains(tc.propertyFunc(mockedName), MiniPath()) {
-				t.Errorf("Propert %s(%v) doesn't contain miniPat %v", tc.name, tc.propertyFunc, miniPath)
+				t.Errorf("Property %s(%v) doesn't contain miniPath %v", tc.name, tc.propertyFunc, miniPath)
 			}
 			if !strings.Contains(tc.propertyFunc(mockedName), mockedName) {
-				t.Errorf("Propert %s(%v) doesn't contain passed name inpath %v", tc.name, tc.propertyFunc, mockedName)
+				t.Errorf("Property %s(%v) doesn't contain passed name %v", tc.name, tc.propertyFunc, mockedName)
 			}
 		})
 
@@ -153,7 +153,7 @@ func TestPropertyWithoutNameArg(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			if !strings.Contains(tc.propertyFunc(), MiniPath()) {
-				t.Errorf("Propert %s(%v) doesn't contain miniPat %v", tc.name, tc.propertyFunc, miniPath)
+				t.Errorf("Property %s(%v) doesn't contain expected miniPath %v", tc.name, tc.propertyFunc, miniPath)
 			}
 		})
 	}

From 546b26e695a8c9af8530959ffe7d52443382fe93 Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sat, 28 Mar 2020 20:16:48 +1100
Subject: [PATCH 332/668] implement CR suggestions

---
 pkg/minikube/localpath/localpath_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 6a4ee4e51b..4753752ee2 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -75,8 +75,8 @@ func TestMiniPath(t *testing.T) {
 		{"/tmp/", "/tmp"},
 		{"", homedir.HomeDir()},
 	}
+	originalEnv := os.Getenv(MinikubeHome)
 	for _, tc := range testCases {
-		originalEnv := os.Getenv(MinikubeHome)
 		defer func() { // revert to pre-test env var
 			err := os.Setenv(MinikubeHome, originalEnv)
 			if err != nil {

From 73dd9914f61ad8a68fcbe83f71f37adcf0e5a7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sat, 28 Mar 2020 12:25:32 +0100
Subject: [PATCH 333/668] Fix gofmt and golint on master, after merges

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 1 +
 pkg/minikube/bootstrapper/certs.go                  | 1 +
 pkg/minikube/mustload/mustload.go                   | 3 ++-
 pkg/minikube/tunnel/route_freebsd.go                | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 6f47fc3204..b80f0689e4 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -231,6 +231,7 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	return nil
 }
 
+// APIServerVersionMatch checks if the server version matches the expected
 func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
 	vi, err := client.ServerVersion()
 	if err != nil {
diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index cbd9d27b86..28ea6e5295 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -129,6 +129,7 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 	return copyableFiles, nil
 }
 
+// CACerts has cert and key for CA (and Proxy)
 type CACerts struct {
 	caCert    string
 	caKey     string
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index e9703c1746..9897102638 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// mustload loads minikube clusters, exiting with user-friendly messages
+// Package mustload loads minikube clusters, exiting with user-friendly messages
 package mustload
 
 import (
@@ -37,6 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
+// ClusterController holds all the needed information for a minikube cluster
 type ClusterController struct {
 	Config   *config.ClusterConfig
 	API      libmachine.API
diff --git a/pkg/minikube/tunnel/route_freebsd.go b/pkg/minikube/tunnel/route_freebsd.go
index d88d5301ca..19cd4e4ad3 100644
--- a/pkg/minikube/tunnel/route_freebsd.go
+++ b/pkg/minikube/tunnel/route_freebsd.go
@@ -164,5 +164,3 @@ func (router *osRouter) Cleanup(route *Route) error {
 	}
 	return nil
 }
-
-

From 1f31d25c16dfef600d06e425d81863f25d72a12e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 28 Mar 2020 13:19:48 -0700
Subject: [PATCH 334/668] Use LookPath to verify conntrack install

---
 cmd/minikube/cmd/start.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index cb97d8ca43..498849f437 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -836,10 +836,8 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 		// conntrack is required starting with kubernetes 1.18, include the release candidates for completion
 		version, _ := util.ParseKubernetesVersion(getKubernetesVersion(nil))
 		if version.GTE(semver.MustParse("1.18.0-beta.1")) {
-			err := exec.Command("conntrack").Run()
-			if err != nil {
-				exit.WithCodeT(exit.Config, "The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}", out.V{"k8sVersion": version.String()})
-
+			if _, err := exec.LookPath("conntrack"); err != nil {
+				exit.WithCodeT(exit.Config, "Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path", out.V{"k8sVersion": version.String()})
 			}
 		}
 	}

From 27882f122d978bb85b09e50ddb9ca4a62ac59d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sat, 28 Mar 2020 13:44:43 -0700
Subject: [PATCH 335/668] Issue template: attempt to get better reproduction
 cases

I'm curious if this will yield better issue reports.
---
 .github/ISSUE_TEMPLATE/__en-US.md | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index 261f435c2d..8b72b70175 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -2,21 +2,16 @@
 name: English
 about: Report an issue
 ---
-<!-- Please use this template while reporting an issue, providing as much information as possible. Failure to do so may result in a delayed response. Thank you! -->
+<!-- Please include the exact "minikube start" command line you used-->
+**Commands required to reproduce the issue:**
 
-**The exact command to reproduce the issue**:
+1.
+2. 
+3.
 
+<!-- Tip: Add `--alsologtostderr -v=1` to the minikube command-line for more information! -->
+**The full output of the command that failed**:
 
-**The full output of the command that failed**:<details>
+**Optional: The full output of the `minikube start` command you used, if not already included**:
 
-
-
-</details>
-
-**The output of the `minikube logs` command**:<details>
-
-
-
-</details>
-
-**The operating system version**:
+**Optional: The full output of `minikube logs`**:

From 8a4289c3c4a2ab6ea00e094d97f72811be785015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sat, 28 Mar 2020 21:02:09 -0700
Subject: [PATCH 336/668] Minor tweaks

---
 .github/ISSUE_TEMPLATE/__en-US.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index 8b72b70175..0d283dc54b 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -2,16 +2,19 @@
 name: English
 about: Report an issue
 ---
-<!-- Please include the exact "minikube start" command line you used-->
-**Commands required to reproduce the issue:**
+
+**Commands required to reproduce the issue:** <!-- TIP: include your "minikube start" options -->
 
 1.
 2. 
 3.
 
-<!-- Tip: Add `--alsologtostderr -v=1` to the minikube command-line for more information! -->
-**The full output of the command that failed**:
+**The full output of the command that failed**: <!-- TIP: use "--alsologtostderr -v=1" for verbose logging -->
+
+
 
 **Optional: The full output of the `minikube start` command you used, if not already included**:
 
+
+
 **Optional: The full output of `minikube logs`**:

From d05a13aa4e30378832d0d432077a9ecba3848d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sat, 28 Mar 2020 21:04:39 -0700
Subject: [PATCH 337/668] Simplify template

---
 .github/ISSUE_TEMPLATE/__en-US.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index 0d283dc54b..be92553c31 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -3,18 +3,17 @@ name: English
 about: Report an issue
 ---
 
-**Commands required to reproduce the issue:** <!-- TIP: include your "minikube start" options -->
+**Steps to reproduce the issue:** <!-- include the "minikube start" command! -->
 
 1.
 2. 
 3.
 
-**The full output of the command that failed**: <!-- TIP: use "--alsologtostderr -v=1" for verbose logging -->
+**The full output of the command that failed:** <!-- hint: "--alsologtostderr -v=1" for more logs -->
 
 
-
-**Optional: The full output of the `minikube start` command you used, if not already included**:
+**Optional: The full output of the `minikube start` command used, if not already included:**
 
 
+**Optional: The full output of the `minikube logs` command:**
 
-**Optional: The full output of `minikube logs`**:

From 736b60de89c338451110f8e2fed7822456fe592b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sat, 28 Mar 2020 21:05:55 -0700
Subject: [PATCH 338/668] Update __en-US.md

---
 .github/ISSUE_TEMPLATE/__en-US.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index be92553c31..1f056087fb 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -2,7 +2,6 @@
 name: English
 about: Report an issue
 ---
-
 **Steps to reproduce the issue:** <!-- include the "minikube start" command! -->
 
 1.
@@ -12,8 +11,13 @@ about: Report an issue
 **The full output of the command that failed:** <!-- hint: "--alsologtostderr -v=1" for more logs -->
 
 
+
 **Optional: The full output of the `minikube start` command used, if not already included:**
 
 
-**Optional: The full output of the `minikube logs` command:**
 
+**Optional: The full output of the `minikube logs` command:**
+<details>
+
+
+</details>

From da7227eb7249cc46917f794767a3bc9a452542b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sat, 28 Mar 2020 21:08:17 -0700
Subject: [PATCH 339/668] Less words

---
 .github/ISSUE_TEMPLATE/__en-US.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index 1f056087fb..f917021a78 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -8,15 +8,15 @@ about: Report an issue
 2. 
 3.
 
-**The full output of the command that failed:** <!-- hint: "--alsologtostderr -v=1" for more logs -->
+**Full output of failed command:** <!-- use the "--alsologtostderr" flag for more logs -->
 
 
 
-**Optional: The full output of the `minikube start` command used, if not already included:**
+**Full output of `minikube start` command used, if not already included:**
 
 
 
-**Optional: The full output of the `minikube logs` command:**
+**Optional: Full output of `minikube logs` command:**
 <details>
 
 

From 417081aeb672e242ed31955d63a1f4b64b8f131b Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sun, 29 Mar 2020 15:08:30 +1100
Subject: [PATCH 340/668] move defer outside of for loop

---
 pkg/minikube/localpath/localpath_test.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 4753752ee2..d8e6915a43 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -76,13 +76,13 @@ func TestMiniPath(t *testing.T) {
 		{"", homedir.HomeDir()},
 	}
 	originalEnv := os.Getenv(MinikubeHome)
+	defer func() { // revert to pre-test env var
+		err := os.Setenv(MinikubeHome, originalEnv)
+		if err != nil {
+			t.Fatalf("Error reverting env %s to its original value (%s) var after test ", MinikubeHome, originalEnv)
+		}
+	}()
 	for _, tc := range testCases {
-		defer func() { // revert to pre-test env var
-			err := os.Setenv(MinikubeHome, originalEnv)
-			if err != nil {
-				t.Fatalf("Error reverting env %s to its original value (%s) var after test ", MinikubeHome, originalEnv)
-			}
-		}()
 		t.Run(tc.env, func(t *testing.T) {
 			expectedPath := filepath.Join(tc.basePath, ".minikube")
 			os.Setenv(MinikubeHome, tc.env)

From 5bb0c580a0750427a7453259f47da81fc8ad120b Mon Sep 17 00:00:00 2001
From: Vincent Link <mail@linkvt.de>
Date: Sun, 29 Mar 2020 15:12:37 +0200
Subject: [PATCH 341/668] Add simple embed-certs integration test

---
 test/integration/start_stop_delete_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index dd106484c9..c484a2491b 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/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",
 			}},
+			{"embed-certs", constants.DefaultKubernetesVersion, []string{
+				"--embed-certs",
+			}},
 		}
 
 		for _, tc := range tests {

From 7debdacf5bade075ba1d3cde5999e247905da772 Mon Sep 17 00:00:00 2001
From: Vincent Link <mail@linkvt.de>
Date: Sun, 29 Mar 2020 15:13:59 +0200
Subject: [PATCH 342/668] Write the kubeconfig after generating certs

The content of the kubeconfig is defined before certs are generated by
the bootstrapper. When certs are embedded via --embed-certs writing the
kubeconfig fails if the certificates are not generated so it must run
after the bootstrap process which generates them.
---
 pkg/minikube/node/start.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 44ff9bb1cc..c72df40965 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -101,10 +101,10 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	showVersionInfo(n.KubernetesVersion, cr)
 
 	var bs bootstrapper.Bootstrapper
-	var kubeconfig *kubeconfig.Settings
+	var kcs *kubeconfig.Settings
 	if apiServer {
 		// Must be written before bootstrap, otherwise health checks may flake due to stale IP
-		kubeconfig, err = setupKubeconfig(host, &cc, &n, cc.Name)
+		kcs = setupKubeconfig(host, &cc, &n, cc.Name)
 		if err != nil {
 			exit.WithError("Failed to setup kubeconfig", err)
 		}
@@ -115,6 +115,11 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		if err != nil {
 			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
 		}
+
+		// write the kubeconfig to the file system after everything required (like certs) are created by the bootstrapper
+		if err := kubeconfig.Update(kcs); err != nil {
+			exit.WithError("Failed to update kubeconfig file.", err)
+		}
 	} else {
 		bs, err = cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
 		if err != nil {
@@ -124,7 +129,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
 			exit.WithError("setting up certs", err)
 		}
-
 	}
 
 	configureMounts()
@@ -175,8 +179,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 	}
 
-	return kubeconfig
-
+	return kcs
 }
 
 // ConfigureRuntimes does what needs to happen to get a runtime going.
@@ -239,7 +242,7 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node)
 	return bs
 }
 
-func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clusterName string) *kubeconfig.Settings {
 	addr, err := apiServerURL(*h, *cc, *n)
 	if err != nil {
 		exit.WithError("Failed to get API Server URL", err)
@@ -259,10 +262,7 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 	}
 
 	kcs.SetPath(kubeconfig.PathFromEnv())
-	if err := kubeconfig.Update(kcs); err != nil {
-		return kcs, err
-	}
-	return kcs, nil
+	return kcs
 }
 
 func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string, error) {

From 063077c712c4d8b88aabdea861f18963755326f8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sun, 29 Mar 2020 11:34:21 -0700
Subject: [PATCH 343/668] mustload: Check apiserver status using forwarded
 IP/port

---
 cmd/minikube/cmd/docker-env.go    |  4 +--
 cmd/minikube/cmd/logs.go          | 10 +++----
 cmd/minikube/cmd/mount.go         | 10 +++----
 cmd/minikube/cmd/podman-env.go    |  6 ++--
 cmd/minikube/cmd/ssh.go           |  4 +--
 pkg/minikube/mustload/mustload.go | 48 ++++++++++++++++++++-----------
 6 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index 4b61a435d2..901e57fc7b 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -129,7 +129,7 @@ var dockerEnvCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cname := ClusterFlagValue()
 		co := mustload.Running(cname)
-		driverName := co.CPHost.DriverName
+		driverName := co.CP.Host.DriverName
 
 		if driverName == driver.None {
 			exit.UsageT(`'none' driver does not support 'minikube docker-env' command`)
@@ -140,7 +140,7 @@ var dockerEnvCmd = &cobra.Command{
 				out.V{"runtime": co.Config.KubernetesConfig.ContainerRuntime})
 		}
 
-		if ok := isDockerActive(co.CPRunner); !ok {
+		if ok := isDockerActive(co.CP.Runner); !ok {
 			exit.WithCodeT(exit.Unavailable, `The docker service within '{{.name}}' is not active`, out.V{"name": cname})
 		}
 
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index f2a1fba453..0c3854ea14 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -53,28 +53,28 @@ var logsCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		co := mustload.Running(ClusterFlagValue())
 
-		bs, err := cluster.Bootstrapper(co.API, viper.GetString(cmdcfg.Bootstrapper), *co.Config, *co.CPNode)
+		bs, err := cluster.Bootstrapper(co.API, viper.GetString(cmdcfg.Bootstrapper), *co.Config, *co.CP.Node)
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}
 
-		cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: co.CPRunner})
+		cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: co.CP.Runner})
 		if err != nil {
 			exit.WithError("Unable to get runtime", err)
 		}
 		if followLogs {
-			err := logs.Follow(cr, bs, *co.Config, co.CPRunner)
+			err := logs.Follow(cr, bs, *co.Config, co.CP.Runner)
 			if err != nil {
 				exit.WithError("Follow", err)
 			}
 			return
 		}
 		if showProblems {
-			problems := logs.FindProblems(cr, bs, *co.Config, co.CPRunner)
+			problems := logs.FindProblems(cr, bs, *co.Config, co.CP.Runner)
 			logs.OutputProblems(problems, numberOfProblems)
 			return
 		}
-		err = logs.Output(cr, bs, *co.Config, co.CPRunner, numberOfLines)
+		err = logs.Output(cr, bs, *co.Config, co.CP.Runner, numberOfLines)
 		if err != nil {
 			out.Ln("")
 			// Avoid exit.WithError, since it outputs the issue URL
diff --git a/cmd/minikube/cmd/mount.go b/cmd/minikube/cmd/mount.go
index 570a76447e..4e97c7b463 100644
--- a/cmd/minikube/cmd/mount.go
+++ b/cmd/minikube/cmd/mount.go
@@ -99,14 +99,14 @@ var mountCmd = &cobra.Command{
 		}
 
 		co := mustload.Running(ClusterFlagValue())
-		if co.CPHost.Driver.DriverName() == driver.None {
+		if co.CP.Host.Driver.DriverName() == driver.None {
 			exit.UsageT(`'none' driver does not support 'minikube mount' command`)
 		}
 
 		var ip net.IP
 		var err error
 		if mountIP == "" {
-			ip, err = cluster.GetVMHostIP(co.CPHost)
+			ip, err = cluster.GetVMHostIP(co.CP.Host)
 			if err != nil {
 				exit.WithError("Error getting the host IP address to use from within the VM", err)
 			}
@@ -147,7 +147,7 @@ var mountCmd = &cobra.Command{
 		}
 
 		bindIP := ip.String() // the ip to listen on the user's host machine
-		if driver.IsKIC(co.CPHost.Driver.DriverName()) && runtime.GOOS != "linux" {
+		if driver.IsKIC(co.CP.Host.Driver.DriverName()) && runtime.GOOS != "linux" {
 			bindIP = "127.0.0.1"
 		}
 		out.T(out.Mounting, "Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...", out.V{"sourcePath": hostPath, "destinationPath": vmPath})
@@ -177,7 +177,7 @@ var mountCmd = &cobra.Command{
 		go func() {
 			for sig := range c {
 				out.T(out.Unmount, "Unmounting {{.path}} ...", out.V{"path": vmPath})
-				err := cluster.Unmount(co.CPRunner, vmPath)
+				err := cluster.Unmount(co.CP.Runner, vmPath)
 				if err != nil {
 					out.ErrT(out.FailureType, "Failed unmount: {{.error}}", out.V{"error": err})
 				}
@@ -185,7 +185,7 @@ var mountCmd = &cobra.Command{
 			}
 		}()
 
-		err = cluster.Mount(co.CPRunner, ip.String(), vmPath, cfg)
+		err = cluster.Mount(co.CP.Runner, ip.String(), vmPath, cfg)
 		if err != nil {
 			exit.WithError("mount failed", err)
 		}
diff --git a/cmd/minikube/cmd/podman-env.go b/cmd/minikube/cmd/podman-env.go
index c55ba5f5f0..124a721de8 100644
--- a/cmd/minikube/cmd/podman-env.go
+++ b/cmd/minikube/cmd/podman-env.go
@@ -108,17 +108,17 @@ var podmanEnvCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cname := ClusterFlagValue()
 		co := mustload.Running(cname)
-		driverName := co.CPHost.DriverName
+		driverName := co.CP.Host.DriverName
 
 		if driverName == driver.None {
 			exit.UsageT(`'none' driver does not support 'minikube podman-env' command`)
 		}
 
-		if ok := isPodmanAvailable(co.CPRunner); !ok {
+		if ok := isPodmanAvailable(co.CP.Runner); !ok {
 			exit.WithCodeT(exit.Unavailable, `The podman service within '{{.cluster}}' is not active`, out.V{"cluster": cname})
 		}
 
-		client, err := createExternalSSHClient(co.CPHost.Driver)
+		client, err := createExternalSSHClient(co.CP.Host.Driver)
 		if err != nil {
 			exit.WithError("Error getting ssh client", err)
 		}
diff --git a/cmd/minikube/cmd/ssh.go b/cmd/minikube/cmd/ssh.go
index a18ae297de..bbd39af369 100644
--- a/cmd/minikube/cmd/ssh.go
+++ b/cmd/minikube/cmd/ssh.go
@@ -43,14 +43,14 @@ var sshCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cname := ClusterFlagValue()
 		co := mustload.Running(cname)
-		if co.CPHost.DriverName == driver.None {
+		if co.CP.Host.DriverName == driver.None {
 			exit.UsageT("'none' driver does not support 'minikube ssh' command")
 		}
 
 		var err error
 		var n *config.Node
 		if nodeName == "" {
-			n = co.CPNode
+			n = co.CP.Node
 		} else {
 			n, _, err = node.Retrieve(co.Config, nodeName)
 			if err != nil {
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index 9897102638..ac5a0fbca3 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -41,10 +41,16 @@ import (
 type ClusterController struct {
 	Config   *config.ClusterConfig
 	API      libmachine.API
-	CPHost   *host.Host
-	CPNode   *config.Node
-	CPRunner command.Runner
 	DriverIP net.IP
+	CP       ControlPlane
+}
+
+type ControlPlane struct {
+	Host          *host.Host
+	Node          *config.Node
+	Runner        command.Runner
+	ForwardedIP   net.IP
+	ForwardedPort int
 }
 
 // Partial is a cmd-friendly way to load a cluster which may or may not be running
@@ -107,26 +113,36 @@ func Running(name string) ClusterController {
 		exit.WithError("Unable to get command runner", err)
 	}
 
-	ips, err := host.Driver.GetIP()
+	ipStr, err := host.Driver.GetIP()
 	if err != nil {
 		exit.WithError("Unable to get driver IP", err)
 	}
 
-	if driver.IsKIC(host.DriverName) {
-		ips = oci.DefaultBindIPV4
+	ip := net.ParseIP(ipStr)
+	if ip == nil {
+		exit.WithCodeT(exit.Software, fmt.Sprintf("Unable to parse driver IP: %q", ipStr))
 	}
 
-	ip := net.ParseIP(ips)
-	if ip == nil {
-		exit.WithCodeT(exit.Software, fmt.Sprintf("Unable to parse driver IP: %q", ips))
+	cpIP := cp.IP
+	cpPort := cp.Port
+	if driver.IsKIC(host.DriverName) {
+		cpIP = oci.DefaultBindIPV4
+		cpPort, err = oci.ForwardedPort(cc.Driver, cc.Name, cp.Port)
+		if err != nil {
+			exit.WithError("Unable to get forwarded port", err)
+		}
 	}
 
 	return ClusterController{
-		API:      api,
-		Config:   cc,
-		CPRunner: cr,
-		CPHost:   host,
-		CPNode:   &cp,
+		API:    api,
+		Config: cc,
+		CP: ControlPlane{
+			Runner:        cr,
+			Host:          host,
+			Node:          &cp,
+			ForwardedIP:   net.ParseIP(cpIP),
+			ForwardedPort: cpPort,
+		},
 		DriverIP: ip,
 	}
 }
@@ -135,7 +151,7 @@ func Running(name string) ClusterController {
 func Healthy(name string) ClusterController {
 	co := Running(name)
 
-	as, err := kverify.APIServerStatus(co.CPRunner, net.ParseIP(co.CPNode.IP), co.CPNode.Port)
+	as, err := kverify.APIServerStatus(co.CP.Runner, co.CP.ForwardedIP, co.CP.ForwardedPort)
 	if err != nil {
 		out.T(out.FailureType, `Unable to get control plane status: {{.error}}`, out.V{"error": err})
 		exitTip("delete", name, exit.Unavailable)
@@ -165,6 +181,6 @@ func ExampleCmd(cname string, action string) string {
 // exitTip returns an action tip and exits
 func exitTip(action string, profile string, code int) {
 	command := ExampleCmd(profile, action)
-	out.T(out.Workaround, "To fix this, run: {{.command}}", out.V{"command": command})
+	out.T(out.Workaround, `To fix this, run: "{{.command}}"`, out.V{"command": command})
 	os.Exit(code)
 }

From 7f5f12c5f4fe18c444b8f0211e10f4e765d62c6f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sun, 29 Mar 2020 11:44:25 -0700
Subject: [PATCH 344/668] Get rid of DriverIP attr to prevent future misuse

---
 cmd/minikube/cmd/docker-env.go     | 2 +-
 cmd/minikube/cmd/ip.go             | 2 +-
 cmd/minikube/cmd/update-context.go | 9 ++++++---
 pkg/minikube/mustload/mustload.go  | 8 +++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index 901e57fc7b..cf18ad0414 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -161,7 +161,7 @@ var dockerEnvCmd = &cobra.Command{
 			EnvConfig: sh,
 			profile:   cname,
 			driver:    driverName,
-			hostIP:    co.DriverIP.String(),
+			hostIP:    co.CP.ForwardedIP.String(),
 			port:      port,
 			certsDir:  localpath.MakeMiniPath("certs"),
 			noProxy:   noProxy,
diff --git a/cmd/minikube/cmd/ip.go b/cmd/minikube/cmd/ip.go
index 04dd705fb5..f91709f02f 100644
--- a/cmd/minikube/cmd/ip.go
+++ b/cmd/minikube/cmd/ip.go
@@ -29,6 +29,6 @@ var ipCmd = &cobra.Command{
 	Long:  `Retrieves the IP address of the running cluster, and writes it to STDOUT.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		co := mustload.Running(ClusterFlagValue())
-		out.Ln(co.DriverIP.String())
+		out.Ln(co.CP.ForwardedIP.String())
 	},
 }
diff --git a/cmd/minikube/cmd/update-context.go b/cmd/minikube/cmd/update-context.go
index 39a76e5929..79e42fe96d 100644
--- a/cmd/minikube/cmd/update-context.go
+++ b/cmd/minikube/cmd/update-context.go
@@ -33,14 +33,17 @@ var updateContextCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cname := ClusterFlagValue()
 		co := mustload.Running(cname)
-		updated, err := kubeconfig.UpdateIP(co.DriverIP, cname, kubeconfig.PathFromEnv())
+		ip := co.CP.ForwardedIP
+
+		// ??? For KIC, should we also update the port ???
+		updated, err := kubeconfig.UpdateIP(ip, cname, kubeconfig.PathFromEnv())
 		if err != nil {
 			exit.WithError("update config", err)
 		}
 		if updated {
-			out.T(out.Celebrate, "{{.cluster}} IP has been updated to point at {{.ip}}", out.V{"cluster": cname, "ip": co.DriverIP})
+			out.T(out.Celebrate, "{{.cluster}} IP has been updated to point at {{.ip}}", out.V{"cluster": cname, "ip": ip})
 		} else {
-			out.T(out.Meh, "{{.cluster}} IP was already correctly configured for {{.ip}}", out.V{"cluster": cname, "ip": co.DriverIP})
+			out.T(out.Meh, "{{.cluster}} IP was already correctly configured for {{.ip}}", out.V{"cluster": cname, "ip": ip})
 		}
 
 	},
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index ac5a0fbca3..b6e24bdfac 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -39,10 +39,9 @@ import (
 
 // ClusterController holds all the needed information for a minikube cluster
 type ClusterController struct {
-	Config   *config.ClusterConfig
-	API      libmachine.API
-	DriverIP net.IP
-	CP       ControlPlane
+	Config *config.ClusterConfig
+	API    libmachine.API
+	CP     ControlPlane
 }
 
 type ControlPlane struct {
@@ -143,7 +142,6 @@ func Running(name string) ClusterController {
 			ForwardedIP:   net.ParseIP(cpIP),
 			ForwardedPort: cpPort,
 		},
-		DriverIP: ip,
 	}
 }
 

From cc731bb0101f30c449e46c936c8feb8c5532eeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Sun, 29 Mar 2020 14:16:01 -0700
Subject: [PATCH 345/668] Add badges for downloads & most recent version

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 75423b7474..c9f85e00a8 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
 
 [![BuildStatus Widget]][BuildStatus Result]
 [![GoReport Widget]][GoReport Status]
+[![Github All Releases](https://img.shields.io/github/downloads/kubernetes/minikube/total.svg)](https://github.com/kubernetes/minikube/releases/latest)
+[![Latest Release](https://img.shields.io/github/v/release/kubernetes/minikube?include_prereleases)](https://github.com/kubernetes/minikube/releases/latest)
+ 
 
 [BuildStatus Result]: https://travis-ci.org/kubernetes/minikube
 [BuildStatus Widget]: https://travis-ci.org/kubernetes/minikube.svg?branch=master

From 15ddaf723ebe445d964ec472ce49c095d9acd84e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 08:40:12 -0700
Subject: [PATCH 346/668] Release schedule proposal

---
 .../schedule-proposal.md                      | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 enhancements/proposed/20200316-release-schedule/schedule-proposal.md

diff --git a/enhancements/proposed/20200316-release-schedule/schedule-proposal.md b/enhancements/proposed/20200316-release-schedule/schedule-proposal.md
new file mode 100644
index 0000000000..eca00232e6
--- /dev/null
+++ b/enhancements/proposed/20200316-release-schedule/schedule-proposal.md
@@ -0,0 +1,56 @@
+# Release Schedule
+
+* First proposed: 2020-03-30
+* Authors: Thomas Stromberg (@tstromberg)
+
+## Reviewer Priorities
+
+Please review this proposal with the following priorities:
+
+* Does this fit with minikube's [principles](https://minikube.sigs.k8s.io/docs/concepts/principles/)?
+* Are there other approaches to consider?
+* Could the implementation be made simpler?
+* Are there usability, reliability, or technical debt concerns?
+
+Please leave the above text in your proposal as instructions to the reader.
+
+## Summary
+
+Adding structure to the release process to encourage predictable stress-free releases with fewer regressions.
+
+## Goals
+
+* A decrease in release regressions
+* Minimal disruption to development velocity
+* Compatible with the upstream Kubernetes release schedule
+
+## Non-Goals
+
+* Maintaining release branches
+
+## Design Details
+
+minikube currently has 3 types of releases:
+
+* Feature release (v1.9.0)
+* Bugfix release (v1.9.1)
+* Beta releases
+
+This proposal maintains the pre-existing structure, but adds dates for when each step will occur:
+
+* Day 0: Create milestones for the next regression & feature release
+* Day 7: Regression release (optional)
+* Day 14: Early Beta release (optional)
+* Day 21: Beta release
+* Day 24: Feature freeze and optional final beta
+* Day 28: Feature release
+
+To synchronize with Kubernetes release schedule (Tuesday afternoon PST), minikube releases should be Wednesday morning (PST). To select a final release date, consult [sig-release](https://github.com/kubernetes/sig-release/tree/master/releases) to see if there is an upcoming minor release of Kubernetes within the next 6 weeks. If so, schedule the minikube release to occur within 24 hours of it.
+
+Even with this schedule, it is assumed that release dates may slip.
+
+## Alternatives Considered
+
+### Release branches
+
+Rather than considering master to always be in a releasable state, we could maintain long-lived release branches. This adds a lot of overhead to the release manager, as they have to manage cherry-picks.

From f1be2247215a0bea1d62f119e6e10854cf48f602 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 08:49:21 -0700
Subject: [PATCH 347/668] Mention extension idea

---
 .../20200316-release-schedule/schedule-proposal.md  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/enhancements/proposed/20200316-release-schedule/schedule-proposal.md b/enhancements/proposed/20200316-release-schedule/schedule-proposal.md
index eca00232e6..fdcb03ba08 100644
--- a/enhancements/proposed/20200316-release-schedule/schedule-proposal.md
+++ b/enhancements/proposed/20200316-release-schedule/schedule-proposal.md
@@ -54,3 +54,16 @@ Even with this schedule, it is assumed that release dates may slip.
 ### Release branches
 
 Rather than considering master to always be in a releasable state, we could maintain long-lived release branches. This adds a lot of overhead to the release manager, as they have to manage cherry-picks.
+
+### Extending cycle by a week
+
+As this process assumes a regression release at Day 7, it begs the question on whether or not a 5-week feature release cycle makes more sense:
+
+* Day 0: Create milestones for the next regression & feature release
+* Day 7: Regression release (optional)
+* Day 21: Beta release
+* Day 28: Beta 2 release
+* Day 31: Feature freeze and optional final beta
+* Day 35: Feature release
+
+The downside is a slightly lower release velocity, the upside may be more a more stable final release.

From 0696e90acd9d3f5e35c3bc55d4b9ae382c677d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Mon, 30 Mar 2020 09:02:49 -0700
Subject: [PATCH 348/668] Fix HTML comments

---
 .github/ISSUE_TEMPLATE/__en-US.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/__en-US.md b/.github/ISSUE_TEMPLATE/__en-US.md
index f917021a78..0e78dda079 100644
--- a/.github/ISSUE_TEMPLATE/__en-US.md
+++ b/.github/ISSUE_TEMPLATE/__en-US.md
@@ -2,13 +2,15 @@
 name: English
 about: Report an issue
 ---
-**Steps to reproduce the issue:** <!-- include the "minikube start" command! -->
+<!--- Please include the "minikube start" command you used in your reproduction steps --->
+**Steps to reproduce the issue:** 
 
 1.
 2. 
 3.
 
-**Full output of failed command:** <!-- use the "--alsologtostderr" flag for more logs -->
+<!--- TIP: Add the "--alsologtostderr" flag to the command-line for more logs --->
+**Full output of failed command:** 
 
 
 

From 5f9515040d813061e6ea486a9c82acd7c29f4b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sat, 28 Mar 2020 14:19:11 +0100
Subject: [PATCH 349/668] Run dashboard with internal kubectl if not in path

If "kubectl" is not in the PATH, then use the same cached binary
as with the "minikube kubectl" command (version matching cluster).
---
 cmd/minikube/cmd/dashboard.go | 19 ++++++++++++-------
 cmd/minikube/cmd/kubectl.go   | 21 +++++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go
index c235adbab2..e3c9e93b6b 100644
--- a/cmd/minikube/cmd/dashboard.go
+++ b/cmd/minikube/cmd/dashboard.go
@@ -63,10 +63,8 @@ var dashboardCmd = &cobra.Command{
 			}
 		}
 
-		kubectl, err := exec.LookPath("kubectl")
-		if err != nil {
-			exit.WithCodeT(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
-		}
+		kubectlVersion := co.Config.KubernetesConfig.KubernetesVersion
+		var err error
 
 		// Check dashboard status before enabling it
 		dashboardAddon := assets.Addons["dashboard"]
@@ -90,7 +88,7 @@ var dashboardCmd = &cobra.Command{
 		}
 
 		out.ErrT(out.Launch, "Launching proxy ...")
-		p, hostPort, err := kubectlProxy(kubectl, cname)
+		p, hostPort, err := kubectlProxy(kubectlVersion, cname)
 		if err != nil {
 			exit.WithError("kubectl proxy", err)
 		}
@@ -124,10 +122,17 @@ var dashboardCmd = &cobra.Command{
 }
 
 // kubectlProxy runs "kubectl proxy", returning host:port
-func kubectlProxy(path string, contextName string) (*exec.Cmd, string, error) {
+func kubectlProxy(kubectlVersion string, contextName string) (*exec.Cmd, string, error) {
 	// port=0 picks a random system port
 
-	cmd := exec.Command(path, "--context", contextName, "proxy", "--port=0")
+	kubectlArgs := []string{"--context", contextName, "proxy", "--port=0"}
+
+	var cmd *exec.Cmd
+	if kubectl, err := exec.LookPath("kubectl"); err == nil {
+		cmd = exec.Command(kubectl, kubectlArgs...)
+	} else if cmd, err = KubectlCommand(kubectlVersion, kubectlArgs...); err != nil {
+		return nil, "", err
+	}
 
 	stdoutPipe, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/cmd/minikube/cmd/kubectl.go b/cmd/minikube/cmd/kubectl.go
index f4867b45e0..3eca6dfb06 100644
--- a/cmd/minikube/cmd/kubectl.go
+++ b/cmd/minikube/cmd/kubectl.go
@@ -43,17 +43,12 @@ minikube kubectl -- get pods --namespace kube-system`,
 		co := mustload.Healthy(ClusterFlagValue())
 
 		version := co.Config.KubernetesConfig.KubernetesVersion
-		if version == "" {
-			version = constants.DefaultKubernetesVersion
-		}
-
-		path, err := node.CacheKubectlBinary(version)
+		c, err := KubectlCommand(version, args...)
 		if err != nil {
 			out.ErrLn("Error caching kubectl: %v", err)
 		}
 
 		glog.Infof("Running %s %v", path, args)
-		c := exec.Command(path, args...)
 		c.Stdin = os.Stdin
 		c.Stdout = os.Stdout
 		c.Stderr = os.Stderr
@@ -70,3 +65,17 @@ minikube kubectl -- get pods --namespace kube-system`,
 		}
 	},
 }
+
+// KubectlCommand will return kubectl command with a version matching the cluster
+func KubectlCommand(version string, args ...string) (*exec.Cmd, error) {
+	if version == "" {
+		version = constants.DefaultKubernetesVersion
+	}
+
+	path, err := node.CacheKubectlBinary(version)
+	if err != nil {
+		return nil, err
+	}
+
+	return exec.Command(path, args...), nil
+}

From d1769f6c31ec7ae75879a4d9b4c42bd0577d341b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 11:57:21 -0700
Subject: [PATCH 350/668] docs: Update hugo version used by netlify

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index d335d812be..bbf6fcf397 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,7 +4,7 @@ publish = "site/public/"
 command = "pwd && cd themes/docsy && git submodule update -f --init && cd ../.. && hugo"
 
 [build.environment]
-HUGO_VERSION = "0.59.0"
+HUGO_VERSION = "0.68.3"
 
 [context.production.environment]
 HUGO_ENV = "production"

From a1cc3188bb6e0598de68c72f61f6a0fc9e1d2922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Mon, 30 Mar 2020 22:16:10 +0200
Subject: [PATCH 351/668] Implement options for the minikube version command

Add --short and --output options, just like kubectl
---
 cmd/minikube/cmd/version.go | 41 ++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/version.go b/cmd/minikube/cmd/version.go
index 00c61efd88..c56ca7cdea 100644
--- a/cmd/minikube/cmd/version.go
+++ b/cmd/minikube/cmd/version.go
@@ -17,20 +17,55 @@ limitations under the License.
 package cmd
 
 import (
+	"encoding/json"
 	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v2"
+	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/version"
 )
 
+var (
+	versionOutput string
+	shortVersion  bool
+)
+
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version of minikube",
 	Long:  `Print the version of minikube.`,
 	Run: func(command *cobra.Command, args []string) {
-		out.Ln("minikube version: %v", version.GetVersion())
+		minikubeVersion := version.GetVersion()
 		gitCommitID := version.GetGitCommitID()
-		if gitCommitID != "" {
-			out.Ln("commit: %v", gitCommitID)
+		data := map[string]string{
+			"minikubeVersion": minikubeVersion,
+			"commit":          gitCommitID,
+		}
+		switch versionOutput {
+		case "":
+			out.Ln("minikube version: %v", minikubeVersion)
+			if !shortVersion && gitCommitID != "" {
+				out.Ln("commit: %v", gitCommitID)
+			}
+		case "json":
+			json, err := json.Marshal(data)
+			if err != nil {
+				exit.WithError("version json failure", err)
+			}
+			out.Ln(string(json))
+		case "yaml":
+			yaml, err := yaml.Marshal(data)
+			if err != nil {
+				exit.WithError("version yaml failure", err)
+			}
+			out.Ln(string(yaml))
+		default:
+			exit.WithCodeT(exit.BadUsage, "error: --output must be 'yaml' or 'json'")
 		}
 	},
 }
+
+func init() {
+	versionCmd.Flags().StringVarP(&versionOutput, "output", "o", "", "One of 'yaml' or 'json'.")
+	versionCmd.Flags().BoolVar(&shortVersion, "short", false, "Print just the version number.")
+}

From fd3e0f505a2141ab52864685143b40dcb82a6e72 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 30 Mar 2020 15:31:17 -0700
Subject: [PATCH 352/668] clean up minikube start output

---
 cmd/minikube/cmd/start.go  | 1 +
 pkg/minikube/node/start.go | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 498849f437..780e2ec766 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -371,6 +371,7 @@ func runStart(cmd *cobra.Command, args []string) {
 					ControlPlane:      false,
 					KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
 				}
+				out.Ln("") // extra newline for clarity on the command line
 				err := node.Add(&cc, n)
 				if err != nil {
 					exit.WithError("adding node", err)
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 44ff9bb1cc..0945a32ddd 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -66,6 +66,14 @@ const (
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) *kubeconfig.Settings {
+
+	cp := ""
+	if apiServer {
+		cp = "control plane "
+	}
+
+	out.T(out.ThumbsUp, "Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}", out.V{"controlPlane": cp, "name": n.Name, "cluster": cc.Name})
+
 	var kicGroup errgroup.Group
 	if driver.IsKIC(cc.Driver) {
 		beginDownloadKicArtifacts(&kicGroup)

From 2b68cb72d8bea912f4fe725b8fee5c22dc845b37 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 30 Mar 2020 15:36:11 -0700
Subject: [PATCH 353/668] glorb

---
 pkg/minikube/node/start.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 0945a32ddd..3b3ee6890f 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -66,7 +66,6 @@ const (
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) *kubeconfig.Settings {
-
 	cp := ""
 	if apiServer {
 		cp = "control plane "

From 4b49fb9a81e073b525b4127211e3c8724b622ce8 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 30 Mar 2020 17:56:55 -0700
Subject: [PATCH 354/668] Update ebpf tools doc

---
 .../en/docs/Tutorials/ebpf_tools_in_minikube.md      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md b/site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md
index 4931f35d9a..21dcb9b0b0 100644
--- a/site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md
+++ b/site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md
@@ -22,25 +22,25 @@ This tutorial will cover how to set up your minikube cluster so that you can run
 First, start minikube:
 
 ```
-$ minikube start
+$ minikube start --iso-url https://storage.googleapis.com/minikube-performance/minikube.iso
 ```
 
 You will need to download and extract necessary kernel headers within minikube:
 
 ```shell
-$ minikube ssh -- curl -Lo /tmp/kernel-headers-linux-4.19.94.tar.lz4 https://storage.googleapis.com/minikube-kernel-headers/kernel-headers-linux-4.19.94.tar.lz4 
+minikube ssh -- curl -Lo /tmp/kernel-headers-linux-4.19.94.tar.lz4 https://storage.googleapis.com/minikube-kernel-headers/kernel-headers-linux-4.19.94.tar.lz4 
 
-$ minikube ssh -- sudo mkdir -p /lib/modules/4.19.94/build
+minikube ssh -- sudo mkdir -p /lib/modules/4.19.94/build
 
-$ minikube ssh -- sudo tar -I lz4 -C /lib/modules/4.19.94/build -xvf /tmp/kernel-headers-linux-4.19.94.tar.lz4
+minikube ssh -- sudo tar -I lz4 -C /lib/modules/4.19.94/build -xvf /tmp/kernel-headers-linux-4.19.94.tar.lz4
 
-$ minikube ssh -- rm /tmp/kernel-headers-linux-4.19.94.tar.lz4
+minikube ssh -- rm /tmp/kernel-headers-linux-4.19.94.tar.lz4
 ```
 
 You can now run [BCC tools](https://github.com/iovisor/bcc) as a Docker container in minikube:
 
 ```shell
-$ minikube ssh -- docker run -it --rm   --privileged   -v /lib/modules:/lib/modules:ro   -v /usr/src:/usr/src:ro   -v /etc/localtime:/etc/localtime:ro   --workdir /usr/share/bcc/tools   zlim/bcc ./execsnoop
+$ minikube ssh -- docker run --rm   --privileged   -v /lib/modules:/lib/modules:ro   -v /usr/src:/usr/src:ro   -v /etc/localtime:/etc/localtime:ro   --workdir /usr/share/bcc/tools   zlim/bcc ./execsnoop
 
 
 Unable to find image 'zlim/bcc:latest' locally

From 9d64dfdfe0a8169d9e391eba0f1f3d2a7fcfe67b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 19:31:17 -0700
Subject: [PATCH 355/668] Make site mostly compatible with hugo v0.69.0 through
 criminal hacks

---
 site/config.toml                        | 48 +++++++--------------
 site/layouts/partials/sidebar-tree.html | 57 +++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 32 deletions(-)
 create mode 100644 site/layouts/partials/sidebar-tree.html

diff --git a/site/config.toml b/site/config.toml
index c241a41581..4b9529f580 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -29,43 +29,27 @@ pygmentsStyle = "tango"
  # First one is picked as the Twitter card image if not set on page.
  #images = ["images/project-illustration.png"]
 
+# Auto-generate the menu
+# sectionPagesMenu = "main"
+
 # Configure how URLs look like per section.
 [permalinks]
 blog = "/:section/:year/:month/:day/:slug/"
 
-[module]
-  [[module.mounts]]
-    source = "../deploy/addons/gvisor/"
-    target = "content/gvisor/"
-  [[module.mounts]]
-    source = "../deploy/addons/helm-tiller/"
-    target = "content/helm-tiller/"
-  [[module.mounts]]
-    source = "../deploy/addons/istio/"
-    target = "content/istio/"
-  [[module.mounts]]
-    source = "../deploy/addons/ingress-dns/"
-    target = "content/ingress-dns/"
-  [[module.mounts]]
-    source = "../deploy/addons/storage-provisioner-gluster/"
-    target = "content/storage-provisioner-gluster/"
-  [[module.mounts]]
-    source = "../deploy/addons/layouts/"
-    target = "layouts"
+[markup]
+  [markup.highlight]
+    codeFences = true
+    hl_Lines = ""
+    lineNoStart = 1
+    lineNos = false
+    lineNumbersInTable = true
+    noClasses = true
+    style = "vs"
+    tabWidth = 4
 
-  [[module.mounts]]
-    source = "content/en"
-    target = "content"
-  [[module.mounts]]
-    source = "layouts"
-    target = "layouts"
-
-## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
-[blackfriday]
-plainIDAnchors = true
-hrefTargetBlank = true
-angledQuotes = false
-latexDashes = true
+# allow html in markdown
+[markup.goldmark.renderer]
+  unsafe=true
 
 # Image processing configuration.
 [imaging]
diff --git a/site/layouts/partials/sidebar-tree.html b/site/layouts/partials/sidebar-tree.html
new file mode 100644
index 0000000000..9b4dfa3503
--- /dev/null
+++ b/site/layouts/partials/sidebar-tree.html
@@ -0,0 +1,57 @@
+{{/* We cache this partial for bigger sites and set the active class client side. */}}
+{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }}
+<div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}">
+  {{ if not .Site.Params.ui.sidebar_search_disable }}
+  <form class="td-sidebar__search d-flex align-items-center">
+    {{ partial "search-input.html" . }}
+    <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
+    </button>
+  </form>
+  {{ end }}
+  <nav class="collapse td-sidebar-nav pt-2 pl-4" id="td-section-nav">
+    {{ if  (gt (len .Site.Home.Translations) 0) }}
+    <div class="nav-item dropdown d-block d-lg-none">
+      {{ partial "navbar-lang-selector.html" . }}
+    </div>
+    {{ end }}
+    {{ template "section-tree-nav-section" (dict "page" . "section" .FirstSection "delayActive" $shouldDelayActive)  }}
+  </nav>
+</div>
+{{ define "section-tree-nav-section" }}
+{{ $s := .section }}
+{{ $p := .page }}
+{{ $shouldDelayActive := .delayActive }}
+{{ $active := eq $p.CurrentSection $s }}
+{{ $show := or (and (not $p.Site.Params.ui.sidebar_menu_compact) ($p.IsAncestor $s)) ($p.IsDescendant $s) }}
+
+{{/* minikube hack: Override $show due to a Hugo upgrade bug */}}
+{{ $show = true }}
+{{/* end minikube hack */}}
+
+{{ $sid := $s.RelPermalink | anchorize }}
+<ul class="td-sidebar-nav__section pr-md-3">
+  <li class="td-sidebar-nav__section-title">
+    <a href="{{ $s.RelPermalink }}" class="align-left pl-0 pr-2{{ if not $show }} collapsed{{ end }}{{ if $active}} active{{ end }} td-sidebar-link td-sidebar-link__section">{{ $s.LinkTitle }}</a>
+  </li>
+  <ul>
+    <li class="collapse {{ if $show }}show{{ end }}" id="{{ $sid }}">
+      {{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
+      {{ $pages := $pages | first 50 }}
+      {{ range $pages }}
+      {{ if .IsPage }}
+        {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }}
+
+        {{/* minikube hack: Override $active due to a Hugo upgrade bug */}}
+        {{ if $active }}
+            {{ $activePage := eq . $p }}
+            <a class="td-sidebar-link td-sidebar-link__page {{ if $activePage }} active{{ end }}" id="{{ $mid }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
+        {{ end }}
+        {{/* end minikube hack */}}
+      {{ else }}
+          {{ template "section-tree-nav-section" (dict "page" $p "section" .) }}
+      {{ end }}
+      {{ end }}
+    </li>
+  </ul>
+</ul>
+{{ end }}

From f956f6a69ab60b49d9aa1d8a646d93bbd70b1693 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 19:36:12 -0700
Subject: [PATCH 356/668] Cleaner diff

---
 site/config.toml                        | 3 ---
 site/layouts/partials/sidebar-tree.html | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/site/config.toml b/site/config.toml
index 4b9529f580..e0c6e2a4bc 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -29,9 +29,6 @@ pygmentsStyle = "tango"
  # First one is picked as the Twitter card image if not set on page.
  #images = ["images/project-illustration.png"]
 
-# Auto-generate the menu
-# sectionPagesMenu = "main"
-
 # Configure how URLs look like per section.
 [permalinks]
 blog = "/:section/:year/:month/:day/:slug/"
diff --git a/site/layouts/partials/sidebar-tree.html b/site/layouts/partials/sidebar-tree.html
index 9b4dfa3503..ebf99e2a74 100644
--- a/site/layouts/partials/sidebar-tree.html
+++ b/site/layouts/partials/sidebar-tree.html
@@ -1,5 +1,5 @@
-{{/* We cache this partial for bigger sites and set the active class client side. */}}
-{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }}
+{{/* minikube hack: temporarily forked from docsy/layouts/partials/sidebar-tree.html due to hugo v0.69 compatibility issues */}}
+
 <div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}">
   {{ if not .Site.Params.ui.sidebar_search_disable }}
   <form class="td-sidebar__search d-flex align-items-center">

From 3c727c4bbbfc61c1ff998645d18dd4281c63c349 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 19:37:37 -0700
Subject: [PATCH 357/668] Bring back shouldDelayActive

---
 site/layouts/partials/sidebar-tree.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/layouts/partials/sidebar-tree.html b/site/layouts/partials/sidebar-tree.html
index ebf99e2a74..7e1fcf4c80 100644
--- a/site/layouts/partials/sidebar-tree.html
+++ b/site/layouts/partials/sidebar-tree.html
@@ -1,5 +1,7 @@
-{{/* minikube hack: temporarily forked from docsy/layouts/partials/sidebar-tree.html due to hugo v0.69 compatibility issues */}}
+{{/* minikube hack: temporarily forked from docsy/layouts/partials/sidebar-tree.html for hugo v0.69 compatibility */}}
 
+{{/* We cache this partial for bigger sites and set the active class client side. */}}
+{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }}
 <div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}">
   {{ if not .Site.Params.ui.sidebar_search_disable }}
   <form class="td-sidebar__search d-flex align-items-center">

From e9e1a77fecd2fef6ce1f75ee37ed3e2ed00b94bf Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 21:35:07 -0700
Subject: [PATCH 358/668] Massive reorganization

---
 site/content/en/_index.html                   |   6 +-
 site/content/en/blog/_index.md                |  13 --
 site/content/en/blog/news/_index.md           |   8 -
 site/content/en/blog/news/new-website.md      |  12 --
 site/content/en/blog/releases/_index.md       |   8 -
 site/content/en/blog/releases/v1.13.1.md      |  26 ---
 .../docs/{Reference => }/Commands/_index.md   |   0
 .../docs/{Reference => }/Commands/addons.md   |   0
 .../en/docs/{Reference => }/Commands/cache.md |   0
 .../{Reference => }/Commands/completion.md    |   0
 .../docs/{Reference => }/Commands/config.md   |   0
 .../{Reference => }/Commands/dashboard.md     |   0
 .../docs/{Reference => }/Commands/delete.md   |   0
 .../{Reference => }/Commands/docker-env.md    |   0
 .../en/docs/{Reference => }/Commands/ip.md    |   0
 .../docs/{Reference => }/Commands/kubectl.md  |   0
 .../en/docs/{Reference => }/Commands/logs.md  |   0
 .../en/docs/{Reference => }/Commands/mount.md |   0
 .../en/docs/{Reference => }/Commands/pause.md |   0
 .../docs/{Reference => }/Commands/profile.md  |   0
 .../docs/{Reference => }/Commands/service.md  |   0
 .../docs/{Reference => }/Commands/ssh-key.md  |   0
 .../en/docs/{Reference => }/Commands/ssh.md   |   0
 .../en/docs/{Reference => }/Commands/start.md |   0
 .../docs/{Reference => }/Commands/status.md   |   0
 .../en/docs/{Reference => }/Commands/stop.md  |   0
 .../docs/{Reference => }/Commands/tunnel.md   |   0
 .../docs/{Reference => }/Commands/unpause.md  |   0
 .../{Reference => }/Commands/update-check.md  |   0
 .../Commands/update-context.md                |   0
 .../docs/{Reference => }/Commands/version.md  |   0
 site/content/en/docs/Concepts/_index.md       |   7 -
 .../principles.en.md                          |   0
 .../en/docs/{Reference => }/Drivers/_index.md |   0
 .../en/docs/{Reference => }/Drivers/docker.md |   2 +-
 .../docs/{Reference => }/Drivers/hyperkit.md  |   2 +-
 .../en/docs/{Reference => }/Drivers/hyperv.md |   2 +-
 .../includes/check_baremetal_linux.inc        |   0
 .../includes/check_virtualization_linux.inc   |   0
 .../includes/check_virtualization_windows.inc |   0
 .../Drivers/includes/docker_usage.inc         |   0
 .../Drivers/includes/hyperkit_usage.inc       |   0
 .../Drivers/includes/hyperv_usage.inc         |   0
 .../Drivers/includes/kvm2_usage.inc           |   0
 .../Drivers/includes/none_usage.inc           |   0
 .../Drivers/includes/parallels_usage.inc      |   0
 .../Drivers/includes/podman_usage.inc         |   2 +-
 .../Drivers/includes/virtualbox_usage.inc     |   0
 .../Drivers/includes/vmware_macos_usage.inc   |   0
 .../en/docs/{Reference => }/Drivers/kvm2.md   |   4 +-
 .../en/docs/{Reference => }/Drivers/none.md   |   2 +-
 .../docs/{Reference => }/Drivers/parallels.md |   2 +-
 .../en/docs/{Reference => }/Drivers/podman.md |   4 +-
 .../{Reference => }/Drivers/virtualbox.md     |   2 +-
 .../en/docs/{Reference => }/Drivers/vmware.md |   2 +-
 .../en/docs/Handbook/Installation/_index.md   |   7 +
 .../Installation}/includes/post_install.inc   |   0
 .../{Start => Handbook/Installation}/linux.md |  18 +-
 .../{Start => Handbook/Installation}/macos.md |  14 +-
 .../Installation}/windows.md                  |  12 +-
 site/content/en/docs/Handbook/_index.md       |   6 +
 .../accessing-host-resources.md               |   4 +-
 .../loadbalancer.md => Handbook/accessing.md} |  43 ++++-
 site/content/en/docs/Handbook/config.md       | 132 ++++++++++++++
 .../_index.md => Handbook/controls.md}        |   7 +-
 .../en/docs/{Tasks => Handbook}/dashboard.md  |   7 +-
 site/content/en/docs/Handbook/deploying.md    |  47 +++++
 .../{Tasks/sync.md => Handbook/filesync.md}   |   2 +-
 .../en/docs/{Tasks => Handbook}/mount.md      |   5 +-
 .../disk_cache.md => Handbook/offline.md}     |  12 +-
 .../persistent_volumes.md                     |   2 +-
 site/content/en/docs/Handbook/pushing.md      | 116 +++++++++++++
 .../insecure.md => Handbook/registry.md}      |  34 +++-
 .../debug.md => Handbook/troubleshooting.md}  |   8 +-
 .../uninstalling_minikube.md                  |   0
 .../proxy.md => Handbook/vpn_and_proxy.md}    |  50 +++---
 site/content/en/docs/Overview/_index.md       |  50 ------
 .../en/docs/Reference/Configuration/_index.md |   8 -
 .../Reference/Configuration/kubernetes.md     |  57 ------
 .../docs/Reference/Configuration/minikube.md  | 164 ------------------
 .../en/docs/Reference/Networking/_index.md    |  10 --
 .../en/docs/Reference/Networking/dns.md       |  58 -------
 .../en/docs/Reference/Networking/vpn.md       |  23 ---
 site/content/en/docs/Reference/_index.md      |   8 -
 .../docs/Reference/environment_variables.md   |  44 -----
 site/content/en/docs/Reference/runtimes.md    |  47 -----
 site/content/en/docs/Start/_index.md          |   7 -
 site/content/en/docs/Tasks/Registry/_index.md |   8 -
 .../content/en/docs/Tasks/Registry/private.md |  30 ----
 site/content/en/docs/Tasks/_index.md          |  15 --
 site/content/en/docs/Tasks/addons.md          |  81 ---------
 site/content/en/docs/Tasks/building.md        |  37 ----
 site/content/en/docs/Tasks/caching.md         |  42 -----
 site/content/en/docs/Tasks/docker_daemon.md   |  79 ---------
 site/content/en/docs/Tasks/docker_registry.md |  48 -----
 site/content/en/docs/Tasks/nodeport.md        |  33 ----
 site/content/en/docs/Tasks/podman_service.md  |  58 -------
 site/content/en/docs/Tutorials/_index.md      |   3 +-
 .../content/en/docs/Tutorials/audit-policy.md |   8 +-
 .../docs/Tutorials/continuous_integration.md  |   4 +-
 .../docs/Tutorials/nginx_tcp_udp_ingress.md   |   6 +-
 site/content/en/docs/_index.md                |  53 +++++-
 102 files changed, 518 insertions(+), 1093 deletions(-)
 delete mode 100644 site/content/en/blog/_index.md
 delete mode 100644 site/content/en/blog/news/_index.md
 delete mode 100755 site/content/en/blog/news/new-website.md
 delete mode 100644 site/content/en/blog/releases/_index.md
 delete mode 100755 site/content/en/blog/releases/v1.13.1.md
 rename site/content/en/docs/{Reference => }/Commands/_index.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/addons.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/cache.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/completion.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/config.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/dashboard.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/delete.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/docker-env.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/ip.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/kubectl.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/logs.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/mount.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/pause.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/profile.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/service.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/ssh-key.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/ssh.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/start.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/status.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/stop.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/tunnel.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/unpause.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/update-check.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/update-context.md (100%)
 rename site/content/en/docs/{Reference => }/Commands/version.md (100%)
 delete mode 100644 site/content/en/docs/Concepts/_index.md
 rename site/content/en/docs/{Concepts => Contributing}/principles.en.md (100%)
 rename site/content/en/docs/{Reference => }/Drivers/_index.md (100%)
 rename site/content/en/docs/{Reference => }/Drivers/docker.md (83%)
 rename site/content/en/docs/{Reference => }/Drivers/hyperkit.md (94%)
 rename site/content/en/docs/{Reference => }/Drivers/hyperv.md (88%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/check_baremetal_linux.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/check_virtualization_linux.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/check_virtualization_windows.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/docker_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/hyperkit_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/hyperv_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/kvm2_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/none_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/parallels_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/podman_usage.inc (86%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/virtualbox_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/includes/vmware_macos_usage.inc (100%)
 rename site/content/en/docs/{Reference => }/Drivers/kvm2.md (91%)
 rename site/content/en/docs/{Reference => }/Drivers/none.md (97%)
 rename site/content/en/docs/{Reference => }/Drivers/parallels.md (85%)
 rename site/content/en/docs/{Reference => }/Drivers/podman.md (81%)
 rename site/content/en/docs/{Reference => }/Drivers/virtualbox.md (89%)
 rename site/content/en/docs/{Reference => }/Drivers/vmware.md (88%)
 create mode 100644 site/content/en/docs/Handbook/Installation/_index.md
 rename site/content/en/docs/{Start => Handbook/Installation}/includes/post_install.inc (100%)
 rename site/content/en/docs/{Start => Handbook/Installation}/linux.md (66%)
 rename site/content/en/docs/{Start => Handbook/Installation}/macos.md (68%)
 rename site/content/en/docs/{Start => Handbook/Installation}/windows.md (63%)
 create mode 100644 site/content/en/docs/Handbook/_index.md
 rename site/content/en/docs/{Tasks => Handbook}/accessing-host-resources.md (95%)
 rename site/content/en/docs/{Tasks/loadbalancer.md => Handbook/accessing.md} (65%)
 create mode 100644 site/content/en/docs/Handbook/config.md
 rename site/content/en/docs/{Examples/_index.md => Handbook/controls.md} (93%)
 rename site/content/en/docs/{Tasks => Handbook}/dashboard.md (90%)
 create mode 100644 site/content/en/docs/Handbook/deploying.md
 rename site/content/en/docs/{Tasks/sync.md => Handbook/filesync.md} (99%)
 rename site/content/en/docs/{Tasks => Handbook}/mount.md (96%)
 rename site/content/en/docs/{Reference/disk_cache.md => Handbook/offline.md} (91%)
 rename site/content/en/docs/{Reference => Handbook}/persistent_volumes.md (99%)
 create mode 100644 site/content/en/docs/Handbook/pushing.md
 rename site/content/en/docs/{Tasks/Registry/insecure.md => Handbook/registry.md} (66%)
 rename site/content/en/docs/{Tasks/debug.md => Handbook/troubleshooting.md} (95%)
 rename site/content/en/docs/{Reference => Handbook}/uninstalling_minikube.md (100%)
 rename site/content/en/docs/{Reference/Networking/proxy.md => Handbook/vpn_and_proxy.md} (71%)
 delete mode 100644 site/content/en/docs/Overview/_index.md
 delete mode 100644 site/content/en/docs/Reference/Configuration/_index.md
 delete mode 100644 site/content/en/docs/Reference/Configuration/kubernetes.md
 delete mode 100644 site/content/en/docs/Reference/Configuration/minikube.md
 delete mode 100644 site/content/en/docs/Reference/Networking/_index.md
 delete mode 100644 site/content/en/docs/Reference/Networking/dns.md
 delete mode 100644 site/content/en/docs/Reference/Networking/vpn.md
 delete mode 100644 site/content/en/docs/Reference/_index.md
 delete mode 100644 site/content/en/docs/Reference/environment_variables.md
 delete mode 100644 site/content/en/docs/Reference/runtimes.md
 delete mode 100644 site/content/en/docs/Start/_index.md
 delete mode 100644 site/content/en/docs/Tasks/Registry/_index.md
 delete mode 100644 site/content/en/docs/Tasks/Registry/private.md
 delete mode 100755 site/content/en/docs/Tasks/_index.md
 delete mode 100644 site/content/en/docs/Tasks/addons.md
 delete mode 100644 site/content/en/docs/Tasks/building.md
 delete mode 100644 site/content/en/docs/Tasks/caching.md
 delete mode 100644 site/content/en/docs/Tasks/docker_daemon.md
 delete mode 100644 site/content/en/docs/Tasks/docker_registry.md
 delete mode 100644 site/content/en/docs/Tasks/nodeport.md
 delete mode 100644 site/content/en/docs/Tasks/podman_service.md

diff --git a/site/content/en/_index.html b/site/content/en/_index.html
index 05ade99efe..96d2b078d6 100644
--- a/site/content/en/_index.html
+++ b/site/content/en/_index.html
@@ -69,9 +69,9 @@ A single command away from reproducing your production environment, from the com
 
 {{< blocks/section color="white" >}}
 {{% blocks/feature icon="fa-star" title="Developer focused" %}}
-- [LoadBalancer emulation](https://minikube.sigs.k8s.io/docs/tasks/loadbalancer/)
-- [Addons Marketplace](https://minikube.sigs.k8s.io/docs/tasks/addons/)
-- [Integrated Dashboard](https://minikube.sigs.k8s.io/docs/tasks/dashboard/)
+- [LoadBalancer emulation](https://minikube.sigs.k8s.io/docs/Handbook/loadbalancer/)
+- [Addons Marketplace](https://minikube.sigs.k8s.io/docs/Handbook/addons/)
+- [Integrated Dashboard](https://minikube.sigs.k8s.io/docs/Handbook/dashboard/)
 - [GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/)
 - Reusable Docker daemon
 {{% /blocks/feature %}}
diff --git a/site/content/en/blog/_index.md b/site/content/en/blog/_index.md
deleted file mode 100644
index 59c4cdd84b..0000000000
--- a/site/content/en/blog/_index.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: "Docsy Blog"
-linkTitle: "News"
-menu:
-  main:
-    weight: 30
----
-
-
-This is the **blog** section. It has two categories: News and Releases.
-
-Files in these directories will be listed in reverse chronological order.
-
diff --git a/site/content/en/blog/news/_index.md b/site/content/en/blog/news/_index.md
deleted file mode 100644
index 13d25eaa45..0000000000
--- a/site/content/en/blog/news/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
----
-title: "News About Docsy"
-linkTitle: "News"
-weight: 20
----
-
-
diff --git a/site/content/en/blog/news/new-website.md b/site/content/en/blog/news/new-website.md
deleted file mode 100755
index 4718f0afe2..0000000000
--- a/site/content/en/blog/news/new-website.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: "New website launched"
-date: 2019-08-13
-description: >
-  About the new minikube website
----
-
-As you may have noticed, minikube has a brand new website.
-
-As part of our [2019 roadmap](https://minikube.sigs.k8s.io/docs/contributing/roadmap/), we identified the need for a user-focused website for documentation, and this is it. It's based on the [Hugo Website Framework](https://gohugo.io/) and uses the [Docsy Templates for Technical Documentation](https://github.com/google/docsy).
-
-We have more work to do with organizing the documentation and making it more useful, but we hope you are able to enjoy the fruits of our labor. PR's welcome!
diff --git a/site/content/en/blog/releases/_index.md b/site/content/en/blog/releases/_index.md
deleted file mode 100644
index b1d9eb4ff3..0000000000
--- a/site/content/en/blog/releases/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
----
-title: "New Releases"
-linkTitle: "Releases"
-weight: 20
----
-
-
diff --git a/site/content/en/blog/releases/v1.13.1.md b/site/content/en/blog/releases/v1.13.1.md
deleted file mode 100755
index e62fe052bd..0000000000
--- a/site/content/en/blog/releases/v1.13.1.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: "v1.3.1"
-linkTitle: "v1.3.1 released"
-date: 2019-08-13
-description: >
-  Release notes for v1.3.1
----
-
-minikube v1.3.1 is now available, which addresses regressions found in the v1.3.0 release. Here are the [changes](https://raw.githubusercontent.com/kubernetes/minikube/v1.3.1/CHANGELOG.md)
-
-* Update code references to point to new documentation site [#5052](https://github.com/kubernetes/minikube/pull/5052)
-* Localization support for help text [#4814](https://github.com/kubernetes/minikube/pull/4814)
-* Upgrade cheggaaa/pb from v1.0.27 to v3.0.1 [#5025](https://github.com/kubernetes/minikube/pull/5025)
-* Restore --disable-driver-mounts flag [#5026](https://github.com/kubernetes/minikube/pull/5026)
-* Fixed the template for dashboard output [#5004](https://github.com/kubernetes/minikube/pull/5004)
-* Use a temp dest to atomically download the iso [#5000](https://github.com/kubernetes/minikube/pull/5000)
-
-Thank you to our merry band of contributors for assembling this last minute bug fix release.
-
-- Jituri, Pranav
-- Medya Ghazizadeh
-- Pranav Jituri
-- Ramiro Berrelleza
-- Sharif Elgamal
-- Thomas Strömberg
-- josedonizetti
diff --git a/site/content/en/docs/Reference/Commands/_index.md b/site/content/en/docs/Commands/_index.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/_index.md
rename to site/content/en/docs/Commands/_index.md
diff --git a/site/content/en/docs/Reference/Commands/addons.md b/site/content/en/docs/Commands/addons.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/addons.md
rename to site/content/en/docs/Commands/addons.md
diff --git a/site/content/en/docs/Reference/Commands/cache.md b/site/content/en/docs/Commands/cache.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/cache.md
rename to site/content/en/docs/Commands/cache.md
diff --git a/site/content/en/docs/Reference/Commands/completion.md b/site/content/en/docs/Commands/completion.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/completion.md
rename to site/content/en/docs/Commands/completion.md
diff --git a/site/content/en/docs/Reference/Commands/config.md b/site/content/en/docs/Commands/config.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/config.md
rename to site/content/en/docs/Commands/config.md
diff --git a/site/content/en/docs/Reference/Commands/dashboard.md b/site/content/en/docs/Commands/dashboard.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/dashboard.md
rename to site/content/en/docs/Commands/dashboard.md
diff --git a/site/content/en/docs/Reference/Commands/delete.md b/site/content/en/docs/Commands/delete.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/delete.md
rename to site/content/en/docs/Commands/delete.md
diff --git a/site/content/en/docs/Reference/Commands/docker-env.md b/site/content/en/docs/Commands/docker-env.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/docker-env.md
rename to site/content/en/docs/Commands/docker-env.md
diff --git a/site/content/en/docs/Reference/Commands/ip.md b/site/content/en/docs/Commands/ip.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/ip.md
rename to site/content/en/docs/Commands/ip.md
diff --git a/site/content/en/docs/Reference/Commands/kubectl.md b/site/content/en/docs/Commands/kubectl.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/kubectl.md
rename to site/content/en/docs/Commands/kubectl.md
diff --git a/site/content/en/docs/Reference/Commands/logs.md b/site/content/en/docs/Commands/logs.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/logs.md
rename to site/content/en/docs/Commands/logs.md
diff --git a/site/content/en/docs/Reference/Commands/mount.md b/site/content/en/docs/Commands/mount.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/mount.md
rename to site/content/en/docs/Commands/mount.md
diff --git a/site/content/en/docs/Reference/Commands/pause.md b/site/content/en/docs/Commands/pause.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/pause.md
rename to site/content/en/docs/Commands/pause.md
diff --git a/site/content/en/docs/Reference/Commands/profile.md b/site/content/en/docs/Commands/profile.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/profile.md
rename to site/content/en/docs/Commands/profile.md
diff --git a/site/content/en/docs/Reference/Commands/service.md b/site/content/en/docs/Commands/service.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/service.md
rename to site/content/en/docs/Commands/service.md
diff --git a/site/content/en/docs/Reference/Commands/ssh-key.md b/site/content/en/docs/Commands/ssh-key.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/ssh-key.md
rename to site/content/en/docs/Commands/ssh-key.md
diff --git a/site/content/en/docs/Reference/Commands/ssh.md b/site/content/en/docs/Commands/ssh.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/ssh.md
rename to site/content/en/docs/Commands/ssh.md
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Commands/start.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/start.md
rename to site/content/en/docs/Commands/start.md
diff --git a/site/content/en/docs/Reference/Commands/status.md b/site/content/en/docs/Commands/status.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/status.md
rename to site/content/en/docs/Commands/status.md
diff --git a/site/content/en/docs/Reference/Commands/stop.md b/site/content/en/docs/Commands/stop.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/stop.md
rename to site/content/en/docs/Commands/stop.md
diff --git a/site/content/en/docs/Reference/Commands/tunnel.md b/site/content/en/docs/Commands/tunnel.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/tunnel.md
rename to site/content/en/docs/Commands/tunnel.md
diff --git a/site/content/en/docs/Reference/Commands/unpause.md b/site/content/en/docs/Commands/unpause.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/unpause.md
rename to site/content/en/docs/Commands/unpause.md
diff --git a/site/content/en/docs/Reference/Commands/update-check.md b/site/content/en/docs/Commands/update-check.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/update-check.md
rename to site/content/en/docs/Commands/update-check.md
diff --git a/site/content/en/docs/Reference/Commands/update-context.md b/site/content/en/docs/Commands/update-context.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/update-context.md
rename to site/content/en/docs/Commands/update-context.md
diff --git a/site/content/en/docs/Reference/Commands/version.md b/site/content/en/docs/Commands/version.md
similarity index 100%
rename from site/content/en/docs/Reference/Commands/version.md
rename to site/content/en/docs/Commands/version.md
diff --git a/site/content/en/docs/Concepts/_index.md b/site/content/en/docs/Concepts/_index.md
deleted file mode 100644
index 2b874a5243..0000000000
--- a/site/content/en/docs/Concepts/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: "Concepts"
-linkTitle: "Concepts"
-weight: 4
-description: >
-   Concepts that users and contributors should be aware of.
----
diff --git a/site/content/en/docs/Concepts/principles.en.md b/site/content/en/docs/Contributing/principles.en.md
similarity index 100%
rename from site/content/en/docs/Concepts/principles.en.md
rename to site/content/en/docs/Contributing/principles.en.md
diff --git a/site/content/en/docs/Reference/Drivers/_index.md b/site/content/en/docs/Drivers/_index.md
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/_index.md
rename to site/content/en/docs/Drivers/_index.md
diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Drivers/docker.md
similarity index 83%
rename from site/content/en/docs/Reference/Drivers/docker.md
rename to site/content/en/docs/Drivers/docker.md
index afd0a970b7..3ebd62e51e 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Drivers/docker.md
@@ -11,7 +11,7 @@ description: >
 
 The Docker driver is the newest minikube driver. which runs kubernetes in container VM-free ! with full feature parity with minikube in VM.
 
-{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
 
 
 ## Special features
diff --git a/site/content/en/docs/Reference/Drivers/hyperkit.md b/site/content/en/docs/Drivers/hyperkit.md
similarity index 94%
rename from site/content/en/docs/Reference/Drivers/hyperkit.md
rename to site/content/en/docs/Drivers/hyperkit.md
index 2b72f11719..4831bbf536 100644
--- a/site/content/en/docs/Reference/Drivers/hyperkit.md
+++ b/site/content/en/docs/Drivers/hyperkit.md
@@ -11,7 +11,7 @@ description: >
 
 [HyperKit](https://github.com/moby/hyperkit) is an open-source hypervisor for macOS hypervisor, optimized for lightweight virtual machines and container deployment.
 
-{{% readfile file="/docs/Reference/Drivers/includes/hyperkit_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/hyperkit_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Reference/Drivers/hyperv.md b/site/content/en/docs/Drivers/hyperv.md
similarity index 88%
rename from site/content/en/docs/Reference/Drivers/hyperv.md
rename to site/content/en/docs/Drivers/hyperv.md
index 3595a2bb9d..deac57d470 100644
--- a/site/content/en/docs/Reference/Drivers/hyperv.md
+++ b/site/content/en/docs/Drivers/hyperv.md
@@ -11,7 +11,7 @@ description: >
 
 Hyper-V is a native hypervisor built in to modern versions of Microsoft Windows.
 
-{{% readfile file="/docs/Reference/Drivers/includes/hyperv_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/hyperv_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_baremetal_linux.inc b/site/content/en/docs/Drivers/includes/check_baremetal_linux.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/check_baremetal_linux.inc
rename to site/content/en/docs/Drivers/includes/check_baremetal_linux.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc b/site/content/en/docs/Drivers/includes/check_virtualization_linux.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/check_virtualization_linux.inc
rename to site/content/en/docs/Drivers/includes/check_virtualization_linux.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc b/site/content/en/docs/Drivers/includes/check_virtualization_windows.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/check_virtualization_windows.inc
rename to site/content/en/docs/Drivers/includes/check_virtualization_windows.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/docker_usage.inc b/site/content/en/docs/Drivers/includes/docker_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/docker_usage.inc
rename to site/content/en/docs/Drivers/includes/docker_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/hyperkit_usage.inc b/site/content/en/docs/Drivers/includes/hyperkit_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/hyperkit_usage.inc
rename to site/content/en/docs/Drivers/includes/hyperkit_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/hyperv_usage.inc b/site/content/en/docs/Drivers/includes/hyperv_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/hyperv_usage.inc
rename to site/content/en/docs/Drivers/includes/hyperv_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/kvm2_usage.inc b/site/content/en/docs/Drivers/includes/kvm2_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/kvm2_usage.inc
rename to site/content/en/docs/Drivers/includes/kvm2_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/none_usage.inc b/site/content/en/docs/Drivers/includes/none_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/none_usage.inc
rename to site/content/en/docs/Drivers/includes/none_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/parallels_usage.inc b/site/content/en/docs/Drivers/includes/parallels_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/parallels_usage.inc
rename to site/content/en/docs/Drivers/includes/parallels_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc b/site/content/en/docs/Drivers/includes/podman_usage.inc
similarity index 86%
rename from site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
rename to site/content/en/docs/Drivers/includes/podman_usage.inc
index 9962043165..0d2db84e06 100644
--- a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc
+++ b/site/content/en/docs/Drivers/includes/podman_usage.inc
@@ -1,7 +1,7 @@
 ## experimental
 
 This is an experimental driver. please use it only for experimental reasons.
-for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/docs/reference/drivers/docker).
+for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/docs/Drivers/docker).
 
 ## Install Podman
 
diff --git a/site/content/en/docs/Reference/Drivers/includes/virtualbox_usage.inc b/site/content/en/docs/Drivers/includes/virtualbox_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/virtualbox_usage.inc
rename to site/content/en/docs/Drivers/includes/virtualbox_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/includes/vmware_macos_usage.inc b/site/content/en/docs/Drivers/includes/vmware_macos_usage.inc
similarity index 100%
rename from site/content/en/docs/Reference/Drivers/includes/vmware_macos_usage.inc
rename to site/content/en/docs/Drivers/includes/vmware_macos_usage.inc
diff --git a/site/content/en/docs/Reference/Drivers/kvm2.md b/site/content/en/docs/Drivers/kvm2.md
similarity index 91%
rename from site/content/en/docs/Reference/Drivers/kvm2.md
rename to site/content/en/docs/Drivers/kvm2.md
index 52102bb83e..d56b4d8e84 100644
--- a/site/content/en/docs/Reference/Drivers/kvm2.md
+++ b/site/content/en/docs/Drivers/kvm2.md
@@ -13,11 +13,11 @@ description: >
 
 [KVM (Kernel-based Virtual Machine)](https://www.linux-kvm.org/page/Main_Page) is a full virtualization solution for Linux on x86 hardware containing virtualization extensions. To work with KVM, minikube uses the [libvirt virtualization API](https://libvirt.org/)
 
-{{% readfile file="/docs/Reference/Drivers/includes/kvm2_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/kvm2_usage.inc" %}}
 
 ## Check virtualization support
 
-{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Reference/Drivers/none.md b/site/content/en/docs/Drivers/none.md
similarity index 97%
rename from site/content/en/docs/Reference/Drivers/none.md
rename to site/content/en/docs/Drivers/none.md
index 2040128bdf..2a5ffd9207 100644
--- a/site/content/en/docs/Reference/Drivers/none.md
+++ b/site/content/en/docs/Drivers/none.md
@@ -12,7 +12,7 @@ description: >
 
 This document is written for system integrators who are familiar with minikube, and wish to run it within a customized VM environment. The `none` driver allows advanced minikube users to skip VM creation, allowing minikube to be run on a user-supplied VM.
 
-{{% readfile file="/docs/Reference/Drivers/includes/none_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/none_usage.inc" %}}
 
 ## Issues
 
diff --git a/site/content/en/docs/Reference/Drivers/parallels.md b/site/content/en/docs/Drivers/parallels.md
similarity index 85%
rename from site/content/en/docs/Reference/Drivers/parallels.md
rename to site/content/en/docs/Drivers/parallels.md
index 8bcfbb0222..b345fd6011 100644
--- a/site/content/en/docs/Reference/Drivers/parallels.md
+++ b/site/content/en/docs/Drivers/parallels.md
@@ -11,7 +11,7 @@ description: >
 
 The Parallels driver is particularly useful for users who own Parallels Desktop, as it does not require VT-x hardware support.
 
-{{% readfile file="/docs/Reference/Drivers/includes/parallels_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/parallels_usage.inc" %}}
 
 ## Issues
 
diff --git a/site/content/en/docs/Reference/Drivers/podman.md b/site/content/en/docs/Drivers/podman.md
similarity index 81%
rename from site/content/en/docs/Reference/Drivers/podman.md
rename to site/content/en/docs/Drivers/podman.md
index 17425b1e58..b07ad7655e 100644
--- a/site/content/en/docs/Reference/Drivers/podman.md
+++ b/site/content/en/docs/Drivers/podman.md
@@ -9,7 +9,7 @@ description: >
 
 ## Overview
 
-The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker/) driver.
+The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](https://minikube.sigs.k8s.io/docs/Drivers/docker/) driver.
 podman driver is currently experimental. 
 and only supported on Linux and MacOs (with a remote podman server)
 
@@ -20,7 +20,7 @@ minikube start --driver=podman --container-runtime=cri-o
 ```
 
 
-{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
 
 
 
diff --git a/site/content/en/docs/Reference/Drivers/virtualbox.md b/site/content/en/docs/Drivers/virtualbox.md
similarity index 89%
rename from site/content/en/docs/Reference/Drivers/virtualbox.md
rename to site/content/en/docs/Drivers/virtualbox.md
index f979ad499e..695f820893 100644
--- a/site/content/en/docs/Reference/Drivers/virtualbox.md
+++ b/site/content/en/docs/Drivers/virtualbox.md
@@ -11,7 +11,7 @@ description: >
 
 VirtualBox is the oldest and most stable VM driver for minikube.
 
-{{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Reference/Drivers/vmware.md b/site/content/en/docs/Drivers/vmware.md
similarity index 88%
rename from site/content/en/docs/Reference/Drivers/vmware.md
rename to site/content/en/docs/Drivers/vmware.md
index cd355144aa..cd57cdaf5b 100644
--- a/site/content/en/docs/Reference/Drivers/vmware.md
+++ b/site/content/en/docs/Drivers/vmware.md
@@ -13,7 +13,7 @@ The vmware driver supports virtualization across all VMware based hypervisors.
 
 {{% tabs %}}
 {{% tab "macOS" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/vmware_macos_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/vmware_macos_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Linux" %}}
 No documentation is available yet.
diff --git a/site/content/en/docs/Handbook/Installation/_index.md b/site/content/en/docs/Handbook/Installation/_index.md
new file mode 100644
index 0000000000..dfd645c030
--- /dev/null
+++ b/site/content/en/docs/Handbook/Installation/_index.md
@@ -0,0 +1,7 @@
+---
+title: "Installation"
+linkTitle: "Installation"
+weight: 1
+description: >
+  How to install minikube
+---
diff --git a/site/content/en/docs/Start/includes/post_install.inc b/site/content/en/docs/Handbook/Installation/includes/post_install.inc
similarity index 100%
rename from site/content/en/docs/Start/includes/post_install.inc
rename to site/content/en/docs/Handbook/Installation/includes/post_install.inc
diff --git a/site/content/en/docs/Start/linux.md b/site/content/en/docs/Handbook/Installation/linux.md
similarity index 66%
rename from site/content/en/docs/Start/linux.md
rename to site/content/en/docs/Handbook/Installation/linux.md
index 1e4fd4a9b1..f214ce56cb 100644
--- a/site/content/en/docs/Start/linux.md
+++ b/site/content/en/docs/Handbook/Installation/linux.md
@@ -44,34 +44,34 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< la
 {{% tabs %}}
 {{% tab "Docker" %}}
 ## Check container support
-{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
 {{% /tab %}}
 
 {{% tab "KVM" %}}
 ## Check virtualization support
-{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
 
-{{% readfile file="/docs/Reference/Drivers/includes/kvm2_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/kvm2_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VirtualBox" %}}
 ## Check virtualization support
-{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_linux.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
 
-{{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
 {{% /tab %}}
 {{% tab "None (bare-metal)" %}}
 ## Check baremetal support
-{{% readfile file="/docs/Reference/Drivers/includes/check_baremetal_linux.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_baremetal_linux.inc" %}}
 
 If you are already running minikube from inside a VM, it is possible to skip the creation of an additional VM layer by using the `none` driver.
 
-{{% readfile file="/docs/Reference/Drivers/includes/none_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/none_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
 {{% /tab %}}
 
 
 {{% /tabs %}}
 
-{{% readfile file="/docs/Start/includes/post_install.inc" %}}
+{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Start/macos.md b/site/content/en/docs/Handbook/Installation/macos.md
similarity index 68%
rename from site/content/en/docs/Start/macos.md
rename to site/content/en/docs/Handbook/Installation/macos.md
index b23a81cf13..15e4665b3f 100644
--- a/site/content/en/docs/Start/macos.md
+++ b/site/content/en/docs/Handbook/Installation/macos.md
@@ -51,24 +51,24 @@ brew upgrade minikube
 
 {{% tabs %}}
 {{% tab "Docker" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Hyperkit" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/hyperkit_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/hyperkit_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VirtualBox" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Parallels" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/parallels_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/parallels_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VMware" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/vmware_macos_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/vmware_macos_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/podman_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
 {{% /tab %}}
 
 {{% /tabs %}}
 
-{{% readfile file="/docs/Start/includes/post_install.inc" %}}
+{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Start/windows.md b/site/content/en/docs/Handbook/Installation/windows.md
similarity index 63%
rename from site/content/en/docs/Start/windows.md
rename to site/content/en/docs/Handbook/Installation/windows.md
index 2fe1d79a5f..3ca2eafbc2 100644
--- a/site/content/en/docs/Start/windows.md
+++ b/site/content/en/docs/Handbook/Installation/windows.md
@@ -32,21 +32,21 @@ After it has installed, close the current CLI session and reopen it. minikube sh
 
 {{% tabs %}}
 {{% tab "Docker" %}}
-{{% readfile file="/docs/Reference/Drivers/includes/docker_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
 {{% /tab %}}
 
 {{% tab "Hyper-V" %}}
 ## Check Hypervisor 
-{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_windows.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_virtualization_windows.inc" %}}
 
-{{% readfile file="/docs/Reference/Drivers/includes/hyperv_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/hyperv_usage.inc" %}}
 {{% /tab %}}
 {{% tab "VirtualBox" %}}
 ## Check Hypervisor 
-{{% readfile file="/docs/Reference/Drivers/includes/check_virtualization_windows.inc" %}}
+{{% readfile file="/docs/Drivers/includes/check_virtualization_windows.inc" %}}
 
-{{% readfile file="/docs/Reference/Drivers/includes/virtualbox_usage.inc" %}}
+{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
 {{% /tab %}}
 {{% /tabs %}}
 
-{{% readfile file="/docs/Start/includes/post_install.inc" %}}
+{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Handbook/_index.md b/site/content/en/docs/Handbook/_index.md
new file mode 100644
index 0000000000..314dfc61b7
--- /dev/null
+++ b/site/content/en/docs/Handbook/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Handbook"
+weight: 1
+description: >
+  How to perform common tasks with minikube
+---
diff --git a/site/content/en/docs/Tasks/accessing-host-resources.md b/site/content/en/docs/Handbook/accessing-host-resources.md
similarity index 95%
rename from site/content/en/docs/Tasks/accessing-host-resources.md
rename to site/content/en/docs/Handbook/accessing-host-resources.md
index 421eb0afb5..048fd69dc9 100644
--- a/site/content/en/docs/Tasks/accessing-host-resources.md
+++ b/site/content/en/docs/Handbook/accessing-host-resources.md
@@ -1,7 +1,7 @@
 ---
-title: "Accessing host resources"
+title: "Host access"
 date: 2017-01-05
-weight: 2
+weight: 10
 description: >
   How to access host resources from a pod
 ---
diff --git a/site/content/en/docs/Tasks/loadbalancer.md b/site/content/en/docs/Handbook/accessing.md
similarity index 65%
rename from site/content/en/docs/Tasks/loadbalancer.md
rename to site/content/en/docs/Handbook/accessing.md
index 4ec2f0f06d..ae0f550a17 100644
--- a/site/content/en/docs/Tasks/loadbalancer.md
+++ b/site/content/en/docs/Handbook/accessing.md
@@ -1,13 +1,44 @@
 ---
-title: "LoadBalancer access"
-linkTitle: "LoadBalancer access"
-weight: 6
-date: 2018-08-02
+title: "Accessing apps"
+weight: 3
 description: >
-  How to access a LoadBalancer service in minikube
+  How to access applications running within minikube
 ---
 
-## Overview
+There are two major categories of services in Kubernetes:
+
+* NodePort
+* LoadBalancer
+
+minikube supports either. Read on!
+
+## NodePort access
+
+A NodePort service is the most basic way to get external traffic directly to your service. NodePort, as the name implies, opens a specific port, and any traffic that is sent to this port is forwarded to the service.
+
+### Getting the NodePort using the service command
+
+We also have a shortcut for fetching the minikube IP and a service's `NodePort`:
+
+`minikube service --url $SERVICE`
+
+## Getting the NodePort using kubectl
+
+The minikube VM is exposed to the host system via a host-only IP address, that can be obtained with the `minikube ip` command. Any services of type `NodePort` can be accessed over that IP address, on the NodePort.
+
+To determine the NodePort for your service, you can use a `kubectl` command like this (note that `nodePort` begins with lowercase `n` in JSON output):
+
+`kubectl get service $SERVICE --output='jsonpath="{.spec.ports[0].nodePort}"'`
+
+### Increasing the NodePort range
+
+By default, minikube only exposes ports 30000-32767. If this does not work for you, you can adjust the range by using:
+
+`minikube start --extra-config=apiserver.service-node-port-range=1-65535`
+
+This flag also accepts a comma separated list of ports and port ranges.
+
+## LoadBalancer access
 
 A LoadBalancer service is the standard way to expose a service to the internet. With this method, each service gets its own IP address.
 
diff --git a/site/content/en/docs/Handbook/config.md b/site/content/en/docs/Handbook/config.md
new file mode 100644
index 0000000000..78b18a5dde
--- /dev/null
+++ b/site/content/en/docs/Handbook/config.md
@@ -0,0 +1,132 @@
+---
+title: "Configuration & Tuning"
+weight: 4
+description: >
+  Configuring your cluster 
+---
+
+## Basic Configuration
+
+
+Most minikube configuration is done via the flags interface. To see which flags are possible for the start command, run:
+
+```shell
+minikube start --help
+```
+
+## Persistent Configuration
+
+minikube allows users to persistently store new default values to be used across all profiles, using the `minikube config` command. This is done providing a property name, and a property value.
+
+### Listing config properties
+
+```shell
+minikube config
+```
+
+For example, to persistently configure minikube to use hyperkit:
+
+```shell
+minikube config set driver hyperkit
+```
+
+## Kubernetes configuration
+
+minikube allows users to configure the Kubernetes components with arbitrary values. To use this feature, you can use the `--extra-config` flag on the `minikube start` command.
+
+This flag is repeated, so you can pass it several times with several different values to set multiple options.
+
+### Selecting a Kubernetes version
+
+By default, minikube installs the latest stable version of Kubernetes that was available at the time of the minikube release. You may select a different Kubernetes release by using the `--kubernetes-version` flag, for example:
+
+`minikube start --kubernetes-version=v1.11.10`
+  
+If you omit this flag, minikube will upgrade your cluster to the default version. If you would like to pin to a specific Kubernetes version across clusters, restarts, and upgrades to minikube, use:
+
+`minikube config set kubernetes-version v1.11.0`
+
+minikube follows the [Kubernetes Version and Version Skew Support Policy](https://kubernetes.io/docs/setup/version-skew-policy/), so we guarantee support for the latest build for the last 3 minor Kubernetes releases. When practical, minikube aims for the last 6 minor releases so that users can emulate legacy environments.
+
+As of September 2019, this means that minikube supports and actively tests against the latest builds of:
+
+* v1.16 (default)
+* v1.15
+* v1.14
+* v1.13
+* v1.12
+* v1.11 (best effort)
+
+For more up to date information, see `OldestKubernetesVersion` and `NewestKubernetesVersion` in [constants.go](https://github.com/kubernetes/minikube/blob/master/pkg/minikube/constants/constants.go)
+
+### Modifying Kubernetes defaults
+
+The kubeadm bootstrapper can be configured by the `--extra-config` flag on the `minikube start` command.  It takes a string of the form `component.key=value` where `component` is one of the strings
+
+* kubeadm
+* kubelet
+* apiserver
+* controller-manager
+* scheduler
+
+and `key=value` is a flag=value pair for the component being configured.  For example,
+
+```shell
+minikube start --extra-config=apiserver.v=10 --extra-config=kubelet.max-pods=100
+```
+
+For instance, to allow Kubernetes to launch on an unsupported Docker release:
+
+```shell
+minikube start --extra-config=kubeadm.ignore-preflight-errors=SystemVerification
+```
+
+## Runtime configuration
+
+The default container runtime in minikube is Docker. You can select it explicitly by using:
+
+```shell
+minikube start --container-runtime=docker
+```
+
+You can also select:
+
+* *[containerd](https://github.com/containerd/containerd):
+* `cri-o`: [CRI-O](https://github.com/kubernetes-sigs/cri-o):
+
+## Command-line behaviors
+
+minikube supports passing environment variables instead of flags for every value listed in `minikube config`.  This is done by passing an environment variable with the prefix `MINIKUBE_`.
+
+For example the `minikube start --iso-url="$ISO_URL"` flag can also be set by setting the `MINIKUBE_ISO_URL="$ISO_URL"` environment variable.
+
+## Other variables
+
+Some features can only be accessed by environment variables, here is a list of these features:
+
+* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration
+
+* **MINIKUBE_IN_STYLE** - (bool) manually sets whether or not emoji and colors should appear in minikube. Set to false or 0 to disable this feature, true or 1 to force it to be turned on.
+
+* **MINIKUBE_WANTUPDATENOTIFICATION** - (bool) sets whether the user wants an update notification for new minikube versions
+
+* **MINIKUBE_REMINDERWAITPERIODINHOURS** - (int) sets the number of hours to check for an update notification
+
+* **CHANGE_MINIKUBE_NONE_USER** - (bool) automatically change ownership of ~/.minikube to the value of $SUDO_USER
+
+* **MINIKUBE_ENABLE_PROFILING** - (int, `1` enables it) enables trace profiling to be generated for minikube
+
+### Example: Disabling emoji
+
+```shell
+export MINIKUBE_IN_STYLE=false
+minikube start
+```
+
+### Making environment values persistent
+
+To make the exported variables persistent across reboots:
+
+* Linux and macOS: Add these declarations to `~/.bashrc` or wherever your shells environment variables are stored.
+* Windows: Add these declarations via [system settings](https://support.microsoft.com/en-au/help/310519/how-to-manage-environment-variables-in-windows-xp) or using [setx](https://stackoverflow.com/questions/5898131/set-a-persistent-environment-variable-from-cmd-exe)
+
diff --git a/site/content/en/docs/Examples/_index.md b/site/content/en/docs/Handbook/controls.md
similarity index 93%
rename from site/content/en/docs/Examples/_index.md
rename to site/content/en/docs/Handbook/controls.md
index c9e665ae05..c8a21a302c 100755
--- a/site/content/en/docs/Examples/_index.md
+++ b/site/content/en/docs/Handbook/controls.md
@@ -1,9 +1,8 @@
 
 ---
-title: "Examples"
-linkTitle: "Examples"
-weight: 3
-date: 2017-01-05
+title: "Basic controls"
+linkTitle: "Basic controls"
+weight: 1
 description: >
   See minikube in action!
 ---
diff --git a/site/content/en/docs/Tasks/dashboard.md b/site/content/en/docs/Handbook/dashboard.md
similarity index 90%
rename from site/content/en/docs/Tasks/dashboard.md
rename to site/content/en/docs/Handbook/dashboard.md
index 3fec853830..2f8aae6c13 100644
--- a/site/content/en/docs/Tasks/dashboard.md
+++ b/site/content/en/docs/Handbook/dashboard.md
@@ -1,9 +1,8 @@
 ---
 title: "Dashboard"
-date: 2019-07-31
-weight: 1
+weight: 3
 description: >
-  Using the Kubernetes Dashboard
+  Dashboard
 ---
 
 minikube has integrated support for the [Kubernetes Dashboard UI](https://github.com/kubernetes/dashboard).
@@ -46,4 +45,4 @@ minikube dashboard --url
 
 ## Reference
 
-For additional information, see [the official Dashboard documentation](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/).
+For additional information, see [the official Dashboard documentation](https://kubernetes.io/docs/Handbook/access-application-cluster/web-ui-dashboard/).
diff --git a/site/content/en/docs/Handbook/deploying.md b/site/content/en/docs/Handbook/deploying.md
new file mode 100644
index 0000000000..a0a9bebc4f
--- /dev/null
+++ b/site/content/en/docs/Handbook/deploying.md
@@ -0,0 +1,47 @@
+---
+title: "Deploying apps"
+linkTitle: "Deploying apps"
+weight: 2
+description: >
+  How to deploy an application to minikube
+---
+
+## kubectl
+
+```
+kubectl create deployment hello-minikube1 --image=k8s.gcr.io/echoserver:1.4
+kubectl expose deployment hello-minikube1 --type=LoadBalancer --port=8080
+```
+
+## Addons
+
+minikube has a built-in list of applications and services that may be easily deployed, such as Istio or Ingress. To list the available addons for your version of minikube:
+
+
+```shell
+minikube addons list
+```
+
+To enable an add-on, see:
+```shell
+minikube addons enable <name>
+```
+
+To enable an addon at start-up:
+
+```shell
+minikube start --addons <name>
+```
+
+For addons that expose a browser endpoint, you can quickly open them with:
+
+```shell
+minikube addons open <name>
+```
+
+To disable an addon:
+
+
+```shell
+minikube addons disable <name>
+```
diff --git a/site/content/en/docs/Tasks/sync.md b/site/content/en/docs/Handbook/filesync.md
similarity index 99%
rename from site/content/en/docs/Tasks/sync.md
rename to site/content/en/docs/Handbook/filesync.md
index fb39f5dc87..c7f415c2d5 100644
--- a/site/content/en/docs/Tasks/sync.md
+++ b/site/content/en/docs/Handbook/filesync.md
@@ -1,7 +1,7 @@
 ---
 title: "File Sync"
 linkTitle: "File Sync"
-weight: 6
+weight: 15
 date: 2019-08-01
 description: >
   How to sync files into minikube
diff --git a/site/content/en/docs/Tasks/mount.md b/site/content/en/docs/Handbook/mount.md
similarity index 96%
rename from site/content/en/docs/Tasks/mount.md
rename to site/content/en/docs/Handbook/mount.md
index d7b19f05c4..a145aef97d 100644
--- a/site/content/en/docs/Tasks/mount.md
+++ b/site/content/en/docs/Handbook/mount.md
@@ -1,7 +1,6 @@
 ---
-title: "Filesystem mounts"
+title: "Mounting filesystems"
 date: 2017-01-05
-weight: 4
 description: >
   How to mount a host directory into the VM
 ---
@@ -78,4 +77,4 @@ These mounts can be disabled by passing `--disable-driver-mounts` to `minikube s
 
 ## File Sync
 
-See [File Sync]({{<ref "sync.md" >}})
+See [File Sync]({{<ref "filesync.md" >}})
diff --git a/site/content/en/docs/Reference/disk_cache.md b/site/content/en/docs/Handbook/offline.md
similarity index 91%
rename from site/content/en/docs/Reference/disk_cache.md
rename to site/content/en/docs/Handbook/offline.md
index 24590727d5..d9238520fb 100644
--- a/site/content/en/docs/Reference/disk_cache.md
+++ b/site/content/en/docs/Handbook/offline.md
@@ -1,7 +1,7 @@
 ---
-title: "Disk cache"
-linkTitle: "Disk cache"
-weight: 6
+title: "Offline usage"
+linkTitle: "Offline usage"
+weight: 8
 date: 2019-08-01
 description: >
   Cache Rules Everything Around minikube
@@ -16,12 +16,10 @@ minikube has built-in support for caching downloaded resources into `$MINIKUBE_H
 
 ## Kubernetes image cache
 
+NOTE: the `none` driver caches images directly into Docker rather than a separate disk cache.
+
 `minikube start` caches all required Kubernetes images by default. This default may be changed by setting `--cache-images=false`. These images are not displayed by the `minikube cache` command.
 
-## Arbitrary docker image cache
-
-See [Tasks: Caching images]({{< ref "/docs/tasks/caching.md" >}})
-
 ## Sharing the minikube cache
 
 For offline use on other hosts, one can copy the contents of `~/.minikube/cache`. As of the v1.0 release, this directory contains 685MB of data:
diff --git a/site/content/en/docs/Reference/persistent_volumes.md b/site/content/en/docs/Handbook/persistent_volumes.md
similarity index 99%
rename from site/content/en/docs/Reference/persistent_volumes.md
rename to site/content/en/docs/Handbook/persistent_volumes.md
index 02e90bc703..6c483a5c41 100644
--- a/site/content/en/docs/Reference/persistent_volumes.md
+++ b/site/content/en/docs/Handbook/persistent_volumes.md
@@ -1,7 +1,7 @@
 ---
 title: "Persistent Volumes"
 linkTitle: "Persistent Volumes"
-weight: 6
+weight: 12
 date: 2019-08-01
 description: >
   About persistent volumes (hostPath)
diff --git a/site/content/en/docs/Handbook/pushing.md b/site/content/en/docs/Handbook/pushing.md
new file mode 100644
index 0000000000..c695ae670d
--- /dev/null
+++ b/site/content/en/docs/Handbook/pushing.md
@@ -0,0 +1,116 @@
+---
+title: "Pushing images"
+date: 2019-08-05
+weight: 4
+description: >
+  There are many ways to push images into minikube.
+---
+
+## Cached Images
+
+From the host, you can push a Docker image directly to minikube. It will also be cached for future cluster starts.
+
+```shell
+minikube cache add ubuntu:16.04
+```
+
+The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the VM's container runtime environment next time `minikube start` is called.
+
+To display images you have added to the cache:
+
+```shell
+minikube cache list
+```
+
+This listing will not include the images which are built-in to minikube.
+
+
+```shell
+minikube cache delete <image name>
+```
+
+For more information, see:
+
+* [Reference: cache command]({{< ref "/docs/Commands/cache.md" >}})
+
+You must be using minikube with the container runtime set to Docker. This is the default setting.
+
+## Pushing directly to the in-cluster Docker daemon
+
+When using a single VM of Kubernetes it's really handy to reuse the Docker daemon 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 docker daemon as minikube which speeds up local experiments.
+
+To be able to work with the docker daemon on your mac/linux host use the docker-env command in your shell:
+
+```shell
+eval $(minikube docker-env)
+```
+
+You should now be able to use docker on the command line on your host mac/linux machine talking to the docker daemon inside the minikube VM:
+
+```shell
+docker ps
+```
+
+Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
+
+
+## Pushing directly to in-cluster CRIO
+
+To push directly to CRIO, configure podman client on your mac/linux host using the podman-env command in your shell:
+
+```shell
+eval $(minikube podman-env)
+```
+
+You should now be able to use podman on the command line on your host mac/linux machine talking to the podman service inside the minikube VM:
+
+```shell
+podman-remote help
+```
+
+Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
+
+## Pushing to an in-cluster Registry
+
+For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/docs/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
+
+Ensure that docker is configured to use `192.168.39.0/24` as insecure registry. Refer [here](https://docs.docker.com/registry/insecure/) for instructions.
+
+Ensure that `192.168.39.0/24` is enabled as insecure registry in minikube. Refer [here](https://minikube.sigs.k8s.io/docs/Handbook/registry/insecure/) for instructions..
+
+Enable minikube registry addon:
+
+```shell
+minikube addons enable registry
+```
+
+Build docker image and tag it appropriately:
+
+```shell
+docker build --tag $(minikube ip):5000/test-img .
+```
+
+Push docker image to minikube registry:
+
+```shell
+docker push $(minikube ip):5000/test-img
+```
+
+## Building images inside of minikube
+
+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).
+
+For Podman, use:
+
+```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/source/markdown/podman-build.1.md) (podman.io).
+
diff --git a/site/content/en/docs/Tasks/Registry/insecure.md b/site/content/en/docs/Handbook/registry.md
similarity index 66%
rename from site/content/en/docs/Tasks/Registry/insecure.md
rename to site/content/en/docs/Handbook/registry.md
index e3f1116014..f5776c4795 100644
--- a/site/content/en/docs/Tasks/Registry/insecure.md
+++ b/site/content/en/docs/Handbook/registry.md
@@ -1,12 +1,36 @@
 ---
-title: "Insecure"
-linkTitle: "Insecure"
+title: "Registries"
+linkTitle: "Registries"
 weight: 6
-date: 2019-08-1
+date: 2017-01-05
 description: >
-  How to enable insecure registry support within minikube
+  How to interact with Docker registries.
 ---
 
+## Using a Private Registry
+
+**GCR/ECR/ACR/Docker**: minikube has an addon, `registry-creds` which maps credentials into minikube to support pulling from Google Container Registry (GCR), Amazon's EC2 Container Registry (ECR), Azure Container Registry (ACR), and Private Docker registries.  You will need to run `minikube addons configure registry-creds` and `minikube addons enable registry-creds` to get up and running.  An example of this is below:
+
+```shell
+$ minikube addons configure registry-creds
+Do you want to enable AWS Elastic Container Registry? [y/n]: n
+
+Do you want to enable Google Container Registry? [y/n]: y
+-- Enter path to credentials (e.g. /home/user/.config/gcloud/application_default_credentials.json):/home/user/.config/gcloud/application_default_credentials.json
+
+Do you want to enable Docker Registry? [y/n]: n
+
+Do you want to enable Azure Container Registry? [y/n]: n
+registry-creds was successfully configured
+$ minikube addons enable registry-creds
+```
+
+For additional information on private container registries, see [this page](https://kubernetes.io/docs/Handbook/configure-pod-container/pull-image-private-registry/).
+
+We recommend you use _ImagePullSecrets_, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/var/lib/kubelet` directory. Make sure to restart your kubelet (for kubeadm) process with `sudo systemctl restart kubelet`.
+
+## Enabling Insecure Registries
+
 minikube allows users to configure the docker engine's `--insecure-registry` flag. 
 
 You can use the `--insecure-registry` flag on the
@@ -78,3 +102,5 @@ docker push localhost:5000/myimage
 ```
 
 After the image is pushed, refer to it by `localhost:5000/{name}` in kubectl specs.
+
+## 
\ No newline at end of file
diff --git a/site/content/en/docs/Tasks/debug.md b/site/content/en/docs/Handbook/troubleshooting.md
similarity index 95%
rename from site/content/en/docs/Tasks/debug.md
rename to site/content/en/docs/Handbook/troubleshooting.md
index bab4de45c7..b4606f0116 100644
--- a/site/content/en/docs/Tasks/debug.md
+++ b/site/content/en/docs/Handbook/troubleshooting.md
@@ -1,10 +1,10 @@
 ---
-title: "Debugging"
-linkTitle: "Debugging"
-weight: 9
+title: "Troubleshooting"
+linkTitle: "Troubleshoot"
+weight: 20
 date: 2019-08-01
 description: >
-  How to debug issues within minikube
+  How to troubleshoot minikube issues
 ---
 
 ## Enabling debug logs
diff --git a/site/content/en/docs/Reference/uninstalling_minikube.md b/site/content/en/docs/Handbook/uninstalling_minikube.md
similarity index 100%
rename from site/content/en/docs/Reference/uninstalling_minikube.md
rename to site/content/en/docs/Handbook/uninstalling_minikube.md
diff --git a/site/content/en/docs/Reference/Networking/proxy.md b/site/content/en/docs/Handbook/vpn_and_proxy.md
similarity index 71%
rename from site/content/en/docs/Reference/Networking/proxy.md
rename to site/content/en/docs/Handbook/vpn_and_proxy.md
index e82fece322..08c8e1c5ff 100644
--- a/site/content/en/docs/Reference/Networking/proxy.md
+++ b/site/content/en/docs/Handbook/vpn_and_proxy.md
@@ -1,13 +1,15 @@
 ---
-title: "HTTP Proxies"
-linkTitle: "HTTP Proxies"
+title: "Proxies & VPN's"
 weight: 6
-date: 2017-01-05
 description: >
-  How to use an HTTP/HTTPS proxy with minikube
+  How to use minikube with a VPN or HTTP/HTTPS Proxy
 ---
 
-minikube requires access to the internet via HTTP, HTTPS, and DNS protocols. If a HTTP proxy is required to access the internet, you may need to pass the proxy connection information to both minikube and Docker using environment variables:
+minikube requires access to the internet via HTTP, HTTPS, and DNS protocols.
+
+## Proxy
+
+If a HTTP proxy is required to access the internet, you may need to pass the proxy connection information to both minikube and Docker using environment variables:
 
 * `HTTP_PROXY` - The URL to your HTTP proxy
 * `HTTPS_PROXY` - The URL to your HTTPS proxy
@@ -47,20 +49,9 @@ minikube start
 
 To set these environment variables permanently, consider adding these to your [system settings](https://support.microsoft.com/en-au/help/310519/how-to-manage-environment-variables-in-windows-xp) or using [setx](https://stackoverflow.com/questions/5898131/set-a-persistent-environment-variable-from-cmd-exe)
 
-## Configuring Docker to use a proxy
+### Troubleshooting
 
-As of v1.0, minikube automatically configures the Docker instance inside of the VM to use the proxy environment variables, unless you have specified a `--docker-env` override. If you need to manually configure Docker for a set of proxies, use:
-
-```shell
-minikube start \
-  --docker-env=HTTP_PROXY=$HTTP_PROXY \
-  --docker-env HTTPS_PROXY=$HTTPS_PROXY \
-  --docker-env NO_PROXY=$NO_PROXY
-```
-
-## Troubleshooting
-
-### unable to cache ISO... connection refused
+#### unable to cache ISO... connection refused
 
 ```text
 Unable to start VM: unable to cache ISO: https://storage.googleapis.com/minikube/iso/minikube.iso:
@@ -72,7 +63,7 @@ proxyconnect tcp: dial tcp <host>:<port>: connect: connection refused
 
 This error indicates that the host:port combination defined by HTTPS_PROXY or HTTP_PROXY is incorrect, or that the proxy is unavailable.
 
-## Unable to pull images..Client.Timeout exceeded while awaiting headers
+#### Unable to pull images..Client.Timeout exceeded while awaiting headers
 
 ```text
 Unable to pull images, which may be OK:
@@ -84,7 +75,7 @@ Get https://k8s.gcr.io/v2/: net/http: request canceled while waiting for connect
 
 This error indicates that the container runtime running within the VM does not have access to the internet. Verify that you are passing the appropriate value to `--docker-env HTTPS_PROXY`.
 
-## x509: certificate signed by unknown authority
+#### x509: certificate signed by unknown authority
 
 ```text
 [ERROR ImagePull]: failed to pull image k8s.gcr.io/kube-apiserver:v1.13.3:
@@ -100,10 +91,23 @@ Ask your IT department for the appropriate PEM file, and add it to:
 
 Then run `minikube delete` and `minikube start`.
 
-## downloading binaries: proxyconnect tcp: tls: oversized record received with length 20527
+#### downloading binaries: proxyconnect tcp: tls: oversized record received with length 20527
 
 The supplied value of `HTTPS_PROXY` is probably incorrect. Verify that this value is not pointing to an HTTP proxy rather than an HTTPS proxy.
 
-## Additional Information
+## VPN
 
-* [Configure Docker to use a proxy server](https://docs.docker.com/network/proxy/)
+minikube requires access from the host to the following IP ranges:
+
+* **192.168.99.0/24**: Used by the minikube VM. Configurable for some hypervisors via `--host-only-cidr`
+* **192.168.39.0/24**: Used by the minikube kvm2 driver.
+* **10.96.0.0/12**: Used by service cluster IP's. Configurable via  `--service-cluster-ip-range`
+
+Unfortunately, many VPN configurations route packets to these destinations through an encrypted tunnel, rather than allowing the packets to go to the minikube VM.
+
+### Possible workarounds
+
+1. If you have access, whitelist the above IP ranges in your VPN software
+2. In your VPN software, select an option similar to "Allow local (LAN) access when using VPN" [(Cisco VPN example)](https://superuser.com/questions/987150/virtualbox-guest-os-through-vpn)
+3. You may have luck selecting alternate values to the `--host-only-cidr` and `--service-cluster-ip-range` flags.
+4. Turn off the VPN
diff --git a/site/content/en/docs/Overview/_index.md b/site/content/en/docs/Overview/_index.md
deleted file mode 100644
index 5094d5fe67..0000000000
--- a/site/content/en/docs/Overview/_index.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: "Overview"
-linkTitle: "Overview"
-weight: 1
-description: >
-  What is it?
----
-
-minikube implements a local Kubernetes cluster on macOS, Linux, and Windows.
-
-minikube's [primary goals](https://minikube.sigs.k8s.io/docs/concepts/principles/) are to be the best tool for local Kubernetes application development and to support all Kubernetes features that fit.
-
-minikube runs the latest stable release of Kubernetes, with support for standard Kubernetes features like:
-
-* [LoadBalancer](https://minikube.sigs.k8s.io/docs/tasks/loadbalancer/) - using `minikube tunnel`
-* Multi-cluster - using `minikube start -p <name>`
-* NodePorts - using `minikube service`
-* [Persistent Volumes](https://minikube.sigs.k8s.io/docs/reference/persistent_volumes/)
-* Ingress
-* RBAC
-* [Dashboard](https://minikube.sigs.k8s.io/docs/tasks/dashboard/) - `minikube dashboard`
-* [Container runtimes](https://minikube.sigs.k8s.io/docs/reference/runtimes/) - `start --container-runtime`
-* [Configure apiserver and kubelet options](https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/) via command-line flags
-
-As well as developer-friendly features:
-
-* [Addons](https://minikube.sigs.k8s.io/docs/tasks/addons/) - a marketplace for developers to share configurations for running services on minikube
-* [GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/) - for machine learning
-* [Filesystem mounts](https://minikube.sigs.k8s.io/docs/tasks/mount/)
-* Automatic failure analysis
-
-## Why do I want it?
-
-If you would like to develop Kubernetes applications:
-
-* locally
-* offline
-* using the latest version of Kubernetes
-
-Then minikube is for you.
-
-* **What is it good for?** Developing local Kubernetes applications
-* **What is it not good for?** Production Kubernetes deployments
-
-## Where should I go next?
-
-* [Getting Started](/docs/start/): Get started with minikube
-* [Examples](/docs/examples/): Check out some minikube examples!
-
-📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
diff --git a/site/content/en/docs/Reference/Configuration/_index.md b/site/content/en/docs/Reference/Configuration/_index.md
deleted file mode 100644
index 1615c60d70..0000000000
--- a/site/content/en/docs/Reference/Configuration/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Configuration"
-linkTitle: "Configuration"
-weight: 1
-date: 2019-08-01
-description: >
-  minikube configuration reference
----
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Configuration/kubernetes.md b/site/content/en/docs/Reference/Configuration/kubernetes.md
deleted file mode 100644
index 8781b3f710..0000000000
--- a/site/content/en/docs/Reference/Configuration/kubernetes.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-title: "Kubernetes"
-linkTitle: "Kubernetes"
-weight: 3
-date: 2019-08-01
-description: >
-  Kubernetes configuration reference
----
-
-minikube allows users to configure the Kubernetes components with arbitrary values. To use this feature, you can use the `--extra-config` flag on the `minikube start` command.
-
-This flag is repeated, so you can pass it several times with several different values to set multiple options.
-
-## Selecting a Kubernetes version
-
-By default, minikube installs the latest stable version of Kubernetes that was available at the time of the minikube release. You may select a different Kubernetes release by using the `--kubernetes-version` flag, for example:
-
-`minikube start --kubernetes-version=v1.11.10`
-  
-If you omit this flag, minikube will upgrade your cluster to the default version. If you would like to pin to a specific Kubernetes version across clusters, restarts, and upgrades to minikube, use:
-
-`minikube config set kubernetes-version v1.11.0`
-
-minikube follows the [Kubernetes Version and Version Skew Support Policy](https://kubernetes.io/docs/setup/version-skew-policy/), so we guarantee support for the latest build for the last 3 minor Kubernetes releases. When practical, minikube aims for the last 6 minor releases so that users can emulate legacy environments.
-
-As of September 2019, this means that minikube supports and actively tests against the latest builds of:
-
-* v1.16 (default)
-* v1.15
-* v1.14
-* v1.13
-* v1.12
-* v1.11 (best effort)
-
-For more up to date information, see `OldestKubernetesVersion` and `NewestKubernetesVersion` in [constants.go](https://github.com/kubernetes/minikube/blob/master/pkg/minikube/constants/constants.go)
-
-## Modifying Kubernetes defaults
-
-The kubeadm bootstrapper can be configured by the `--extra-config` flag on the `minikube start` command.  It takes a string of the form `component.key=value` where `component` is one of the strings
-
-* kubeadm
-* kubelet
-* apiserver
-* controller-manager
-* scheduler
-
-and `key=value` is a flag=value pair for the component being configured.  For example,
-
-```shell
-minikube start --extra-config=apiserver.v=10 --extra-config=kubelet.max-pods=100
-```
-
-For instance, to allow Kubernetes to launch on an unsupported Docker release:
-
-```shell
-minikube start --extra-config=kubeadm.ignore-preflight-errors=SystemVerification
-```
diff --git a/site/content/en/docs/Reference/Configuration/minikube.md b/site/content/en/docs/Reference/Configuration/minikube.md
deleted file mode 100644
index 8fc3c39438..0000000000
--- a/site/content/en/docs/Reference/Configuration/minikube.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-title: "minikube"
-linkTitle: "minikube"
-weight: 2
-date: 2019-08-01
-description: >
-  minikube configuration reference
----
-
-## Flags
-
-Most minikube configuration is done via the flags interface. To see which flags are possible for the start command, run:
-
-```shell
-minikube start --help
-```
-
-For example:
-
-```shell
-minikube start --apiserver-port 9999
-```
-
-Many of these flags are also available to be set via persistent configuration or environment variables. 
-While most flags are applicable to any command, some are globally scoped:
-
-```
-Flags:
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-  -h, --help                             help for minikube
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used.  
-                                         	This can be modified to allow for multiple minikube instances to be run independently (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-## Persistent Configuration
-
-minikube allows users to persistently store new default values to be used across all profiles, using the `minikube config` command. This is done providing a property name, and a property value.
-
-### Listing config properties
-
-```shell
-minikube config
-```
-
-Example:
-
-```shell
-Configurable fields: 
-
- * driver
- * feature-gates
- * v
- * cpus
- * disk-size
- * host-only-cidr
- * memory
- * log_dir
- * kubernetes-version
- * iso-url
- * WantUpdateNotification
- * ReminderWaitPeriodInHours
- * WantReportError
- * WantReportErrorPrompt
- * WantKubectlDownloadMsg
- * WantNoneDriverWarning
- * profile
- * bootstrapper
- * ShowDriverDeprecationNotification
- * ShowBootstrapperDeprecationNotification
- * dashboard
- * addon-manager
- * default-storageclass
- * efk
- * ingress
- * registry
- * registry-creds
- * freshpod
- * default-storageclass
- * storage-provisioner
- * storage-provisioner-gluster
- * metrics-server
- * nvidia-driver-installer
- * nvidia-gpu-device-plugin
- * logviewer
- * gvisor
- * hyperv-virtual-switch
- * disable-driver-mounts
- * cache
- * embed-certs
-```
-
-### Listing your property overrides
-
-```shell
-minikube config view
-```
-
-Example output:
-
-```shell
-- memory: 4096
-- registry: true
-- driver: vmware
-- dashboard: true
-- gvisor: true
-```
-
-### Setting a new property override
-
-
-```shell
-minikube config set <key> <value>
-```
-
-For example:
-
-```shell
-minikube config set driver hyperkit
-```
-
-## Environment Configuration
-
-### Config variables
-
-minikube supports passing environment variables instead of flags for every value listed in `minikube config`.  This is done by passing an environment variable with the prefix `MINIKUBE_`.
-
-For example the `minikube start --iso-url="$ISO_URL"` flag can also be set by setting the `MINIKUBE_ISO_URL="$ISO_URL"` environment variable.
-
-### Other variables
-
-Some features can only be accessed by environment variables, here is a list of these features:
-
-* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration
-
-* **MINIKUBE_IN_STYLE** - (bool) manually sets whether or not emoji and colors should appear in minikube. Set to false or 0 to disable this feature, true or 1 to force it to be turned on.
-
-* **MINIKUBE_WANTUPDATENOTIFICATION** - (bool) sets whether the user wants an update notification for new minikube versions
-
-* **MINIKUBE_REMINDERWAITPERIODINHOURS** - (int) sets the number of hours to check for an update notification
-
-* **CHANGE_MINIKUBE_NONE_USER** - (bool) automatically change ownership of ~/.minikube to the value of $SUDO_USER
-
-* **MINIKUBE_ENABLE_PROFILING** - (int, `1` enables it) enables trace profiling to be generated for minikube
-
-### Making environment variables persistent
-
-To make the exported variables persistent:
-
-* Linux and macOS: Add these declarations to `~/.bashrc` or wherever your shells environment variables are stored.
-* Windows: Add these declarations via [system settings](https://support.microsoft.com/en-au/help/310519/how-to-manage-environment-variables-in-windows-xp) or using [setx](https://stackoverflow.com/questions/5898131/set-a-persistent-environment-variable-from-cmd-exe)
-
-#### Example: Disabling emoji
-
-```shell
-export MINIKUBE_IN_STYLE=false
-minikube start
-```
diff --git a/site/content/en/docs/Reference/Networking/_index.md b/site/content/en/docs/Reference/Networking/_index.md
deleted file mode 100644
index b1add3ea29..0000000000
--- a/site/content/en/docs/Reference/Networking/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: "Networking"
-linkTitle: "Networking"
-weight: 6
-date: 2018-08-01
-description: >
-  How minikube interacts with networks.
----
-
-Since minikube runs everything from within a VM, networking can get fairly complicated. 
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Networking/dns.md b/site/content/en/docs/Reference/Networking/dns.md
deleted file mode 100644
index 6c44114b7b..0000000000
--- a/site/content/en/docs/Reference/Networking/dns.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: "DNS Domain"
-linkTitle: "DNS Domain"
-weight: 6
-date: 2019-10-09
-description: >
-  Use configured DNS domain in bootstrapper kubeadm
----
-
-minikube by default uses **cluster.local** if none is specified via the start flag --dns-domain. The configuration file used by kubeadm are found inside **/var/tmp/minikube/kubeadm.yaml** directory inside minikube.
-
-Default DNS configuration will look like below
-
-```
-apiVersion: kubeadm.k8s.io/v1beta1
-kind: InitConfiguration
-localAPIEndpoint:
-......
-......
----
-apiVersion: kubeadm.k8s.io/v1beta1
-kind: ClusterConfiguration
-.....
-.....
-kubernetesVersion: v1.16.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: ""
-  serviceSubnet: 10.96.0.0/12
----
-```
-
-To change the dns pass the value when starting minikube 
-
-```
-minikube start --dns-domain bla.blah.blah   
-```
-
-the dns now changed to bla.blah.blah
-
-```
-apiVersion: kubeadm.k8s.io/v1beta1
-kind: InitConfiguration
-localAPIEndpoint:
-......
-......
----
-apiVersion: kubeadm.k8s.io/v1beta1
-kind: ClusterConfiguration
-.....
-.....
-kubernetesVersion: v1.16.0
-networking:
-  dnsDomain: bla.blah.blah
-  podSubnet: ""
-  serviceSubnet: 10.96.0.0/12
----
-```
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Networking/vpn.md b/site/content/en/docs/Reference/Networking/vpn.md
deleted file mode 100644
index 94392a3980..0000000000
--- a/site/content/en/docs/Reference/Networking/vpn.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: "Host VPN"
-linkTitle: "Host VPN"
-weight: 6
-date: 2019-08-01
-description: >
-  Using minikube on a host with a VPN installed
----
-
-minikube requires access from the host to the following IP ranges:
-
-* **192.168.99.0/24**: Used by the minikube VM. Configurable for some hypervisors via `--host-only-cidr`
-* **192.168.39.0/24**: Used by the minikube kvm2 driver.
-* **10.96.0.0/12**: Used by service cluster IP's. Configurable via  `--service-cluster-ip-range`
-
-Unfortunately, many VPN configurations route packets to these destinations through an encrypted tunnel, rather than allowing the packets to go to the minikube VM. 
-
-### Possible workarounds
-
-1. If you have access, whitelist the above IP ranges in your VPN software
-2. In your VPN software, select an option similar to "Allow local (LAN) access when using VPN" [(Cisco VPN example)](https://superuser.com/questions/987150/virtualbox-guest-os-through-vpn)
-3. You may have luck selecting alternate values to the `--host-only-cidr` and `--service-cluster-ip-range` flags.
-4. Turn off the VPN
diff --git a/site/content/en/docs/Reference/_index.md b/site/content/en/docs/Reference/_index.md
deleted file mode 100644
index bfe11dd2b6..0000000000
--- a/site/content/en/docs/Reference/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Reference"
-linkTitle: "Reference"
-weight: 5
-description: >
-  Low level reference docs
----
-
diff --git a/site/content/en/docs/Reference/environment_variables.md b/site/content/en/docs/Reference/environment_variables.md
deleted file mode 100644
index 7a02d204d9..0000000000
--- a/site/content/en/docs/Reference/environment_variables.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: "Environment Variables"
-linkTitle: "Environment Variables"
-weight: 6
-date: 2019-08-01
----
-
-## Config option variables
-
-minikube supports passing environment variables instead of flags for every value listed in `minikube config`.  This is done by passing an environment variable with the prefix `MINIKUBE_`.
-
-For example the `minikube start --iso-url="$ISO_URL"` flag can also be set by setting the `MINIKUBE_ISO_URL="$ISO_URL"` environment variable.
-
-## Other variables
-
-Some features can only be accessed by environment variables, here is a list of these features:
-
-* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration
-
-* **MINIKUBE_IN_STYLE** - (bool) manually sets whether or not emoji and colors should appear in minikube. Set to false or 0 to disable this feature, true or 1 to force it to be turned on.
-
-* **MINIKUBE_WANTUPDATENOTIFICATION** - (bool) sets whether the user wants an update notification for new minikube versions
-
-* **MINIKUBE_REMINDERWAITPERIODINHOURS** - (int) sets the number of hours to check for an update notification
-
-* **CHANGE_MINIKUBE_NONE_USER** - (bool) automatically change ownership of ~/.minikube to the value of $SUDO_USER
-
-* **MINIKUBE_ENABLE_PROFILING** - (int, `1` enables it) enables trace profiling to be generated for minikube
-
-
-## Example: Disabling emoji
-
-```shell
-export MINIKUBE_IN_STYLE=false
-minikube start
-```
-
-## Making values persistent
-
-To make the exported variables persistent across reboots:
-
-* Linux and macOS: Add these declarations to `~/.bashrc` or wherever your shells environment variables are stored.
-* Windows: Add these declarations via [system settings](https://support.microsoft.com/en-au/help/310519/how-to-manage-environment-variables-in-windows-xp) or using [setx](https://stackoverflow.com/questions/5898131/set-a-persistent-environment-variable-from-cmd-exe)
-
diff --git a/site/content/en/docs/Reference/runtimes.md b/site/content/en/docs/Reference/runtimes.md
deleted file mode 100644
index 5973040ff7..0000000000
--- a/site/content/en/docs/Reference/runtimes.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: "Container Runtimes"
-linkTitle: "Container Runtimes"
-weight: 6
-date: 2019-08-01
-description: >
-  Available container runtimes
----
-
-### Docker
-
-The default container runtime in minikube is Docker. You can select it explicitly by using:
-
-```shell
-minikube start --container-runtime=docker
-```
-
-### CRI-O
-
-To use [CRI-O](https://github.com/kubernetes-sigs/cri-o):
-
-```shell
-minikube start --container-runtime=cri-o
-```
-
-## containerd
-
-To use [containerd](https://github.com/containerd/containerd):
-
-```shell
-minikube start --container-runtime=containerd
-```
-
-## gvisor
-
-To use [gvisor](https://gvisor.dev):
-
-```shell
-minikube start --container-runtime=containerd
-minikube addons enable gvisor
-```
-
-## Kata
-
-Native support for [Kata containers](https://katacontainers.io) is a work-in-progress. See [#4347](https://github.com/kubernetes/minikube/issues/4347) for details.
-
-In the mean time, it's possible to make Kata containers work within minikube using a bit of [elbow grease](https://gist.github.com/olberger/0413cfb0769dcdc34c83788ced583fa9).
diff --git a/site/content/en/docs/Start/_index.md b/site/content/en/docs/Start/_index.md
deleted file mode 100644
index 2347037978..0000000000
--- a/site/content/en/docs/Start/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: "Getting Started"
-linkTitle: "Getting Started"
-weight: 2
-description: >
-  How to install and start minikube.
----
diff --git a/site/content/en/docs/Tasks/Registry/_index.md b/site/content/en/docs/Tasks/Registry/_index.md
deleted file mode 100644
index cdecd6eff2..0000000000
--- a/site/content/en/docs/Tasks/Registry/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Working with Registries"
-linkTitle: "Working with Registries"
-weight: 6
-date: 2017-01-05
-description: >
-  How to interact with Docker registries.
----
\ No newline at end of file
diff --git a/site/content/en/docs/Tasks/Registry/private.md b/site/content/en/docs/Tasks/Registry/private.md
deleted file mode 100644
index 270ad665e4..0000000000
--- a/site/content/en/docs/Tasks/Registry/private.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: "Private"
-linkTitle: "Private"
-weight: 6
-date: 2020-01-14
-description: >
-  How to use a private registry within minikube
----
-
-
-**GCR/ECR/ACR/Docker**: minikube has an addon, `registry-creds` which maps credentials into minikube to support pulling from Google Container Registry (GCR), Amazon's EC2 Container Registry (ECR), Azure Container Registry (ACR), and Private Docker registries.  You will need to run `minikube addons configure registry-creds` and `minikube addons enable registry-creds` to get up and running.  An example of this is below:
-
-```shell
-$ minikube addons configure registry-creds
-Do you want to enable AWS Elastic Container Registry? [y/n]: n
-
-Do you want to enable Google Container Registry? [y/n]: y
--- Enter path to credentials (e.g. /home/user/.config/gcloud/application_default_credentials.json):/home/user/.config/gcloud/application_default_credentials.json
-
-Do you want to enable Docker Registry? [y/n]: n
-
-Do you want to enable Azure Container Registry? [y/n]: n
-registry-creds was successfully configured
-$ minikube addons enable registry-creds
-```
-
-For additional information on private container registries, see [this page](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
-
-We recommend you use _ImagePullSecrets_, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/var/lib/kubelet` directory. Make sure to restart your kubelet (for kubeadm) process with `sudo systemctl restart kubelet`.
-
diff --git a/site/content/en/docs/Tasks/_index.md b/site/content/en/docs/Tasks/_index.md
deleted file mode 100755
index b5a2e67ad4..0000000000
--- a/site/content/en/docs/Tasks/_index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: "Core Tasks"
-linkTitle: "Core Tasks"
-weight: 4
-date: 2017-01-05
-description: >
-  What can you do with minikube?
----
-
-Each task should give the user
-
-* The prerequisites for this task, if any (this can be specified at the top of a multi-task page if they're the same for all the page's tasks. "All these tasks assume that you understand....and that you have already....").
-* What this task accomplishes.
-* Instructions for the task. If it involves editing a file, running a command, or writing code, provide code-formatted example snippets to show the user what to do! If there are multiple steps, provide them as a numbered list.
-* If appropriate, links to related concept, tutorial, or example pages.
diff --git a/site/content/en/docs/Tasks/addons.md b/site/content/en/docs/Tasks/addons.md
deleted file mode 100644
index 9cecd406bd..0000000000
--- a/site/content/en/docs/Tasks/addons.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: "Addons"
-date: 2019-07-31
-weight: 4
-description: >
-  Using addons
----
-
-minikube has a set of built-in addons that, when enabled, can be used within Kubernetes.
-
-## Available addons
-
-* [Kubernetes Dashboard](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dashboard)
-* [EFK](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/fluentd-elasticsearch)
-* [Registry](https://github.com/kubernetes/minikube/tree/master/deploy/addons/registry)
-* [Registry Credentials](https://github.com/upmc-enterprises/registry-creds)
-* [Ingress](https://github.com/kubernetes/ingress-nginx)
-* [Freshpod](https://github.com/GoogleCloudPlatform/freshpod)
-* [nvidia-driver-installer](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/nvidia-driver-installer/minikube)
-* [nvidia-gpu-device-plugin](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu)
-* [logviewer](https://github.com/ivans3/minikube-log-viewer)
-* [gvisor](../../../gvisor/readme/)
-* [storage-provisioner-gluster](../../../storage-provisioner-gluster/readme)
-* [helm-tiller](../../../helm-tiller/readme)
-* [ingress-dns](../../../ingress-dns/readme)
-* [istio](../../../istio/readme)
-
-## Listing available addons
-
-```shell
-minikube addons list
-```
-
-Example output:
-
-```
-- registry: disabled
-- registry-creds: disabled
-- freshpod: disabled
-- addon-manager: enabled
-- dashboard: enabled
-- efk: disabled
-- ingress: disabled
-- istio: disabled
-- istio-provisioner: enabled
-- default-storageclass: enabled
-- storage-provisioner: enabled
-- storage-provisioner-gluster: disabled
-- nvidia-driver-installer: disabled
-- nvidia-gpu-device-plugin: disabled
-```
-
-## Enabling an addon
-
-```shell
-minikube addons enable <name>
-```
-
-or
-
-```shell
-minikube start --addons <name>
-```
-
-## Interacting with an addon
-
-For addons that expose a browser endpoint, use:
-
-```shell
-minikube addons open <name>
-```
-
-## Disabling an addon
-
-```shell
-minikube addons disable <name>
-```
-
-## Custom Addons
-
-If you would like to have minikube properly start/restart custom addons, place the addon(s) _.yaml_ you wish to be launched with minikube in the `.minikube/addons` directory. Addons in this folder will be moved to the minikube VM and launched each time minikube is started/restarted. Learn [how to develop minikube addons]({{< ref "/docs/contributing/addons.en.md" >}}).
diff --git a/site/content/en/docs/Tasks/building.md b/site/content/en/docs/Tasks/building.md
deleted file mode 100644
index 0df3d6484c..0000000000
--- a/site/content/en/docs/Tasks/building.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: "Building images within minikube"
-date: 2019-08-05
-weight: 1
-description: >
-  Building images within minikube
----
-
-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]({{< ref "/docs/tasks/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, you can either set up your host `podman-remote` client to communicate with Podman service within minikube, by [reusing the Podman service]({{< ref "/docs/tasks/podman_service" >}}).
-
-Or you can use `minikube ssh`; 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/source/markdown/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.
diff --git a/site/content/en/docs/Tasks/caching.md b/site/content/en/docs/Tasks/caching.md
deleted file mode 100644
index 51b9d6d67b..0000000000
--- a/site/content/en/docs/Tasks/caching.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: "Caching images"
-date: 2019-08-05
-weight: 1
-description: >
-  How to cache arbitrary Docker images
----
-
-## Overview
-
-For offline use and performance reasons, minikube caches required Docker images onto the local file system. Developers may find it useful to add their own images to this cache for local development.
-
-## Adding an image
-
-To add the ubuntu 16.04 image to minikube's image cache:
-
-```shell
-minikube cache add ubuntu:16.04
-```
-
-The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the VM's container runtime environment next time `minikube start` is called.
-
-## Listing images
-
-To display images you have added to the cache:
-
-```shell
-minikube cache list
-```
-
-This listing will not include the images which are built-in to minikube.
-
-## Deleting an image
-
-```shell
-minikube cache delete <image name>
-```
-
-### Additional Information
-
-* [Reference: Disk Cache]({{< ref "/docs/reference/disk_cache.md" >}})
-* [Reference: cache command]({{< ref "/docs/reference/commands/cache.md" >}})
\ No newline at end of file
diff --git a/site/content/en/docs/Tasks/docker_daemon.md b/site/content/en/docs/Tasks/docker_daemon.md
deleted file mode 100644
index 2402099b53..0000000000
--- a/site/content/en/docs/Tasks/docker_daemon.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-title: "Using the Docker daemon"
-linkTitle: "Using the Docker daemon"
-weight: 6
-date: 2018-08-02
-description: >
-  How to access the Docker daemon within minikube
----
-
-## Prerequisites
-
-You must be using minikube with the container runtime set to Docker. This is the default setting.
-
-## Method 1: Without minikube registry addon
-
-When using a single VM of Kubernetes it's really handy to reuse the Docker daemon 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 docker daemon as minikube which speeds up local experiments.
-
-To be able to work with the docker daemon on your mac/linux host use the docker-env command in your shell:
-
-```shell
-eval $(minikube docker-env)
-```
-
-You should now be able to use docker on the command line on your host mac/linux machine talking to the docker daemon inside the minikube VM:
-
-```shell
-docker ps
-```
-
-Remember to turn off the _imagePullPolicy:Always_, as otherwise Kubernetes won't use images you built locally.
-
-### Possible errors and solutions
-
-Docker may report following forbidden error if you are using http proxy and the `$(minikube ip)` is not added to `no_proxy`/`NO_PROXY`:
-
-```
-error during connect: Get https://192.168.39.98:2376/v1.39/containers/json: Forbidden
-```
-
-On Centos 7, docker may report the following error:
-
-```
-Could not read CA certificate "/etc/docker/ca.pem": open /etc/docker/ca.pem: no such file or directory
-```
-
-The fix is to update ``/etc/sysconfig/docker`` to ensure that minikube's environment changes are respected:
-
-```diff
-< DOCKER_CERT_PATH=/etc/docker
----
-> if [ -z "${DOCKER_CERT_PATH}" ]; then
->   DOCKER_CERT_PATH=/etc/docker
-> fi
-```
-
-When you're using a docker installed via `snap` on a distribution like Ubuntu that uses AppArmor profiles the following error may appear:
-
-```
-could not read CA certificate "/home/USERNAME/.minikube/certs/ca.pem": open /home/USERNAME/.minikube/certs/ca.pem: permission denied
-```
-
-The solution is to allow docker to read the minikube certificates by adding a line in ``/var/lib/snapd/apparmor/profiles/snap.docker.docker`` file:
-
-```shell
-# allow docker to read minikube certificates
-owner @{HOME}/.minikube/certs/* r,
-```
-
-After that check for syntax errors and try again:
-
-```shell
-sudo apparmor_parser -r /var/lib/snapd/apparmor/profiles/snap.docker.docker
-eval $(minikube docker-env)
-docker ps
-```
-
-##  Related Documentation
-
--  [Using the Docker registry]({{< ref "/docs/tasks/docker_registry" >}})
diff --git a/site/content/en/docs/Tasks/docker_registry.md b/site/content/en/docs/Tasks/docker_registry.md
deleted file mode 100644
index 64afca1c00..0000000000
--- a/site/content/en/docs/Tasks/docker_registry.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "Using the Docker registry"
-linkTitle: "Using the Docker registry"
-weight: 6
-date: 2018-08-02
-description: >
-  How to access the Docker registry within minikube
----
-
-As an alternative to [reusing the Docker daemon]({{< ref "/docs/tasks/docker_daemon.md" >}}), you may enable the registry addon to push images directly into registry.
-
-Steps are as follows:
-
-For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/docs/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
-
-Ensure that docker is configured to use `192.168.39.0/24` as insecure registry. Refer [here](https://docs.docker.com/registry/insecure/) for instructions.
-
-Ensure that `192.168.39.0/24` is enabled as insecure registry in minikube. Refer [here](https://minikube.sigs.k8s.io/docs/tasks/registry/insecure/) for instructions..
-
-Enable minikube registry addon:
-
-```shell
-minikube addons enable registry
-```
-
-Build docker image and tag it appropriately:
-
-```shell
-docker build --tag $(minikube ip):5000/test-img .
-```
-
-Push docker image to minikube registry:
-
-```shell
-docker push $(minikube ip):5000/test-img
-```
-
-Now run it in minikube:
-
-```shell
-kubectl run test-img --image=$(minikube ip):5000/test-img
-```
-
-Or if `192.168.39.0/24` is not enabled as insecure registry in minikube, then:
-
-```shell
-kubectl run test-img --image=localhost:5000/test-img
-```
diff --git a/site/content/en/docs/Tasks/nodeport.md b/site/content/en/docs/Tasks/nodeport.md
deleted file mode 100644
index 5e73db4cad..0000000000
--- a/site/content/en/docs/Tasks/nodeport.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: "NodePort access"
-linkTitle: "NodePort access"
-weight: 6
-date: 2018-08-02
-description: >
-  How to access a NodePort service in minikube
----
-
-A NodePort service is the most basic way to get external traffic directly to your service. NodePort, as the name implies, opens a specific port, and any traffic that is sent to this port is forwarded to the service.
-
-### Getting the NodePort using the service command
-
-We also have a shortcut for fetching the minikube IP and a service's `NodePort`:
-
-`minikube service --url $SERVICE`
-
-## Getting the NodePort using kubectl
-
-The minikube VM is exposed to the host system via a host-only IP address, that can be obtained with the `minikube ip` command. Any services of type `NodePort` can be accessed over that IP address, on the NodePort.
-
-To determine the NodePort for your service, you can use a `kubectl` command like this (note that `nodePort` begins with lowercase `n` in JSON output):
-
-`kubectl get service $SERVICE --output='jsonpath="{.spec.ports[0].nodePort}"'`
-
-### Increasing the NodePort range
-
-By default, minikube only exposes ports 30000-32767. If this does not work for you, you can adjust the range by using:
-
-`minikube start --extra-config=apiserver.service-node-port-range=1-65535`
-
-This flag also accepts a comma separated list of ports and port ranges.
-
diff --git a/site/content/en/docs/Tasks/podman_service.md b/site/content/en/docs/Tasks/podman_service.md
deleted file mode 100644
index 778388ac60..0000000000
--- a/site/content/en/docs/Tasks/podman_service.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: "Using the Podman service"
-linkTitle: "Using the Podman service"
-weight: 6
-date: 2020-01-20
-description: >
-  How to access the Podman service within minikube
----
-
-## Prerequisites
-
-You should be using minikube with the container runtime set to CRI-O. It uses the same storage as Podman.
-
-## Method 1: Without minikube registry addon
-
-When using a single VM of Kubernetes it's really handy to reuse the Podman service inside the VM; as this means you don't have to build on your host machine and push the image into a container registry - you can just build inside the same container storage as minikube which speeds up local experiments.
-
-To be able to work with the podman client on your mac/linux host use the podman-env command in your shell:
-
-```shell
-eval $(minikube podman-env)
-```
-
-You should now be able to use podman on the command line on your host mac/linux machine talking to the podman service inside the minikube VM:
-
-```shell
-podman-remote help
-```
-
-Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
-
-### Example
-
-```shell
-$ cat Containerfile 
-FROM busybox
-CMD exec /bin/sh -c "trap : TERM INT; (while true; do sleep 1000; done) & wait"
-$ eval $(minikube podman-env)
-$ podman-remote build -t example.com/test:v1 .
-STEP 1: FROM busybox
-STEP 2: CMD exec /bin/sh -c "trap : TERM INT; (while true; do sleep 1000; done) & wait"
-STEP 3: COMMIT example.com/test:v1
-2881381f7b9675ea5a0e635605bc0c4c08857582990bcadf0685b9f8976de2d3
-$ minikube ssh -- sudo crictl images example.com/test:v1
-IMAGE               TAG                 IMAGE ID            SIZE
-example.com/test    v1                  2881381f7b967       1.44MB
-$ kubectl run test --image example.com/test:v1 --image-pull-policy=IfNotPresent
-kubectl run --generator=deployment/apps.v1 is DEPRECATED and will be removed in a future version. Use kubectl run --generator=run-pod/v1 or kubectl create instead.
-deployment.apps/test created
-$ kubectl get pods
-NAME                   READY   STATUS    RESTARTS   AGE
-test-d98bdbfdd-lwnqz   1/1     Running   0          18s
-
-```
-
-##  Related Documentation
-
-- [Using the Docker registry]({{< ref "/docs/tasks/docker_registry" >}})
diff --git a/site/content/en/docs/Tutorials/_index.md b/site/content/en/docs/Tutorials/_index.md
index 60e07fef45..9bd77be263 100755
--- a/site/content/en/docs/Tutorials/_index.md
+++ b/site/content/en/docs/Tutorials/_index.md
@@ -1,7 +1,6 @@
 ---
 title: "Tutorials"
-linkTitle: "Tutorials"
-weight: 4
+weight: 9
 date: 2017-01-04
 description: >
   Contributed end-to-end tutorials using minikube
diff --git a/site/content/en/docs/Tutorials/audit-policy.md b/site/content/en/docs/Tutorials/audit-policy.md
index 56cf6428d2..fee350cb8e 100644
--- a/site/content/en/docs/Tutorials/audit-policy.md
+++ b/site/content/en/docs/Tutorials/audit-policy.md
@@ -9,8 +9,8 @@ description: >
 
 ## Overview
 
-[Auditing](https://kubernetes.io/docs/tasks/debug-application-cluster/audit/) is not enabled in minikube by default.
-This tutorial shows how to provide an [Audit Policy](https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy) file to the minikube API server on startup.
+[Auditing](https://kubernetes.io/docs/Handbook/debug-application-cluster/audit/) is not enabled in minikube by default.
+This tutorial shows how to provide an [Audit Policy](https://kubernetes.io/docs/Handbook/debug-application-cluster/audit/#audit-policy) file to the minikube API server on startup.
 
 ## Tutorial
 
@@ -34,6 +34,6 @@ minikube start \
 kubectl logs kube-apiserver-minikube -n  kube-system | grep audit.k8s.io/v1
 ```
 
-The [Audit Policy](https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy) used in this tutorial is very minimal and quite verbose. As a next step you might want to finetune the `audit-policy.yaml` file. To get the changes applied you need to stop and start minikube. Restarting minikube triggers the [file sync mechanism](https://minikube.sigs.k8s.io/docs/tasks/sync/) that copies the yaml file onto the minikube node and causes the API server to read the changed policy file.
+The [Audit Policy](https://kubernetes.io/docs/Handbook/debug-application-cluster/audit/#audit-policy) used in this tutorial is very minimal and quite verbose. As a next step you might want to finetune the `audit-policy.yaml` file. To get the changes applied you need to stop and start minikube. Restarting minikube triggers the [file sync mechanism](https://minikube.sigs.k8s.io/docs/Handbook/sync/) that copies the yaml file onto the minikube node and causes the API server to read the changed policy file.
 
-Note: Currently there is no dedicated directory to store the `audit-policy.yaml` file in `~/.minikube/`. Using the `~/.minikube/files/etc/ssl/certs` directory is a workaround! This workaround works like this: By putting the file into a sub-directory of `~/.minikube/files/`, the [file sync mechanism](https://minikube.sigs.k8s.io/docs/tasks/sync/) gets triggered and copies the `audit-policy.yaml` file from the host onto the minikube node. When the API server container gets started by `kubeadm` I'll mount the `/etc/ssl/certs` directory from the minikube node into the container. This is the reason why the `audit-policy.yaml` file has to be stored in the ssl certs directory: It's one of the directories that get mounted from the minikube node into the container.
+Note: Currently there is no dedicated directory to store the `audit-policy.yaml` file in `~/.minikube/`. Using the `~/.minikube/files/etc/ssl/certs` directory is a workaround! This workaround works like this: By putting the file into a sub-directory of `~/.minikube/files/`, the [file sync mechanism](https://minikube.sigs.k8s.io/docs/Handbook/sync/) gets triggered and copies the `audit-policy.yaml` file from the host onto the minikube node. When the API server container gets started by `kubeadm` I'll mount the `/etc/ssl/certs` directory from the minikube node into the container. This is the reason why the `audit-policy.yaml` file has to be stored in the ssl certs directory: It's one of the directories that get mounted from the minikube node into the container.
diff --git a/site/content/en/docs/Tutorials/continuous_integration.md b/site/content/en/docs/Tutorials/continuous_integration.md
index 1a55a58150..f8392a4c0c 100644
--- a/site/content/en/docs/Tutorials/continuous_integration.md
+++ b/site/content/en/docs/Tutorials/continuous_integration.md
@@ -9,7 +9,7 @@ description: >
 
 ## Overview
 
-Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. or you could alternatively use the [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker).
+Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. or you could alternatively use the [Docker](https://minikube.sigs.k8s.io/docs/Drivers/docker).
 
 ## Prerequisites
 
@@ -42,4 +42,4 @@ sudo -E minikube start --driver=none
 
 ##  Alternative ways
 
-you could alternatively use minikube's container drivers such as [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker) or [Podman](https://minikube.sigs.k8s.io/docs/reference/drivers/podman).
\ No newline at end of file
+you could alternatively use minikube's container drivers such as [Docker](https://minikube.sigs.k8s.io/docs/Drivers/docker) or [Podman](https://minikube.sigs.k8s.io/docs/Drivers/podman).
\ No newline at end of file
diff --git a/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md b/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
index 596ddf1f3d..bb05c52652 100644
--- a/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
+++ b/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
@@ -18,7 +18,7 @@ is only configured to listen on ports 80 and 443. TCP and UDP services listening
 
 - Latest minikube binary and ISO
 - Telnet command line tool
-- [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) command line tool
+- [Kubectl](https://kubernetes.io/docs/Handbook/tools/install-kubectl) command line tool
 - A text editor
 
 ## Configuring TCP and UDP services with the nginx ingress controller
@@ -228,6 +228,6 @@ for the latest info on these potential changes.
 
 ## Related articles
 
-- [Routing traffic multiple services on ports 80 and 443 in minikube with the Kubernetes Ingress resource](https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/)
-- [Use port forwarding to access applications in a cluster](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)
+- [Routing traffic multiple services on ports 80 and 443 in minikube with the Kubernetes Ingress resource](https://kubernetes.io/docs/Handbook/access-application-cluster/ingress-minikube/)
+- [Use port forwarding to access applications in a cluster](https://kubernetes.io/docs/Handbook/access-application-cluster/port-forward-access-application-cluster/)
 
diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md
index f285e090f8..4cfbecadf9 100755
--- a/site/content/en/docs/_index.md
+++ b/site/content/en/docs/_index.md
@@ -1,11 +1,54 @@
-
 ---
-title: "Documentation"
+title: "Welcome!"
 linkTitle: "Documentation"
-weight: 20
+weight: 1
 menu:
   main:
-    weight: 20
+    weight: 1
+description: >
+  What is minikube?
+no_list: true
 ---
-This section is where the user documentation for minikube lives - all the information that users need to understand and successfully use minikube.
 
+minikube implements a local Kubernetes cluster on macOS, Linux, and Windows.
+
+minikube's [primary goals](https://minikube.sigs.k8s.io/docs/concepts/principles/) are to be the best tool for local Kubernetes application development and to support all Kubernetes features that fit.
+
+minikube runs the latest stable release of Kubernetes, with support for standard Kubernetes features like:
+
+* [LoadBalancer](https://minikube.sigs.k8s.io/docs/Handbook/loadbalancer/) - using `minikube tunnel`
+* Multi-cluster - using `minikube start -p <name>`
+* NodePorts - using `minikube service`
+* [Persistent Volumes](https://minikube.sigs.k8s.io/docs/reference/persistent_volumes/)
+* Ingress
+* RBAC
+* [Dashboard](https://minikube.sigs.k8s.io/docs/Handbook/dashboard/) - `minikube dashboard`
+* [Container runtimes](https://minikube.sigs.k8s.io/docs/reference/runtimes/) - `start --container-runtime`
+* [Configure apiserver and kubelet options](https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/) via command-line flags
+
+As well as developer-friendly features:
+
+* [Addons](https://minikube.sigs.k8s.io/docs/Handbook/addons/) - a marketplace for developers to share configurations for running services on minikube
+* [GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/) - for machine learning
+* [Filesystem mounts](https://minikube.sigs.k8s.io/docs/Handbook/mount/)
+* Automatic failure analysis
+
+## Why do I want it?
+
+If you would like to develop Kubernetes applications:
+
+* locally
+* offline
+* using the latest version of Kubernetes
+
+Then minikube is for you.
+
+* **What is it good for?** Developing local Kubernetes applications
+* **What is it not good for?** Production Kubernetes deployments
+
+## Where should I go next?
+
+* [Getting Started](/docs/start/): Get started with minikube
+* [Examples](/docs/examples/): Check out some minikube examples!
+
+📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉

From fe49cab611cd177e744fadc77f47e2f2330e3f26 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 30 Mar 2020 22:00:48 -0700
Subject: [PATCH 359/668] More barrels of fun

---
 site/content/en/docs/Commands/_index.md       |  2 +-
 site/content/en/docs/FAQ/_index.md            | 11 +++
 site/content/en/docs/FAQ/sudo_prompts.md      | 20 ------
 site/content/en/docs/Handbook/config.md       |  2 +-
 site/content/en/docs/Handbook/controls.md     |  1 -
 site/content/en/docs/Handbook/dashboard.md    |  2 +-
 site/content/en/docs/Handbook/deploying.md    |  1 -
 site/content/en/docs/Handbook/filesync.md     |  4 +-
 ...ssing-host-resources.md => host-access.md} |  2 +-
 site/content/en/docs/Handbook/mount.md        |  1 +
 .../en/docs/Handbook/persistent_volumes.md    |  2 +-
 site/content/en/docs/Handbook/pushing.md      |  3 +-
 .../en/docs/Handbook/uninstalling_minikube.md | 69 ++++++-------------
 .../en/docs/Handbook/untrusted_certs.md       | 35 ++++++++++
 .../docs/Tutorials/continuous_integration.md  | 33 +++------
 .../docs/Tutorials/nginx_tcp_udp_ingress.md   |  4 +-
 .../Tutorials/untrusted_root_certificate.md   | 42 -----------
 17 files changed, 86 insertions(+), 148 deletions(-)
 delete mode 100644 site/content/en/docs/FAQ/sudo_prompts.md
 rename site/content/en/docs/Handbook/{accessing-host-resources.md => host-access.md} (98%)
 create mode 100644 site/content/en/docs/Handbook/untrusted_certs.md
 delete mode 100644 site/content/en/docs/Tutorials/untrusted_root_certificate.md

diff --git a/site/content/en/docs/Commands/_index.md b/site/content/en/docs/Commands/_index.md
index 889734bd1f..a2accbac1b 100644
--- a/site/content/en/docs/Commands/_index.md
+++ b/site/content/en/docs/Commands/_index.md
@@ -1,7 +1,7 @@
 ---
 title: "Commands"
 linkTitle: "Commands"
-weight: 1
+weight: 2
 date: 2019-08-01
 description: >
   minikube command reference
diff --git a/site/content/en/docs/FAQ/_index.md b/site/content/en/docs/FAQ/_index.md
index 4c22c42c78..94c90fcc46 100644
--- a/site/content/en/docs/FAQ/_index.md
+++ b/site/content/en/docs/FAQ/_index.md
@@ -6,3 +6,14 @@ description: >
   Questions that come up regularly
 ---
 
+## Operating-systems
+
+## Linux
+
+### Preventing password prompts
+
+The easiest approach is to use the `docker` driver, as the backend service always runs as `root`.
+
+`none` users may want to try `CHANGE_MINIKUBE_NONE_USER=true`,  where kubectl and such will still work: [see environment variables](https://minikube.sigs.k8s.io/docs/reference/environment_variables/)
+
+Alternatively, configure `sudo` to never prompt for the commands issued by minikube.
diff --git a/site/content/en/docs/FAQ/sudo_prompts.md b/site/content/en/docs/FAQ/sudo_prompts.md
deleted file mode 100644
index a78b9d141d..0000000000
--- a/site/content/en/docs/FAQ/sudo_prompts.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: "Sudo prompts"
-linkTitle: "Sudo prompts"
-weight: 1
-date: 2020-03-26
-description: >
-  Disabling sudo prompts when using minikude start/stop/status, kubectl cluster-info, ... 
----
-
-## Use the `docker` driver
-
-Use the `docker` driver rather than the `none` driver. `docker` driver should be used unless it does not meet requirements for some reason.
-
-## For `none` users
-
-For `none` users, `CHANGE_MINIKUBE_NONE_USER=true`, kubectl and such will still work: [see environment variables](https://minikube.sigs.k8s.io/docs/reference/environment_variables/)
-
-## Otherwise deal with `sudo`
-
-Configure `sudo` to never prompt for the commands issued by minikube.
diff --git a/site/content/en/docs/Handbook/config.md b/site/content/en/docs/Handbook/config.md
index 78b18a5dde..9c99762c53 100644
--- a/site/content/en/docs/Handbook/config.md
+++ b/site/content/en/docs/Handbook/config.md
@@ -1,5 +1,5 @@
 ---
-title: "Configuration & Tuning"
+title: "Configuration"
 weight: 4
 description: >
   Configuring your cluster 
diff --git a/site/content/en/docs/Handbook/controls.md b/site/content/en/docs/Handbook/controls.md
index c8a21a302c..638926dd74 100755
--- a/site/content/en/docs/Handbook/controls.md
+++ b/site/content/en/docs/Handbook/controls.md
@@ -1,7 +1,6 @@
 
 ---
 title: "Basic controls"
-linkTitle: "Basic controls"
 weight: 1
 description: >
   See minikube in action!
diff --git a/site/content/en/docs/Handbook/dashboard.md b/site/content/en/docs/Handbook/dashboard.md
index 2f8aae6c13..7252f2d8e5 100644
--- a/site/content/en/docs/Handbook/dashboard.md
+++ b/site/content/en/docs/Handbook/dashboard.md
@@ -1,6 +1,6 @@
 ---
 title: "Dashboard"
-weight: 3
+weight: 4
 description: >
   Dashboard
 ---
diff --git a/site/content/en/docs/Handbook/deploying.md b/site/content/en/docs/Handbook/deploying.md
index a0a9bebc4f..d96b30cb87 100644
--- a/site/content/en/docs/Handbook/deploying.md
+++ b/site/content/en/docs/Handbook/deploying.md
@@ -1,6 +1,5 @@
 ---
 title: "Deploying apps"
-linkTitle: "Deploying apps"
 weight: 2
 description: >
   How to deploy an application to minikube
diff --git a/site/content/en/docs/Handbook/filesync.md b/site/content/en/docs/Handbook/filesync.md
index c7f415c2d5..e88ad0c66c 100644
--- a/site/content/en/docs/Handbook/filesync.md
+++ b/site/content/en/docs/Handbook/filesync.md
@@ -1,8 +1,6 @@
 ---
 title: "File Sync"
-linkTitle: "File Sync"
-weight: 15
-date: 2019-08-01
+weight: 12
 description: >
   How to sync files into minikube
 ---
diff --git a/site/content/en/docs/Handbook/accessing-host-resources.md b/site/content/en/docs/Handbook/host-access.md
similarity index 98%
rename from site/content/en/docs/Handbook/accessing-host-resources.md
rename to site/content/en/docs/Handbook/host-access.md
index 048fd69dc9..596477a1ee 100644
--- a/site/content/en/docs/Handbook/accessing-host-resources.md
+++ b/site/content/en/docs/Handbook/host-access.md
@@ -1,7 +1,7 @@
 ---
 title: "Host access"
 date: 2017-01-05
-weight: 10
+weight: 9
 description: >
   How to access host resources from a pod
 ---
diff --git a/site/content/en/docs/Handbook/mount.md b/site/content/en/docs/Handbook/mount.md
index a145aef97d..c4000894b0 100644
--- a/site/content/en/docs/Handbook/mount.md
+++ b/site/content/en/docs/Handbook/mount.md
@@ -1,6 +1,7 @@
 ---
 title: "Mounting filesystems"
 date: 2017-01-05
+weight: 11
 description: >
   How to mount a host directory into the VM
 ---
diff --git a/site/content/en/docs/Handbook/persistent_volumes.md b/site/content/en/docs/Handbook/persistent_volumes.md
index 6c483a5c41..0da5465b7b 100644
--- a/site/content/en/docs/Handbook/persistent_volumes.md
+++ b/site/content/en/docs/Handbook/persistent_volumes.md
@@ -1,7 +1,7 @@
 ---
 title: "Persistent Volumes"
 linkTitle: "Persistent Volumes"
-weight: 12
+weight: 10
 date: 2019-08-01
 description: >
   About persistent volumes (hostPath)
diff --git a/site/content/en/docs/Handbook/pushing.md b/site/content/en/docs/Handbook/pushing.md
index c695ae670d..f8cbb5e75f 100644
--- a/site/content/en/docs/Handbook/pushing.md
+++ b/site/content/en/docs/Handbook/pushing.md
@@ -1,7 +1,6 @@
 ---
 title: "Pushing images"
-date: 2019-08-05
-weight: 4
+weight: 5
 description: >
   There are many ways to push images into minikube.
 ---
diff --git a/site/content/en/docs/Handbook/uninstalling_minikube.md b/site/content/en/docs/Handbook/uninstalling_minikube.md
index 7971e5ec98..b01809f513 100644
--- a/site/content/en/docs/Handbook/uninstalling_minikube.md
+++ b/site/content/en/docs/Handbook/uninstalling_minikube.md
@@ -1,72 +1,45 @@
 ---
-title: "Uninstall minikube"
-linkTitle: "Uninstall minikube"
-weight: 6
+title: "Uninstall"
+linkTitle: "Uninstall"
+weight: 99
+draft: true 
 date: 2019-08-18
 description: >
-  Reference on uninstalling minikube from your system completely.
+  Reference on uninstalling minikube
 ---
 
-# Uninstall minikube on Windows
-Following are the ways you can install minikube on Windows. Depending on how you installed minikube, please follow the guide appropriately.
+NOTE: To be moved to the FAQ
 
 ## Chocolatey
-If you have installed minikube using Chocolatey package manager, follow the below steps to completely uninstall minikube from your system -
+
 - Open a command prompt with Administrator privileges.
-- We need to delete the cluster which was created by minikube - `minikube delete`
+- Run `minikube delete --purge --all`
 - Run, `choco uninstall minikube` to remove the minikube package from your system.
-- Now, navigate to your User Folder - `C:\Users\YOUR_USER_NAME` (You can also find the path by expanding the environment variable `%USERPROFILE%`)
-- In this folder, delete the `.minikube` folder.
 
 ## Windows Installer
-If you have downloaded and installed minikube using the Windows Installer provided in our Releases, kindly follow the below steps -
+
 - Open a command prompt with Administrator privileges.
-- We need to delete the cluster which was created by minikube - `minikube delete`
-- Now, open the Run dialog box (**Win+R**), type in `appwiz.cpl` and hit **Enter** key.
+- Run `minikube delete --purge --all`
+- Open the Run dialog box (**Win+R**), type in `appwiz.cpl` and hit **Enter** key.
 - In there, find an entry for the Minikube installer, right click on it & click on **Uninstall**.
-- Follow the onscreen prompts to uninstall minikube from your system.
-- Now, navigate to your User Folder - `C:\Users\YOUR_USER_NAME` (You can also find the path by expanding the environment variable `%USERPROFILE%`)
-- In this folder, delete the `.minikube` folder.
 
 ## Binary/Direct
-If you have downloaded just the binary and are using it to run minikube, please follow the below steps -
+
 - Open a command prompt with Administrator privileges.
-- We need to delete the cluster which was created by minikube - `minikube delete`
+- Run `minikube delete --purge --all`
 - Delete the minikube binary.
-- Now, navigate to your User Folder - `C:\Users\YOUR_USER_NAME` (You can also find the path by expanding the environment variable `%USERPROFILE%`)
-- In this folder, delete the `.minikube` folder.
-
-
-# Uninstall minikube on Linux
-## Binary/Direct
-If you have installed minikube using the direct download method, follow the below steps to uninstall minikube completely from your system -
-- In the shell, type in `minikube delete` to delete the minikube cluster.
-- Remove the binary using `rm /usr/local/bin/minikube`
-- Remove the directory containing the minikube configuration `rm -rf ~/.minikube`
 
 ## Debian/Ubuntu (Deb)
-If you have installed minikube using the (deb) file, follow the below instructions -
-- In the shell, type in `minikube delete` to delete the minikube cluster.
-- Uninstall the minikube package completely - `sudo dpkg -P minikube`
-- Remove the minikube configuration directory - `rm -rf ~/.minikube`
+
+- Run `minikube delete --purge --all`
+- Run `sudo dpkg -P minikube`
 
 ## Fedora/Red Hat (RPM)
-If you have installed minikube using RPM, follow the below steps -
-- In the shell, type in `minikube delete` to delete the minikube cluster.
-- Uninstall the minikube package - `sudo rpm -e minikube`
-- Remove the minikube configuration directory - `rm -rf ~/.minikube`
-
-
-# Uninstall minikube on MacOS
-## Binary/Direct
-If you have installed minikube using the direct download method, follow the below steps to uninstall minikube completely from your system -
-- In the shell, type in `minikube delete` to delete the minikube cluster.
-- Remove the binary using `rm /usr/local/bin/minikube`
-- Remove the directory containing the minikube configuration `rm -rf ~/.minikube`
 
+- Run `minikube delete --purge --all`
+- Run  `sudo rpm -e minikube`
 
 ## Brew
-If you have installed minikube using the direct download method, follow the below steps to uninstall minikube completely from your system -
-- In the shell, type in `minikube delete` to delete the minikube cluster.
-- Uninstall the minikube package using `brew uninstall minikube`
-- Remove the directory containing the minikube configuration `rm -rf ~/.minikube`
+
+- Run `minikube delete --purge --all`
+- Run `brew uninstall minikube`
diff --git a/site/content/en/docs/Handbook/untrusted_certs.md b/site/content/en/docs/Handbook/untrusted_certs.md
new file mode 100644
index 0000000000..049f9075d7
--- /dev/null
+++ b/site/content/en/docs/Handbook/untrusted_certs.md
@@ -0,0 +1,35 @@
+---
+title: "Certificates"
+weight: 7
+date: 2019-08-15
+description: >
+  All about TLS certificates
+---
+
+## Untrusted Root Certificates
+
+Many organizations deploy their own Root Certificate and CA service inside the corporate networks.
+Internal websites, image repositories and other resources may install SSL server certificates issued by this CA service for security and privacy concerns. 
+
+You may install the Root Certificate into the minikube cluster to access these corporate resources within the cluster.
+
+### Tutorial
+
+You will need a corporate X.509 Root Certificate in PEM format. If it's in DER format, convert it:
+
+```
+openssl x509 -inform der -in my_company.cer -out my_company.pem
+```
+
+Copy the certificate into the certs directory:
+
+```shell
+mkdir -p $HOME/.minikube/certs
+cp my_company.pem $HOME/.minikube/certs/my_company.pem
+```
+
+Then restart minikube to sync the certificates:
+
+```shell
+minikube start
+```
diff --git a/site/content/en/docs/Tutorials/continuous_integration.md b/site/content/en/docs/Tutorials/continuous_integration.md
index f8392a4c0c..c4ced226c3 100644
--- a/site/content/en/docs/Tutorials/continuous_integration.md
+++ b/site/content/en/docs/Tutorials/continuous_integration.md
@@ -1,45 +1,30 @@
 ---
 title: "Continuous Integration"
-linkTitle: "Continuous Integration"
 weight: 1
-date: 2018-01-02
 description: >
   Using minikube for Continuous Integration
 ---
 
 ## Overview
 
-Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. or you could alternatively use the [Docker](https://minikube.sigs.k8s.io/docs/Drivers/docker).
+Most continuous integration environments are already running inside a VM, and may not support nested virtualization.
 
-## Prerequisites
+The `docker` driver was designed for this use case, as well as the older `none` driver.
 
-- VM running a systemd based Linux distribution
-
-## using none driver
+## Example
 
  Here is an example, that runs minikube from a non-root user, and ensures that the latest stable kubectl is installed:
 
 ```shell
-curl -Lo minikube \
+curl -LO \
   https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
-  && sudo install minikube /usr/local/bin/
-
+  && install minikube-linux-amd64 /tmp/
+  
 kv=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
-curl -Lo kubectl \
+curl -LO \
   https://storage.googleapis.com/kubernetes-release/release/$kv/bin/linux/amd64/kubectl \
-  && sudo install kubectl /usr/local/bin/
+  && install kubectl /tmp/
 
 export MINIKUBE_WANTUPDATENOTIFICATION=false
-export MINIKUBE_HOME=$HOME
-export CHANGE_MINIKUBE_NONE_USER=true
-export KUBECONFIG=$HOME/.kube/config
-
-mkdir -p $HOME/.kube $HOME/.minikube
-touch $KUBECONFIG
-
-sudo -E minikube start --driver=none
+/tmp/minikube-linux-amd64 start --driver=docker
 ```
-
-##  Alternative ways
-
-you could alternatively use minikube's container drivers such as [Docker](https://minikube.sigs.k8s.io/docs/Drivers/docker) or [Podman](https://minikube.sigs.k8s.io/docs/Drivers/podman).
\ No newline at end of file
diff --git a/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md b/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
index bb05c52652..97eabbbabe 100644
--- a/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
+++ b/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
@@ -23,9 +23,9 @@ is only configured to listen on ports 80 and 443. TCP and UDP services listening
 
 ## Configuring TCP and UDP services with the nginx ingress controller
 
-### Enable the ingress addon 
+### Enable the ingress addon
 
-Enable the minikube ingress addon with the following command: 
+Enable the minikube ingress addon with the following command:
 
 ```shell
 minikube addons enable ingress
diff --git a/site/content/en/docs/Tutorials/untrusted_root_certificate.md b/site/content/en/docs/Tutorials/untrusted_root_certificate.md
deleted file mode 100644
index d1b857aa73..0000000000
--- a/site/content/en/docs/Tutorials/untrusted_root_certificate.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: "Untrusted Root Certificate"
-linkTitle: "Untrusted Root Certificate"
-weight: 1
-date: 2019-08-15
-description: >
-  Using minikube with Untrusted Root Certificate
----
-
-## Overview
-
-Most organizations deploy their own Root Certificate and CA service inside the corporate networks.
-Internal websites, image repositories and other resources may install SSL server certificates issued by this CA service for security and privacy concerns.
-You may install the Root Certificate into the minikube cluster to access these corporate resources within the cluster.
-
-## Prerequisites
-
-- Corporate X.509 Root Certificate
-- Latest minikube binary and ISO
-
-## Tutorial
-
-* The certificate must be in PEM format. You may use `openssl` to convert from DER format.
-
-```
-openssl x509 -inform der -in my_company.cer -out my_company.pem
-```
-
-* You may need to delete existing minikube cluster
-
-```shell
-minikube delete
-```
-
-* Copy the certificate before creating the minikube cluster
-
-```shell
-mkdir -p $HOME/.minikube/certs
-cp my_company.pem $HOME/.minikube/certs/my_company.pem
-
-minikube start
-```

From 15042650203bb3dce7fc36c3917a71606a0627fb Mon Sep 17 00:00:00 2001
From: anencore94 <anencore94@kaist.ac.kr>
Date: Tue, 31 Mar 2020 17:15:21 +0900
Subject: [PATCH 360/668] Update Korean translation

Signed-off-by: anencore94 <anencore94@kaist.ac.kr>
---
 translations/ko.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/translations/ko.json b/translations/ko.json
index 9fdde65376..18a0bb7b99 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -64,10 +64,10 @@
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "",
-	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
+	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "{{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) 에 쿠버네티스를 설치하는 중 ...",
 	"Creating mount {{.name}} ...": "",
 	"Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "{{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) 를 생성하는 중 ...",
-	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
+	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "{{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) 를 생성하는 중 ...",
 	"DEPRECATED, use `driver` instead.": "DEPRECATED 되었습니다, 'driver' 를 사용하세요",
 	"Default group id used for the mount": "마운트를 위한 디폴트 group id",
 	"Default user id used for the mount": "마운트를 위한 디폴트 user id",
@@ -260,8 +260,8 @@
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
 	"Message Size: {{.size}}": "",
-	"Minikube is a CLI tool that provisions and manages single-node Kubernetes clusters optimized for development workflows.": "",
-	"Minikube is a tool for managing local Kubernetes clusters.": "",
+	"Minikube is a CLI tool that provisions and manages single-node Kubernetes clusters optimized for development workflows.": "Minikube 는 개발용으로 최적화된 싱글 노드 쿠버네티스 클러스터 제공 및 관리 CLI 툴입니다",
+	"Minikube is a tool for managing local Kubernetes clusters.": "Minikube 는 로컬 쿠버네티스 클러스터 관리 툴입니다",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
 	"Mount type:   {{.name}}": "",
@@ -309,7 +309,7 @@
 	"Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e   (example: \"/host-home:/vm-home\")": "",
 	"Populates the specified folder with documentation in markdown about minikube": "",
 	"Powering off \"{{.profile_name}}\" via SSH ...": "",
-	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "",
+	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "쿠버네티스 {{.k8sVersion}} 을 {{.runtime}} {{.runtimeVersion}} 런타임으로 설치하는 중",
 	"Print current and latest version number": "현재 그리고 최신 버전을 출력합니다",
 	"Print the version of minikube": "minikube 의 버전을 출력합니다",
 	"Print the version of minikube.": "minikube 의 버전을 출력합니다.",
@@ -326,7 +326,7 @@
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
 	"Related issues:": "",
-	"Removed all traces of the \"{{.name}}\" cluster.": "",
+	"Removed all traces of the \"{{.name}}\" cluster.": "\"{{.name}}\" 클러스터 관련 정보가 모두 삭제되었습니다",
 	"Removing {{.directory}} ...": "",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
@@ -519,7 +519,7 @@
 	"Usage: minikube node stop [name]": "",
 	"Use \"{{.CommandPath}} [command] --help\" for more information about a command.": "",
 	"Use 'kubect get po -A' to find the correct and namespace name": "",
-	"Use -A to specify all namespaces": "",
+	"Use -A to specify all namespaces": "모든 namespace 를 확인하려면 -A 를 사용하세요",
 	"Use VirtualBox to remove the conflicting VM and/or network interfaces": "",
 	"Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.": "",
 	"User ID:      {{.userID}}": "",
@@ -527,8 +527,8 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the {{.driver}} driver based on existing profile": "",
-	"Using the {{.driver}} driver based on user configuration": "",
+	"Using the {{.driver}} driver based on existing profile": "기존 프로필에 기반하여 {{.driver}} 드라이버를 사용하는 중",
+	"Using the {{.driver}} driver based on user configuration": "유저 환경 설정 정보에 기반하여 {{.driver}} 드라이버를 사용하는 중",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
@@ -548,7 +548,7 @@
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "",
 	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "",
-	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "맞는 버전의 kubectl 을 사용하기 위해서는 다음과 같이 사용 가능합니다. minikube kubectl -- get pods'",
 	"You can delete them using the following command(s):": "다음 커맨드(들)을 사용하여 제거할 수 있습니다",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
@@ -603,7 +603,7 @@
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
-	"minikube {{.version}} is available! Download it: {{.url}}": "",
+	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} 이 사용가능합니다! 다음 경로에서 다운받으세요: {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
 	"mount failed": "",
@@ -642,7 +642,7 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
-	"zsh completion failed": "",
+	"zsh completion failed": "zsh 완성이 실패하였습니다",
 	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
 	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
@@ -653,8 +653,8 @@
 	"{{.name}} has no available configuration options": "{{.driver}} 이 사용 가능한 환경 정보 옵션이 없습니다",
 	"{{.name}} is already running": "{{.driver}} 이 이미 실행 중입니다",
 	"{{.name}} was successfully configured": "{{.driver}} 이 성공적으로 설정되었습니다",
-	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
-	"{{.prefix}}minikube {{.version}} on {{.platform}}": "",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "{{.path}} 의 버전은 v{{.client_version}} 이므로, 쿠버네티스 버전 v{{.cluster_version}} 과 호환되지 않을 수 있습니다",
+	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}{{.platform}} 위의 minikube {{.version}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": "{{.url}} 이 접근 불가능합니다: {{.error}}"
 }
\ No newline at end of file

From d8db21478c81892d75d3598c7e0c924d5084036e Mon Sep 17 00:00:00 2001
From: Dan Lorenc <lorenc.d@gmail.com>
Date: Tue, 31 Mar 2020 10:37:04 -0500
Subject: [PATCH 361/668] Remove unused code.

I was looking for an example of reflect and noticed that this code was unused.
---
 pkg/util/config.go      | 189 --------------------------------------
 pkg/util/config_test.go | 197 ----------------------------------------
 2 files changed, 386 deletions(-)
 delete mode 100644 pkg/util/config.go
 delete mode 100644 pkg/util/config_test.go

diff --git a/pkg/util/config.go b/pkg/util/config.go
deleted file mode 100644
index 6d043e1e61..0000000000
--- a/pkg/util/config.go
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"fmt"
-	"net"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-)
-
-// findNestedElement uses reflection to find the element corresponding to the dot-separated string parameter.
-func findNestedElement(s string, c interface{}) (reflect.Value, error) {
-	fields := strings.Split(s, ".")
-
-	// Take the ValueOf to get a pointer, so we can actually mutate the element.
-	e := reflect.Indirect(reflect.ValueOf(c).Elem())
-
-	for _, field := range fields {
-		e = reflect.Indirect(e.FieldByName(field))
-
-		// FieldByName returns the zero value if the field does not exist.
-		if e == (reflect.Value{}) {
-			return e, fmt.Errorf("unable to find field by name: %s", field)
-		}
-		// Start the loop again, on the next level.
-	}
-	return e, nil
-}
-
-// setElement sets the supplied element to the value in the supplied string. The string will be coerced to the correct type.
-func setElement(e reflect.Value, v string) error {
-	switch e.Interface().(type) {
-	case int, int32, int64:
-		return convertInt(e, v)
-	case string:
-		return convertString(e, v)
-	case float32, float64:
-		return convertFloat(e, v)
-	case bool:
-		return convertBool(e, v)
-	case net.IP:
-		return convertIP(e, v)
-	case net.IPNet:
-		return convertCIDR(e, v)
-	case utilnet.PortRange:
-		return convertPortRange(e, v)
-	case time.Duration:
-		return convertDuration(e, v)
-	case []string:
-		vals := strings.Split(v, ",")
-		e.Set(reflect.ValueOf(vals))
-	case map[string]string:
-		return convertMap(e, v)
-	default:
-		// Last ditch attempt to convert anything based on its underlying kind.
-		// This covers any types that are aliased to a native type
-		return convertKind(e, v)
-	}
-
-	return nil
-}
-
-func convertMap(e reflect.Value, v string) error {
-	if e.IsNil() {
-		e.Set(reflect.MakeMap(e.Type()))
-	}
-	vals := strings.Split(v, ",")
-	for _, subitem := range vals {
-		subvals := strings.FieldsFunc(subitem, func(c rune) bool {
-			return c == '<' || c == '=' || c == '>'
-		})
-		if len(subvals) != 2 {
-			return fmt.Errorf("unparsable %s", v)
-		}
-		e.SetMapIndex(reflect.ValueOf(subvals[0]), reflect.ValueOf(subvals[1]))
-	}
-	return nil
-}
-
-func convertKind(e reflect.Value, v string) error {
-	switch e.Kind() {
-	case reflect.Int, reflect.Int32, reflect.Int64:
-		return convertInt(e, v)
-	case reflect.String:
-		return convertString(e, v)
-	case reflect.Float32, reflect.Float64:
-		return convertFloat(e, v)
-	case reflect.Bool:
-		return convertBool(e, v)
-	default:
-		return fmt.Errorf("unable to set type %T", e.Kind())
-	}
-}
-
-func convertInt(e reflect.Value, v string) error {
-	i, err := strconv.Atoi(v)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to an integer: %v", v, err)
-	}
-	e.SetInt(int64(i))
-	return nil
-}
-
-func convertString(e reflect.Value, v string) error {
-	e.SetString(v)
-	return nil
-}
-
-func convertFloat(e reflect.Value, v string) error {
-	f, err := strconv.ParseFloat(v, 64)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to a float: %v", v, err)
-	}
-	e.SetFloat(f)
-	return nil
-}
-
-func convertBool(e reflect.Value, v string) error {
-	b, err := strconv.ParseBool(v)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to a bool: %v", v, err)
-	}
-	e.SetBool(b)
-	return nil
-}
-
-func convertIP(e reflect.Value, v string) error {
-	ip := net.ParseIP(v)
-	if ip == nil {
-		return fmt.Errorf("error converting input %s to an IP", v)
-	}
-	e.Set(reflect.ValueOf(ip))
-	return nil
-}
-
-func convertCIDR(e reflect.Value, v string) error {
-	_, cidr, err := net.ParseCIDR(v)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to a CIDR: %v", v, err)
-	}
-	e.Set(reflect.ValueOf(*cidr))
-	return nil
-}
-
-func convertPortRange(e reflect.Value, v string) error {
-	pr, err := utilnet.ParsePortRange(v)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to PortRange: %v", v, err)
-	}
-	e.Set(reflect.ValueOf(*pr))
-	return nil
-}
-
-func convertDuration(e reflect.Value, v string) error {
-	dur, err := time.ParseDuration(v)
-	if err != nil {
-		return fmt.Errorf("error converting input %s to Duration: %v", v, err)
-	}
-	e.Set(reflect.ValueOf(dur))
-	return nil
-}
-
-// FindAndSet sets the nested value.
-func FindAndSet(path string, c interface{}, value string) error {
-	elem, err := findNestedElement(path, c)
-	if err != nil {
-		return err
-	}
-	return setElement(elem, value)
-}
diff --git a/pkg/util/config_test.go b/pkg/util/config_test.go
deleted file mode 100644
index 2ca74c95ac..0000000000
--- a/pkg/util/config_test.go
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"math"
-	"net"
-	"reflect"
-	"testing"
-	"time"
-
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-)
-
-type aliasedString string
-
-type testConfig struct {
-	A string
-	B int
-	C float32
-	D subConfig1
-	E *subConfig2
-}
-
-type subConfig1 struct {
-	F string
-	G int
-	H float32
-	I subConfig3
-}
-
-type subConfig2 struct {
-	J string
-	K int
-	L float32
-}
-
-type subConfig3 struct {
-	M string
-	N int
-	O float32
-	P bool
-	Q net.IP
-	R utilnet.PortRange
-	S []string
-	T aliasedString
-	U net.IPNet
-	V time.Duration
-}
-
-func buildConfig() testConfig {
-	_, cidr, _ := net.ParseCIDR("12.34.56.78/16")
-	return testConfig{
-		A: "foo",
-		B: 1,
-		C: 1.1,
-		D: subConfig1{
-			F: "bar",
-			G: 2,
-			H: 2.2,
-			I: subConfig3{
-				M: "baz",
-				N: 3,
-				O: 3.3,
-				P: false,
-				Q: net.ParseIP("12.34.56.78"),
-				R: utilnet.PortRange{Base: 2, Size: 4},
-				U: *cidr,
-				V: 5 * time.Second,
-			},
-		},
-		E: &subConfig2{
-			J: "bat",
-			K: 4,
-			L: 4.4,
-		},
-	}
-}
-
-func TestFindNestedStrings(t *testing.T) {
-	a := buildConfig()
-	for _, tc := range []struct {
-		input  string
-		output string
-	}{
-		{"A", "foo"},
-		{"D.F", "bar"},
-		{"D.I.M", "baz"},
-		{"E.J", "bat"},
-	} {
-		v, err := findNestedElement(tc.input, &a)
-		if err != nil {
-			t.Fatalf("Did not expect error. Got: %v", err)
-		}
-		if v.String() != tc.output {
-			t.Fatalf("Expected: %s, got %s", tc.output, v.String())
-		}
-	}
-}
-
-func TestFindNestedInts(t *testing.T) {
-	a := buildConfig()
-
-	for _, tc := range []struct {
-		input  string
-		output int64
-	}{
-		{"B", 1},
-		{"D.G", 2},
-		{"D.I.N", 3},
-		{"E.K", 4},
-	} {
-		v, err := findNestedElement(tc.input, &a)
-		if err != nil {
-			t.Fatalf("Did not expect error. Got: %v", err)
-		}
-		if v.Int() != tc.output {
-			t.Fatalf("Expected: %d, got %d", tc.output, v.Int())
-		}
-	}
-}
-
-func checkFloats(f1, f2 float64) bool {
-	return math.Abs(f1-f2) < .00001
-}
-
-func TestFindNestedFloats(t *testing.T) {
-	a := buildConfig()
-	for _, tc := range []struct {
-		input  string
-		output float64
-	}{
-		{"C", 1.1},
-		{"D.H", 2.2},
-		{"D.I.O", 3.3},
-		{"E.L", 4.4},
-	} {
-		v, err := findNestedElement(tc.input, &a)
-		if err != nil {
-			t.Fatalf("Did not expect error. Got: %v", err)
-		}
-
-		// Floating point comparison is tricky.
-		if !checkFloats(tc.output, v.Float()) {
-			t.Fatalf("Expected: %v, got %v", tc.output, v.Float())
-		}
-	}
-}
-
-func TestSetElement(t *testing.T) {
-	for _, tc := range []struct {
-		path    string
-		newval  string
-		checker func(testConfig) bool
-	}{
-		{"A", "newstring", func(t testConfig) bool { return t.A == "newstring" }},
-		{"B", "13", func(t testConfig) bool { return t.B == 13 }},
-		{"C", "3.14", func(t testConfig) bool { return checkFloats(float64(t.C), 3.14) }},
-		{"D.F", "fizzbuzz", func(t testConfig) bool { return t.D.F == "fizzbuzz" }},
-		{"D.G", "4", func(t testConfig) bool { return t.D.G == 4 }},
-		{"D.H", "7.3", func(t testConfig) bool { return checkFloats(float64(t.D.H), 7.3) }},
-		{"E.J", "otherstring", func(t testConfig) bool { return t.E.J == "otherstring" }},
-		{"E.K", "17", func(t testConfig) bool { return t.E.K == 17 }},
-		{"E.L", "1.234", func(t testConfig) bool { return checkFloats(float64(t.E.L), 1.234) }},
-		{"D.I.P", "true", func(t testConfig) bool { return t.D.I.P == true }},
-		{"D.I.P", "false", func(t testConfig) bool { return t.D.I.P == false }},
-		{"D.I.Q", "11.22.33.44", func(t testConfig) bool { return t.D.I.Q.Equal(net.ParseIP("11.22.33.44")) }},
-		{"D.I.R", "7-11", func(t testConfig) bool { return t.D.I.R.Base == 7 && t.D.I.R.Size == 5 }},
-		{"D.I.S", "a,b", func(t testConfig) bool { return reflect.DeepEqual(t.D.I.S, []string{"a", "b"}) }},
-		{"D.I.T", "foo", func(t testConfig) bool { return t.D.I.T == "foo" }},
-		{"D.I.U", "11.22.0.0/16", func(t testConfig) bool { return t.D.I.U.String() == "11.22.0.0/16" }},
-		{"D.I.V", "5s", func(t testConfig) bool { return t.D.I.V == 5*time.Second }},
-	} {
-		a := buildConfig()
-		if err := FindAndSet(tc.path, &a, tc.newval); err != nil {
-			t.Fatalf("Error setting value: %v", err)
-		}
-		if !tc.checker(a) {
-			t.Fatalf("Error, values not correct: %v, %s, %s", a, tc.newval, tc.path)
-		}
-
-	}
-}

From b23bddb242bbcdb200164aeda81f229852334f1c Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 31 Mar 2020 10:44:32 -0700
Subject: [PATCH 362/668] Make tryRegistry non-blocking, remove tryLookup, add
 timeout

---
 pkg/minikube/node/start.go | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 44ff9bb1cc..db21b7c126 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -382,8 +382,8 @@ func validateNetwork(h *host.Host, r command.Runner) string {
 		trySSH(h, ip)
 	}
 
-	tryLookup(r)
-	tryRegistry(r)
+	// Non-blocking
+	go tryRegistry(r, h.Driver.DriverName())
 	return ip
 }
 
@@ -424,21 +424,12 @@ func trySSH(h *host.Host, ip string) {
 	}
 }
 
-func tryLookup(r command.Runner) {
-	// DNS check
-	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
-		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
-		// will try with without query type for ISOs with different busybox versions.
-		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
-			glog.Warningf("nslookup failed: %v", err)
-			out.WarningT("Node may be unable to resolve external DNS records")
-		}
-	}
-}
-func tryRegistry(r command.Runner) {
-	// Try an HTTPS connection to the image repository
+// tryRegistry tries to connect to the image repository
+func tryRegistry(r command.Runner, driverName string) {
+	// 2 second timeout. For best results, call tryRegistry in a non-blocking manner.
+	opts := []string{"-sS", "-m", "2"}
+
 	proxy := os.Getenv("HTTPS_PROXY")
-	opts := []string{"-sS"}
 	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
 		opts = append([]string{"-x", proxy}, opts...)
 	}
@@ -451,7 +442,8 @@ func tryRegistry(r command.Runner) {
 	opts = append(opts, fmt.Sprintf("https://%s/", repo))
 	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
 		glog.Warningf("%s failed: %v", rr.Args, err)
-		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
+		out.WarningT("This {{.type}} is having trouble accessing https://{{.repository}}", out.V{"repository": repo, "type": driver.MachineType(driverName)})
+		out.T(out.Tip, "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/")
 	}
 }
 

From 85e7df860a2ffdc5a1678dca5fea0b8957d0259d Mon Sep 17 00:00:00 2001
From: John Laswell <john.n.laswell@gmail.com>
Date: Tue, 31 Mar 2020 13:45:37 -0400
Subject: [PATCH 363/668] add documentation context for MINIKUBE env vars

---
 site/content/en/docs/Reference/environment_variables.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/Reference/environment_variables.md b/site/content/en/docs/Reference/environment_variables.md
index 7a02d204d9..636b61d8a8 100644
--- a/site/content/en/docs/Reference/environment_variables.md
+++ b/site/content/en/docs/Reference/environment_variables.md
@@ -13,9 +13,9 @@ For example the `minikube start --iso-url="$ISO_URL"` flag can also be set by se
 
 ## Other variables
 
-Some features can only be accessed by environment variables, here is a list of these features:
+Some features can only be accessed by minikube specific environment variables, here is a list of these features:
 
-* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration
+* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration. *Please note: this is used only by minikube and does not affect anything related to Kubernetes tools such as kubectl.*
 
 * **MINIKUBE_IN_STYLE** - (bool) manually sets whether or not emoji and colors should appear in minikube. Set to false or 0 to disable this feature, true or 1 to force it to be turned on.
 

From fcb5c462f4c9ee30d2034453b441669bf9e1b8ac Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 31 Mar 2020 15:06:16 -0700
Subject: [PATCH 364/668] add delete-on-failure flag

---
 cmd/minikube/cmd/start.go  | 24 +++++++++++++++++++++++-
 pkg/minikube/node/start.go | 26 +++++++++++++-------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 780e2ec766..5e57970426 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -124,6 +124,7 @@ const (
 	natNicType              = "nat-nic-type"
 	nodes                   = "nodes"
 	preload                 = "preload"
+	deleteOnFailure         = "delete-on-failure"
 )
 
 var (
@@ -177,6 +178,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
 	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
 	startCmd.Flags().Bool(preload, true, "If set, download tarball of preloaded images if available to improve start time. Defaults to true.")
+	startCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again.")
 }
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
@@ -353,7 +355,27 @@ func runStart(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	kubeconfig := node.Start(cc, n, existingAddons, true)
+	kubeconfig, err := node.Start(cc, n, existingAddons, true)
+	if err != nil && viper.GetBool(deleteOnFailure) {
+		out.T(out.Warning, "Cluster {{.name}} failed to start, deleting and trying again.", out.V{"name": cc.Name})
+		// Start failed, delete the cluster and try again
+		profile, err := config.LoadProfile(cc.Name)
+		if err != nil {
+			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": cc.Name})
+		}
+
+		err = deleteProfile(profile)
+		if err != nil {
+			// We failed to delete? That's not good. Error out.
+			exit.WithError("deleting cluster failed", err)
+		}
+
+		kubeconfig, err = node.Start(cc, n, existingAddons, true)
+		if err != nil {
+			// Ok we failed again, let's bail
+			exit.WithError("Start failed after cluster deletion", err)
+		}
+	}
 
 	numNodes := viper.GetInt(nodes)
 	if numNodes == 1 && existing != nil {
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index eaa1232e11..a8b3b509ab 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -65,7 +65,7 @@ const (
 )
 
 // Start spins up a guest and starts the kubernetes node.
-func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) *kubeconfig.Settings {
+func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) (*kubeconfig.Settings, error) {
 	cp := ""
 	if apiServer {
 		cp = "control plane "
@@ -100,7 +100,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 	sv, err := util.ParseKubernetesVersion(n.KubernetesVersion)
 	if err != nil {
-		exit.WithError("Failed to parse kubernetes version", err)
+		return nil, errors.Wrap(err, "Failed to parse kubernetes version")
 	}
 
 	// configure the runtime (docker, containerd, crio)
@@ -113,7 +113,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		// Must be written before bootstrap, otherwise health checks may flake due to stale IP
 		kcs = setupKubeconfig(host, &cc, &n, cc.Name)
 		if err != nil {
-			exit.WithError("Failed to setup kubeconfig", err)
+			return nil, errors.Wrap(err, "Failed to setup kubeconfig")
 		}
 
 		// setup kubeadm (must come after setupKubeconfig)
@@ -125,16 +125,16 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 		// write the kubeconfig to the file system after everything required (like certs) are created by the bootstrapper
 		if err := kubeconfig.Update(kcs); err != nil {
-			exit.WithError("Failed to update kubeconfig file.", err)
+			return nil, errors.Wrap(err, "Failed to update kubeconfig file.")
 		}
 	} else {
 		bs, err = cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
 		if err != nil {
-			exit.WithError("Failed to get bootstrapper", err)
+			return nil, errors.Wrap(err, "Failed to get bootstrapper")
 		}
 
 		if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
-			exit.WithError("setting up certs", err)
+			return nil, errors.Wrap(err, "setting up certs")
 		}
 	}
 
@@ -159,34 +159,34 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		// Skip pre-existing, because we already waited for health
 		if viper.GetBool(waitUntilHealthy) && !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
-				exit.WithError("Wait failed", err)
+				return nil, errors.Wrap(err, "Wait failed")
 			}
 		}
 	} else {
 		if err := bs.UpdateNode(cc, n, cr); err != nil {
-			exit.WithError("Updating node", err)
+			return nil, errors.Wrap(err, "Updating node")
 		}
 
 		cp, err := config.PrimaryControlPlane(&cc)
 		if err != nil {
-			exit.WithError("Getting primary control plane", err)
+			return nil, errors.Wrap(err, "Getting primary control plane")
 		}
 		cpBs, err := cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, cp)
 		if err != nil {
-			exit.WithError("Getting bootstrapper", err)
+			return nil, errors.Wrap(err, "Getting bootstrapper")
 		}
 
 		joinCmd, err := cpBs.GenerateToken(cc)
 		if err != nil {
-			exit.WithError("generating join token", err)
+			return nil, errors.Wrap(err, "generating join token")
 		}
 
 		if err = bs.JoinCluster(cc, n, joinCmd); err != nil {
-			exit.WithError("joining cluster", err)
+			return nil, errors.Wrap(err, "joining cluster")
 		}
 	}
 
-	return kcs
+	return kcs, nil
 }
 
 // ConfigureRuntimes does what needs to happen to get a runtime going.

From 673922c8d3dad4aa90c1560d4964ac39e47e2419 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 31 Mar 2020 15:38:59 -0700
Subject: [PATCH 365/668] code comments

---
 cmd/minikube/cmd/node_start.go | 5 ++++-
 cmd/minikube/cmd/start.go      | 7 +++----
 pkg/minikube/node/node.go      | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 285de93d7b..511ac2323d 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -50,7 +50,10 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		node.Start(*cc, *n, nil, false)
+		_, err = node.Start(*cc, *n, nil, false)
+		if err != nil {
+			exit.WithError("starting node", err)
+		}
 	},
 }
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 5e57970426..7253154cec 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -178,7 +178,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
 	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
 	startCmd.Flags().Bool(preload, true, "If set, download tarball of preloaded images if available to improve start time. Defaults to true.")
-	startCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again.")
+	startCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")
 }
 
 // initKubernetesFlags inits the commandline flags for kubernetes related options
@@ -357,7 +357,7 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	kubeconfig, err := node.Start(cc, n, existingAddons, true)
 	if err != nil && viper.GetBool(deleteOnFailure) {
-		out.T(out.Warning, "Cluster {{.name}} failed to start, deleting and trying again.", out.V{"name": cc.Name})
+		out.T(out.Warning, "Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
 		// Start failed, delete the cluster and try again
 		profile, err := config.LoadProfile(cc.Name)
 		if err != nil {
@@ -366,8 +366,7 @@ func runStart(cmd *cobra.Command, args []string) {
 
 		err = deleteProfile(profile)
 		if err != nil {
-			// We failed to delete? That's not good. Error out.
-			exit.WithError("deleting cluster failed", err)
+			out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": cc.Name})
 		}
 
 		kubeconfig, err = node.Start(cc, n, existingAddons, true)
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 03bddc49be..231ce632d0 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -40,8 +40,8 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 	}
 
 	// TODO: Start should return an error rather than calling exit!
-	Start(*cc, n, nil, false)
-	return nil
+	_, err := Start(*cc, n, nil, false)
+	return err
 }
 
 // Delete stops and deletes the given node from the given cluster

From cd7967f26e632b5fef48e5638d777ae7a6706119 Mon Sep 17 00:00:00 2001
From: Frank Schwichtenberg <frank@cambridgesemantics.com>
Date: Tue, 31 Mar 2020 21:52:26 -0400
Subject: [PATCH 366/668] enable kernel support for transparent huge pages with
 madvise

---
 deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
index 93ddba23b8..9611b6a9ac 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
@@ -508,3 +508,5 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_OPTIMIZE_INLINING=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y

From 1d28fae2b11322f45ac45c0c9ad6e9697d8e0f28 Mon Sep 17 00:00:00 2001
From: "re;i" <contrib@razmkhah.fr>
Date: Wed, 1 Apr 2020 12:28:14 +0000
Subject: [PATCH 367/668] use latest go version

---
 site/content/en/docs/Contributing/documentation.en.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/Contributing/documentation.en.md b/site/content/en/docs/Contributing/documentation.en.md
index b2cd2b9971..ef0be91b83 100644
--- a/site/content/en/docs/Contributing/documentation.en.md
+++ b/site/content/en/docs/Contributing/documentation.en.md
@@ -18,7 +18,10 @@ To serve documentation pages locally, clone the `minikube` repository and run:
 
 `make site`
 
-NOTE: On Windows, our site currently causes Hugo to `panic`.
+Notes :
+
+* On GNU/Linux, golang package shipped with the distribution may not be recent enough. Use the latest version.
+* On Windows, our site currently causes Hugo to `panic`.
 
 ## Lint
 

From 28ec78a5cb0dc34258ec67bb03d909aeae9656a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Wed, 1 Apr 2020 05:54:23 -0700
Subject: [PATCH 368/668] lint - add newline after stdlib imports

---
 cmd/minikube/cmd/version.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/minikube/cmd/version.go b/cmd/minikube/cmd/version.go
index c56ca7cdea..478a7aab92 100644
--- a/cmd/minikube/cmd/version.go
+++ b/cmd/minikube/cmd/version.go
@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"encoding/json"
+
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 	"k8s.io/minikube/pkg/minikube/exit"

From 227fec14ae1115cdad7359a142c6407a75540ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Wed, 1 Apr 2020 17:19:14 +0200
Subject: [PATCH 369/668] Use kubectl version --short if --output=json fails

Really old kubernetes clients did not have the --output parameter

Show a friendly reminder to upgrade, instead of an error message.
---
 cmd/minikube/cmd/start.go | 41 ++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 780e2ec766..0c3b233412 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -433,22 +433,12 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 		return nil
 	}
 
-	j, err := exec.Command(path, "version", "--client", "--output=json").Output()
+	gitVersion, err := kubectlVersion(path)
 	if err != nil {
-		return errors.Wrap(err, "exec")
+		return err
 	}
 
-	cv := struct {
-		ClientVersion struct {
-			GitVersion string `json:"gitVersion"`
-		} `json:"clientVersion"`
-	}{}
-	err = json.Unmarshal(j, &cv)
-	if err != nil {
-		return errors.Wrap(err, "unmarshal")
-	}
-
-	client, err := semver.Make(strings.TrimPrefix(cv.ClientVersion.GitVersion, version.VersionPrefix))
+	client, err := semver.Make(strings.TrimPrefix(gitVersion, version.VersionPrefix))
 	if err != nil {
 		return errors.Wrap(err, "client semver")
 	}
@@ -467,6 +457,31 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 	return nil
 }
 
+func kubectlVersion(path string) (string, error) {
+	j, err := exec.Command(path, "version", "--client", "--output=json").Output()
+	if err != nil {
+		// really old kubernetes clients did not have the --output parameter
+		b, err := exec.Command(path, "version", "--client", "--short").Output()
+		if err != nil {
+			return "", errors.Wrap(err, "exec")
+		}
+		s := strings.TrimSpace(string(b))
+		return strings.Replace(s, "Client Version: ", "", 1), nil
+	}
+
+	cv := struct {
+		ClientVersion struct {
+			GitVersion string `json:"gitVersion"`
+		} `json:"clientVersion"`
+	}{}
+	err = json.Unmarshal(j, &cv)
+	if err != nil {
+		return "", errors.Wrap(err, "unmarshal")
+	}
+
+	return cv.ClientVersion.GitVersion, nil
+}
+
 func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))

From d8151730f4bbb1b42e306a3c1ab242ad45439600 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 1 Apr 2020 11:00:39 -0700
Subject: [PATCH 370/668] retry anytime node.Start fails, not just in minikube
 start

---
 cmd/minikube/cmd/node_add.go   | 13 +++------
 cmd/minikube/cmd/node_start.go |  4 +--
 cmd/minikube/cmd/start.go      | 52 ++++++++++++++++++++++------------
 pkg/minikube/node/node.go      |  1 -
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index b923b9e935..ef25f4680d 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -18,10 +18,8 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -56,7 +54,7 @@ var nodeAddCmd = &cobra.Command{
 		}
 
 		if err := node.Add(cc, n); err != nil {
-			exit.WithError("Error adding node to cluster", err)
+			maybeDeleteAndRetry(*cc, n, nil, err)
 		}
 
 		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": cc.Name})
@@ -64,13 +62,10 @@ var nodeAddCmd = &cobra.Command{
 }
 
 func init() {
+	//We should figure out which minikube start flags to actually import
 	nodeAddCmd.Flags().BoolVar(&cp, "control-plane", false, "If true, the node added will also be a control plane in addition to a worker.")
 	nodeAddCmd.Flags().BoolVar(&worker, "worker", true, "If true, the added node will be marked for work. Defaults to true.")
-	//We should figure out which of these flags to actually import
-	startCmd.Flags().Visit(
-		func(f *pflag.Flag) {
-			nodeAddCmd.Flags().AddFlag(f)
-		},
-	)
+	nodeAddCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")
+
 	nodeCmd.AddCommand(nodeAddCmd)
 }
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 511ac2323d..3b2782263b 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -49,15 +49,15 @@ var nodeStartCmd = &cobra.Command{
 			exit.WithError("retrieving node", err)
 		}
 
-		// Start it up baby
 		_, err = node.Start(*cc, *n, nil, false)
 		if err != nil {
-			exit.WithError("starting node", err)
+			maybeDeleteAndRetry(*cc, *n, nil, err)
 		}
 	},
 }
 
 func init() {
 	nodeStartCmd.Flags().String("name", "", "The name of the node to start")
+	nodeStartCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")
 	nodeCmd.AddCommand(nodeStartCmd)
 }
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 7253154cec..57922fea15 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -356,24 +356,8 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	kubeconfig, err := node.Start(cc, n, existingAddons, true)
-	if err != nil && viper.GetBool(deleteOnFailure) {
-		out.T(out.Warning, "Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
-		// Start failed, delete the cluster and try again
-		profile, err := config.LoadProfile(cc.Name)
-		if err != nil {
-			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": cc.Name})
-		}
-
-		err = deleteProfile(profile)
-		if err != nil {
-			out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": cc.Name})
-		}
-
-		kubeconfig, err = node.Start(cc, n, existingAddons, true)
-		if err != nil {
-			// Ok we failed again, let's bail
-			exit.WithError("Start failed after cluster deletion", err)
-		}
+	if err != nil {
+		kubeconfig = maybeDeleteAndRetry(cc, n, existingAddons, err)
 	}
 
 	numNodes := viper.GetInt(nodes)
@@ -488,6 +472,38 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 	return nil
 }
 
+func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, originalErr error) *kubeconfig.Settings {
+	if viper.GetBool(deleteOnFailure) {
+		out.T(out.Warning, "Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
+		// Start failed, delete the cluster and try again
+		profile, err := config.LoadProfile(cc.Name)
+		if err != nil {
+			out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": cc.Name})
+		}
+
+		err = deleteProfile(profile)
+		if err != nil {
+			out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": cc.Name})
+		}
+
+		var kubeconfig *kubeconfig.Settings
+		for _, v := range cc.Nodes {
+			k, err := node.Start(cc, v, existingAddons, v.ControlPlane)
+			if v.ControlPlane {
+				kubeconfig = k
+			}
+			if err != nil {
+				// Ok we failed again, let's bail
+				exit.WithError("Start failed after cluster deletion", err)
+			}
+		}
+		return kubeconfig
+	}
+	// Don't delete the cluster unless they ask
+	exit.WithError("startup failed", originalErr)
+	return nil
+}
+
 func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 231ce632d0..411275f3de 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -39,7 +39,6 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		return errors.Wrap(err, "save node")
 	}
 
-	// TODO: Start should return an error rather than calling exit!
 	_, err := Start(*cc, n, nil, false)
 	return err
 }

From c76fac7d74236f892fa2aa8288aed63f3833193b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 11:57:32 -0700
Subject: [PATCH 371/668] Standardize port-forwarding and kubeconfig hostname
 logic, fix Docker Linux IP

---
 cmd/minikube/cmd/docker-env.go                |   4 +-
 cmd/minikube/cmd/ip.go                        |   2 +-
 cmd/minikube/cmd/start.go                     |   2 +-
 cmd/minikube/cmd/status.go                    |  51 +++---
 cmd/minikube/cmd/update-context.go            |   8 +-
 pkg/drivers/none/none.go                      |  11 +-
 pkg/minikube/bootstrapper/bootstrapper.go     |   3 +-
 .../bootstrapper/bsutil/kverify/kverify.go    |  18 +--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  42 ++---
 pkg/minikube/driver/driver.go                 |   7 +
 pkg/minikube/kubeconfig/context_test.go       |   3 +-
 pkg/minikube/kubeconfig/kubeconfig.go         | 110 +++++--------
 pkg/minikube/kubeconfig/kubeconfig_test.go    | 151 ++++++++++++------
 pkg/minikube/mustload/mustload.go             |  50 +++---
 pkg/minikube/node/start.go                    |  25 +--
 15 files changed, 239 insertions(+), 248 deletions(-)

diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index cf18ad0414..76ae9d4f5a 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -150,7 +150,7 @@ var dockerEnvCmd = &cobra.Command{
 
 		var err error
 		port := constants.DockerDaemonPort
-		if driver.IsKIC(driverName) {
+		if driver.NeedsPortForward(driverName) {
 			port, err = oci.ForwardedPort(driverName, cname, port)
 			if err != nil {
 				exit.WithCodeT(exit.Failure, "Error getting port binding for '{{.driver_name}} driver: {{.error}}", out.V{"driver_name": driverName, "error": err})
@@ -161,7 +161,7 @@ var dockerEnvCmd = &cobra.Command{
 			EnvConfig: sh,
 			profile:   cname,
 			driver:    driverName,
-			hostIP:    co.CP.ForwardedIP.String(),
+			hostIP:    co.CP.IP.String(),
 			port:      port,
 			certsDir:  localpath.MakeMiniPath("certs"),
 			noProxy:   noProxy,
diff --git a/cmd/minikube/cmd/ip.go b/cmd/minikube/cmd/ip.go
index f91709f02f..6a2ca32055 100644
--- a/cmd/minikube/cmd/ip.go
+++ b/cmd/minikube/cmd/ip.go
@@ -29,6 +29,6 @@ var ipCmd = &cobra.Command{
 	Long:  `Retrieves the IP address of the running cluster, and writes it to STDOUT.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		co := mustload.Running(ClusterFlagValue())
-		out.Ln(co.CP.ForwardedIP.String())
+		out.Ln(co.CP.IP.String())
 	},
 }
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 498849f437..d2147ee98f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -190,7 +190,7 @@ func initKubernetesFlags() {
 	startCmd.Flags().String(featureGates, "", "A set of key=value pairs that describe feature gates for alpha/experimental features.")
 	startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster")
 	startCmd.Flags().Int(apiServerPort, constants.APIServerPort, "The apiserver listening port")
-	startCmd.Flags().String(apiServerName, constants.APIServerName, "The apiserver name which is 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(apiServerName, constants.APIServerName, "The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine")
 	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")
 }
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 7b44488e1c..8002912f23 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -32,7 +32,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
@@ -189,31 +188,22 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status
 	// We have a fully operational host, now we can check for details
 	ip, err := cluster.GetHostDriverIP(api, name)
 	if err != nil {
-		glog.Errorln("Error host driver ip status:", err)
-		st.APIServer = state.Error.String()
+		glog.Errorf("failed to get driver ip: %v", err)
+		st.Host = state.Error.String()
 		return st, err
 	}
 
-	port, err := kubeconfig.Port(name)
-	if err != nil {
-		glog.Warningf("unable to get port: %v", err)
-		port = constants.APIServerPort
+	if ip.String() != n.IP {
+		glog.Errorf("host is running at %s, expected: %s", ip.String(), n.IP)
+		st.Host = state.Error.String()
 	}
 
-	st.Kubeconfig = Misconfigured
+	st.Kubeconfig = Configured
 	if !controlPlane {
 		st.Kubeconfig = Irrelevant
 		st.APIServer = Irrelevant
 	}
 
-	if st.Kubeconfig != Irrelevant {
-		ok, err := kubeconfig.IsClusterInConfig(ip, cc.Name)
-		glog.Infof("%s is in kubeconfig at ip %s: %v (err=%v)", name, ip, ok, err)
-		if ok {
-			st.Kubeconfig = Configured
-		}
-	}
-
 	host, err := machine.LoadHost(api, name)
 	if err != nil {
 		return st, err
@@ -234,18 +224,33 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status
 		st.Kubelet = stk.String()
 	}
 
-	if st.APIServer != Irrelevant {
-		sta, err := kverify.APIServerStatus(cr, ip, port)
-		glog.Infof("%s apiserver status = %s (err=%v)", name, stk, err)
+	// Early exit for regular nodes
+	if !controlPlane {
+		return st, nil
+	}
 
+	hostname, _, port, err := driver.ControlPaneEndpoint(&cc, &n, host.DriverName)
+	if err != nil {
+		glog.Errorf("forwarded endpoint: %v", err)
+		st.Kubeconfig = Misconfigured
+	} else {
+		err := kubeconfig.VerifyEndpoint(cc.Name, hostname, port)
 		if err != nil {
-			glog.Errorln("Error apiserver status:", err)
-			st.APIServer = state.Error.String()
-		} else {
-			st.APIServer = sta.String()
+			glog.Errorf("kubeconfig endpoint: %v", err)
+			st.Kubeconfig = Misconfigured
 		}
 	}
 
+	sta, err := kverify.APIServerStatus(cr, hostname, port)
+	glog.Infof("%s apiserver status = %s (err=%v)", name, stk, err)
+
+	if err != nil {
+		glog.Errorln("Error apiserver status:", err)
+		st.APIServer = state.Error.String()
+	} else {
+		st.APIServer = sta.String()
+	}
+
 	return st, nil
 }
 
diff --git a/cmd/minikube/cmd/update-context.go b/cmd/minikube/cmd/update-context.go
index 79e42fe96d..f2e08f5b6e 100644
--- a/cmd/minikube/cmd/update-context.go
+++ b/cmd/minikube/cmd/update-context.go
@@ -33,17 +33,15 @@ var updateContextCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cname := ClusterFlagValue()
 		co := mustload.Running(cname)
-		ip := co.CP.ForwardedIP
 
-		// ??? For KIC, should we also update the port ???
-		updated, err := kubeconfig.UpdateIP(ip, cname, kubeconfig.PathFromEnv())
+		updated, err := kubeconfig.UpdateEndpoint(cname, co.CP.Hostname, co.CP.Port, kubeconfig.PathFromEnv())
 		if err != nil {
 			exit.WithError("update config", err)
 		}
 		if updated {
-			out.T(out.Celebrate, "{{.cluster}} IP has been updated to point at {{.ip}}", out.V{"cluster": cname, "ip": ip})
+			out.T(out.Celebrate, `"{{.context}}" context has been updated to point to {{.hostname}}:{{.port}}`, out.V{"context": cname, "hostname": co.CP.Hostname, "port": co.CP.Port})
 		} else {
-			out.T(out.Meh, "{{.cluster}} IP was already correctly configured for {{.ip}}", out.V{"cluster": cname, "ip": ip})
+			out.T(out.Meh, `No changes required for the "{{.context}}" context`, out.V{"context": cname})
 		}
 
 	},
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index fe5498c91a..91ab305464 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -18,7 +18,6 @@ package none
 
 import (
 	"fmt"
-	"net"
 	"os/exec"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -126,20 +125,14 @@ func (d *Driver) GetURL() (string, error) {
 
 // GetState returns the state that the host is in (running, stopped, etc)
 func (d *Driver) GetState() (state.State, error) {
-	glog.Infof("GetState called")
-	ip, err := d.GetIP()
-	if err != nil {
-		return state.Error, err
-	}
-
-	port, err := kubeconfig.Port(d.BaseDriver.MachineName)
+	hostname, port, err := kubeconfig.Endpoint(d.BaseDriver.MachineName)
 	if err != nil {
 		glog.Warningf("unable to get port: %v", err)
 		port = constants.APIServerPort
 	}
 
 	// Confusing logic, as libmachine.Stop will loop until the state == Stopped
-	ast, err := kverify.APIServerStatus(d.exec, net.ParseIP(ip), port)
+	ast, err := kverify.APIServerStatus(d.exec, hostname, port)
 	if err != nil {
 		return ast, err
 	}
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index 598397b171..c724b2607f 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -17,7 +17,6 @@ limitations under the License.
 package bootstrapper
 
 import (
-	"net"
 	"time"
 
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
@@ -47,7 +46,7 @@ type Bootstrapper interface {
 	LogCommands(config.ClusterConfig, LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
 	GetKubeletStatus() (string, error)
-	GetAPIServerStatus(net.IP, int) (string, error)
+	GetAPIServerStatus(string, int) (string, error)
 }
 
 const (
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index b80f0689e4..b7bf7fd5c5 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -183,7 +183,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 }
 
 // WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, ip string, port int, timeout time.Duration) error {
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, hostname string, port int, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
 
@@ -197,7 +197,7 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 			time.Sleep(kconst.APICallRetryInterval * 5)
 		}
 
-		status, err := apiServerHealthz(net.ParseIP(ip), port)
+		status, err := apiServerHealthz(hostname, port)
 		if err != nil {
 			glog.Warningf("status: %v", err)
 			return false, nil
@@ -254,7 +254,7 @@ func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg conf
 }
 
 // APIServerStatus returns apiserver status in libmachine style state.State
-func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
+func APIServerStatus(cr command.Runner, hostname string, port int) (state.State, error) {
 	glog.Infof("Checking apiserver status ...")
 
 	pid, err := apiServerPID(cr)
@@ -267,7 +267,7 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
 	if err != nil {
 		glog.Warningf("unable to find freezer cgroup: %v", err)
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 
 	}
 	freezer := strings.TrimSpace(rr.Stdout.String())
@@ -275,13 +275,13 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	fparts := strings.Split(freezer, ":")
 	if len(fparts) != 3 {
 		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 	}
 
 	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
 	if err != nil {
 		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 	}
 
 	fs := strings.TrimSpace(rr.Stdout.String())
@@ -289,12 +289,12 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	if fs == "FREEZING" || fs == "FROZEN" {
 		return state.Paused, nil
 	}
-	return apiServerHealthz(ip, port)
+	return apiServerHealthz(hostname, port)
 }
 
 // apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
-func apiServerHealthz(ip net.IP, port int) (state.State, error) {
-	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(ip.String(), fmt.Sprint(port)))
+func apiServerHealthz(hostname string, port int) (state.State, error) {
+	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(hostname, fmt.Sprint(port)))
 	glog.Infof("Checking apiserver healthz at %s ...", url)
 	// To avoid: x509: certificate signed by unknown authority
 	tr := &http.Transport{
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ea2c15f6f2..c4c8c7eab8 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -39,7 +39,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/drivers/kic"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
@@ -103,8 +102,8 @@ func (k *Bootstrapper) GetKubeletStatus() (string, error) {
 }
 
 // GetAPIServerStatus returns the api-server status
-func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, port int) (string, error) {
-	s, err := kverify.APIServerStatus(k.c, ip, port)
+func (k *Bootstrapper) GetAPIServerStatus(hostname string, port int) (string, error) {
+	s, err := kverify.APIServerStatus(k.c, hostname, port)
 	if err != nil {
 		return state.Error.String(), err
 	}
@@ -316,20 +315,6 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 	return k.init(cfg)
 }
 
-func (k *Bootstrapper) controlPlaneEndpoint(cfg config.ClusterConfig) (string, int, error) {
-	cp, err := config.PrimaryControlPlane(&cfg)
-	if err != nil {
-		return "", 0, err
-	}
-
-	if driver.IsKIC(cfg.Driver) {
-		ip := oci.DefaultBindIPV4
-		port, err := oci.ForwardedPort(cfg.Driver, cfg.Name, cp.Port)
-		return ip, port, err
-	}
-	return cp.IP, cp.Port, nil
-}
-
 // client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver
 func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) {
 	if k.k8sClient != nil {
@@ -371,17 +356,17 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return err
 	}
 
-	ip, port, err := k.controlPlaneEndpoint(cfg)
+	hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver)
 	if err != nil {
 		return err
 	}
 
-	client, err := k.client(ip, port)
+	client, err := k.client(hostname, port)
 	if err != nil {
 		return errors.Wrap(err, "get k8s client")
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, ip, port, timeout); err != nil {
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, hostname, port, timeout); err != nil {
 		return err
 	}
 
@@ -392,13 +377,13 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 }
 
 // needsReset returns whether or not the cluster needs to be reconfigured
-func (k *Bootstrapper) needsReset(conf string, ip string, port int, client *kubernetes.Clientset, version string) bool {
+func (k *Bootstrapper) needsReset(conf string, hostname string, port int, client *kubernetes.Clientset, version string) bool {
 	if rr, err := k.c.RunCmd(exec.Command("sudo", "diff", "-u", conf, conf+".new")); err != nil {
 		glog.Infof("needs reset: configs differ:\n%s", rr.Output())
 		return true
 	}
 
-	st, err := kverify.APIServerStatus(k.c, net.ParseIP(ip), port)
+	st, err := kverify.APIServerStatus(k.c, hostname, port)
 	if err != nil {
 		glog.Infof("needs reset: apiserver error: %v", err)
 		return true
@@ -447,19 +432,24 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		glog.Errorf("failed to create compat symlinks: %v", err)
 	}
 
-	ip, port, err := k.controlPlaneEndpoint(cfg)
+	cp, err := config.PrimaryControlPlane(&cfg)
+	if err != nil {
+		return errors.Wrap(err, "primary control plane")
+	}
+
+	hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &cp, cfg.Driver)
 	if err != nil {
 		return errors.Wrap(err, "control plane")
 	}
 
-	client, err := k.client(ip, port)
+	client, err := k.client(hostname, port)
 	if err != nil {
 		return errors.Wrap(err, "getting k8s client")
 	}
 
 	// If the cluster is running, check if we have any work to do.
 	conf := bsutil.KubeadmYamlPath
-	if !k.needsReset(conf, ip, port, client, cfg.KubernetesConfig.KubernetesVersion) {
+	if !k.needsReset(conf, hostname, port, client, cfg.KubernetesConfig.KubernetesVersion) {
 		glog.Infof("Taking a shortcut, as the cluster seems to be properly configured")
 		return nil
 	}
@@ -499,7 +489,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "apiserver healthz")
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, time.Now(), ip, port, kconst.DefaultControlPlaneTimeout); err != nil {
+	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, time.Now(), hostname, port, kconst.DefaultControlPlaneTimeout); err != nil {
 		return errors.Wrap(err, "apiserver health")
 	}
 
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index ed0cbdee23..e66e93b537 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -19,6 +19,7 @@ package driver
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"sort"
 	"strings"
 
@@ -128,6 +129,12 @@ func NeedsRoot(name string) bool {
 	return name == None || name == Podman
 }
 
+// NeedsPortForward returns true if driver is unable provide direct IP connectivity
+func NeedsPortForward(name string) bool {
+	// Docker for Desktop
+	return IsKIC(name) && (runtime.GOOS == "darwin" || runtime.GOOS == "windows")
+}
+
 // HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count.
 func HasResourceLimits(name string) bool {
 	return !(name == None || name == Podman)
diff --git a/pkg/minikube/kubeconfig/context_test.go b/pkg/minikube/kubeconfig/context_test.go
index 29a3b604ca..7725294441 100644
--- a/pkg/minikube/kubeconfig/context_test.go
+++ b/pkg/minikube/kubeconfig/context_test.go
@@ -24,7 +24,8 @@ import (
 )
 
 func TestDeleteContext(t *testing.T) {
-	fn := tempFile(t, fakeKubeCfg)
+	// See kubeconfig_test
+	fn := tempFile(t, kubeConfigWithoutHTTPS)
 	if err := DeleteContext("la-croix", fn); err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/minikube/kubeconfig/kubeconfig.go b/pkg/minikube/kubeconfig/kubeconfig.go
index 6742ac4979..b6ecf1d4a0 100644
--- a/pkg/minikube/kubeconfig/kubeconfig.go
+++ b/pkg/minikube/kubeconfig/kubeconfig.go
@@ -19,7 +19,6 @@ package kubeconfig
 import (
 	"fmt"
 	"io/ioutil"
-	"net"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -35,51 +34,27 @@ import (
 	"k8s.io/minikube/pkg/util/lock"
 )
 
-// IsClusterInConfig verifies the ip stored in kubeconfig.
-func IsClusterInConfig(ip net.IP, clusterName string, configPath ...string) (bool, error) {
+// VerifyEndpoint verifies the IP:port stored in kubeconfig.
+func VerifyEndpoint(contextName string, hostname string, port int, configPath ...string) error {
 	path := PathFromEnv()
 	if configPath != nil {
 		path = configPath[0]
 	}
-	if ip == nil {
-		return false, fmt.Errorf("error, empty ip passed")
-	}
-	kip, err := extractIP(clusterName, path)
-	if err != nil {
-		return false, err
-	}
-	if kip.Equal(ip) {
-		return true, nil
-	}
-	// Kubeconfig IP misconfigured
-	return false, nil
 
-}
+	if hostname == "" {
+		return fmt.Errorf("empty IP")
+	}
 
-// Port returns the Port number stored for minikube in the kubeconfig specified
-func Port(clusterName string, configPath ...string) (int, error) {
-	path := PathFromEnv()
-	if configPath != nil {
-		path = configPath[0]
-	}
-	cfg, err := readOrNew(path)
+	gotHostname, gotPort, err := Endpoint(contextName, path)
 	if err != nil {
-		return 0, errors.Wrap(err, "Error getting kubeconfig status")
+		return errors.Wrap(err, "extract IP")
 	}
-	cluster, ok := cfg.Clusters[clusterName]
-	if !ok {
-		return 0, errors.Errorf("Kubeconfig does not have a record of the machine cluster")
+
+	if hostname != gotHostname || port != gotPort {
+		return fmt.Errorf("got: %s:%d, want: %s:%d", gotHostname, gotPort, hostname, port)
 	}
-	kurl, err := url.Parse(cluster.Server)
-	if err != nil {
-		return constants.APIServerPort, nil
-	}
-	_, kport, err := net.SplitHostPort(kurl.Host)
-	if err != nil {
-		return constants.APIServerPort, nil
-	}
-	port, err := strconv.Atoi(kport)
-	return port, err
+
+	return nil
 }
 
 // PathFromEnv gets the path to the first kubeconfig
@@ -98,65 +73,58 @@ func PathFromEnv() string {
 	return constants.KubeconfigPath
 }
 
-// extractIP returns the IP address stored for minikube in the kubeconfig specified
-func extractIP(machineName string, configPath ...string) (net.IP, error) {
+// Endpoint returns the IP:port address stored for minikube in the kubeconfig specified
+func Endpoint(contextName string, configPath ...string) (string, int, error) {
 	path := PathFromEnv()
 	if configPath != nil {
 		path = configPath[0]
 	}
 	apiCfg, err := readOrNew(path)
 	if err != nil {
-		return nil, errors.Wrap(err, "Error getting kubeconfig status")
+		return "", 0, errors.Wrap(err, "read")
 	}
-	cluster, ok := apiCfg.Clusters[machineName]
+	cluster, ok := apiCfg.Clusters[contextName]
 	if !ok {
-		return nil, errors.Errorf("Kubeconfig does not have a record of the machine cluster")
+		return "", 0, errors.Errorf("%q does not appear in %s", contextName, path)
 	}
-	kurl, err := url.Parse(cluster.Server)
+
+	glog.Infof("found %q server: %q", contextName, cluster.Server)
+	u, err := url.Parse(cluster.Server)
 	if err != nil {
-		return net.ParseIP(cluster.Server), nil
+		return "", 0, errors.Wrap(err, "url parse")
 	}
-	kip, _, err := net.SplitHostPort(kurl.Host)
+
+	port, err := strconv.Atoi(u.Port())
 	if err != nil {
-		return net.ParseIP(kurl.Host), nil
+		return "", 0, errors.Wrap(err, "atoi")
 	}
-	ip := net.ParseIP(kip)
-	return ip, nil
+
+	return u.Hostname(), port, nil
 }
 
-// UpdateIP overwrites the IP stored in kubeconfig with the provided IP.
-func UpdateIP(ip net.IP, machineName string, configPath ...string) (bool, error) {
-	path := PathFromEnv()
-	if configPath != nil {
-		path = configPath[0]
+// UpdateEndpoint overwrites the IP stored in kubeconfig with the provided IP.
+func UpdateEndpoint(contextName string, hostname string, port int, path string) (bool, error) {
+	if hostname == "" {
+		return false, fmt.Errorf("empty ip")
 	}
 
-	if ip == nil {
-		return false, fmt.Errorf("error, empty ip passed")
-	}
-
-	kip, err := extractIP(machineName, path)
-	if err != nil {
-		return false, err
-	}
-	if kip.Equal(ip) {
+	err := VerifyEndpoint(contextName, hostname, port, path)
+	if err == nil {
 		return false, nil
 	}
-	kport, err := Port(machineName, path)
-	if err != nil {
-		return false, err
-	}
+	glog.Infof("verify returned: %v", err)
+
 	cfg, err := readOrNew(path)
 	if err != nil {
-		return false, errors.Wrap(err, "Error getting kubeconfig status")
+		return false, errors.Wrap(err, "read")
 	}
-	// Safe to lookup server because if field non-existent getIPFromKubeconfig would have given an error
-	cfg.Clusters[machineName].Server = "https://" + ip.String() + ":" + strconv.Itoa(kport)
+
+	cfg.Clusters[contextName].Server = "https://" + hostname + ":" + strconv.Itoa(port)
 	err = writeToFile(cfg, path)
 	if err != nil {
-		return false, err
+		return false, errors.Wrap(err, "write")
 	}
-	// Kubeconfig IP reconfigured
+
 	return true, nil
 }
 
diff --git a/pkg/minikube/kubeconfig/kubeconfig_test.go b/pkg/minikube/kubeconfig/kubeconfig_test.go
index 7c58b574d2..c41f167f03 100644
--- a/pkg/minikube/kubeconfig/kubeconfig_test.go
+++ b/pkg/minikube/kubeconfig/kubeconfig_test.go
@@ -18,7 +18,6 @@ package kubeconfig
 
 import (
 	"io/ioutil"
-	"net"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -30,7 +29,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-var fakeKubeCfg = []byte(`
+var kubeConfigWithoutHTTPS = []byte(`
 apiVersion: v1
 clusters:
 - cluster:
@@ -52,7 +51,7 @@ users:
     client-key: /home/la-croix/apiserver.key
 `)
 
-var fakeKubeCfg2 = []byte(`
+var kubeConfig192 = []byte(`
 apiVersion: v1
 clusters:
 - cluster:
@@ -74,12 +73,34 @@ users:
     client-key: /home/la-croix/apiserver.key
 `)
 
-var fakeKubeCfg3 = []byte(`
+var kubeConfigLocalhost = []byte(`
 apiVersion: v1
 clusters:
 - cluster:
     certificate-authority: /home/la-croix/apiserver.crt
-    server: https://192.168.1.1:8443
+    server: https://127.0.0.1:8443
+  name: minikube
+contexts:
+- context:
+    cluster: la-croix
+    user: la-croix
+  name: la-croix
+current-context: la-croix
+kind: Config
+preferences: {}
+users:
+- name: la-croix
+  user:
+    client-certificate: /home/la-croix/apiserver.crt
+    client-key: /home/la-croix/apiserver.key
+`)
+
+var kubeConfigLocalhost12345 = []byte(`
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority: /home/la-croix/apiserver.crt
+    server: https://127.0.0.1:12345
   name: minikube
 contexts:
 - context:
@@ -120,7 +141,7 @@ func TestUpdate(t *testing.T) {
 		{
 			description: "add to kube config",
 			cfg:         setupCfg,
-			existingCfg: fakeKubeCfg,
+			existingCfg: kubeConfigWithoutHTTPS,
 		},
 		{
 			description: "use config env var",
@@ -136,7 +157,7 @@ func TestUpdate(t *testing.T) {
 				CertificateAuthority: "/home/apiserver.crt",
 				KeepContext:          true,
 			},
-			existingCfg: fakeKubeCfg,
+			existingCfg: kubeConfigWithoutHTTPS,
 		},
 	}
 
@@ -176,54 +197,72 @@ func TestUpdate(t *testing.T) {
 	}
 }
 
-func TestIsClusterInConfig(t *testing.T) {
+func TestVerifyEndpoint(t *testing.T) {
 
 	var tests = []struct {
 		description string
-		ip          net.IP
+		hostname    string
+		port        int
 		existing    []byte
 		err         bool
 		status      bool
 	}{
 		{
-			description: "empty ip",
-			ip:          nil,
-			existing:    fakeKubeCfg,
+			description: "empty hostname",
+			hostname:    "",
+			port:        8443,
+			existing:    kubeConfigWithoutHTTPS,
 			err:         true,
 		},
 		{
 			description: "no minikube cluster",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg,
+			hostname:    "192.168.10.100",
+			port:        8443,
+			existing:    kubeConfigWithoutHTTPS,
 			err:         true,
 		},
 		{
-			description: "exactly matching ip",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg2,
+			description: "exactly matching hostname/port",
+			hostname:    "192.168.10.100",
+			port:        8443,
+			existing:    kubeConfig192,
 			status:      true,
 		},
 		{
-			description: "different ips",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg3,
+			description: "different hostnames",
+			hostname:    "192.168.10.100",
+			port:        8443,
+			existing:    kubeConfigLocalhost,
+			err:         true,
+		},
+		{
+			description: "different hostname",
+			hostname:    "",
+			port:        8443,
+			existing:    kubeConfigLocalhost,
+			err:         true,
+		},
+		{
+			description: "different ports",
+			hostname:    "127.0.0.1",
+			port:        84430,
+			existing:    kubeConfigLocalhost,
+			err:         true,
 		},
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.description, func(t *testing.T) {
 			t.Parallel()
 			configFilename := tempFile(t, test.existing)
-			statusActual, err := IsClusterInConfig(test.ip, "minikube", configFilename)
+			err := VerifyEndpoint("minikube", test.hostname, test.port, configFilename)
 			if err != nil && !test.err {
 				t.Errorf("Got unexpected error: %v", err)
 			}
 			if err == nil && test.err {
 				t.Errorf("Expected error but got none: %v", err)
 			}
-			if test.status != statusActual {
-				t.Errorf("Expected status %t, but got %t", test.status, statusActual)
-			}
 		})
 
 	}
@@ -233,45 +272,58 @@ func TestUpdateIP(t *testing.T) {
 
 	var tests = []struct {
 		description string
-		ip          net.IP
+		hostname    string
+		port        int
 		existing    []byte
 		err         bool
 		status      bool
 		expCfg      []byte
 	}{
 		{
-			description: "empty ip",
-			ip:          nil,
-			existing:    fakeKubeCfg2,
+			description: "empty hostname",
+			hostname:    "",
+			port:        8443,
+			existing:    kubeConfig192,
 			err:         true,
-			expCfg:      fakeKubeCfg2,
+			expCfg:      kubeConfig192,
 		},
 		{
 			description: "no minikube cluster",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg,
+			hostname:    "192.168.10.100",
+			port:        8080,
+			existing:    kubeConfigWithoutHTTPS,
 			err:         true,
-			expCfg:      fakeKubeCfg,
+			expCfg:      kubeConfigWithoutHTTPS,
 		},
 		{
 			description: "same IP",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg2,
-			expCfg:      fakeKubeCfg2,
+			hostname:    "192.168.10.100",
+			port:        8443,
+			existing:    kubeConfig192,
+			expCfg:      kubeConfig192,
 		},
 		{
 			description: "different IP",
-			ip:          net.ParseIP("192.168.10.100"),
-			existing:    fakeKubeCfg3,
+			hostname:    "127.0.0.1",
+			port:        8443,
+			existing:    kubeConfig192,
 			status:      true,
-			expCfg:      fakeKubeCfg2,
+			expCfg:      kubeConfigLocalhost,
+		},
+		{
+			description: "different port",
+			hostname:    "127.0.0.1",
+			port:        12345,
+			existing:    kubeConfigLocalhost,
+			status:      true,
+			expCfg:      kubeConfigLocalhost12345,
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
 			t.Parallel()
 			configFilename := tempFile(t, test.existing)
-			statusActual, err := UpdateIP(test.ip, "minikube", configFilename)
+			statusActual, err := UpdateEndpoint("minikube", test.hostname, test.port, configFilename)
 			if err != nil && !test.err {
 				t.Errorf("Got unexpected error: %v", err)
 			}
@@ -336,37 +388,42 @@ func TestNewConfig(t *testing.T) {
 	}
 }
 
-func Test_extractIP(t *testing.T) {
+func Test_Endpoint(t *testing.T) {
 
 	var tests = []struct {
 		description string
 		cfg         []byte
-		ip          net.IP
+		hostname    string
+		port        int
 		err         bool
 	}{
 		{
 			description: "normal IP",
-			cfg:         fakeKubeCfg2,
-			ip:          net.ParseIP("192.168.10.100"),
+			cfg:         kubeConfig192,
+			hostname:    "192.168.10.100",
+			port:        8443,
 		},
 		{
 			description: "no minikube cluster",
-			cfg:         fakeKubeCfg,
+			cfg:         kubeConfigWithoutHTTPS,
 			err:         true,
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
 			configFilename := tempFile(t, test.cfg)
-			ip, err := extractIP("minikube", configFilename)
+			hostname, port, err := Endpoint("minikube", configFilename)
 			if err != nil && !test.err {
 				t.Errorf("Got unexpected error: %v", err)
 			}
 			if err == nil && test.err {
 				t.Errorf("Expected error but got none: %v", err)
 			}
-			if !ip.Equal(test.ip) {
-				t.Errorf("IP returned: %s does not match ip given: %s", ip, test.ip)
+			if hostname != test.hostname {
+				t.Errorf("got hostname = %q, want hostname = %q", hostname, test.hostname)
+			}
+			if port != test.port {
+				t.Errorf("got port = %q, want port = %q", port, test.port)
 			}
 		})
 	}
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index b6e24bdfac..f203d74e1b 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -26,7 +26,6 @@ import (
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -45,11 +44,18 @@ type ClusterController struct {
 }
 
 type ControlPlane struct {
-	Host          *host.Host
-	Node          *config.Node
-	Runner        command.Runner
-	ForwardedIP   net.IP
-	ForwardedPort int
+	// Host is the libmachine host object
+	Host *host.Host
+	// Node is our internal control object
+	Node *config.Node
+	// Runner provides command execution
+	Runner command.Runner
+	// Hostname is the host-accesible target for the apiserver
+	Hostname string
+	// Port is the host-accessible port for the apiserver
+	Port int
+	// IP is the host-accessible IP for the control plane
+	IP net.IP
 }
 
 // Partial is a cmd-friendly way to load a cluster which may or may not be running
@@ -112,35 +118,21 @@ func Running(name string) ClusterController {
 		exit.WithError("Unable to get command runner", err)
 	}
 
-	ipStr, err := host.Driver.GetIP()
+	hostname, ip, port, err := driver.ControlPaneEndpoint(cc, &cp, host.DriverName)
 	if err != nil {
-		exit.WithError("Unable to get driver IP", err)
-	}
-
-	ip := net.ParseIP(ipStr)
-	if ip == nil {
-		exit.WithCodeT(exit.Software, fmt.Sprintf("Unable to parse driver IP: %q", ipStr))
-	}
-
-	cpIP := cp.IP
-	cpPort := cp.Port
-	if driver.IsKIC(host.DriverName) {
-		cpIP = oci.DefaultBindIPV4
-		cpPort, err = oci.ForwardedPort(cc.Driver, cc.Name, cp.Port)
-		if err != nil {
-			exit.WithError("Unable to get forwarded port", err)
-		}
+		exit.WithError("Unable to get forwarded endpoint", err)
 	}
 
 	return ClusterController{
 		API:    api,
 		Config: cc,
 		CP: ControlPlane{
-			Runner:        cr,
-			Host:          host,
-			Node:          &cp,
-			ForwardedIP:   net.ParseIP(cpIP),
-			ForwardedPort: cpPort,
+			Runner:   cr,
+			Host:     host,
+			Node:     &cp,
+			Hostname: hostname,
+			IP:       ip,
+			Port:     port,
 		},
 	}
 }
@@ -149,7 +141,7 @@ func Running(name string) ClusterController {
 func Healthy(name string) ClusterController {
 	co := Running(name)
 
-	as, err := kverify.APIServerStatus(co.CP.Runner, co.CP.ForwardedIP, co.CP.ForwardedPort)
+	as, err := kverify.APIServerStatus(co.CP.Runner, co.CP.Hostname, co.CP.Port)
 	if err != nil {
 		out.T(out.FailureType, `Unable to get control plane status: {{.error}}`, out.V{"error": err})
 		exitTip("delete", name, exit.Unavailable)
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 44ff9bb1cc..95de2a539d 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -29,12 +29,10 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/cluster"
@@ -266,26 +264,9 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 }
 
 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) {
-		// 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.ForwardedPort(h.DriverName, h.Name, port)
-		if err != nil {
-			return "", errors.Wrap(err, "host port binding")
-		}
-	} else {
-		hostname, err = h.Driver.GetIP()
-		if err != nil {
-			return "", errors.Wrap(err, "get ip")
-		}
-	}
-
-	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
-		hostname = cc.KubernetesConfig.APIServerName
+	hostname, _, port, err := driver.ControlPaneEndpoint(&cc, &n, h.DriverName)
+	if err != nil {
+		return "", err
 	}
 	return fmt.Sprintf("https://" + net.JoinHostPort(hostname, strconv.Itoa(port))), nil
 }

From b7f3f045c6b0b5c80bb2921512ce0a8e85ab39ba Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 13:01:12 -0700
Subject: [PATCH 372/668] Update integration tests

---
 test/integration/addons_test.go       |  4 ++
 test/integration/cert_options_test.go | 57 +++++++++++++++++++++++++++
 test/integration/main.go              |  6 +++
 3 files changed, 67 insertions(+)
 create mode 100644 test/integration/cert_options_test.go

diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index e90249a49e..e6c04726ef 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -173,6 +173,10 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 		t.Errorf("expected curl response be %q, but got *%s*", want, rr.Stdout.String())
 	}
 
+	if NeedsPortForward() {
+		t.Skipf("Unable to complete rest of the test due to connectivity assumptions")
+	}
+
 	// Test from outside the cluster
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ip"))
 	if err != nil {
diff --git a/test/integration/cert_options_test.go b/test/integration/cert_options_test.go
new file mode 100644
index 0000000000..cdc95ea0d4
--- /dev/null
+++ b/test/integration/cert_options_test.go
@@ -0,0 +1,57 @@
+// +build integration
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+	"context"
+	"os/exec"
+	"testing"
+)
+
+func TestCertOptionFlags(t *testing.T) {
+	if NoneDriver() {
+		t.Skip("skipping: none driver does not support ssh or bundle docker")
+	}
+	MaybeParallel(t)
+
+	profile := UniqueProfileName("cert-options")
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(30))
+	defer CleanupWithLogs(t, profile, cancel)
+
+	// Use the most verbose logging for the simplest test. If it fails, something is very wrong.
+	args := append([]string{"start", "-p", profile, "--apiserver-ips=127.0.0.1,192.168.15.15", "--apiserver-names=localhost,www.google.com", "--apiserver-port=8555"}, StartArgs()...)
+
+	// We can safely override --apiserver-name with unique that works
+	if NeedsPortForward() {
+		args = append(args, "--apiserver-name=kubernetes.docker.internal")
+
+	}
+
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
+	if err != nil {
+		t.Errorf("failed to start minikube with args: %q : %v", rr.Command(), err)
+	}
+
+	// test that file written from host was read in by the pod via cat /mount-9p/written-by-host;
+	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "version"))
+	if err != nil {
+		t.Errorf("failed to get kubectl version. args %q : %v", rr.Command(), err)
+	}
+
+}
diff --git a/test/integration/main.go b/test/integration/main.go
index b6c5a3916f..144fae4395 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -20,6 +20,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -73,6 +74,11 @@ func KicDriver() bool {
 	return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker") || strings.Contains(*startArgs, "--vm-driver=podman") || strings.Contains(*startArgs, "driver=podman")
 }
 
+// NeedsPortForward requires whether or not this host needs port forwarding
+func NeedsPortForward() bool {
+	return KicDriver() && (runtime.GOOS == "windows" || runtime.GOOS == "darwin")
+}
+
 // CanCleanup returns if cleanup is allowed
 func CanCleanup() bool {
 	return *cleanup

From a7106b44989053cc651a55d5176ce184529350a7 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 13:04:58 -0700
Subject: [PATCH 373/668] Add missing endpoint file

---
 pkg/minikube/driver/endpoint.go | 47 +++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkg/minikube/driver/endpoint.go

diff --git a/pkg/minikube/driver/endpoint.go b/pkg/minikube/driver/endpoint.go
new file mode 100644
index 0000000000..dc9507a4d9
--- /dev/null
+++ b/pkg/minikube/driver/endpoint.go
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package driver
+
+import (
+	"net"
+
+	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+)
+
+// ControlPaneEndpoint returns the location where callers can reach this cluster
+func ControlPaneEndpoint(cc *config.ClusterConfig, cp *config.Node, driverName string) (string, net.IP, int, error) {
+	if NeedsPortForward(driverName) {
+		port, err := oci.ForwardedPort(cc.Driver, cc.Name, cp.Port)
+		hostname := oci.DefaultBindIPV4
+		ip := net.ParseIP(hostname)
+
+		// https://github.com/kubernetes/minikube/issues/3878
+		if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+			hostname = cc.KubernetesConfig.APIServerName
+		}
+		return hostname, ip, port, err
+	}
+
+	// https://github.com/kubernetes/minikube/issues/3878
+	hostname := cp.IP
+	if cc.KubernetesConfig.APIServerName != constants.APIServerName {
+		hostname = cc.KubernetesConfig.APIServerName
+	}
+	return hostname, net.ParseIP(cp.IP), cp.Port, nil
+}

From 96a87e89cf6a8a83cd82d7dbd0242baa99fbf820 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 13:53:17 -0700
Subject: [PATCH 374/668] Remove IP check, because it's wrong on Docker

---
 cmd/minikube/cmd/status.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 8002912f23..bd1a72524c 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -186,18 +186,12 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status
 	}
 
 	// We have a fully operational host, now we can check for details
-	ip, err := cluster.GetHostDriverIP(api, name)
-	if err != nil {
+	if _, err := cluster.GetHostDriverIP(api, name); err != nil {
 		glog.Errorf("failed to get driver ip: %v", err)
 		st.Host = state.Error.String()
 		return st, err
 	}
 
-	if ip.String() != n.IP {
-		glog.Errorf("host is running at %s, expected: %s", ip.String(), n.IP)
-		st.Host = state.Error.String()
-	}
-
 	st.Kubeconfig = Configured
 	if !controlPlane {
 		st.Kubeconfig = Irrelevant

From 0432095115c3dacc885c934f1c02b9031dd6bcef Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 13:53:47 -0700
Subject: [PATCH 375/668] Update IP check message

---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 6623f1f362..7be17ef905 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -831,7 +831,7 @@ func validateUpdateContextCmd(ctx context.Context, t *testing.T, profile string)
 		t.Errorf("failed to run minikube update-context: args %q: %v", rr.Command(), err)
 	}
 
-	want := []byte("IP was already correctly configured")
+	want := []byte("No changes")
 	if !bytes.Contains(rr.Stdout.Bytes(), want) {
 		t.Errorf("update-context: got=%q, want=*%q*", rr.Stdout.Bytes(), want)
 	}

From edd3cf5bc45080574566e808095e98b098ede38f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 14:05:24 -0700
Subject: [PATCH 376/668] Run 'make extract' to update translation samples

---
 translations/de.json    | 14 ++++++++------
 translations/es.json    | 14 ++++++++------
 translations/fr.json    | 17 ++++++++++-------
 translations/ja.json    | 14 ++++++++------
 translations/ko.json    | 14 ++++++++------
 translations/pl.json    | 14 ++++++++------
 translations/zh-CN.json | 13 ++++++++-----
 7 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/translations/de.json b/translations/de.json
index 248328d176..6ef08685ac 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -7,7 +7,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -147,6 +146,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Fehler: Sie haben Kubernetes v{{.new}} ausgewählt, aber auf dem vorhandenen Cluster für Ihr Profil wird Kubernetes v{{.old}} ausgeführt. Zerstörungsfreie Downgrades werden nicht unterstützt. Sie können jedoch mit einer der folgenden Optionen fortfahren:\n* Erstellen Sie den Cluster mit Kubernetes v{{.new}} neu: Führen Sie \"minikube delete {{.profile}}\" und dann \"minikube start {{.profile}} - kubernetes-version = {{.new}}\" aus.\n* Erstellen Sie einen zweiten Cluster mit Kubernetes v{{.new}}: Führen Sie \"minikube start -p \u003cnew name\u003e --kubernetes-version = {{.new}}\" aus.\n* Verwenden Sie den vorhandenen Cluster mit Kubernetes v {{.old}} oder höher: Führen Sie \"minikube start {{.profile}} --kubernetes-version = {{.old}}\" aus.",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Wird beendet",
 	"Exiting.": "",
@@ -184,6 +184,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -269,7 +270,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -331,7 +331,8 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "Die angeforderte Speicherzuweisung {{.requested_size}} liegt unter dem zulässigen Mindestwert von {{.minimum_size}}.",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -362,6 +363,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "Leider wird der Parameter kubeadm.{{.parameter_name}} momentan von --extra-config nicht unterstützt.",
@@ -376,6 +378,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Startet einen lokalen Kubernetes-Cluster",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -441,7 +444,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -465,6 +467,7 @@
 	"This will keep the existing kubectl context and will create a minikube context.": "Dadurch wird der vorhandene Kubectl-Kontext beibehalten und ein minikube-Kontext erstellt.",
 	"This will start the mount daemon and automatically mount files into minikube": "Dadurch wird der Mount-Daemon gestartet und die Dateien werden automatisch in minikube geladen",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Tipp: Um diesen Root-Cluster zu entfernen, führen Sie Folgendes aus: sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}",
@@ -473,6 +476,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Möglicherweise müssen Sie Kubectl- oder minikube-Befehle verschieben, um sie als eigenen Nutzer zu verwenden. Um beispielsweise Ihre eigenen Einstellungen zu überschreiben, führen Sie aus:",
@@ -506,7 +510,6 @@
 	"Unable to pull images, which may be OK: {{.error}}": "Bilder können nicht abgerufen werden, was möglicherweise kein Problem darstellt: {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -542,7 +545,6 @@
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "VM-Treiber ist einer von: %v",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
diff --git a/translations/es.json b/translations/es.json
index ee0814d4a0..094b283d71 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -8,7 +8,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -148,6 +147,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Error: Has seleccionado Kubernetes {{.new}}, pero el clúster de tu perfil utiliza la versión {{.old}}. No se puede cambiar a una versión inferior sin eliminar todos los datos y recursos pertinentes, pero dispones de las siguientes opciones para continuar con la operación:\n* Volver a crear el clúster con Kubernetes {{.new}}: ejecuta \"minikube delete {{.profile}}\" y, luego, \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Crear un segundo clúster con Kubernetes {{.new}}: ejecuta \"minikube start -p \u003cnuevo nombre\u003e --kubernetes-version={{.new}}\"\n* Reutilizar el clúster actual con Kubernetes {{.old}} o una versión posterior: ejecuta \"minikube start {{.profile}} --kubernetes-version={{.old}}",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Saliendo",
 	"Exiting.": "",
@@ -185,6 +185,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -270,7 +271,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -332,7 +332,8 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "El valor de la asignación de memoria de {{.requested_size}} solicitada es inferior al valor mínimo de {{.minimum_size}}",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -363,6 +364,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "De momento, --extra-config no admite el parámetro kubeadm.{{.parameter_name}}",
@@ -377,6 +379,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Inicia un clúster de Kubernetes local",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -442,7 +445,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -466,6 +468,7 @@
 	"This will keep the existing kubectl context and will create a minikube context.": "Se conservará el contexto de kubectl actual y se creará uno de minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Se iniciará el daemon de activación y se activarán automáticamente los archivos en minikube",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Para eliminar este clúster de raíz, ejecuta: sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Para conectarte a este clúster, usa: kubectl --context={{.name}}",
@@ -474,6 +477,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Para usar comandos de kubectl o minikube como tu propio usuario, puede que debas reubicarlos. Por ejemplo, para sobrescribir tu configuración, ejecuta:",
@@ -507,7 +511,6 @@
 	"Unable to pull images, which may be OK: {{.error}}": "No se ha podido recuperar imágenes, que podrían estar en buen estado: {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -543,7 +546,6 @@
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "El controlador de la VM es uno de los siguientes: %v",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
diff --git a/translations/fr.json b/translations/fr.json
index 3148fd8a0a..fa16b33954 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -7,7 +7,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -84,6 +83,7 @@
 	"Display dashboard URL instead of opening a browser": "",
 	"Display the kubernetes addons URL in the CLI instead of opening it in the default browser": "",
 	"Display the kubernetes service URL in the CLI instead of opening it in the default browser": "",
+	"Display values currently set in the minikube config file": "",
 	"Display values currently set in the minikube config file.": "",
 	"Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "",
 	"Docs have been saved at - {{.path}}": "",
@@ -144,6 +144,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Fermeture…",
 	"Exiting.": "",
@@ -181,6 +182,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -266,7 +268,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "Le noeud \"{{.node_name}}\" est arrêté.",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -329,7 +330,8 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "L'allocation de mémoire demandée ({{.requested_size}}) est inférieure au minimum autorisé ({{.minimum_size}}).",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -360,6 +362,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "Désolé, le paramètre kubeadm.{{.parameter_name}} ne peut actuellement pas être utilisé avec \"--extra-config\".",
@@ -374,6 +377,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Démarre un cluster Kubernetes local.",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -437,7 +441,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -461,6 +464,7 @@
 	"This will keep the existing kubectl context and will create a minikube context.": "Cela permet de conserver le contexte kubectl existent et de créer un contexte minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Cela permet de lancer le daemon d'installation et d'installer automatiquement les fichiers dans minikube.",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Conseil : Pour supprimer ce cluster appartenant à la racine, exécutez la commande \"sudo {{.cmd}} delete\".",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Pour vous connecter à ce cluster, utilisez la commande \"kubectl --context={{.name}}\".",
@@ -469,6 +473,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Pour utiliser les commandes kubectl ou minikube sous votre propre nom d'utilisateur, vous devrez peut-être les déplacer. Par exemple, pour écraser vos propres paramètres, exécutez la commande suivante :",
@@ -502,7 +507,6 @@
 	"Unable to pull images, which may be OK: {{.error}}": "Impossible d'extraire des images, qui sont peut-être au bon format : {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -538,7 +542,6 @@
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "Le pilote de la VM appartient à : %v",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
@@ -663,4 +666,4 @@
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} sur {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
-}
+}
\ No newline at end of file
diff --git a/translations/ja.json b/translations/ja.json
index ae49a12ff5..8f5b3dff5c 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -13,7 +13,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "「none」ドライバーは「minikube ssh」コマンドをサポートしていません",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "「{{.driver}}」ドライバーがエラーを報告しました: {{.error}}",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -153,6 +152,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "エラー: Kubernetes v{{.new}} が選択されましたが、使用しているプロファイルの既存クラスタで実行されているのは Kubernetes v{{.old}} です。非破壊的なダウングレードはサポートされていませんが、以下のいずれかの方法で続行できます。\n* Kubernetes v{{.new}} を使用してクラスタを再作成する: 「minikube delete {{.profile}}」を実行してから、「minikube start {{.profile}} --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.new}} を使用して 2 つ目のクラスタを作成する: 「minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.old}} 以降を使用して既存のクラスタを再利用する: 「minikube start {{.profile}} --kubernetes-version={{.old}}」を実行します。",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "終了しています",
 	"Exiting.": "終了しています。",
@@ -190,6 +190,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -275,7 +276,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -337,7 +337,8 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "リクエストされたメモリ割り当て {{.requested_size}} が許可される最小値 {{.minimum_size}} 未満です",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -368,6 +369,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "申し訳ありません。現在、kubeadm.{{.parameter_name}} パラメータは --extra-config でサポートされていません",
@@ -382,6 +384,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "ローカルの Kubernetes クラスタを起動します",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -447,7 +450,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -471,6 +473,7 @@
 	"This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。",
 	"This will start the mount daemon and automatically mount files into minikube": "これによりマウント デーモンが起動し、ファイルが minikube に自動的にマウントされます",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "ヒント: この root 所有のクラスタを削除するには、「sudo {{.cmd}} delete」を実行します",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "このクラスタに接続するには、「kubectl --context={{.name}}」を使用します",
@@ -479,6 +482,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "kubectl か minikube コマンドを独自のユーザーとして使用するには、そのコマンドの再配置が必要な場合があります。たとえば、独自の設定を上書きするには、以下を実行します。",
@@ -512,7 +516,6 @@
 	"Unable to pull images, which may be OK: {{.error}}": "イメージを pull できませんが、問題ありません。{{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -548,7 +551,6 @@
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "VM ドライバは次のいずれかです。%v",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
diff --git a/translations/ko.json b/translations/ko.json
index 18a0bb7b99..20aaa2ef59 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -12,7 +12,6 @@
 	"'none' driver does not support 'minikube ssh' command": "'none' 드라이버는 'minikube ssh' 커맨드를 지원하지 않습니다",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 드라이버가 다음 이슈를 기록하였습니다: {{.error}}",
 	"'{{.profile}}' is not running": "'{{.profile}}' 이 실행 중이지 않습니다",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -154,6 +153,7 @@
 	"Error writing mount pid": "",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "예시",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "",
 	"Exiting.": "",
@@ -193,6 +193,7 @@
 	"Failed to stop node {{.name}}": "노드 {{.name}} 중지에 실패하였습니다",
 	"Failed to update cluster": "클러스터를 수정하는 데 실패하였습니다",
 	"Failed to update config": "컨피그를 수정하는 데 실패하였습니다",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "마운트 해제에 실패하였습니다: {{.error}}",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -275,7 +276,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -332,7 +332,8 @@
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
 	"Retrieve the ssh identity key path of the specified cluster.": "",
 	"Retrieves the IP address of the running cluster": "",
@@ -363,6 +364,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "죄송합니다, 쿠버네티스 {{.version}} 는 해당 minikube 버전에서 지원하지 않습니다",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "",
@@ -378,6 +380,7 @@
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting node": "노드를 시작하는 중",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "로컬 쿠버네티스 클러스터를 시작합니다",
 	"Starts a node.": "노드를 시작합니다",
 	"Starts an existing stopped node in a cluster.": "클러스터의 중지된 노드를 시작합니다",
@@ -434,7 +437,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -455,12 +457,14 @@
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
@@ -494,7 +498,6 @@
 	"Unable to remove machine directory": "",
 	"Unable to remove machine directory: %v": "머신 디렉토리를 제거할 수 없습니다: %v",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "가상 머신을 시작할 수 없습니다. 확인 후 가능하면 'minikube delete' 를 실행하세요",
 	"Unable to stop VM": "가상 머신을 중지할 수 없습니다",
 	"Unable to update {{.driver}} driver: {{.error}}": "{{.driver}} 를 수정할 수 없습니다: {{.error}}",
@@ -529,7 +532,6 @@
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
 	"Using the {{.driver}} driver based on existing profile": "기존 프로필에 기반하여 {{.driver}} 드라이버를 사용하는 중",
 	"Using the {{.driver}} driver based on user configuration": "유저 환경 설정 정보에 기반하여 {{.driver}} 드라이버를 사용하는 중",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
 	"Verify the IP address of the running cluster in kubeconfig.": "",
diff --git a/translations/pl.json b/translations/pl.json
index 0a0d296553..a171c7311c 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -12,7 +12,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "sterownik 'none' nie wspiera komendy 'minikube ssh'",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
@@ -153,6 +152,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
 	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "Przykłady",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "",
 	"Exiting.": "",
@@ -190,6 +190,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "Aktualizacja klastra nie powiodła się",
 	"Failed to update config": "Aktualizacja konfiguracji nie powiodła się",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -274,7 +275,6 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -335,7 +335,8 @@
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "Pozyskuje ścieżkę do klucza ssh dla wyspecyfikowanego klastra",
 	"Retrieve the ssh identity key path of the specified cluster.": "Pozyskuje ścieżkę do klucza ssh dla wyspecyfikowanego klastra.",
 	"Retrieves the IP address of the running cluster": "Pobiera adres IP aktualnie uruchomionego klastra",
@@ -366,6 +367,7 @@
 	"Show only log entries which point to known problems": "Pokaż logi które wskazują na znane problemy",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "Zignorowano zmianę kontekstu kubectl ponieważ --keep-context zostało przekazane",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "",
@@ -380,6 +382,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Uruchamianie lokalnego klastra kubernetesa",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -443,7 +446,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "",
@@ -465,6 +467,7 @@
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "Aby połączyć się z klastrem użyj: kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "Aby połaczyć się z klastem uzyj: kubectl --context={{.profile_name}}",
@@ -472,6 +475,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "Aby uruchomić minikube z HyperV Powershell musi znajdować się w zmiennej PATH",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
@@ -504,7 +508,6 @@
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
 	"Unable to start VM": "Nie można uruchomić maszyny wirtualnej",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to stop VM": "Nie można zatrzymać maszyny wirtualnej",
 	"Unable to update {{.driver}} driver: {{.error}}": "",
 	"Unable to verify SSH connectivity: {{.error}}. Will retry...": "",
@@ -539,7 +542,6 @@
 	"Using the {{.driver}} driver based on existing profile": "",
 	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "Sterownik wirtualnej maszyny to jeden z: %v",
-	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "Weryfikuję czy zmienne HTTP_PROXY i HTTPS_PROXY sa ustawione poprawnie",
 	"Verify the IP address of the running cluster in kubeconfig.": "Weryfikuję adres IP działającego klastra w kubeconfig",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 10d574dc6e..072bb50ab5 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -13,7 +13,6 @@
 	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "'none' 驱动不支持 'minikube ssh' 命令",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 驱动程序报告了一个问题： {{.error}}",
-	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN 或者防火墙正在干扰对 minikube 虚拟机的 HTTP 访问。或者，您可以使用其它的虚拟机驱动：https://minikube.sigs.k8s.io/docs/start/",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网。您可能需要对其进行配置为使用代理",
 	"A firewall is blocking Docker within the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网，您可能需要对其进行配置为使用代理",
@@ -193,6 +192,7 @@
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "错误：您已选择 Kubernetes v{{.new}}，但您的配置文件的现有集群正在运行 Kubernetes v{{.old}}。非破坏性降级不受支持，但若要继续操作，您可以执行以下选项之一：\n* 使用 Kubernetes v{{.new}} 重新创建现有集群：运行“minikube delete {{.profile}}”，然后运行“minikube start {{.profile}} --kubernetes-version={{.new}}”\n* 使用 Kubernetes v{{.new}} 再创建一个集群：运行“minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}”\n* 通过 Kubernetes v{{.old}} 或更高版本重复使用现有集群：运行“minikube start {{.profile}} --kubernetes-version={{.old}}”",
 	"Error: [{{.id}}] {{.error}}": "错误：[{{.id}}] {{.error}}",
 	"Examples": "示例",
+	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "正在退出",
 	"Exiting due to driver incompatibility": "由于驱动程序不兼容而退出",
@@ -235,6 +235,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "更新 cluster 失败",
 	"Failed to update config": "更新 config 失败",
+	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "unmount 失败：{{.error}}",
 	"File permissions used for the mount": "用于 mount 的文件权限",
 	"Filter to use only VM Drivers": "",
@@ -323,7 +324,6 @@
 	"Networking and Connectivity Commands:": "网络和连接命令：",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
-	"Node may be unable to resolve external DNS records": "",
 	"Node operations": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
@@ -387,7 +387,8 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "请求的内存分配 {{.requested_size}} 小于允许的 {{.minimum_size}} 最小值",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
-	"Retarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
+	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "检索指定集群的 ssh 密钥路径",
 	"Retrieve the ssh identity key path of the specified cluster.": "检索指定集群的 ssh 密钥路径。",
 	"Retrieves the IP address of the running cluster": "检索正在运行的群集的 IP 地址",
@@ -420,6 +421,7 @@
 	"Show only log entries which point to known problems": "",
 	"Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "",
 	"Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "",
+	"Sorry, Kubernetes v{{.k8sVersion}} requires conntrack to be installed in root's path": "",
 	"Sorry, Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Sorry, completion support is not yet implemented for {{.name}}": "",
 	"Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config": "抱歉，--extra-config 目前不支持 kubeadm.{{.parameter_name}} 参数",
@@ -434,6 +436,7 @@
 	"StartHost failed again: {{.error}}": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
+	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "启动本地 kubernetes 集群",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
@@ -503,7 +506,6 @@
 	"The node to get logs from. Defaults to the primary control plane.": "",
 	"The node to ssh into. Defaults to the primary control plane.": "",
 	"The none driver is not compatible with multi-node clusters.": "",
-	"The none driver requires conntrack to be installed for kubernetes version {{.k8sVersion}}": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The number of nodes to spin up. Defaults to 1.": "",
 	"The output format. One of 'json', 'table'": "输出的格式。'json' 或者 'table'",
@@ -527,6 +529,7 @@
 	"This will keep the existing kubectl context and will create a minikube context.": "这将保留现有 kubectl 上下文并创建 minikube 上下文。",
 	"This will start the mount daemon and automatically mount files into minikube": "这将启动装载守护进程并将文件自动装载到 minikube 中",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
+	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "",
 	"Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "提示：要移除这个由根用户拥有的集群，请运行 sudo {{.cmd}} delete",
 	"To connect to this cluster, use: kubectl --context={{.name}}": "如需连接到此集群，请使用 kubectl --context={{.name}}",
@@ -535,6 +538,7 @@
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
 	"To fix this, run: {{.command}}": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
+	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "如需以您自己的用户身份使用 kubectl 或 minikube 命令，您可能需要重新定位该命令。例如，如需覆盖您的自定义设置，请运行：",
@@ -570,7 +574,6 @@
 	"Unable to pull images, which may be OK: {{.error}}": "无法拉取镜像，有可能是正常状况：{{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
-	"Unable to start VM after repeated tries. Please try {{'minikube delete' if possible": "",
 	"Unable to start VM. Please investigate and run 'minikube delete' if possible": "无法启动虚拟机。可能的话请检查后执行 'minikube delete'",
 	"Unable to stop VM": "无法停止虚拟机",
 	"Unable to update {{.driver}} driver: {{.error}}": "",

From af8fdc650a3dd5bf8689bb8b36d6a69f17ae6b6f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 14:18:39 -0700
Subject: [PATCH 377/668] Make live cache pushes non-fatal in case of
 stop/delete race

---
 pkg/minikube/machine/cache_images.go | 36 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
index dd3fc58d9e..450c1d6614 100644
--- a/pkg/minikube/machine/cache_images.go
+++ b/pkg/minikube/machine/cache_images.go
@@ -21,6 +21,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -158,36 +159,51 @@ func needsTransfer(imgClient *client.Client, imgName string, cr cruntime.Manager
 
 // CacheAndLoadImages caches and loads images to all profiles
 func CacheAndLoadImages(images []string) error {
+	// This is the most important thing
 	if err := image.SaveToDir(images, constants.ImageCacheDir); err != nil {
-		return err
+		return errors.Wrap(err, "save to dir")
 	}
+
 	api, err := NewAPIClient()
 	if err != nil {
-		return err
+		return errors.Wrap(err, "api")
 	}
 	defer api.Close()
 	profiles, _, err := config.ListProfiles() // need to load image to all profiles
 	if err != nil {
 		return errors.Wrap(err, "list profiles")
 	}
+
+	succeeded := []string{}
+	failed := []string{}
+
 	for _, p := range profiles { // loading images to all running profiles
 		pName := p.Name // capture the loop variable
+
 		c, err := config.Load(pName)
 		if err != nil {
-			return err
+			// Non-fatal because it may race with profile deletion
+			glog.Errorf("Failed to load profile %q: %v", pName, err)
+			failed = append(failed, pName)
+			continue
 		}
+
 		for _, n := range c.Nodes {
 			m := driver.MachineName(*c, n)
+
 			status, err := Status(api, m)
 			if err != nil {
-				glog.Warningf("skipping loading cache for profile %s", pName)
 				glog.Errorf("error getting status for %s: %v", pName, err)
-				continue // try next machine
+				failed = append(failed, pName)
+				continue
 			}
+
 			if status == state.Running.String() { // the not running hosts will load on next start
 				h, err := api.Load(m)
 				if err != nil {
-					return err
+					glog.Errorf("Failed to load machine %q: %v", m, err)
+					failed = append(failed, pName)
+					continue
 				}
 				cr, err := CommandRunner(h)
 				if err != nil {
@@ -195,12 +211,18 @@ func CacheAndLoadImages(images []string) error {
 				}
 				err = LoadImages(c, cr, images, constants.ImageCacheDir)
 				if err != nil {
+					failed = append(failed, pName)
 					glog.Warningf("Failed to load cached images for profile %s. make sure the profile is running. %v", pName, err)
 				}
+				succeeded = append(succeeded, pName)
 			}
 		}
 	}
-	return err
+
+	glog.Infof("succeeded pushing to: ", strings.Join(succeeded, " "))
+	glog.Infof("failed pushing to: ", strings.Join(failed, " "))
+	// Live pushes are not considered a failure
+	return nil
 }
 
 // transferAndLoadImage transfers and loads a single image from the cache

From b71126356f5f45ea7317a7aafec73a6eba6680cb Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 14:24:53 -0700
Subject: [PATCH 378/668] Extend maximum stop retry from 30s to 120s

---
 cmd/minikube/cmd/stop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 1036a5d365..257f95a857 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -88,7 +88,7 @@ func stop(api libmachine.API, cluster config.ClusterConfig, n config.Node) bool
 		}
 	}
 
-	if err := retry.Expo(tryStop, 1*time.Second, 30*time.Second, 3); err != nil {
+	if err := retry.Expo(tryStop, 1*time.Second, 120*time.Second, 5); err != nil {
 		exit.WithError("Unable to stop VM", err)
 	}
 

From 1dcd5cd31077cd6132dea2f231361537e4fa3498 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 14:38:46 -0700
Subject: [PATCH 379/668] Pick a more universal hostname, add comment about
 docker

---
 test/integration/cert_options_test.go | 7 +++----
 test/integration/main.go              | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/cert_options_test.go b/test/integration/cert_options_test.go
index cdc95ea0d4..77d3081798 100644
--- a/test/integration/cert_options_test.go
+++ b/test/integration/cert_options_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 )
 
-func TestCertOptionFlags(t *testing.T) {
+func TestCertOptions(t *testing.T) {
 	if NoneDriver() {
 		t.Skip("skipping: none driver does not support ssh or bundle docker")
 	}
@@ -37,10 +37,9 @@ func TestCertOptionFlags(t *testing.T) {
 	// Use the most verbose logging for the simplest test. If it fails, something is very wrong.
 	args := append([]string{"start", "-p", profile, "--apiserver-ips=127.0.0.1,192.168.15.15", "--apiserver-names=localhost,www.google.com", "--apiserver-port=8555"}, StartArgs()...)
 
-	// We can safely override --apiserver-name with unique that works
+	// We can safely override --apiserver-name with
 	if NeedsPortForward() {
-		args = append(args, "--apiserver-name=kubernetes.docker.internal")
-
+		args = append(args, "--apiserver-name=localhost")
 	}
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
diff --git a/test/integration/main.go b/test/integration/main.go
index 144fae4395..2ef2d90731 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -74,7 +74,8 @@ func KicDriver() bool {
 	return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker") || strings.Contains(*startArgs, "--vm-driver=podman") || strings.Contains(*startArgs, "driver=podman")
 }
 
-// NeedsPortForward requires whether or not this host needs port forwarding
+// NeedsPortForward returns access to endpoints with this driver needs port forwarding
+// (Docker on non-Linux platforms requires ports to be forwarded to 127.0.0.1)
 func NeedsPortForward() bool {
 	return KicDriver() && (runtime.GOOS == "windows" || runtime.GOOS == "darwin")
 }

From 478de7b4a9a5672d49d82b7731cae9352e615f45 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 14:44:57 -0700
Subject: [PATCH 380/668] Fix lint error

---
 pkg/minikube/machine/cache_images.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
index 450c1d6614..93f735467c 100644
--- a/pkg/minikube/machine/cache_images.go
+++ b/pkg/minikube/machine/cache_images.go
@@ -219,8 +219,8 @@ func CacheAndLoadImages(images []string) error {
 		}
 	}
 
-	glog.Infof("succeeded pushing to: ", strings.Join(succeeded, " "))
-	glog.Infof("failed pushing to: ", strings.Join(failed, " "))
+	glog.Infof("succeeded pushing to: %s", strings.Join(succeeded, " "))
+	glog.Infof("failed pushing to: %s", strings.Join(failed, " "))
 	// Live pushes are not considered a failure
 	return nil
 }

From 7af6adfefda8426d8f8882a79a725d75d5eb3b86 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 14:48:43 -0700
Subject: [PATCH 381/668] adjust eviction hard and soft for both v1beta1 and
 v1beta2

---
 .../bootstrapper/bsutil/ktmpl/v1beta1.go      | 14 +++++---
 .../bootstrapper/bsutil/ktmpl/v1beta2.go      | 33 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index 1aca76201a..af861f03cc 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -73,11 +73,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 70
+EvictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index 50f8147d6f..dc10358dae 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -68,4 +68,35 @@ networking:
   dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
   podSubnet: "{{.PodSubnet }}"
   serviceSubnet: {{.ServiceCIDR}}
-`))
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 70
+EvictionSoft
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"  
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 70
+EvictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: {{.AdvertiseAddress}}:10249
+  `))

From 2e19e9902afedb6487b2576dca9dfced78ed4f68 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 14:52:07 -0700
Subject: [PATCH 382/668] remove duplicate paste

---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index dc10358dae..143bb4dc8e 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -68,19 +68,6 @@ networking:
   dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
   podSubnet: "{{.PodSubnet }}"
   serviceSubnet: {{.ServiceCIDR}}
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-imageGCHighThresholdPercent: 70
-EvictionSoft
-  memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
-evictionHard:
-  memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"  
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration

From 0f3b1d5da0d594ba6a10652358a94d431b87b4a3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 14:53:18 -0700
Subject: [PATCH 383/668] lowercase

---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go | 2 +-
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index af861f03cc..077544bb4a 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -74,7 +74,7 @@ networking:
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 imageGCHighThresholdPercent: 70
-EvictionSoft:
+evictionSoft:
   memory.available: "300mb"
   nodefs.available: "30%"
   nodefs.inodesFree: "20%"
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index 143bb4dc8e..884444ecdf 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -72,7 +72,7 @@ networking:
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 imageGCHighThresholdPercent: 70
-EvictionSoft:
+evictionSoft:
   memory.available: "300mb"
   nodefs.available: "30%"
   nodefs.inodesFree: "20%"

From 44e73384894581b87ef216e94fd27818694fd1bf Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 15:28:44 -0700
Subject: [PATCH 384/668] fix some unit tests

---
 .../bootstrapper/bsutil/ktmpl/v1alpha3.go      | 13 ++++++++++---
 .../bootstrapper/bsutil/ktmpl/v1beta1.go       |  2 +-
 .../bootstrapper/bsutil/ktmpl/v1beta2.go       |  2 +-
 .../bsutil/testdata/v1.12/default.yaml         | 13 ++++++++++---
 .../bsutil/testdata/v1.13/default.yaml         | 13 ++++++++++---
 .../bsutil/testdata/v1.14/default.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.15/default.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.16/default.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.17/default.yaml         | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.18/default.yaml         | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.19/default.yaml         | 18 ++++++++++++++++++
 11 files changed, 116 insertions(+), 23 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
index 4c534c161e..8e0f9cd81a 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
@@ -64,8 +64,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 `))
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index 077544bb4a..8fcb2cff9d 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -73,7 +73,7 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 70
+imageGCHighThresholdPercent: 85
 evictionSoft:
   memory.available: "300mb"
   nodefs.available: "30%"
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index 884444ecdf..bb853da62d 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -71,7 +71,7 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 70
+imageGCHighThresholdPercent: 85
 evictionSoft:
   memory.available: "300mb"
   nodefs.available: "30%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
index 3c8b8b41a8..d0c6be5d52 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
index 25d166e0dc..0d90c7e43e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
\ No newline at end of file
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
index 746eb9fb7d..1f4b0b6672 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
index d68ef1b1f2..d4c88935db 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
index 765a4b2398..59f837c7e1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
index 7651466f86..87d1907bf8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
index 6e3eefc76d..400cada689 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
index aa884e40d1..d7aff011a4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file

From 8350674c40d291fc38b649d8aa324928a97cc2d7 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 15:47:03 -0700
Subject: [PATCH 385/668] fix v12 tests

---
 .../bsutil/testdata/v1.12/containerd-api-port.yaml  | 13 ++++++++++---
 .../testdata/v1.12/containerd-pod-network-cidr.yaml | 13 ++++++++++---
 .../bsutil/testdata/v1.12/containerd.yaml           | 13 ++++++++++---
 .../bsutil/testdata/v1.12/crio-options-gates.yaml   | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.12/crio.yaml    | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.12/dns.yaml     | 13 ++++++++++---
 .../bsutil/testdata/v1.12/image-repository.yaml     | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.12/options.yaml | 13 ++++++++++---
 8 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
index adf230658d..ebb8139a38 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
index 300ee2825f..a851120a67 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
\ No newline at end of file
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
index 9866d944d9..37d0788b2d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
index c8e2fbb46a..f4903a052b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
@@ -44,7 +44,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
index 834021df94..9a3b74e892 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
\ No newline at end of file
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
index d6154f4ecd..79c486f7dc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
index e9dd51d811..6349f360b5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
@@ -37,7 +37,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
index a49db3c29f..f463317aba 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
@@ -41,7 +41,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
\ No newline at end of file

From ba84f942bd1f872644fe1af5b071c22964b67abc Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 1 Apr 2020 15:47:35 -0700
Subject: [PATCH 386/668] Apply a memory limit

---
 test/integration/cert_options_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/cert_options_test.go b/test/integration/cert_options_test.go
index 77d3081798..efa1cb4262 100644
--- a/test/integration/cert_options_test.go
+++ b/test/integration/cert_options_test.go
@@ -35,7 +35,7 @@ func TestCertOptions(t *testing.T) {
 	defer CleanupWithLogs(t, profile, cancel)
 
 	// Use the most verbose logging for the simplest test. If it fails, something is very wrong.
-	args := append([]string{"start", "-p", profile, "--apiserver-ips=127.0.0.1,192.168.15.15", "--apiserver-names=localhost,www.google.com", "--apiserver-port=8555"}, StartArgs()...)
+	args := append([]string{"start", "-p", profile, "--memory=1900", "--apiserver-ips=127.0.0.1,192.168.15.15", "--apiserver-names=localhost,www.google.com", "--apiserver-port=8555"}, StartArgs()...)
 
 	// We can safely override --apiserver-name with
 	if NeedsPortForward() {

From 6af355c08e8b50e6268f6e8d8e2431c256033d38 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 15:53:56 -0700
Subject: [PATCH 387/668] fix unit test for v1.13

---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go   |  2 +-
 .../testdata/v1.12/containerd-pod-network-cidr.yaml |  2 +-
 .../bootstrapper/bsutil/testdata/v1.12/crio.yaml    |  2 +-
 .../bootstrapper/bsutil/testdata/v1.12/options.yaml |  2 +-
 .../bsutil/testdata/v1.13/containerd-api-port.yaml  | 13 ++++++++++---
 .../testdata/v1.13/containerd-pod-network-cidr.yaml | 13 ++++++++++---
 .../bsutil/testdata/v1.13/containerd.yaml           | 13 ++++++++++---
 .../bsutil/testdata/v1.13/crio-options-gates.yaml   | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.13/crio.yaml    | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.13/default.yaml |  2 +-
 .../bootstrapper/bsutil/testdata/v1.13/dns.yaml     | 13 ++++++++++---
 .../bsutil/testdata/v1.13/image-repository.yaml     | 13 ++++++++++---
 .../bootstrapper/bsutil/testdata/v1.13/options.yaml | 13 ++++++++++---
 13 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index bb853da62d..2bf38849d0 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -86,4 +86,4 @@ evictionHard:
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
 metricsBindAddress: {{.AdvertiseAddress}}:10249
-  `))
+`))
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
index a851120a67..6204601b5e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
@@ -46,4 +46,4 @@ evictionHard:
   memory.available: "100mb"
   nodefs.available: "10%"
   nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
\ No newline at end of file
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
index 9a3b74e892..a85b8acfe1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
@@ -46,4 +46,4 @@ evictionHard:
   memory.available: "100mb"
   nodefs.available: "10%"
   nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
\ No newline at end of file
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
index f463317aba..575134b4a7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
@@ -51,4 +51,4 @@ evictionHard:
   memory.available: "100mb"
   nodefs.available: "10%"
   nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
\ No newline at end of file
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
index 8d90c3e212..c11f88a8ed 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
index 1788a1adb8..616a307086 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
index 770f46cc0f..cfd89e8f5e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
index 326912679e..2ba4188db7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
@@ -44,7 +44,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
index 08646f704f..b6ee3cd774 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
index 0d90c7e43e..0b73033f7a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
@@ -46,4 +46,4 @@ evictionHard:
   memory.available: "100mb"
   nodefs.available: "10%"
   nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
\ No newline at end of file
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
index eb057faf76..90063e993a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
@@ -36,7 +36,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
index d828d72006..5889d79524 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
@@ -37,7 +37,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
index 5fe5d326bc..2006ab732d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
@@ -41,7 +41,14 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"

From 5505ad885807930380d02b194ddc7f1c61c30279 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 15:55:45 -0700
Subject: [PATCH 388/668] fix v.1.14 unit tst

---
 .../bsutil/testdata/v1.14/containerd-api-port.yaml | 14 ++++++++++----
 .../v1.14/containerd-pod-network-cidr.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.14/containerd.yaml          | 14 ++++++++++----
 .../bsutil/testdata/v1.14/crio-options-gates.yaml  | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.14/crio.yaml   | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.14/dns.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.14/image-repository.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.14/options.yaml             | 14 ++++++++++----
 8 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
index 64efcf3938..650f50992b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
index 6ef28c1c8d..133fa70ee7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
index 97b4065593..5e3255aa8a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
index cf8a3e4728..63ff7696b8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
@@ -51,11 +51,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
index 3ef27c9b9f..dc7d218de5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
index a4e2567756..a58d3c431d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
index aedd2a9047..51dbc54d15 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
@@ -42,11 +42,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
index 81980c953d..1b4eaf3e3f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
@@ -48,11 +48,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration

From a9dcfe82fe21afa1b3c129d2a705c59b15aae5e7 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 1 Apr 2020 15:59:33 -0700
Subject: [PATCH 389/668] Update generate-docs command

Now, generate-docs will compile all subcommands for one command into one document instead of creating a document per subcommand.

For example, instead of creating:

minikbue_addons_enable.md
minikbue_addons_disable.md

it will now create

addons.md

which will include subsections for `minikube addons enable` and `minikube addons disable`.
---
 cmd/minikube/cmd/generate-docs.go |   4 +-
 pkg/generate/docs.go              | 129 ++++++++++++++++++++++++++++++
 pkg/generate/docs_templates.go    |  29 +++++++
 pkg/minikube/out/out.go           |   4 +-
 pkg/minikube/out/style.go         |   3 +-
 5 files changed, 164 insertions(+), 5 deletions(-)
 create mode 100644 pkg/generate/docs.go
 create mode 100644 pkg/generate/docs_templates.go

diff --git a/cmd/minikube/cmd/generate-docs.go b/cmd/minikube/cmd/generate-docs.go
index 3bd6aba070..e87b7270a4 100644
--- a/cmd/minikube/cmd/generate-docs.go
+++ b/cmd/minikube/cmd/generate-docs.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/cobra/doc"
+	"k8s.io/minikube/pkg/generate"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/out"
 )
@@ -43,7 +43,7 @@ var generateDocs = &cobra.Command{
 		}
 
 		// generate docs
-		if err := doc.GenMarkdownTree(RootCmd, path); err != nil {
+		if err := generate.Docs(RootCmd, path); err != nil {
 			exit.WithError("Unable to generate docs", err)
 		}
 		out.T(out.Documentation, "Docs have been saved at - {{.path}}", out.V{"path": path})
diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
new file mode 100644
index 0000000000..887a8c684c
--- /dev/null
+++ b/pkg/generate/docs.go
@@ -0,0 +1,129 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package generate
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+// Docs generates docs for minikube command
+func Docs(root *cobra.Command, path string) error {
+	cmds := root.Commands()
+	for _, c := range cmds {
+		contents, err := docForCommand(c)
+		if err != nil {
+			return errors.Wrapf(err, "generating doc for %s", c.Name)
+		}
+		if err := saveDocForCommand(c, contents, path); err != nil {
+			return errors.Wrapf(err, "saving doc for %s", c.Name())
+		}
+	}
+	return nil
+}
+
+func docForCommand(command *cobra.Command) ([]byte, error) {
+	buf := bytes.NewBuffer([]byte{})
+	if err := generateTitle(command, buf); err != nil {
+		return nil, errors.Wrap(err, "generating title")
+	}
+	if err := writeSubcommands(command, buf); err != nil {
+		return nil, errors.Wrap(err, "writing subcommands")
+	}
+	return removeHelpCommand(buf), nil
+}
+
+// after every command, cobra automatically appends
+// ### SEE ALSO
+
+// * [minikube addons](minikube_addons.md)	 - Modify minikube's kubernetes addons
+
+// ###### Auto generated by spf13/cobra on 1-Apr-2020
+// help text which is unecessary info after every subcommand
+// This function removes that text.
+func removeHelpCommand(buffer *bytes.Buffer) []byte {
+	beginningHelpText := "### SEE ALSO"
+	endHelpText := "###### Auto generated by spf13/cobra"
+	scanner := bufio.NewScanner(buffer)
+	includeLine := true
+
+	final := bytes.NewBuffer([]byte{})
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.Contains(line, beginningHelpText) {
+			includeLine = false
+			continue
+		}
+		if strings.Contains(line, endHelpText) {
+			includeLine = true
+			continue
+		}
+		if !includeLine {
+			continue
+		}
+		// scanner strips the ending newline
+		if _, err := final.WriteString(line + "\n"); err != nil {
+			glog.Warningf("error removing help text: %v", err)
+			break
+		}
+	}
+	return final.Bytes()
+}
+
+func writeSubcommands(command *cobra.Command, w io.Writer) error {
+	if err := doc.GenMarkdown(command, w); err != nil {
+		return errors.Wrapf(err, "getting markdown custom")
+	}
+	if !command.HasSubCommands() {
+		return nil
+	}
+	subCommands := command.Commands()
+	for _, sc := range subCommands {
+		if err := writeSubcommands(sc, w); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func generateTitle(command *cobra.Command, w io.Writer) error {
+	date := time.Now().Format("2006-01-02")
+	title := out.ApplyTemplateFormatting(9999, false, title, out.V{"Command": command.Name(), "Description": command.Short, "Date": date})
+	_, err := w.Write([]byte(title))
+	return err
+}
+
+func saveDocForCommand(command *cobra.Command, contents []byte, path string) error {
+	fp := filepath.Join(path, fmt.Sprintf("%s.md", command.Name()))
+	if err := os.Remove(fp); err != nil {
+		glog.Warningf("error removing %s", fp)
+	}
+	return ioutil.WriteFile(fp, contents, 0644)
+}
diff --git a/pkg/generate/docs_templates.go b/pkg/generate/docs_templates.go
new file mode 100644
index 0000000000..0e8dca5ac3
--- /dev/null
+++ b/pkg/generate/docs_templates.go
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package generate
+
+var title = `---
+title: {{.Command}}
+linkTitle: {{.Command}}
+weight: 1
+date: {{.Date}}
+description: >
+  {{.Description}}
+---
+
+
+`
diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
index 38c817339b..494b32befe 100644
--- a/pkg/minikube/out/out.go
+++ b/pkg/minikube/out/out.go
@@ -62,7 +62,7 @@ type V map[string]interface{}
 
 // T writes a stylized and templated message to stdout
 func T(style StyleEnum, format string, a ...V) {
-	outStyled := applyTemplateFormatting(style, useColor, format, a...)
+	outStyled := ApplyTemplateFormatting(style, useColor, format, a...)
 	String(outStyled)
 }
 
@@ -88,7 +88,7 @@ func Ln(format string, a ...interface{}) {
 
 // ErrT writes a stylized and templated error message to stderr
 func ErrT(style StyleEnum, format string, a ...V) {
-	errStyled := applyTemplateFormatting(style, useColor, format, a...)
+	errStyled := ApplyTemplateFormatting(style, useColor, format, a...)
 	Err(errStyled)
 }
 
diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index c67188e12d..7499a5e94e 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -161,7 +161,8 @@ func applyStyle(style StyleEnum, useColor bool, format string) string {
 	return applyPrefix(s.Prefix, format)
 }
 
-func applyTemplateFormatting(style StyleEnum, useColor bool, format string, a ...V) string {
+// ApplyTemplateFormatting applies formatting to the provided template
+func ApplyTemplateFormatting(style StyleEnum, useColor bool, format string, a ...V) string {
 	if a == nil {
 		a = []V{{}}
 	}

From c409c4c91c3683c3e25a9e259b78dd25612a8363 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 1 Apr 2020 16:13:54 -0700
Subject: [PATCH 390/668] Add unit tests to make sure docs are up to date

---
 cmd/minikube/cmd/generate-docs_test.go | 47 ++++++++++++++++++++++++++
 pkg/generate/docs.go                   |  4 +--
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 cmd/minikube/cmd/generate-docs_test.go

diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
new file mode 100644
index 0000000000..06178eda95
--- /dev/null
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+
+	"k8s.io/minikube/pkg/generate"
+)
+
+func TestCommandsDocs(t *testing.T) {
+	dir := "../../../site/content/en/docs/Reference/Commands/"
+
+	for _, sc := range RootCmd.Commands() {
+		t.Run(sc.Name(), func(t *testing.T) {
+			fp := filepath.Join(dir, fmt.Sprintf("%s.md", sc.Name()))
+			expectedContents, err := ioutil.ReadFile(fp)
+			if err != nil {
+				t.Fatalf("Docs are not updated. Please run `make generate-docs` to update commands documentation: %v", err)
+			}
+			actualContents, err := generate.DocForCommand(sc)
+			if err != nil {
+				t.Fatalf("error getting contents: %v", err)
+			}
+			if string(actualContents) != string(expectedContents) {
+				t.Fatalf("Docs are not updated. Please run `make generate-docs` to update commands documentation.")
+			}
+		})
+	}
+}
diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
index 887a8c684c..905009ef7b 100644
--- a/pkg/generate/docs.go
+++ b/pkg/generate/docs.go
@@ -38,7 +38,7 @@ import (
 func Docs(root *cobra.Command, path string) error {
 	cmds := root.Commands()
 	for _, c := range cmds {
-		contents, err := docForCommand(c)
+		contents, err := DocForCommand(c)
 		if err != nil {
 			return errors.Wrapf(err, "generating doc for %s", c.Name)
 		}
@@ -49,7 +49,7 @@ func Docs(root *cobra.Command, path string) error {
 	return nil
 }
 
-func docForCommand(command *cobra.Command) ([]byte, error) {
+func DocForCommand(command *cobra.Command) ([]byte, error) {
 	buf := bytes.NewBuffer([]byte{})
 	if err := generateTitle(command, buf); err != nil {
 		return nil, errors.Wrap(err, "generating title")

From 9405163530400ef54bae2d288231d63b2747abc7 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 1 Apr 2020 16:15:27 -0700
Subject: [PATCH 391/668] add makefile rule for generating docs

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 049427610c..7e2e6d6e11 100755
--- a/Makefile
+++ b/Makefile
@@ -270,9 +270,13 @@ integration-versioned: out/minikube ## Trigger minikube integration testing
 test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go ## Trigger minikube test
 	./test.sh
 
-.PHONY: gotest
-gotest: $(SOURCE_GENERATED) ## Trigger minikube test
-	go test -tags "$(MINIKUBE_BUILD_TAGS)" $(MINIKUBE_TEST_FILES)
+.PHONY: generate-docs
+generate-docs: out/minikube
+	out/minikube generate-docs --path ./site/content/en/docs/Reference/Commands/
+
+.PHONY: extract
+extract: ## Compile extract tool
+	go run cmd/extract/extract.go
 
 .PHONY: extract
 extract: ## Compile extract tool

From d4853b0d9d112c724bcf4ed60034021865dea036 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 16:24:37 -0700
Subject: [PATCH 392/668] fix v1.15 unit tests

---
 .../bsutil/testdata/v1.15/containerd-api-port.yaml | 14 ++++++++++----
 .../v1.15/containerd-pod-network-cidr.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.15/containerd.yaml          | 14 ++++++++++----
 .../bsutil/testdata/v1.15/crio-options-gates.yaml  | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.15/crio.yaml   | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.15/dns.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.15/image-repository.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.15/options.yaml             | 14 ++++++++++----
 8 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
index 4e6bbead95..dbff89902e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
index 9a9a5c60f6..14b9a1e957 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
index cacacc7e43..636ef0fa92 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
index c78edc0119..999c234227 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
@@ -51,11 +51,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
index 47db96b5c2..42a7f5e44e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
index 1e79a74a1c..801ffbe402 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
index f11df32d8b..7230fb8108 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
@@ -42,11 +42,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
index d277ac59e6..8911e2eead 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
@@ -48,11 +48,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration

From 84d469ab841a474bfe52149dccb8e8d275099e42 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 16:26:38 -0700
Subject: [PATCH 393/668] fix unit test _v1.16

---
 .../bsutil/testdata/v1.16/containerd-api-port.yaml | 14 ++++++++++----
 .../v1.16/containerd-pod-network-cidr.yaml         | 14 ++++++++++----
 .../bsutil/testdata/v1.16/containerd.yaml          | 14 ++++++++++----
 .../bsutil/testdata/v1.16/crio-options-gates.yaml  | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.16/crio.yaml   | 14 ++++++++++----
 .../bootstrapper/bsutil/testdata/v1.16/dns.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.16/image-repository.yaml    | 14 ++++++++++----
 .../bsutil/testdata/v1.16/options.yaml             | 14 ++++++++++----
 8 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
index 758f7b2f62..5a67f6a8fb 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
index 15802a1859..52924ded68 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
index 0876e3bdde..9035413978 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
index 6ca53c67e9..77ffe132d1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
@@ -51,11 +51,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
index 0b87277ba2..763197d967 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
index 1105d6fc3c..b15ea752a9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
@@ -41,11 +41,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
index 5b78859ead..ff79100240 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
@@ -42,11 +42,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
index cb4d159683..dd49714784 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
@@ -48,11 +48,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration

From 2af012fbe34df1c9a7500281f7fad9a76e7da88f Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 16:31:12 -0700
Subject: [PATCH 394/668] fix v1.17 unit test

---
 .../testdata/v1.17/containerd-api-port.yaml    | 18 ++++++++++++++++++
 .../v1.17/containerd-pod-network-cidr.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.17/containerd.yaml      | 18 ++++++++++++++++++
 .../testdata/v1.17/crio-options-gates.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.17/crio.yaml            | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.17/default.yaml         |  2 +-
 .../bsutil/testdata/v1.17/dns.yaml             | 18 ++++++++++++++++++
 .../testdata/v1.17/image-repository.yaml       | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.17/options.yaml         | 18 ++++++++++++++++++
 9 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
index a4c4222b5b..39460d670f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
index cd1a400c07..1f3c30314a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
index fe006e5d53..34b37482a3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
index 74ec1286eb..cf69c09b96 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
@@ -46,3 +46,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
index 3588d336df..ce16542fd4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
index 87d1907bf8..a243b8ab1f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
@@ -53,4 +53,4 @@ evictionHard:
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
-metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
index 779cceeb46..c0b5150b89 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: 1.1.1.1
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
index a37e2dda86..97d4fec6ce 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
@@ -37,3 +37,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
index c940653ab5..f51e2b2923 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
@@ -43,3 +43,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249

From 8bcda5c7ee8b7f0eee75cfa4f8d25bf0a7f09805 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 16:33:27 -0700
Subject: [PATCH 395/668] fix v1.18 unit test

---
 .../testdata/v1.18/containerd-api-port.yaml    | 18 ++++++++++++++++++
 .../v1.18/containerd-pod-network-cidr.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.18/containerd.yaml      | 18 ++++++++++++++++++
 .../testdata/v1.18/crio-options-gates.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.18/crio.yaml            | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.18/default.yaml         |  2 +-
 .../bsutil/testdata/v1.18/dns.yaml             | 18 ++++++++++++++++++
 .../testdata/v1.18/image-repository.yaml       | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.18/options.yaml         | 18 ++++++++++++++++++
 9 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
index 4360299921..df3764a44a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
index d714225d46..f95cafe800 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
index 64161c1b0a..d40f594d57 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
index 66dfb8c7ea..59c2b12bdf 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
@@ -46,3 +46,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
index 862711d0c9..dbee9b84bd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
index 400cada689..176ea4808f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
@@ -53,4 +53,4 @@ evictionHard:
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
-metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
index c463026f5f..a2be08e577 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: 1.1.1.1
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
index 55ca1f3421..760e9f5ff0 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
@@ -37,3 +37,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
index 9049b3f987..3b0ff6bac3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
@@ -43,3 +43,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249

From 72cc9cb7c1b107181bbef243b21e77e1ae769bd0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 16:36:08 -0700
Subject: [PATCH 396/668] fix v1.19 unit test

---
 .../testdata/v1.19/containerd-api-port.yaml    | 18 ++++++++++++++++++
 .../v1.19/containerd-pod-network-cidr.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.19/containerd.yaml      | 18 ++++++++++++++++++
 .../testdata/v1.19/crio-options-gates.yaml     | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.19/crio.yaml            | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.19/default.yaml         |  2 +-
 .../bsutil/testdata/v1.19/dns.yaml             | 18 ++++++++++++++++++
 .../testdata/v1.19/image-repository.yaml       | 18 ++++++++++++++++++
 .../bsutil/testdata/v1.19/options.yaml         | 18 ++++++++++++++++++
 9 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
index c04d7a5011..156508326d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
index 980c7e94e7..68c5c7a1f8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
index 0e28179d6b..04c98cb4bc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
index 326f80a61d..e9b2694f82 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
@@ -46,3 +46,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
index 72ea86b7bc..86c2c246ac 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
index d7aff011a4..d5e503b35b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
@@ -53,4 +53,4 @@ evictionHard:
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
-metricsBindAddress: {{.AdvertiseAddress}}:10249
\ No newline at end of file
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
index b06f44e6b6..442896f730 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
@@ -36,3 +36,21 @@ networking:
   dnsDomain: 1.1.1.1
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
index 7d8f48ca3d..5c5f4d434e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
@@ -37,3 +37,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
index 0adff142eb..99a3710185 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
@@ -43,3 +43,21 @@ networking:
   dnsDomain: cluster.local
   podSubnet: ""
   serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 85
+evictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: 1.1.1.1:10249

From ac1b3b0c59957139f8c0bafb1ef5f0af3238eb6f Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 1 Apr 2020 17:32:36 -0700
Subject: [PATCH 397/668] merge

---
 cmd/minikube/cmd/start.go | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 56326fa41f..61965e87cb 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -304,11 +304,15 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	validateSpecifiedDriver(existing)
-	ds := selectDriver(existing)
+	ds, alts := selectDriver(existing)
+
+}
+
+func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) error {
 	driverName := ds.Name
 	glog.Infof("selected driver: %s", driverName)
 	validateDriver(ds, existing)
-	err = autoSetDriverOptions(cmd, driverName)
+	err := autoSetDriverOptions(cmd, driverName)
 	if err != nil {
 		glog.Errorf("Error autoSetOptions : %v", err)
 	}
@@ -330,7 +334,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	// This is about as far as we can go without overwriting config files
 	if viper.GetBool(dryRun) {
 		out.T(out.DryRun, `dry-run validation complete!`)
-		return
+		return nil
 	}
 
 	if driver.IsVM(driverName) {
@@ -388,6 +392,8 @@ func runStart(cmd *cobra.Command, args []string) {
 	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
 		glog.Errorf("kubectl info: %v", err)
 	}
+
+	return nil
 }
 
 func updateDriver(driverName string) {
@@ -519,7 +525,7 @@ func kubectlVersion(path string) (string, error) {
 	return cv.ClientVersion.GitVersion, nil
 }
 
-func selectDriver(existing *config.ClusterConfig) registry.DriverState {
+func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []registry.DriverState) {
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
 
@@ -528,7 +534,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 		old := hostDriver(existing)
 		ds := driver.Status(old)
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on existing profile`, out.V{"driver": ds.String()})
-		return ds
+		return ds, nil
 	}
 
 	// Default to looking at the new driver parameter
@@ -548,7 +554,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
 		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
-		return ds
+		return ds, nil
 	}
 
 	// Fallback to old driver parameter
@@ -558,7 +564,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
 		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
-		return ds
+		return ds, nil
 	}
 
 	pick, alts := driver.Suggest(driver.Choices(viper.GetBool("vm")))
@@ -575,7 +581,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 	} else {
 		out.T(out.Sparkle, `Automatically selected the {{.driver}} driver`, out.V{"driver": pick.String()})
 	}
-	return pick
+	return pick, alts
 }
 
 // hostDriver returns the actual driver used by a libmachine host, which can differ from our config

From 0357c89ee57e0579937a42a6a6604b9dbac39de4 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 1 Apr 2020 17:35:41 -0700
Subject: [PATCH 398/668] add issue to todo comment

---
 cmd/minikube/cmd/node_add.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index ef25f4680d..ec97540cf9 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -62,7 +62,7 @@ var nodeAddCmd = &cobra.Command{
 }
 
 func init() {
-	//We should figure out which minikube start flags to actually import
+	// TODO(https://github.com/kubernetes/minikube/issues/7366): We should figure out which minikube start flags to actually import
 	nodeAddCmd.Flags().BoolVar(&cp, "control-plane", false, "If true, the node added will also be a control plane in addition to a worker.")
 	nodeAddCmd.Flags().BoolVar(&worker, "worker", true, "If true, the added node will be marked for work. Defaults to true.")
 	nodeAddCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")

From 071b2c11a44139d9d506a4e558aed36fe5b672d5 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 17:44:19 -0700
Subject: [PATCH 399/668] disable disk resource management by default

---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go   | 12 +++++-------
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go    | 12 +++++-------
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go    | 12 +++++-------
 .../bsutil/testdata/v1.12/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.12/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.12/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.12/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.12/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.12/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.12/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.12/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.12/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.13/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.13/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.13/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.13/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.13/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.13/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.13/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.13/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.13/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.14/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.14/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.14/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.14/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.14/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.14/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.14/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.14/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.14/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.15/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.15/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.15/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.15/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.15/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.15/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.15/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.15/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.15/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.16/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.16/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.16/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.16/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.16/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.16/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.16/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.16/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.16/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.17/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.17/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.17/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.17/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.17/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.17/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.17/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.17/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.17/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.18/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.18/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.18/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.18/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.18/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.18/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.18/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.18/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.18/options.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.19/containerd-api-port.yaml   | 12 +++++-------
 .../testdata/v1.19/containerd-pod-network-cidr.yaml  | 12 +++++-------
 .../bsutil/testdata/v1.19/containerd.yaml            | 12 +++++-------
 .../bsutil/testdata/v1.19/crio-options-gates.yaml    | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.19/crio.yaml     | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.19/default.yaml  | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.19/dns.yaml      | 12 +++++-------
 .../bsutil/testdata/v1.19/image-repository.yaml      | 12 +++++-------
 .../bootstrapper/bsutil/testdata/v1.19/options.yaml  | 12 +++++-------
 75 files changed, 375 insertions(+), 525 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
index 8e0f9cd81a..7a301e9623 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
@@ -64,15 +64,13 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 `))
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index 8fcb2cff9d..9b77410933 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -73,17 +73,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index 2bf38849d0..b6138e6008 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -71,17 +71,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
index ebb8139a38..38bbe649ec 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
index 6204601b5e..40eeec238e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
index 37d0788b2d..c9ff5d3911 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
index f4903a052b..5815d707c7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
@@ -44,14 +44,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
index a85b8acfe1..44f8730a46 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
index d0c6be5d52..be35f4082d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
index 79c486f7dc..6f7e66f9c4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
index 6349f360b5..36867696ae 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
@@ -37,14 +37,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
index 575134b4a7..b467ac87a4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
@@ -41,14 +41,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
index c11f88a8ed..60d0690ae6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
index 616a307086..21ca73b1b1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
index cfd89e8f5e..d2e151a35b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
index 2ba4188db7..543fb1ee8b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
@@ -44,14 +44,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
index b6ee3cd774..e60f55e7ef 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
index 0b73033f7a..53f15ac13f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
index 90063e993a..0a70972344 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
@@ -36,14 +36,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
index 5889d79524..c551fc0536 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
@@ -37,14 +37,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
index 2006ab732d..6ea8b389df 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
@@ -41,14 +41,12 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
index 650f50992b..7654305fab 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
index 133fa70ee7..81c28b2f33 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
index 5e3255aa8a..8acd5f3267 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
index 63ff7696b8..6388c22c22 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
@@ -51,17 +51,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
index dc7d218de5..aa82c8b78e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
index 1f4b0b6672..cc3dcab741 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
index a58d3c431d..bf54b6f60c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
index 51dbc54d15..0f8b5ef75c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
@@ -42,17 +42,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
index 1b4eaf3e3f..519c507a3d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
@@ -48,17 +48,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
index dbff89902e..736cbd3abc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
index 14b9a1e957..d9f6ccff91 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
index 636ef0fa92..6c694c17c9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
index 999c234227..2c053158be 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
@@ -51,17 +51,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
index 42a7f5e44e..08f281323e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
index d4c88935db..1dbf3e30e9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
index 801ffbe402..3c6131ed2f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
index 7230fb8108..3f9ba2a441 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
@@ -42,17 +42,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
index 8911e2eead..991dbb4a47 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
@@ -48,17 +48,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
index 5a67f6a8fb..08262396ea 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
index 52924ded68..40dd1b4614 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
index 9035413978..a3455b2a94 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
index 77ffe132d1..74290838bd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
@@ -51,17 +51,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
index 763197d967..19497ad327 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
index 59f837c7e1..18a2278edb 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
index b15ea752a9..34bd689a50 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
@@ -41,17 +41,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
index ff79100240..3291805326 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
@@ -42,17 +42,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
index dd49714784..6f4c460192 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
@@ -48,17 +48,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
index 39460d670f..3bbd6cb2d9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
index 1f3c30314a..427043372e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
index 34b37482a3..6b9744239d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
index cf69c09b96..e4266ad54d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
@@ -49,17 +49,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
index ce16542fd4..e5d6ee8e58 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
index a243b8ab1f..a4ae1beadb 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
index c0b5150b89..92c1b12bd8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
index 97d4fec6ce..520e1a83db 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
@@ -40,17 +40,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
index f51e2b2923..b75b0ed685 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
@@ -46,17 +46,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
index df3764a44a..797c24abf5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
index f95cafe800..c069ee3982 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
index d40f594d57..33b2cf1926 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
index 59c2b12bdf..4e45d2dffd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
@@ -49,17 +49,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
index dbee9b84bd..1c6741073c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
index 176ea4808f..4e6b615a6e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
index a2be08e577..5643b4a60a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
index 760e9f5ff0..869a531661 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
@@ -40,17 +40,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
index 3b0ff6bac3..f312f43f57 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
@@ -46,17 +46,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
index 156508326d..d9bdba3949 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
index 68c5c7a1f8..3c826b1135 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
index 04c98cb4bc..2168d818d7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
index e9b2694f82..61edca441b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
@@ -49,17 +49,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
index 86c2c246ac..106e3d4fb5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
index d5e503b35b..222165c3b5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
index 442896f730..f2f6813ca9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
@@ -39,17 +39,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
index 5c5f4d434e..cb64377077 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
@@ -40,17 +40,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
index 99a3710185..d254907f0b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
@@ -46,17 +46,15 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 85
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
 evictionSoft:
   memory.available: "300mb"
-  nodefs.available: "30%"
-  nodefs.inodesFree: "20%"
-  imagefs.available: "30%"
 evictionHard:
   memory.available: "100mb"
-  nodefs.available: "10%"
-  nodefs.inodesFree: "5%"
-  imagefs.available: "10%"
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration

From 9b2176298ccfc5b39e9825c9c05d881409715516 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 18:21:20 -0700
Subject: [PATCH 400/668] get rid of evicition soft

---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go             | 3 ---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go              | 3 ---
 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go              | 3 ---
 .../bsutil/testdata/v1.12/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.12/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.12/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml   | 3 ---
 .../bsutil/testdata/v1.13/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.13/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.13/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml   | 3 ---
 .../bsutil/testdata/v1.14/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.14/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml   | 3 ---
 .../bsutil/testdata/v1.15/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.15/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml   | 3 ---
 .../bsutil/testdata/v1.16/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.16/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml   | 3 ---
 .../bsutil/testdata/v1.17/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml   | 3 ---
 .../bsutil/testdata/v1.18/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml   | 3 ---
 .../bsutil/testdata/v1.19/containerd-api-port.yaml             | 3 ---
 .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml     | 3 ---
 .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml         | 3 ---
 .../bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml      | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml       | 3 ---
 .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml   | 3 ---
 pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml   | 3 ---
 75 files changed, 225 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
index 7a301e9623..a459bb8a27 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
@@ -66,10 +66,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index 9b77410933..cbd2ec6d20 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -75,10 +75,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index b6138e6008..8655dfa7df 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -73,10 +73,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
index 38bbe649ec..e7ae37e44a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
index 40eeec238e..d49b9ec306 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
index c9ff5d3911..e8bc0ce7da 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
index 5815d707c7..71c60951ac 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml
@@ -46,10 +46,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
index 44f8730a46..1f79aeb4d6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
index be35f4082d..5588fe6c75 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
index 6f7e66f9c4..7092fb6277 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
index 36867696ae..a22a4d75cc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml
@@ -39,10 +39,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
index b467ac87a4..1303e6b6ac 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
index 60d0690ae6..4389e10b5a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
index 21ca73b1b1..71d7a676be 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
index d2e151a35b..485394334f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
index 543fb1ee8b..4fa17efa5e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml
@@ -46,10 +46,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
index e60f55e7ef..f5daeef55d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
index 53f15ac13f..d99a3fbfaf 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
index 0a70972344..23bac82149 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml
@@ -38,10 +38,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
index c551fc0536..924f4fc5a9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml
@@ -39,10 +39,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
index 6ea8b389df..3d9770bed6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
index 7654305fab..fc26257b55 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
index 81c28b2f33..9608b92860 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
index 8acd5f3267..c3a54825dd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
index 6388c22c22..7b43973e7d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
@@ -53,10 +53,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
index aa82c8b78e..fa5b62cb02 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
index cc3dcab741..84f68f98fc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
index bf54b6f60c..8791cf879f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
index 0f8b5ef75c..b1c12c218e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
@@ -44,10 +44,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
index 519c507a3d..72302c5654 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
@@ -50,10 +50,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
index 736cbd3abc..307f517ace 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
index d9f6ccff91..9a0077f387 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
index 6c694c17c9..3fee964be4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
index 2c053158be..b07e909cc2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
@@ -53,10 +53,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
index 08f281323e..c30eed071b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
index 1dbf3e30e9..99c6275ebd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
index 3c6131ed2f..7a41b4cd55 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
index 3f9ba2a441..053a5977f9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
@@ -44,10 +44,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
index 991dbb4a47..bac9bdd0c1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
@@ -50,10 +50,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
index 08262396ea..1ac14c682a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
index 40dd1b4614..0a43dd453b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
index a3455b2a94..13ebbb05a2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
index 74290838bd..56388066f7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
@@ -53,10 +53,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
index 19497ad327..70d0f5219b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
index 18a2278edb..fd99dfc616 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
index 34bd689a50..8c880bada8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
@@ -43,10 +43,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
index 3291805326..919063dda8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
@@ -44,10 +44,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
index 6f4c460192..bf5753a224 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
@@ -50,10 +50,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
index 3bbd6cb2d9..43b450f5c0 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
index 427043372e..9cc48c0109 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
index 6b9744239d..fd4f8c324d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
index e4266ad54d..658763f28f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
@@ -51,10 +51,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
index e5d6ee8e58..f4c255c0c1 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
index a4ae1beadb..03b1632e50 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
index 92c1b12bd8..bf54c68796 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
index 520e1a83db..607c43532c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
@@ -42,10 +42,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
index b75b0ed685..2dfa4b76fd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
@@ -48,10 +48,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
index 797c24abf5..376b6dd2fa 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
index c069ee3982..910e9e9596 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
index 33b2cf1926..30b062ee58 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
index 4e45d2dffd..2f787eb95f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
@@ -51,10 +51,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
index 1c6741073c..ab798b8bf7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
index 4e6b615a6e..12ae87fcd3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
index 5643b4a60a..abb27ec9fb 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
index 869a531661..c22581b268 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
@@ -42,10 +42,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
index f312f43f57..65e991dbce 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
@@ -48,10 +48,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
index d9bdba3949..5c7c731951 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
index 3c826b1135..833a7ce604 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
index 2168d818d7..6e2bca9c65 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
index 61edca441b..9183325cff 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
@@ -51,10 +51,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
index 106e3d4fb5..7c8a91362f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
index 222165c3b5..efe78f9ea4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
index f2f6813ca9..c771a624ee 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
@@ -41,10 +41,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
index cb64377077..0d9e4b7b4a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
@@ -42,10 +42,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
index d254907f0b..c288ba36c4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
@@ -48,10 +48,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
-evictionSoft:
-  memory.available: "300mb"
 evictionHard:
-  memory.available: "100mb"
   nodefs.available: "0%"
   nodefs.inodesFree: "0%"
   imagefs.available: "0%"

From c74604e806d007290e629809f1b0ecc869f0ca9d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 21:34:37 -0700
Subject: [PATCH 401/668] fix validate node test output

---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 6623f1f362..5be2a71bc9 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -142,7 +142,7 @@ func validateNodeLabels(ctx context.Context, t *testing.T, profile string) {
 	expectedLabels := []string{"minikube.k8s.io/commit", "minikube.k8s.io/version", "minikube.k8s.io/updated_at", "minikube.k8s.io/name"}
 	for _, el := range expectedLabels {
 		if !strings.Contains(rr.Output(), el) {
-			t.Errorf("expected to have label %q in node labels: %q", expectedLabels, rr.Output())
+			t.Errorf("expected to have label %q in node labels but got : %s", el, rr.Output())
 		}
 	}
 }

From 9b04d2afbb9d1ebb55bb16f659f5a1d5ed210daa Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 21:40:09 -0700
Subject: [PATCH 402/668] change all q to s for rr.Output

---
 test/integration/functional_test.go        | 16 ++++++++--------
 test/integration/start_stop_delete_test.go |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 5be2a71bc9..29e1868d96 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -158,7 +158,7 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 		t.Fatalf("failed to do minikube status after eval-ing docker-env %s", err)
 	}
 	if !strings.Contains(rr.Output(), "Running") {
-		t.Fatalf("expected status output to include 'Running' after eval docker-env but got: *%q*", rr.Output())
+		t.Fatalf("expected status output to include 'Running' after eval docker-env but got: *%s*", rr.Output())
 	}
 
 	mctx, cancel = context.WithTimeout(ctx, Seconds(13))
@@ -172,7 +172,7 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 
 	expectedImgInside := "gcr.io/k8s-minikube/storage-provisioner"
 	if !strings.Contains(rr.Output(), expectedImgInside) {
-		t.Fatalf("expected 'docker images' to have %q inside minikube. but the output is: *%q*", expectedImgInside, rr.Output())
+		t.Fatalf("expected 'docker images' to have %q inside minikube. but the output is: *%s*", expectedImgInside, rr.Output())
 	}
 
 }
@@ -281,7 +281,7 @@ func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
 	re := `host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`
 	match, _ := regexp.MatchString(re, rr.Stdout.String())
 	if !match {
-		t.Errorf("failed to match regex %q for minikube status with custom format. args %q. output %q", re, rr.Command(), rr.Output())
+		t.Errorf("failed to match regex %q for minikube status with custom format. args %q. output: %s", re, rr.Command(), rr.Output())
 	}
 
 	// Json output
@@ -427,10 +427,10 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 				t.Errorf("failed to do cache list. args %q: %v", rr.Command(), err)
 			}
 			if !strings.Contains(rr.Output(), "k8s.gcr.io/pause") {
-				t.Errorf("expected 'cache list' output to include 'k8s.gcr.io/pause' but got:\n ***%q***", rr.Output())
+				t.Errorf("expected 'cache list' output to include 'k8s.gcr.io/pause' but got:\n ***%s***", rr.Output())
 			}
 			if strings.Contains(rr.Output(), "busybox:1.28.4-glibc") {
-				t.Errorf("expected 'cache list' output not to include busybox:1.28.4-glibc but got:\n ***%q***", rr.Output())
+				t.Errorf("expected 'cache list' output not to include busybox:1.28.4-glibc but got:\n ***%s***", rr.Output())
 			}
 		})
 
@@ -440,7 +440,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
 				t.Errorf("failed to get images by %q ssh %v", rr.Command(), err)
 			}
 			if !strings.Contains(rr.Output(), "1.28.4-glibc") {
-				t.Errorf("expected '1.28.4-glibc' to be in the output but got %q", rr.Output())
+				t.Errorf("expected '1.28.4-glibc' to be in the output but got *%s*", rr.Output())
 			}
 
 		})
@@ -513,7 +513,7 @@ func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {
 	}
 	for _, word := range []string{"Docker", "apiserver", "Linux", "kubelet"} {
 		if !strings.Contains(rr.Stdout.String(), word) {
-			t.Errorf("excpeted minikube logs to include word: -%q- but got \n***%q***\n", word, rr.Output())
+			t.Errorf("excpeted minikube logs to include word: -%q- but got \n***%s***\n", word, rr.Output())
 		}
 	}
 }
@@ -678,7 +678,7 @@ func validateAddonsCmd(ctx context.Context, t *testing.T, profile string) {
 	}
 	for _, a := range []string{"dashboard", "ingress", "ingress-dns"} {
 		if !strings.Contains(rr.Output(), a) {
-			t.Errorf("expected 'addon list' output to include -%q- but got *%q*", a, rr.Output())
+			t.Errorf("expected 'addon list' output to include -%q- but got *%s*", a, rr.Output())
 		}
 	}
 
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index c484a2491b..30698b1da9 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -260,7 +260,7 @@ func testPulledImages(ctx context.Context, t *testing.T, profile string, version
 	}{}
 	err = json.Unmarshal(rr.Stdout.Bytes(), &jv)
 	if err != nil {
-		t.Errorf("failed to decode images json %v. output: %q", err, rr.Output())
+		t.Errorf("failed to decode images json %v. output: %s", err, rr.Output())
 	}
 	found := map[string]bool{}
 	for _, img := range jv["images"] {

From e09a1221bb793618bed59632b22f12e9fdc31dd9 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 06:20:35 -0700
Subject: [PATCH 403/668] Add rejection reason to 'unable to find driver' error

---
 cmd/minikube/cmd/start.go       | 10 ++++++++--
 pkg/minikube/driver/driver.go   | 21 +++++++++++++++++----
 pkg/minikube/out/style.go       |  1 +
 pkg/minikube/out/style_enum.go  |  1 +
 pkg/minikube/registry/global.go |  2 ++
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 56326fa41f..7bbe224ec6 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -561,9 +561,15 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 		return ds
 	}
 
-	pick, alts := driver.Suggest(driver.Choices(viper.GetBool("vm")))
+	choices := driver.Choices(viper.GetBool("vm"))
+	pick, alts, rejects := driver.Suggest(choices)
 	if pick.Name == "" {
-		exit.WithCodeT(exit.Config, "Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/")
+		out.T(out.ThumbsDown, "Unable to pick a default driver. Here is what was considered, in preference order:")
+		for _, r := range rejects {
+			out.T(out.Option, "{{ .name }}: {{ .rejection }}", out.V{"name": r.Name, "rejection": r.Rejection})
+		}
+		out.T(out.Workaround, "Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/")
+		os.Exit(exit.Unavailable)
 	}
 
 	if len(alts) > 1 {
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index ed0cbdee23..bc2ca06c0a 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -174,8 +174,8 @@ func Choices(vm bool) []registry.DriverState {
 	return options
 }
 
-// Suggest returns a suggested driver from a set of options
-func Suggest(options []registry.DriverState) (registry.DriverState, []registry.DriverState) {
+// Suggest returns a suggested driver, alternate drivers, and rejected drivers
+func Suggest(options []registry.DriverState) (registry.DriverState, []registry.DriverState, []registry.DriverState) {
 	pick := registry.DriverState{}
 	for _, ds := range options {
 		if !ds.State.Installed {
@@ -198,17 +198,30 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 	}
 
 	alternates := []registry.DriverState{}
+	rejects := []registry.DriverState{}
 	for _, ds := range options {
 		if ds != pick {
-			if !ds.State.Healthy || !ds.State.Installed {
+			glog.Errorf("%s: %s", ds.Name, ds.Rejection)
+			if !ds.State.Healthy {
+				ds.Rejection = fmt.Sprintf("Not healthy: %v", ds.State.Error)
+				rejects = append(rejects, ds)
 				continue
 			}
+
+			if !ds.State.Installed {
+				ds.Rejection = fmt.Sprintf("Not installed: %v", ds.State.Error)
+				rejects = append(rejects, ds)
+				continue
+			}
+
+			ds.Rejection = fmt.Sprintf("%s is preferred", pick.Name)
 			alternates = append(alternates, ds)
 		}
 	}
 	glog.Infof("Picked: %+v", pick)
 	glog.Infof("Alternatives: %+v", alternates)
-	return pick, alternates
+	glog.Infof("Rejects: %+v", rejects)
+	return pick, alternates, rejects
 }
 
 // Status returns the status of a driver
diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index c67188e12d..a8eee7811e 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -68,6 +68,7 @@ var styles = map[StyleEnum]style{
 	Launch:        {Prefix: "🚀  "},
 	Sad:           {Prefix: "😿  "},
 	ThumbsUp:      {Prefix: "👍  "},
+	ThumbsDown:    {Prefix: "👎  "},
 	Option:        {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
 	Command:       {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
 	LogEntry:      {Prefix: "    "},                         // Indent
diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go
index 097f4452dc..1437b26823 100644
--- a/pkg/minikube/out/style_enum.go
+++ b/pkg/minikube/out/style_enum.go
@@ -41,6 +41,7 @@ const (
 	Launch
 	Sad
 	ThumbsUp
+	ThumbsDown
 	Option
 	Command
 	LogEntry
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
index 16ede79a27..3f608ef471 100644
--- a/pkg/minikube/registry/global.go
+++ b/pkg/minikube/registry/global.go
@@ -68,6 +68,8 @@ type DriverState struct {
 	Name     string
 	Priority Priority
 	State    State
+	// Rejection is why we chose not to use this driver
+	Rejection string
 }
 
 func (d DriverState) String() string {

From 8f3ef2d69e8da26a9df806af50c4bdf9ad2d30b1 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 06:28:21 -0700
Subject: [PATCH 404/668] Update tests

---
 pkg/minikube/driver/driver.go      |  8 ++++----
 pkg/minikube/driver/driver_test.go | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index bc2ca06c0a..7f67a76fe7 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -202,14 +202,14 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 	for _, ds := range options {
 		if ds != pick {
 			glog.Errorf("%s: %s", ds.Name, ds.Rejection)
-			if !ds.State.Healthy {
-				ds.Rejection = fmt.Sprintf("Not healthy: %v", ds.State.Error)
+			if !ds.State.Installed {
+				ds.Rejection = fmt.Sprintf("Not installed: %v", ds.State.Error)
 				rejects = append(rejects, ds)
 				continue
 			}
 
-			if !ds.State.Installed {
-				ds.Rejection = fmt.Sprintf("Not installed: %v", ds.State.Error)
+			if !ds.State.Healthy {
+				ds.Rejection = fmt.Sprintf("Not healthy: %v", ds.State.Error)
 				rejects = append(rejects, ds)
 				continue
 			}
diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go
index 5d0bfd4009..b6afd6a62c 100644
--- a/pkg/minikube/driver/driver_test.go
+++ b/pkg/minikube/driver/driver_test.go
@@ -112,6 +112,7 @@ func TestSuggest(t *testing.T) {
 		choices []string
 		pick    string
 		alts    []string
+		rejects []string
 	}{
 		{
 			def: registry.DriverDef{
@@ -122,6 +123,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"unhealthy"},
 			pick:    "",
 			alts:    []string{},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -132,6 +134,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"discouraged", "unhealthy"},
 			pick:    "",
 			alts:    []string{"discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -142,6 +145,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"default", "discouraged", "unhealthy"},
 			pick:    "default",
 			alts:    []string{"discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -152,6 +156,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"preferred", "default", "discouraged", "unhealthy"},
 			pick:    "preferred",
 			alts:    []string{"default", "discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 	}
 	for _, tc := range tests {
@@ -172,7 +177,7 @@ func TestSuggest(t *testing.T) {
 				t.Errorf("choices mismatch (-want +got):\n%s", diff)
 			}
 
-			pick, alts := Suggest(got)
+			pick, alts, rejects := Suggest(got)
 			if pick.Name != tc.pick {
 				t.Errorf("pick = %q, expected %q", pick.Name, tc.pick)
 			}
@@ -184,6 +189,15 @@ func TestSuggest(t *testing.T) {
 			if diff := cmp.Diff(gotAlts, tc.alts); diff != "" {
 				t.Errorf("alts mismatch (-want +got):\n%s", diff)
 			}
+
+			gotRejects := []string{}
+			for _, r := range rejects {
+				gotRejects = append(gotRejects, r.Name)
+			}
+			if diff := cmp.Diff(gotRejects, tc.rejects); diff != "" {
+				t.Errorf("rejects mismatch (-want +got):\n%s", diff)
+			}
+
 		})
 	}
 }

From c81b4696dff52a4b7bcba0da3f2f8f6e0bedbdab Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Thu, 2 Apr 2020 03:31:27 +0900
Subject: [PATCH 405/668] Run make extract

---
 translations/de.json    | 3 ++-
 translations/es.json    | 3 ++-
 translations/fr.json    | 3 ++-
 translations/ja.json    | 3 ++-
 translations/ko.json    | 3 ++-
 translations/pl.json    | 3 ++-
 translations/zh-CN.json | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/translations/de.json b/translations/de.json
index 6ef08685ac..89c9dde056 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -474,7 +474,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -496,6 +496,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
diff --git a/translations/es.json b/translations/es.json
index 094b283d71..f4d3dfce4d 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -475,7 +475,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Para conectarte a este clúster, usa: kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -497,6 +497,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
diff --git a/translations/fr.json b/translations/fr.json
index fa16b33954..3488e4e0e7 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -471,7 +471,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "Pour vous connecter à ce cluster, utilisez la commande \"kubectl --context={{.name}}\".",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -493,6 +493,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
diff --git a/translations/ja.json b/translations/ja.json
index 8f5b3dff5c..429674b998 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -480,7 +480,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "このクラスタに接続するには、「kubectl --context={{.name}}」を使用します",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -502,6 +502,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
diff --git a/translations/ko.json b/translations/ko.json
index 20aaa2ef59..60b64b1e19 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -462,7 +462,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}": "",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -483,6 +483,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "현재 사용자를 조회할 수 없습니다",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "런타임을 조회할 수 없습니다",
 	"Unable to get the status of the {{.name}} cluster.": "{{.name}} 클러스터의 상태를 조회할 수 없습니다",
diff --git a/translations/pl.json b/translations/pl.json
index a171c7311c..af836caa5c 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -473,7 +473,7 @@
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "Aby połaczyć się z klastem uzyj: kubectl --context={{.profile_name}}",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'": "Aby wyłączyć te notyfikację, użyj: 'minikube config set WantUpdateNotification false'",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -494,6 +494,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 072bb50ab5..21e79c6e35 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -536,7 +536,7 @@
 	"To connect to this cluster, use: kubectl --context={{.name}}__1": "如需连接到此集群，请使用 kubectl --context={{.name}}",
 	"To connect to this cluster, use: kubectl --context={{.profile_name}}": "",
 	"To disable this notice, run: 'minikube config set WantUpdateNotification false'\\n": "",
-	"To fix this, run: {{.command}}": "",
+	"To fix this, run: \"{{.command}}\"": "",
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
@@ -559,6 +559,7 @@
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
 	"Unable to get driver IP": "",
+	"Unable to get forwarded port": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to get the status of the {{.name}} cluster.": "无法获取 {{.name}} 集群状态。",

From fcafee63e10e01506c6a851521b2ed7889f8914c Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Thu, 2 Apr 2020 03:32:30 +0900
Subject: [PATCH 406/668] Update some Japanese translations

---
 translations/ja.json | 238 +++++++++++++++++++++----------------------
 1 file changed, 119 insertions(+), 119 deletions(-)

diff --git a/translations/ja.json b/translations/ja.json
index 429674b998..9d24358ff4 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -1,41 +1,41 @@
 {
-	"\"The '{{.minikube_addon}}' addon is disabled": "",
-	"\"{{.machineName}}\" does not exist, nothing to stop": "",
+	"\"The '{{.minikube_addon}}' addon is disabled": "「{{.minikube_addon}}」アドオンは無効化されています",
+	"\"{{.machineName}}\" does not exist, nothing to stop": "「{{.machineName}}」は存在しません。停止すべき対象がありません",
 	"\"{{.minikube_addon}}\" was successfully disabled": "「{{.minikube_addon}}」が無効化されました",
-	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "「{{.name}}」というクラスターは存在しません。クリーンアップ処理を続行します。",
+	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "「{{.name}}」というクラスターは存在しません。クリーンアップ処理を続行します",
 	"\"{{.name}}\" profile does not exist": "「{{.name}}」というプロファイルは存在しません",
-	"\"{{.name}}\" profile does not exist, trying anyways.": "",
+	"\"{{.name}}\" profile does not exist, trying anyways.": "「{{.name}}」というプロファイルは存在しません",
 	"\"{{.profile_name}}\" VM does not exist, nothing to stop": "「{{.profile_name}}」というVMは存在しません。停止すべき対象がありません",
 	"\"{{.profile_name}}\" host does not exist, unable to show an IP": "「{{.profile_name}}」というホストは存在しません。IPを表示できません",
-	"\"{{.profile_name}}\" stopped.": "「{{.profile_name}}」が停止しました。",
+	"\"{{.profile_name}}\" stopped.": "「{{.profile_name}}」が停止しました",
 	"'none' driver does not support 'minikube docker-env' command": "「none」ドライバーは「minikube docker-env」コマンドをサポートしていません",
 	"'none' driver does not support 'minikube mount' command": "「none」ドライバーは「minikube mount」コマンドをサポートしていません",
-	"'none' driver does not support 'minikube podman-env' command": "",
+	"'none' driver does not support 'minikube podman-env' command": "「none」ドライバーは「minikube podman-env」コマンドをサポートしていません",
 	"'none' driver does not support 'minikube ssh' command": "「none」ドライバーは「minikube ssh」コマンドをサポートしていません",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "「{{.driver}}」ドライバーがエラーを報告しました: {{.error}}",
-	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
-	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
-	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
-	"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": "",
-	"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": "Kubernetes 用に生成された証明書で使用される一連の API サーバー IP アドレス。マシンの外部から API サーバーを利用できるようにする場合に使用します。",
-	"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": "",
-	"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": "Kubernetes 用に生成された証明書で使用される一連の API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します。",
+	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN、あるいはファイアウォールによって、minkube VM への HTTP アクセスが干渉されています。他の手段として、別の VM を試してみてください: https://minikube.sigs.k8s.io/docs/start/",
+	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "ファイアウォールによって、Docker minikube VM はインターネットと繋がることができません。 プロキシを使用するように設定する必要があるかもしれません",
+	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "ファイアウォールによって、minikube は外側への HTTPS リクエストをすることができません。HTTPS_PROXY 環境変数の値を変える必要があるかもしれません",
+	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "ファイアウォールによって、minikube がインターネットに繋がることができてない可能性があります。minikube がプロキシーを使うように設定する必要があるかもしれません",
+	"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": "Kubernetes 用に生成された証明書で使用されている一連の APIサーバーの IP アドレスのセット。 マシンの外部から API サーバーを利用できるようにする場合に使用します",
+	"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": "Kubernetes 用に生成された証明書で使用される一連の API サーバー IP アドレス。マシンの外部から API サーバーを利用できるようにする場合に使用します",
+	"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": "Kubernetes 用に生成された証明書で使用される一連の API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します",
+	"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": "Kubernetes 用に生成された証明書で使用される一連の API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します",
 	"A set of key=value pairs that describe configuration that may be passed to different components.\nThe key should be '.' separated, and the first part before the dot is the component to apply the configuration to.\nValid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler\nValid kubeadm parameters:": "さまざまなコンポーネントに渡される可能性のある構成を記述する一連の key=value ペア。\nキーは「.」で区切る必要があり、このドットより前の部分は構成の適用先のコンポーネントを表します。\n有効なコンポーネントは、kubelet、kubeadm、apiserver、controller-manager、etcd、proxy、scheduler です。\n有効な kubeadm パラメータ:",
-	"A set of key=value pairs that describe feature gates for alpha/experimental features.": "アルファ版または試験運用版の機能のフィーチャーゲートを記述する一連の key=value ペアです。",
-	"Access the kubernetes dashboard running within the minikube cluster": "",
+	"A set of key=value pairs that describe feature gates for alpha/experimental features.": "アルファ版または試験運用版の機能のフィーチャーゲートを記述する一連の key=value ペアです",
+	"Access the kubernetes dashboard running within the minikube cluster": "minikube クラスタ内で動いている Kubernetes のダッシュボードにアクセスします",
 	"Add an image to local cache.": "イメージをローカルキャッシュに追加します",
-	"Add machine IP to NO_PROXY environment variable": "",
-	"Add or delete an image from the local cache.": "",
-	"Adding node {{.name}} to cluster {{.cluster}}": "",
-	"Additional help topics": "",
-	"Additional mount options, such as cache=fscache": "",
-	"Adds a node to the given cluster config, and starts it.": "",
-	"Adds a node to the given cluster.": "",
-	"Advanced Commands:": "",
-	"Aliases": "",
+	"Add machine IP to NO_PROXY environment variable": "マシーンの IP アドレスをNO_PROXY 環境変数に追加します",
+	"Add or delete an image from the local cache.": "ローカルのキャッシュからイメージを追加あるいは削除します",
+	"Adding node {{.name}} to cluster {{.cluster}}": "「{{.name}}」というノードを「{{.cluster}}」というクラスタに追加します",
+	"Additional help topics": "追加のトピック",
+	"Additional mount options, such as cache=fscache": "cache=fscache などの追加のマウントオプション",
+	"Adds a node to the given cluster config, and starts it.": "ノードをクラスタの設定に追加して、起動します",
+	"Adds a node to the given cluster.": "ノードをクラスターに追加します",
+	"Advanced Commands:": "高度なコマンド",
+	"Aliases": "エイリアス",
 	"Allow user prompts for more information": "",
-	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Docker イメージの pull 元の代替イメージ リポジトリ。これは、gcr.io へのアクセスが制限されている場合に使用できます。これを \\\"auto\\\" に設定すると、minikube によって自動的に指定されるようになります。中国本土のユーザーの場合、registry.cn-hangzhou.aliyuncs.com/google_containers などのローカル gcr.io ミラーを使用できます。",
+	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Docker イメージの pull 元の代替イメージ リポジトリ。これは、gcr.io へのアクセスが制限されている場合に使用できます。これを \\\"auto\\\" に設定すると、minikube によって自動的に指定されるようになります。中国本土のユーザーの場合、registry.cn-hangzhou.aliyuncs.com/google_containers などのローカル gcr.io ミラーを使用できます",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "minikube VM に割り当てられた RAM 容量（形式: \u003cnumber\u003e[\u003cunit\u003e]、unit = b、k、m、g）",
 	"Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
 	"Amount of time to wait for a service in seconds": "",
@@ -43,10 +43,10 @@
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
 	"Automatically selected the {{.driver}} driver": "",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
-	"Available Commands": "",
-	"Basic Commands:": "",
+	"Available Commands": "利用可能なコマンド",
+	"Basic Commands:": "基本的なコマンド",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
-	"Bind Address: {{.Address}}": "",
+	"Bind Address: {{.Address}}": "アドレスをバインドします: {{.Address}}",
 	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
@@ -66,96 +66,96 @@
 	"Confirm that you have supplied the correct value to --hyperv-virtual-switch using the 'Get-VMSwitch' command": "",
 	"Could not process error from failed deletion": "",
 	"Could not process errors from failed deletion": "",
-	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "使用するイメージミラーの国コード。グローバルのものを使用する場合は空のままにします。中国本土のユーザーの場合は、「cn」に設定します。",
+	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "使用するイメージミラーの国コード。グローバルのものを使用する場合は空のままにします。中国本土のユーザーの場合は、「cn」に設定します",
 	"Creating Kubernetes in {{.driver_name}} {{.machine_type}} with (CPUs={{.number_of_cpus}}) ({{.number_of_host_cpus}} available), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...": "",
 	"Creating mount {{.name}} ...": "マウント {{.name}} を作成しています...",
 	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
-	"DEPRECATED, use `driver` instead.": "",
-	"Default group id used for the mount": "",
-	"Default user id used for the mount": "",
-	"Delete an image from the local cache.": "",
-	"Deletes a local kubernetes cluster": "",
+	"DEPRECATED, use `driver` instead.": "非推奨。代わりに driver を使ってください",
+	"Default group id used for the mount": "マウント時のデフォルトのグループ ID",
+	"Default user id used for the mount": "マウント時のデフォルトのユーザー ID",
+	"Delete an image from the local cache.": "ローカルのキャッシュからイメージを削除します",
+	"Deletes a local kubernetes cluster": "ローカルの Kubernetes クラスタを削除します",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "",
-	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "ローカルの Kubernetes クラスタを削除します。このコマンドによって、VM とそれに関連付けられているすべてのファイルが削除されます。",
-	"Deletes a node from a cluster.": "",
+	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "ローカルの Kubernetes クラスタを削除します。このコマンドによって、VM とそれに関連付けられているすべてのファイルが削除されます",
+	"Deletes a node from a cluster.": "ノードをクラスタから削除します",
 	"Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "{{.driver_name}} の「{{.profile_name}}」を削除しています...",
-	"Deleting node {{.name}} from cluster {{.cluster}}": "",
+	"Deleting node {{.name}} from cluster {{.cluster}}": "{{.cluster}} クラスタから {{.name}} ノードを削除しています",
 	"Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)": "VM が起動する前にハードウェアの仮想化の可用性チェックを無効にします（virtualbox ドライバのみ）",
 	"Disable dynamic memory in your VM manager, or pass in a larger --memory value": "",
 	"Disables the addon w/ADDON_NAME within minikube (example: minikube addons disable dashboard). For a list of available addons use: minikube addons list": "",
 	"Disables the filesystem mounts provided by the hypervisors": "ハイパーバイザによって指定されているファイル システム マウントを無効にします",
 	"Disk size allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "minikube VM に割り当てられたディスクサイズ（形式: \u003cnumber\u003e[\u003cunit\u003e]、unit = b、k、m、g）",
 	"Disk size allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "",
-	"Display dashboard URL instead of opening a browser": "",
+	"Display dashboard URL instead of opening a browser": "ブラウザで開く代わりにダッシュボードの URL を表示します",
 	"Display the kubernetes addons URL in the CLI instead of opening it in the default browser": "",
 	"Display the kubernetes service URL in the CLI instead of opening it in the default browser": "",
-	"Display values currently set in the minikube config file": "",
+	"Display values currently set in the minikube config file": "現在の minikube の設定ファイルにセットされている値を表示します",
 	"Display values currently set in the minikube config file.": "",
 	"Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "",
-	"Docs have been saved at - {{.path}}": "",
-	"Documentation: {{.url}}": "",
+	"Docs have been saved at - {{.path}}": "ドキュメントは以下のパスに保存されました。{{.path}}",
+	"Documentation: {{.url}}": "ドキュメント: {{.url}}",
 	"Done! kubectl is now configured to use \"{{.name}}": "完了しました。kubectl が「{{.name}}」を使用するよう構成されました",
 	"Done! kubectl is now configured to use \"{{.name}}\"": "",
 	"Done! kubectl is now configured to use \"{{.name}}__1": "完了しました。kubectl が「{{.name}}」を使用するよう構成されました",
-	"Download complete!": "ダウンロードが完了しました。",
-	"Downloading Kubernetes {{.version}} preload ...": "",
-	"Downloading VM boot image ...": "",
-	"Downloading driver {{.driver}}:": "",
-	"ERROR creating `registry-creds-acr` secret": "",
-	"ERROR creating `registry-creds-dpr` secret": "",
-	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
-	"ERROR creating `registry-creds-gcr` secret: {{.error}}": "",
+	"Download complete!": "ダウンロードが完了しました",
+	"Downloading Kubernetes {{.version}} preload ...": "Kubernetes {{.version}} のダウンロードの準備をしています",
+	"Downloading VM boot image ...": "VM ブートイメージをダウンロードしています...",
+	"Downloading driver {{.driver}}:": "{{.driver}} ドライバをダウンロードしています:",
+	"ERROR creating `registry-creds-acr` secret": "`registry-creds-acr` シークレット作成中にエラーが発生しました",
+	"ERROR creating `registry-creds-dpr` secret": "`registry-creds-dpr` シークレット作成中にエラーが発生しました",
+	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "`registry-creds-ecr` シークレット作成中にエラーが発生しました。{{.error}}",
+	"ERROR creating `registry-creds-gcr` secret: {{.error}}": "`registry-creds-gcr` シークレット作成中にエラーが発生しました。{{.error}}",
 	"Either systemctl is not installed, or Docker is broken. Run 'sudo systemctl start docker' and 'journalctl -u docker'": "",
 	"Enable addons. see `minikube addons list` for a list of valid addon names.": "",
 	"Enable experimental NVIDIA GPU support in minikube": "minikube での試験運用版 NVIDIA GPU の対応を有効にします",
 	"Enable host resolver for NAT DNS requests (virtualbox driver only)": "NAT DNS リクエスト用のホストリゾルバを有効にします（virtualbox ドライバのみ）",
 	"Enable proxy for NAT DNS requests (virtualbox driver only)": "NAT DNS リクエスト用のプロキシを有効にします（virtualbox ドライバのみ）",
-	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "デフォルトの CNI プラグイン（/etc/cni/net.d/k8s.conf）を有効にします。\\\"--network-plugin=cni\\\" と組み合わせて使用されます。",
+	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "デフォルトの CNI プラグイン（/etc/cni/net.d/k8s.conf）を有効にします。\\\"--network-plugin=cni\\\" と組み合わせて使用されます",
 	"Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "",
 	"Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "",
-	"Enabling '{{.name}}' returned an error: {{.error}}": "",
-	"Enabling addons: {{.addons}}": "",
-	"Enabling dashboard ...": "",
+	"Enabling '{{.name}}' returned an error: {{.error}}": "'{{.name}}' を有効にする際にエラーが発生しました。{{.error}}",
+	"Enabling addons: {{.addons}}": "アドオンを有効化しています: {{.addons}}",
+	"Enabling dashboard ...": "ダッシュボードを有効化しています...",
 	"Ensure that CRI-O is installed and healthy: Run 'sudo systemctl start crio' and 'journalctl -u crio'. Alternatively, use --container-runtime=docker": "",
 	"Ensure that Docker is installed and healthy: Run 'sudo systemctl start docker' and 'journalctl -u docker'. Alternatively, select another value for --driver": "",
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Docker デーモンに渡す環境変数（形式: Key=Value）",
-	"Error adding node to cluster": "",
+	"Error adding node to cluster": "クラスタにノードを追加中にエラーが発生しました",
 	"Error checking driver version: {{.error}}": "ドライバのバージョンの確認中にエラーが発生しました。{{.error}}",
-	"Error creating minikube directory": "",
-	"Error creating view template": "",
-	"Error detecting shell": "",
-	"Error executing view template": "",
-	"Error finding port for mount": "",
-	"Error generating set output": "",
-	"Error generating unset output": "",
-	"Error getting cluster bootstrapper": "",
-	"Error getting cluster config": "",
-	"Error getting host": "",
-	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "",
-	"Error getting primary control plane": "",
+	"Error creating minikube directory": "minikube のディレクトリ作成中にエラーが発生しました",
+	"Error creating view template": "表示用のテンプレートを作成中にエラーが発生しました",
+	"Error detecting shell": "シェルの確認中にエラーが発生しました",
+	"Error executing view template": "表示用のテンプレートを実行中にエラーが発生しました",
+	"Error finding port for mount": "マウント用のポートを確認中にエラーが発生しました",
+	"Error generating set output": "set の出力を生成中にエラーが発生しました",
+	"Error generating unset output": "unset の出力を生成中にエラーが発生しました",
+	"Error getting cluster bootstrapper": "クラスタのブートストラッパを取得中にエラーが発生しました",
+	"Error getting cluster config": "クラスタの設定を取得中にエラーが発生しました",
+	"Error getting host": "ホストを取得中にエラーが発生しました",
+	"Error getting port binding for '{{.driver_name}} driver: {{.error}}": "「{{.driver_name}}」ドライバー用のポートをバインディング中にエラーが発生しました",
+	"Error getting primary control plane": "コントロールプレーンを取得中にエラーが発生しました",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
-	"Error getting ssh client": "",
+	"Error getting ssh client": "SSH クライアントを取得中にエラーが発生しました",
 	"Error getting the host IP address to use from within the VM": "",
-	"Error killing mount process": "",
-	"Error loading profile config: {{.error}}": "",
+	"Error killing mount process": "マウントプロセスを Kill 中にエラーが発生しました",
+	"Error loading profile config: {{.error}}": "プロフィールの設定を読み込み中にエラーが発生しました。{{.error}}",
 	"Error loading profile {{.name}}: {{.error}}": "プロファイル {{.name}} の読み込み中にエラーが発生しました。{{.error}}",
-	"Error opening service": "",
+	"Error opening service": "サービスを公開中にエラーが発生しました",
 	"Error parsing Driver version: {{.error}}": "Driver バージョンの解析中にエラーが発生しました。{{.error}}",
 	"Error parsing minikube version: {{.error}}": "minikube バージョンの解析中にエラーが発生しました。{{.error}}",
-	"Error reading {{.path}}: {{.error}}": "",
-	"Error starting cluster": "",
-	"Error starting mount": "",
+	"Error reading {{.path}}: {{.error}}": "{{.path}} を読み込み中にエラーが発生しました。{{.error}}",
+	"Error starting cluster": "クラスタを起動中にエラーが発生しました",
+	"Error starting mount": "マウントを開始中にエラーが発生しました",
 	"Error while setting kubectl current context :  {{.error}}": "",
-	"Error writing mount pid": "",
-	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "エラー: Kubernetes v{{.new}} が選択されましたが、使用しているプロファイルの既存クラスタで実行されているのは Kubernetes v{{.old}} です。非破壊的なダウングレードはサポートされていませんが、以下のいずれかの方法で続行できます。\n* Kubernetes v{{.new}} を使用してクラスタを再作成する: 「minikube delete {{.profile}}」を実行してから、「minikube start {{.profile}} --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.new}} を使用して 2 つ目のクラスタを作成する: 「minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.old}} 以降を使用して既存のクラスタを再利用する: 「minikube start {{.profile}} --kubernetes-version={{.old}}」を実行します。",
-	"Error: [{{.id}}] {{.error}}": "",
-	"Examples": "",
+	"Error writing mount pid": "マウントした pid を書き込み中にエラーが発生しました",
+	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "エラー: Kubernetes v{{.new}} が選択されましたが、使用しているプロファイルの既存クラスタで実行されているのは Kubernetes v{{.old}} です。非破壊的なダウングレードはサポートされていませんが、以下のいずれかの方法で続行できます。\n* Kubernetes v{{.new}} を使用してクラスタを再作成する: 「minikube delete {{.profile}}」を実行してから、「minikube start {{.profile}} --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.new}} を使用して 2 つ目のクラスタを作成する: 「minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}」を実行します。\n* Kubernetes v{{.old}} 以降を使用して既存のクラスタを再利用する: 「minikube start {{.profile}} --kubernetes-version={{.old}}」を実行します",
+	"Error: [{{.id}}] {{.error}}": "エラーが発生しました。[{{.id}}] {{.error}}",
+	"Examples": "例",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "終了しています",
-	"Exiting.": "終了しています。",
+	"Exiting.": "終了しています",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
 	"Failed runtime": "",
 	"Failed to cache ISO": "",
@@ -183,7 +183,7 @@
 	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
-	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY 環境変数を設定できませんでした。「export NO_PROXY=$NO_PROXY,{{.ip}}」を使用してください。",
+	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY 環境変数を設定できませんでした。「export NO_PROXY=$NO_PROXY,{{.ip}}」を使用してください",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
 	"Failed to setup kubeconfig": "",
@@ -194,14 +194,14 @@
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
-	"Flags": "",
-	"Follow": "",
+	"Flags": "フラグ",
+	"Follow": "たどる",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "最適な結果を得るには、kubectl を次のサイト https://kubernetes.io/docs/tasks/tools/install-kubectl/ からインストールしてください",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "最適な結果を得るには、kubectl を次のサイト https://kubernetes.io/docs/tasks/tools/install-kubectl/ からインストールしてください",
-	"For more information, see:": "詳細については、次をご覧ください。",
+	"For more information, see:": "詳細については、次をご覧ください",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "minikube で危険な可能性のある操作を強制的に実行します",
-	"Found network options:": "ネットワーク オプションが見つかりました。",
+	"Found network options:": "ネットワーク オプションが見つかりました",
 	"Found {{.number}} invalid profile(s) !": "",
 	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
@@ -211,13 +211,13 @@
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
-	"Getting primary control plane": "",
-	"Global Flags": "",
+	"Getting bootstrapper": "ブートストラッパを取得中です",
+	"Getting primary control plane": "コントロールプレーンを取得中です",
+	"Global Flags": "グローバルなフラグ",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
 	"Go template format string for the status output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "",
-	"Group ID:     {{.groupID}}": "",
+	"Group ID:     {{.groupID}}": "グループ ID:     {{.groupID}}",
 	"Have you set up libvirt correctly?": "",
 	"Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "minikube でゲストに対し、ハイパーバイザ署名を非表示にします（kvm2 ドライバのみ）",
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
@@ -229,29 +229,29 @@
 	"If set, unpause all namespaces": "",
 	"If the above advice does not help, please let us know:": "",
 	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "",
-	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "true の場合、現在のブートストラッパの Docker イメージをキャッシュに保存して、マシンに読み込みます。--vm-driver=none の場合は常に false です。",
-	"If true, only download and cache files for later use - don't install or start anything.": "true の場合、後で使用できるようにファイルのダウンロードとキャッシュ保存だけが行われます。インストールも起動も行われません。",
+	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "true の場合、現在のブートストラッパの Docker イメージをキャッシュに保存して、マシンに読み込みます。--vm-driver=none の場合は常に false です",
+	"If true, only download and cache files for later use - don't install or start anything.": "true の場合、後で使用できるようにファイルのダウンロードとキャッシュ保存だけが行われます。インストールも起動も行われません",
 	"If true, the added node will be marked for work. Defaults to true.": "",
 	"If true, the node added will also be a control plane in addition to a worker.": "",
 	"If using the none driver, ensure that systemctl is installed": "",
 	"If you are running minikube within a VM, consider using --driver=none:": "",
-	"Images Commands:": "",
+	"Images Commands:": "イメージ用のコマンド",
 	"Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.": "",
-	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Docker デーモンに渡す Docker レジストリが安全ではありません。デフォルトのサービス CIDR 範囲が自動的に追加されます。",
+	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Docker デーモンに渡す Docker レジストリが安全ではありません。デフォルトのサービス CIDR 範囲が自動的に追加されます",
 	"Install VirtualBox, or select an alternative value for --driver": "",
 	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"IsEnabled failed": "",
+	"IsEnabled failed": "IsEnabled が失敗しました",
 	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
 	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
 	"Kill the mount process spawned by minikube start": "",
 	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "",
 	"Kubernetes {{.version}} is not supported by this release of minikube": "",
 	"Launching Kubernetes ...": "Kubernetes を起動しています...",
-	"Launching proxy ...": "",
+	"Launching proxy ...": "プロキシを起動しています...",
 	"List all available images from the local cache.": "",
 	"List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)": "ホストでソケットとして公開する必要のあるゲスト VSock ポートのリスト（hyperkit ドライバのみ）",
 	"Lists all available minikube addons as well as their current statuses (enabled/disabled)": "",
-	"Lists all minikube profiles.": "",
+	"Lists all minikube profiles.": "すべてのminikubeのプロフィールを一覧で表示します",
 	"Lists all valid minikube profiles and detects all possible invalid profiles.": "",
 	"Lists the URLs for the services in your local cluster": "",
 	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "NFS マウントを介してゲストと共有するローカル フォルダ（hyperkit ドライバのみ）",
@@ -260,34 +260,34 @@
 	"Locations to fetch the minikube ISO from.": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "",
 	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
-	"Message Size: {{.size}}": "",
+	"Message Size: {{.size}}": "メッセージのサイズ: {{.size}}",
 	"Minikube is a CLI tool that provisions and manages single-node Kubernetes clusters optimized for development workflows.": "",
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
-	"Modify minikube config": "",
-	"Modify minikube's kubernetes addons": "",
-	"Mount type:   {{.name}}": "",
+	"Modify minikube config": "minikube の設定を修正しています",
+	"Modify minikube's kubernetes addons": "minikube の Kubernetes アドオンを修正しています",
+	"Mount type:   {{.name}}": "マウントタイプ:   {{.name}}",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "",
 	"Mounts the specified directory into minikube.": "",
-	"Multiple errors deleting profiles": "",
-	"Multiple minikube profiles were found -": "",
+	"Multiple errors deleting profiles": "プロフィールを削除中に複数のエラーが発生しました",
+	"Multiple minikube profiles were found -": "複数の minikube のプロフィールが見つかりました",
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
-	"Node \"{{.node_name}}\" stopped.": "",
-	"Node operations": "",
-	"Node {{.name}} was successfully deleted.": "",
-	"Node {{.nodeName}} does not exist.": "",
+	"Node \"{{.node_name}}\" stopped.": "「{{.node_name}}」ノードが停止しました。",
+	"Node operations": "ノードの運用",
+	"Node {{.name}} was successfully deleted.": "{{.name}} ノードは削除されました。",
+	"Node {{.nodeName}} does not exist.": "{{.name}} ノードは存在しません。",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
-	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "使用しているロケーション内で既知のいずれのリポジトリにもアクセスできません。フォールバックとして {{.image_repository_name}} を使用します。",
-	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "既知のいずれのリポジトリにもアクセスできません。--image-repository フラグとともに代替のイメージ リポジトリを指定することを検討してください。",
+	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "使用しているロケーション内で既知のいずれのリポジトリにもアクセスできません。フォールバックとして {{.image_repository_name}} を使用します",
+	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "既知のいずれのリポジトリにもアクセスできません。--image-repository フラグとともに代替のイメージ リポジトリを指定することを検討してください",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
 	"Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "",
 	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of CPUs allocated to the minikube VM": "minikube VM に割り当てられた CPU の数",
 	"Number of lines back to go within the log": "",
-	"OS release is {{.pretty_name}}": "",
+	"OS release is {{.pretty_name}}": "OS は {{.pretty_name}} です。",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -333,7 +333,7 @@
 	"Removing {{.directory}} ...": "{{.directory}} を削除しています...",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "リクエストされたディスクサイズ {{.requested_size}} が最小値 {{.minimum_size}} 未満です",
-	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "リクエストされたメモリ割り当て（{{.memory}} MB）がデフォルトのメモリ割り当て {{.default_memorysize}} MB 未満です。minikube が正常に動作しないか、予期せずクラッシュする可能性があることに注意してください。",
+	"Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "リクエストされたメモリ割り当て（{{.memory}} MB）がデフォルトのメモリ割り当て {{.default_memorysize}} MB 未満です。minikube が正常に動作しないか、予期せずクラッシュする可能性があることに注意してください",
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "リクエストされたメモリ割り当て {{.requested_size}} が許可される最小値 {{.minimum_size}} 未満です",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
@@ -377,7 +377,7 @@
 	"Specified Kubernetes version {{.specified}} is less than the oldest supported version: {{.oldest}}": "",
 	"Specify --kubernetes-version in v\u003cmajor\u003e.\u003cminor.\u003cbuild\u003e form. example: 'v1.1.14'": "",
 	"Specify an alternate --host-only-cidr value, such as 172.16.0.1/24": "",
-	"Specify arbitrary flags to pass to the Docker daemon. (format: key=value)": "Docker デーモンに渡す任意のフラグを指定します（形式: key=value）。",
+	"Specify arbitrary flags to pass to the Docker daemon. (format: key=value)": "Docker デーモンに渡す任意のフラグを指定します（形式: key=value）",
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
@@ -403,15 +403,15 @@
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "「{{.driver_name}}」ドライバにはルート権限が必要です。「sudo minikube --vm-driver={{.driver_name}}」を使用して minikube を実行してください",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
-	"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスタが削除されました。",
-	"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスタが削除されました。",
-	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバに「none」を指定すると、分離が制限され、システムのセキュリティと信頼性が低下する可能性があります。",
+	"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスタが削除されました",
+	"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスタが削除されました",
+	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバに「none」を指定すると、分離が制限され、システムのセキュリティと信頼性が低下する可能性があります",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
 	"The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"The '{{.name}}' driver does not respect the --cpus flag": "",
 	"The '{{.name}}' driver does not respect the --memory flag": "",
-	"The CIDR to be used for service cluster IPs.": "サービス クラスタ IP に使用される CIDR。",
+	"The CIDR to be used for service cluster IPs.": "サービス クラスタ IP に使用される CIDR",
 	"The CIDR to be used for the minikube VM (virtualbox driver only)": "minikube VM に使用される CIDR（virtualbox ドライバのみ）",
 	"The KVM QEMU connection URI. (kvm2 driver only)": "KVM QEMU 接続 URI（kvm2 ドライバのみ）",
 	"The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.": "",
@@ -421,7 +421,7 @@
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "API サーバー リスニング ポート",
 	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
-	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Kubernetes 用に生成された証明書で使用される API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します。",
+	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Kubernetes 用に生成された証明書で使用される API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します",
 	"The argument to pass the minikube mount command on start": "起動時に minikube マウント コマンドを渡す引数",
 	"The argument to pass the minikube mount command on start.": "",
 	"The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスタで使用されるクラスタ DNS ドメイン名",
@@ -462,7 +462,7 @@
 	"The value passed to --format is invalid": "",
 	"The value passed to --format is invalid: {{.error}}": "",
 	"The vmwarefusion driver is deprecated and support for it will be removed in a future release.\n\t\t\tPlease consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.\n\t\t\tSee https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.\n\t\t\tTo disable this message, run [minikube config set ShowDriverDeprecationNotification false]": "",
-	"The {{.driver_name}} driver should not be used with root privileges.": "{{.driver_name}} ドライバをルート権限で使用しないでください。",
+	"The {{.driver_name}} driver should not be used with root privileges.": "{{.driver_name}} ドライバをルート権限で使用しないでください",
 	"There is no local cluster named \"{{.cluster}}\"": "",
 	"There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "「{{.driver_executable}}」の新しいバージョンがあります。アップグレードを検討してください。{{.documentation_url}}",
 	"These changes will take effect upon a minikube delete and then a minikube start": "",
@@ -470,7 +470,7 @@
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます",
 	"This control plane is not running! (state={{.state}})": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
-	"This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。",
+	"This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます",
 	"This will start the mount daemon and automatically mount files into minikube": "これによりマウント デーモンが起動し、ファイルが minikube に自動的にマウントされます",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
 	"This {{.type}} is having trouble accessing https://{{.repository}}": "",
@@ -485,7 +485,7 @@
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "",
-	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "kubectl か minikube コマンドを独自のユーザーとして使用するには、そのコマンドの再配置が必要な場合があります。たとえば、独自の設定を上書きするには、以下を実行します。",
+	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "kubectl か minikube コマンドを独自のユーザーとして使用するには、そのコマンドの再配置が必要な場合があります。たとえば、独自の設定を上書きするには、以下を実行します",
 	"Troubleshooting Commands:": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
@@ -506,7 +506,7 @@
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
-	"Unable to load cached images from config file.": "キャッシュに保存されているイメージを構成ファイルから読み込むことができません。",
+	"Unable to load cached images from config file.": "キャッシュに保存されているイメージを構成ファイルから読み込むことができません",
 	"Unable to load cached images: {{.error}}": "",
 	"Unable to load config: {{.error}}": "構成を読み込むことができません。{{.error}}",
 	"Unable to load host": "",

From 530714580262292c9365a87689c599b94f0576fd Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 09:58:13 -0700
Subject: [PATCH 407/668] Move errors and warnings to output to stderr

---
 cmd/minikube/cmd/config/profile.go           |  4 +--
 cmd/minikube/cmd/config/profile_list.go      |  8 +++---
 cmd/minikube/cmd/config/validations.go       |  2 +-
 cmd/minikube/cmd/delete.go                   |  4 +--
 cmd/minikube/cmd/logs.go                     |  2 +-
 cmd/minikube/cmd/mount.go                    |  4 +--
 cmd/minikube/cmd/node_add.go                 |  2 +-
 cmd/minikube/cmd/service.go                  |  2 +-
 cmd/minikube/cmd/start.go                    | 18 +++++++-------
 cmd/minikube/cmd/stop.go                     |  2 +-
 go.mod                                       |  1 +
 pkg/drivers/kic/oci/oci.go                   |  2 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go |  4 +--
 pkg/minikube/exit/exit.go                    |  4 +--
 pkg/minikube/logs/logs.go                    |  2 +-
 pkg/minikube/machine/fix.go                  |  2 +-
 pkg/minikube/mustload/mustload.go            |  4 +--
 pkg/minikube/node/start.go                   | 26 ++++++++++----------
 18 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go
index 4161ee3aac..46afa5237a 100644
--- a/cmd/minikube/cmd/config/profile.go
+++ b/cmd/minikube/cmd/config/profile.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -48,8 +49,7 @@ var ProfileCmd = &cobra.Command{
 		name is in the list of reserved keywords
 		*/
 		if config.ProfileNameInReservedKeywords(profile) {
-			out.ErrT(out.FailureType, `Profile name "{{.profilename}}" is minikube keyword. To delete profile use command minikube delete -p <profile name>  `, out.V{"profilename": profile})
-			os.Exit(0)
+			exit.WithCodeT(exit.Config, `Profile name "{{.profilename}}" is reserved keyword. To delete this profile, run: "{{.cmd}}"`, out.V{"profilename": profile, "cmd": mustload.ExampleCmd(profile, "delete")})
 		}
 
 		if profile == "default" {
diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go
index d3b4bf1b9f..3a7cfa6069 100644
--- a/cmd/minikube/cmd/config/profile_list.go
+++ b/cmd/minikube/cmd/config/profile_list.go
@@ -91,13 +91,13 @@ var printProfilesTable = func() {
 	table.Render()
 
 	if invalidProfiles != nil {
-		out.T(out.Warning, "Found {{.number}} invalid profile(s) ! ", out.V{"number": len(invalidProfiles)})
+		out.WarningT("Found {{.number}} invalid profile(s) ! ", out.V{"number": len(invalidProfiles)})
 		for _, p := range invalidProfiles {
-			out.T(out.Empty, "\t "+p.Name)
+			out.ErrT(out.Empty, "\t "+p.Name)
 		}
-		out.T(out.Tip, "You can delete them using the following command(s): ")
+		out.ErrT(out.Tip, "You can delete them using the following command(s): ")
 		for _, p := range invalidProfiles {
-			out.String(fmt.Sprintf("\t $ minikube delete -p %s \n", p.Name))
+			out.Err(fmt.Sprintf("\t $ minikube delete -p %s \n", p.Name))
 		}
 
 	}
diff --git a/cmd/minikube/cmd/config/validations.go b/cmd/minikube/cmd/config/validations.go
index 8f57e13c45..071512daea 100644
--- a/cmd/minikube/cmd/config/validations.go
+++ b/cmd/minikube/cmd/config/validations.go
@@ -40,7 +40,7 @@ func IsValidDriver(string, name string) error {
 
 // RequiresRestartMsg returns the "requires restart" message
 func RequiresRestartMsg(string, string) error {
-	out.T(out.Warning, "These changes will take effect upon a minikube delete and then a minikube start")
+	out.WarningT("These changes will take effect upon a minikube delete and then a minikube start")
 	return nil
 }
 
diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 770868f045..5f4ad12513 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -236,7 +236,7 @@ func deleteProfile(profile *config.Profile) error {
 	}
 
 	if err := killMountProcess(); err != nil {
-		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
+		out.FailureT("Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
 	deleteHosts(api, cc)
@@ -264,7 +264,7 @@ func deleteHosts(api libmachine.API, cc *config.ClusterConfig) {
 				case mcnerror.ErrHostDoesNotExist:
 					glog.Infof("Host %s does not exist. Proceeding ahead with cleanup.", machineName)
 				default:
-					out.T(out.FailureType, "Failed to delete cluster: {{.error}}", out.V{"error": err})
+					out.FailureT("Failed to delete cluster: {{.error}}", out.V{"error": err})
 					out.T(out.Notice, `You may need to manually remove the "{{.name}}" VM from your hypervisor`, out.V{"name": machineName})
 				}
 			}
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
index 0c3854ea14..109938dc34 100644
--- a/cmd/minikube/cmd/logs.go
+++ b/cmd/minikube/cmd/logs.go
@@ -78,7 +78,7 @@ var logsCmd = &cobra.Command{
 		if err != nil {
 			out.Ln("")
 			// Avoid exit.WithError, since it outputs the issue URL
-			out.T(out.Warning, "{{.error}}", out.V{"error": err})
+			out.WarningT("{{.error}}", out.V{"error": err})
 			os.Exit(exit.Unavailable)
 		}
 	},
diff --git a/cmd/minikube/cmd/mount.go b/cmd/minikube/cmd/mount.go
index 4e97c7b463..fa0db9f75d 100644
--- a/cmd/minikube/cmd/mount.go
+++ b/cmd/minikube/cmd/mount.go
@@ -143,7 +143,7 @@ var mountCmd = &cobra.Command{
 
 		// An escape valve to allow future hackers to try NFS, VirtFS, or other FS types.
 		if !supportedFilesystems[cfg.Type] {
-			out.T(out.Warning, "{{.type}} is not yet a supported filesystem. We will try anyways!", out.V{"type": cfg.Type})
+			out.WarningT("{{.type}} is not yet a supported filesystem. We will try anyways!", out.V{"type": cfg.Type})
 		}
 
 		bindIP := ip.String() // the ip to listen on the user's host machine
@@ -179,7 +179,7 @@ var mountCmd = &cobra.Command{
 				out.T(out.Unmount, "Unmounting {{.path}} ...", out.V{"path": vmPath})
 				err := cluster.Unmount(co.CP.Runner, vmPath)
 				if err != nil {
-					out.ErrT(out.FailureType, "Failed unmount: {{.error}}", out.V{"error": err})
+					out.FailureT("Failed unmount: {{.error}}", out.V{"error": err})
 				}
 				exit.WithCodeT(exit.Interrupted, "Received {{.name}} signal", out.V{"name": sig})
 			}
diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index ec97540cf9..fa0f96bb3e 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -38,7 +38,7 @@ var nodeAddCmd = &cobra.Command{
 		cc := co.Config
 
 		if driver.BareMetal(cc.Driver) {
-			out.ErrT(out.FailureType, "none driver does not support multi-node clusters")
+			out.FailureT("none driver does not support multi-node clusters")
 		}
 
 		name := node.Name(len(cc.Nodes) + 1)
diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 0302df7c3b..039afefc28 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -137,7 +137,7 @@ func startKicServiceTunnel(svc, configName string) {
 	service.PrintServiceList(os.Stdout, data)
 
 	openURLs(svc, urls)
-	out.T(out.Warning, "Because you are using docker driver on Mac, the terminal needs to be open to run it.")
+	out.WarningT("Because you are using docker driver on Mac, the terminal needs to be open to run it.")
 
 	<-ctrlC
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 56326fa41f..883b368f42 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -434,7 +434,7 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 
 	path, err := exec.LookPath("kubectl")
 	if err != nil {
-		out.T(out.Tip, "For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
+		out.ErrT(out.Tip, "For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
 		return nil
 	}
 
@@ -454,9 +454,9 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 
 	if client.Major != cluster.Major || minorSkew > 1 {
 		out.Ln("")
-		out.T(out.Warning, "{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.",
+		out.WarningT("{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.",
 			out.V{"path": path, "client_version": client, "cluster_version": cluster})
-		out.T(out.Tip, "You can also use 'minikube kubectl -- get pods' to invoke a matching version",
+		out.ErrT(out.Tip, "You can also use 'minikube kubectl -- get pods' to invoke a matching version",
 			out.V{"path": path, "client_version": client})
 	}
 	return nil
@@ -464,7 +464,7 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 
 func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, originalErr error) *kubeconfig.Settings {
 	if viper.GetBool(deleteOnFailure) {
-		out.T(out.Warning, "Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
+		out.WarningT("Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
 		// Start failed, delete the cluster and try again
 		profile, err := config.LoadProfile(cc.Name)
 		if err != nil {
@@ -541,7 +541,7 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 
     If vm-driver is set in the global config, please run "minikube config unset vm-driver" to resolve this warning.
 			`
-			out.T(out.Warning, warning, out.V{"driver": d, "vmd": vmd})
+			out.WarningT(warning, out.V{"driver": d, "vmd": vmd})
 		}
 		ds := driver.Status(d)
 		if ds.Name == "" {
@@ -744,9 +744,9 @@ func validateUser(drvName string) {
 		return
 	}
 
-	out.T(out.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges.`, out.V{"driver_name": drvName})
-	out.T(out.Tip, "If you are running minikube within a VM, consider using --driver=none:")
-	out.T(out.Documentation, "  https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+	out.ErrT(out.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges.`, out.V{"driver_name": drvName})
+	out.ErrT(out.Tip, "If you are running minikube within a VM, consider using --driver=none:")
+	out.ErrT(out.Documentation, "  https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
 
 	if !useForce {
 		os.Exit(exit.Permissions)
@@ -754,7 +754,7 @@ func validateUser(drvName string) {
 	cname := ClusterFlagValue()
 	_, err = config.Load(cname)
 	if err == nil || !config.IsNotExist(err) {
-		out.T(out.Tip, "Tip: To remove this root owned cluster, run: sudo {{.cmd}}", out.V{"cmd": mustload.ExampleCmd(cname, "delete")})
+		out.ErrT(out.Tip, "Tip: To remove this root owned cluster, run: sudo {{.cmd}}", out.V{"cmd": mustload.ExampleCmd(cname, "delete")})
 	}
 	if !useForce {
 		exit.WithCodeT(exit.Permissions, "Exiting")
diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 257f95a857..a0b90f878b 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -59,7 +59,7 @@ func runStop(cmd *cobra.Command, args []string) {
 	}
 
 	if err := killMountProcess(); err != nil {
-		out.T(out.Warning, "Unable to kill mount process: {{.error}}", out.V{"error": err})
+		out.WarningT("Unable to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
 	if err := kubeconfig.UnsetCurrentContext(cname, kubeconfig.PathFromEnv()); err != nil {
diff --git a/go.mod b/go.mod
index 29a5ac30d5..2a00c74992 100644
--- a/go.mod
+++ b/go.mod
@@ -82,6 +82,7 @@ require (
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3
diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index af6cd19c50..a1265dbe24 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -248,7 +248,7 @@ func WarnIfSlow(arg ...string) ([]byte, error) {
 	d := time.Since(start)
 	if d > warnTime {
 		out.WarningT(`Executing "{{.command}}" took an unusually long time: {{.duration}}`, out.V{"command": strings.Join(cmd.Args, " "), "duration": d})
-		out.T(out.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": arg[0]})
+		out.ErrT(out.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": arg[0]})
 	}
 
 	if ctx.Err() == context.DeadlineExceeded {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ea2c15f6f2..0bf2f9b994 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -292,7 +292,7 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		if rerr == nil {
 			return nil
 		}
-		out.T(out.Embarrassed, "Unable to restart cluster, will reset it: {{.error}}", out.V{"error": rerr})
+		out.ErrT(out.Embarrassed, "Unable to restart cluster, will reset it: {{.error}}", out.V{"error": rerr})
 		if err := k.DeleteCluster(cfg.KubernetesConfig); err != nil {
 			glog.Warningf("delete failed: %v", err)
 		}
@@ -309,7 +309,7 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
 		return nil
 	}
 
-	out.T(out.Conflict, "initialization failed, will try again: {{.error}}", out.V{"error": err})
+	out.ErrT(out.Conflict, "initialization failed, will try again: {{.error}}", out.V{"error": err})
 	if err := k.DeleteCluster(cfg.KubernetesConfig); err != nil {
 		glog.Warningf("delete failed: %v", err)
 	}
diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go
index 221001f86e..3290363ef4 100644
--- a/pkg/minikube/exit/exit.go
+++ b/pkg/minikube/exit/exit.go
@@ -70,7 +70,7 @@ func WithError(msg string, err error) {
 // WithProblem outputs info related to a known problem and exits.
 func WithProblem(msg string, err error, p *problem.Problem) {
 	out.ErrT(out.Empty, "")
-	out.ErrT(out.FailureType, "[{{.id}}] {{.msg}} {{.error}}", out.V{"msg": msg, "id": p.ID, "error": p.Err})
+	out.FailureT("[{{.id}}] {{.msg}} {{.error}}", out.V{"msg": msg, "id": p.ID, "error": p.Err})
 	p.Display()
 	if p.ShowIssueLink {
 		out.ErrT(out.Empty, "")
@@ -85,7 +85,7 @@ func WithLogEntries(msg string, err error, entries map[string][]string) {
 	displayError(msg, err)
 
 	for name, lines := range entries {
-		out.T(out.FailureType, "Problems detected in {{.entry}}:", out.V{"entry": name})
+		out.FailureT("Problems detected in {{.entry}}:", out.V{"entry": name})
 		if len(lines) > MaxLogEntries {
 			lines = lines[:MaxLogEntries]
 		}
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index 97afcd59a4..aedf55457d 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -143,7 +143,7 @@ func FindProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.C
 // OutputProblems outputs discovered problems.
 func OutputProblems(problems map[string][]string, maxLines int) {
 	for name, lines := range problems {
-		out.T(out.FailureType, "Problems detected in {{.name}}:", out.V{"name": name})
+		out.FailureT("Problems detected in {{.name}}:", out.V{"name": name})
 		if len(lines) > maxLines {
 			lines = lines[len(lines)-maxLines:]
 		}
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
index 7323b33089..8aa74723e1 100644
--- a/pkg/minikube/machine/fix.go
+++ b/pkg/minikube/machine/fix.go
@@ -161,7 +161,7 @@ func maybeWarnAboutEvalEnv(drver string, name string) {
 	}
 	out.T(out.Notice, "Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:", out.V{"driver_name": drver})
 	// TODO: refactor docker-env package to generate only eval command per shell. https://github.com/kubernetes/minikube/issues/6887
-	out.T(out.Warning, `Please re-eval your docker-env, To ensure your environment variables have updated ports: 
+	out.WarningT(`Please re-eval your docker-env, To ensure your environment variables have updated ports: 
 
 	'minikube -p {{.profile_name}} docker-env'
 
diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index b6e24bdfac..7fb016b750 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -151,7 +151,7 @@ func Healthy(name string) ClusterController {
 
 	as, err := kverify.APIServerStatus(co.CP.Runner, co.CP.ForwardedIP, co.CP.ForwardedPort)
 	if err != nil {
-		out.T(out.FailureType, `Unable to get control plane status: {{.error}}`, out.V{"error": err})
+		out.FailureT(`Unable to get control plane status: {{.error}}`, out.V{"error": err})
 		exitTip("delete", name, exit.Unavailable)
 	}
 
@@ -162,7 +162,7 @@ func Healthy(name string) ClusterController {
 
 	if as != state.Running {
 		out.T(out.Shrug, `This control plane is not running! (state={{.state}})`, out.V{"state": as.String()})
-		out.T(out.Warning, `This is unusual - you may want to investigate using "{{.command}}"`, out.V{"command": ExampleCmd(name, "logs")})
+		out.WarningT(`This is unusual - you may want to investigate using "{{.command}}"`, out.V{"command": ExampleCmd(name, "logs")})
 		exitTip("start", name, exit.Unavailable)
 	}
 	return co
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 37202613f7..fff3f9d7ea 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -141,7 +141,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	configureMounts()
 
 	if err := CacheAndLoadImagesInConfig(); err != nil {
-		out.T(out.FailureType, "Unable to load cached images from config file.")
+		out.FailureT("Unable to load cached images from config file.")
 	}
 
 	// enable addons, both old and new!
@@ -211,7 +211,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 		if err := cr.Preload(k8s); err != nil {
 			switch err.(type) {
 			case *cruntime.ErrISOFeature:
-				out.T(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
+				out.ErrT(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
 			default:
 				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
 			}
@@ -314,7 +314,7 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 	// Bypass proxy for minikube's vm host ip
 	err = proxy.ExcludeIP(ip)
 	if err != nil {
-		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
+		out.FailureT("Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
 	}
 
 	// Save IP to config file for subsequent use
@@ -333,7 +333,7 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 	if err == nil {
 		return host, exists
 	}
-	out.T(out.Embarrassed, "StartHost failed, but will try again: {{.error}}", out.V{"error": err})
+	out.ErrT(out.Embarrassed, "StartHost failed, but will try again: {{.error}}", out.V{"error": err})
 
 	// NOTE: People get very cranky if you delete their prexisting VM. Only delete new ones.
 	if !exists {
@@ -447,7 +447,7 @@ func tryRegistry(r command.Runner, driverName string) {
 	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
 		glog.Warningf("%s failed: %v", rr.Args, err)
 		out.WarningT("This {{.type}} is having trouble accessing https://{{.repository}}", out.V{"repository": repo, "type": driver.MachineType(driverName)})
-		out.T(out.Tip, "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/")
+		out.ErrT(out.Tip, "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/")
 	}
 }
 
@@ -455,11 +455,11 @@ func tryRegistry(r command.Runner, driverName string) {
 func prepareNone() {
 	out.T(out.StartingNone, "Configuring local host environment ...")
 	if viper.GetBool(config.WantNoneDriverWarning) {
-		out.T(out.Empty, "")
+		out.ErrT(out.Empty, "")
 		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
 		out.WarningT("For more information, see:")
-		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
-		out.T(out.Empty, "")
+		out.ErrT(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.ErrT(out.Empty, "")
 	}
 
 	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
@@ -467,12 +467,12 @@ func prepareNone() {
 		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
 		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
 
-		out.T(out.Empty, "")
-		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
-		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
-		out.T(out.Empty, "")
+		out.ErrT(out.Empty, "")
+		out.ErrT(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
+		out.ErrT(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
+		out.ErrT(out.Empty, "")
 
-		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
+		out.ErrT(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
 	}
 
 	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {

From 5cde362650c55fb5451540abc53ccb0d0f9fdfad Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 10:03:12 -0700
Subject: [PATCH 408/668] Revert unrelated go.mod change

---
 go.mod | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go.mod b/go.mod
index 2a00c74992..29a5ac30d5 100644
--- a/go.mod
+++ b/go.mod
@@ -82,7 +82,6 @@ require (
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
-	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3

From a855f4ed052f615c7e5d72a3666f79d0d8089a75 Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 10:37:23 -0700
Subject: [PATCH 409/668] Run sudo for file display due to umask

---
 test/integration/functional_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 6623f1f362..75d489f7f5 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -774,7 +774,7 @@ func validateFileSync(ctx context.Context, t *testing.T, profile string) {
 
 	vp := vmSyncTestPath()
 	t.Logf("Checking for existence of %s within VM", vp)
-	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("sudo cat %s", vp)))
 	if err != nil {
 		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
@@ -811,7 +811,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 	}
 	for _, vp := range paths {
 		t.Logf("Checking for existence of %s within VM", vp)
-		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
+		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("sudo cat %s", vp)))
 		if err != nil {
 			t.Errorf("failed to check existence of %q inside minikube. args %q: %v", vp, rr.Command(), err)
 		}

From 6fdecf2ebf86d1261449905f095c84447533cd0a Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 10:48:47 -0700
Subject: [PATCH 410/668] Add unit test to check that docs are up to date

This requires the following changes:

1. We need to pass in -ldflags to `go test`, since we need to know the curren iso version to correctly generate the description for --iso-url

2. We need to rewrite the description of the --driver flag on `minikube start` because it is operating system specific, which doesn't make sense for our documentation
---
 Makefile                                      |   6 +-
 cmd/minikube/cmd/actual                       | 108 +++++++++
 cmd/minikube/cmd/expected                     | 108 +++++++++
 cmd/minikube/cmd/generate-docs_test.go        |   5 +-
 pkg/generate/docs.go                          |  20 +-
 pkg/generate/docs_templates.go                |   4 +-
 pkg/generate/rewrite.go                       |  66 ++++++
 pkg/minikube/out/style_test.go                |   2 +-
 .../en/docs/Reference/Commands/_index.md      |   8 -
 .../en/docs/Reference/Commands/addons.md      | 175 +++++++++++++--
 .../en/docs/Reference/Commands/cache.md       | 157 ++++++++++++-
 .../en/docs/Reference/Commands/completion.md  |  48 ++--
 .../en/docs/Reference/Commands/config.md      | 152 +++++++++++--
 .../en/docs/Reference/Commands/dashboard.md   |  19 +-
 .../en/docs/Reference/Commands/delete.md      |  41 ++--
 .../en/docs/Reference/Commands/docker-env.md  |  13 +-
 .../docs/Reference/Commands/generate-docs.md  |  50 +++++
 .../en/docs/Reference/Commands/help.md        |  44 ++++
 site/content/en/docs/Reference/Commands/ip.md |  19 +-
 .../en/docs/Reference/Commands/kubectl.md     |  23 +-
 .../en/docs/Reference/Commands/logs.md        |  24 +-
 .../en/docs/Reference/Commands/mount.md       |  13 +-
 .../en/docs/Reference/Commands/node.md        | 208 ++++++++++++++++++
 .../en/docs/Reference/Commands/options.md     |  43 ++++
 .../en/docs/Reference/Commands/pause.md       |  19 +-
 .../en/docs/Reference/Commands/podman-env.md  |  45 ++++
 .../en/docs/Reference/Commands/profile.md     |  71 +++++-
 .../en/docs/Reference/Commands/service.md     |  75 ++++++-
 .../en/docs/Reference/Commands/ssh-key.md     |  21 +-
 .../content/en/docs/Reference/Commands/ssh.md |  31 ++-
 .../en/docs/Reference/Commands/start.md       |  96 +-------
 .../en/docs/Reference/Commands/status.md      |  38 ++--
 .../en/docs/Reference/Commands/stop.md        |  23 +-
 .../en/docs/Reference/Commands/tunnel.md      |  12 +-
 .../en/docs/Reference/Commands/unpause.md     |  19 +-
 .../docs/Reference/Commands/update-check.md   |  33 ++-
 .../docs/Reference/Commands/update-context.md |  22 +-
 .../en/docs/Reference/Commands/version.md     |  13 +-
 test.sh                                       |   4 +-
 39 files changed, 1562 insertions(+), 316 deletions(-)
 create mode 100644 cmd/minikube/cmd/actual
 create mode 100644 cmd/minikube/cmd/expected
 create mode 100644 pkg/generate/rewrite.go
 delete mode 100644 site/content/en/docs/Reference/Commands/_index.md
 create mode 100644 site/content/en/docs/Reference/Commands/generate-docs.md
 create mode 100644 site/content/en/docs/Reference/Commands/help.md
 create mode 100644 site/content/en/docs/Reference/Commands/node.md
 create mode 100644 site/content/en/docs/Reference/Commands/options.md
 create mode 100644 site/content/en/docs/Reference/Commands/podman-env.md

diff --git a/Makefile b/Makefile
index 7e2e6d6e11..a0a19584cd 100755
--- a/Makefile
+++ b/Makefile
@@ -268,7 +268,7 @@ integration-versioned: out/minikube ## Trigger minikube integration testing
 
 .PHONY: test
 test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go ## Trigger minikube test
-	./test.sh
+	MINIKUBE_LDFLAGS="${MINIKUBE_LDFLAGS}" ./test.sh
 
 .PHONY: generate-docs
 generate-docs: out/minikube
@@ -278,10 +278,6 @@ generate-docs: out/minikube
 extract: ## Compile extract tool
 	go run cmd/extract/extract.go
 
-.PHONY: extract
-extract: ## Compile extract tool
-	go run cmd/extract/extract.go
-
 # Regenerates assets.go when template files have been updated
 pkg/minikube/assets/assets.go: $(shell find "deploy/addons" -type f)
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
diff --git a/cmd/minikube/cmd/actual b/cmd/minikube/cmd/actual
new file mode 100644
index 0000000000..80bc9cb864
--- /dev/null
+++ b/cmd/minikube/cmd/actual
@@ -0,0 +1,108 @@
+---
+title: "start"
+linkTitle: "start"
+weight: 1
+date: 2020-04-01
+description: >
+  Starts a local kubernetes cluster
+---
+
+
+
+## minikube start
+
+Starts a local kubernetes cluster
+
+### Synopsis
+
+Starts a local kubernetes cluster
+
+```
+minikube start [flags]
+```
+
+### Options
+
+```
+      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
+      --apiserver-ips ipSlice             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 (default [])
+      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
+      --apiserver-names stringArray       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
+      --apiserver-port int                The apiserver listening port (default 8443)
+      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
+      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
+      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
+      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
+      --cri-socket string                 The cri socket path to be used.
+      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
+      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
+      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
+      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
+      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
+      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
+      --download-only                     If true, only download and cache files for later use - don't install or start anything.
+      --driver string                     Driver is one of: virtualbox, parallels, vmwarefusion, hyperkit, vmware, docker, podman (defaults to auto-detect)
+      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
+      --embed-certs                       if true, will embed the certs in kubeconfig.
+      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
+      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
+                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
+                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
+                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
+      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
+      --force                             Force minikube to perform possibly dangerous operations
+  -h, --help                              help for start
+      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
+      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
+      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
+      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
+      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)
+      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)
+      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
+      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
+      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
+      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
+      --install-addons                    If set, install addons. Defaults to true. (default true)
+      --interactive                       Allow user prompts for more information (default true)
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])
+      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
+      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.
+      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
+      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
+      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
+      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
+      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
+      --mount                             This will start the mount daemon and automatically mount files into minikube.
+      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
+      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
+      --network-plugin string             The name of the network plugin.
+      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
+      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
+      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
+  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)
+      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)
+      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
+      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
+      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
+      --vm                                Filter to use only VM Drivers
+      --vm-driver driver                  DEPRECATED, use driver instead.
+      --wait                              Block until the apiserver is servicing API requests (default true)
+      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/cmd/minikube/cmd/expected b/cmd/minikube/cmd/expected
new file mode 100644
index 0000000000..7f612e8062
--- /dev/null
+++ b/cmd/minikube/cmd/expected
@@ -0,0 +1,108 @@
+---
+title: "start"
+linkTitle: "start"
+weight: 1
+date: 2020-04-01
+description: >
+  Starts a local kubernetes cluster
+---
+
+
+
+## minikube start
+
+Starts a local kubernetes cluster
+
+### Synopsis
+
+Starts a local kubernetes cluster
+
+```
+minikube start [flags]
+```
+
+### Options
+
+```
+      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
+      --apiserver-ips ipSlice             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 (default [])
+      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
+      --apiserver-names stringArray       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
+      --apiserver-port int                The apiserver listening port (default 8443)
+      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
+      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
+      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
+      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
+      --cri-socket string                 The cri socket path to be used.
+      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
+      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
+      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
+      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
+      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
+      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
+      --download-only                     If true, only download and cache files for later use - don't install or start anything.
+      --driver string                     Driver is one of: virtualbox, parallels, vmwarefusion, hyperkit, vmware, docker, podman (experimental) (defaults to auto-detect)
+      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
+      --embed-certs                       if true, will embed the certs in kubeconfig.
+      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
+      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
+                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
+                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
+                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
+      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
+      --force                             Force minikube to perform possibly dangerous operations
+  -h, --help                              help for start
+      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
+      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
+      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
+      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
+      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)
+      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)
+      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
+      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
+      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
+      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
+      --install-addons                    If set, install addons. Defaults to true. (default true)
+      --interactive                       Allow user prompts for more information (default true)
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])
+      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
+      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.
+      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
+      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
+      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
+      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
+      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
+      --mount                             This will start the mount daemon and automatically mount files into minikube.
+      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
+      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
+      --network-plugin string             The name of the network plugin.
+      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
+      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
+      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
+  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)
+      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)
+      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
+      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
+      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
+      --vm                                Filter to use only VM Drivers
+      --vm-driver driver                  DEPRECATED, use driver instead.
+      --wait                              Block until the apiserver is servicing API requests (default true)
+      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index 06178eda95..fed8fceb88 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"k8s.io/minikube/pkg/generate"
 )
 
@@ -39,8 +40,8 @@ func TestCommandsDocs(t *testing.T) {
 			if err != nil {
 				t.Fatalf("error getting contents: %v", err)
 			}
-			if string(actualContents) != string(expectedContents) {
-				t.Fatalf("Docs are not updated. Please run `make generate-docs` to update commands documentation.")
+			if diff := cmp.Diff(actualContents, string(expectedContents)); diff != "" {
+				t.Fatalf("Docs are not updated. Please run `make generate-docs` to update commands documentation: %s", diff)
 			}
 		})
 	}
diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
index 905009ef7b..c4148df033 100644
--- a/pkg/generate/docs.go
+++ b/pkg/generate/docs.go
@@ -40,24 +40,26 @@ func Docs(root *cobra.Command, path string) error {
 	for _, c := range cmds {
 		contents, err := DocForCommand(c)
 		if err != nil {
-			return errors.Wrapf(err, "generating doc for %s", c.Name)
+			return errors.Wrapf(err, "generating doc for %s", c.Name())
 		}
-		if err := saveDocForCommand(c, contents, path); err != nil {
+		if err := saveDocForCommand(c, []byte(contents), path); err != nil {
 			return errors.Wrapf(err, "saving doc for %s", c.Name())
 		}
 	}
 	return nil
 }
 
-func DocForCommand(command *cobra.Command) ([]byte, error) {
+// DocForCommand returns the specific doc for that command
+func DocForCommand(command *cobra.Command) (string, error) {
 	buf := bytes.NewBuffer([]byte{})
 	if err := generateTitle(command, buf); err != nil {
-		return nil, errors.Wrap(err, "generating title")
+		return "", errors.Wrap(err, "generating title")
 	}
 	if err := writeSubcommands(command, buf); err != nil {
-		return nil, errors.Wrap(err, "writing subcommands")
+		return "", errors.Wrap(err, "writing subcommands")
 	}
-	return removeHelpCommand(buf), nil
+	edited := removeHelpCommand(buf)
+	return rewriteFlags(command, edited), nil
 }
 
 // after every command, cobra automatically appends
@@ -66,9 +68,9 @@ func DocForCommand(command *cobra.Command) ([]byte, error) {
 // * [minikube addons](minikube_addons.md)	 - Modify minikube's kubernetes addons
 
 // ###### Auto generated by spf13/cobra on 1-Apr-2020
-// help text which is unecessary info after every subcommand
+// help text which is unnecessary info after every subcommand
 // This function removes that text.
-func removeHelpCommand(buffer *bytes.Buffer) []byte {
+func removeHelpCommand(buffer *bytes.Buffer) string {
 	beginningHelpText := "### SEE ALSO"
 	endHelpText := "###### Auto generated by spf13/cobra"
 	scanner := bufio.NewScanner(buffer)
@@ -94,7 +96,7 @@ func removeHelpCommand(buffer *bytes.Buffer) []byte {
 			break
 		}
 	}
-	return final.Bytes()
+	return final.String()
 }
 
 func writeSubcommands(command *cobra.Command, w io.Writer) error {
diff --git a/pkg/generate/docs_templates.go b/pkg/generate/docs_templates.go
index 0e8dca5ac3..7e6bc94d34 100644
--- a/pkg/generate/docs_templates.go
+++ b/pkg/generate/docs_templates.go
@@ -17,8 +17,8 @@ limitations under the License.
 package generate
 
 var title = `---
-title: {{.Command}}
-linkTitle: {{.Command}}
+title: "{{.Command}}"
+linkTitle: "{{.Command}}"
 weight: 1
 date: {{.Date}}
 description: >
diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go
new file mode 100644
index 0000000000..a55396b638
--- /dev/null
+++ b/pkg/generate/rewrite.go
@@ -0,0 +1,66 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package generate
+
+import (
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+type rewrite struct {
+	flag        string
+	description string
+}
+
+// rewriteFlags rewrites flags that are dependent on operating system
+// for example, for `minikube start`, the description of --driver
+// outputs possible drivers for the operating system
+func rewriteFlags(command *cobra.Command, contents string) string {
+	rewrites := map[string][]rewrite{
+		"start": []rewrite{{
+			flag:        "--driver",
+			description: "Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.",
+		}},
+	}
+	rws, ok := rewrites[command.Name()]
+	if !ok {
+		return contents
+	}
+	for _, r := range rws {
+		contents = rewriteFlag(contents, r.flag, r.description)
+	}
+	return contents
+}
+
+func rewriteFlag(contents, flag, description string) string {
+	lines := strings.Split(contents, "\n")
+	for i, l := range lines {
+		if strings.Contains(l, flag) {
+			spacesBetween := 42 - len(flag)
+			// docs start with a prefix of 6 spaces
+			replacement := "      "
+			replacement += flag
+			for i := 0; i < spacesBetween; i++ {
+				replacement += " "
+			}
+			replacement += description
+			lines[i] = replacement
+		}
+	}
+	return strings.Join(lines, "")
+}
diff --git a/pkg/minikube/out/style_test.go b/pkg/minikube/out/style_test.go
index 06e1c42073..65f63c59b2 100644
--- a/pkg/minikube/out/style_test.go
+++ b/pkg/minikube/out/style_test.go
@@ -177,7 +177,7 @@ func TestApplyTemplateFormating(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			rawGot := applyTemplateFormatting(test.styleEnum, test.useColor, test.format, test.a...)
+			rawGot := ApplyTemplateFormatting(test.styleEnum, test.useColor, test.format, test.a...)
 			got := strings.TrimSpace(rawGot)
 			if got != test.expected {
 				t.Errorf("Expected '%v' but got '%v'", test.expected, got)
diff --git a/site/content/en/docs/Reference/Commands/_index.md b/site/content/en/docs/Reference/Commands/_index.md
deleted file mode 100644
index 889734bd1f..0000000000
--- a/site/content/en/docs/Reference/Commands/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Commands"
-linkTitle: "Commands"
-weight: 1
-date: 2019-08-01
-description: >
-  minikube command reference
----
diff --git a/site/content/en/docs/Reference/Commands/addons.md b/site/content/en/docs/Reference/Commands/addons.md
index e87deb9216..53cb511426 100644
--- a/site/content/en/docs/Reference/Commands/addons.md
+++ b/site/content/en/docs/Reference/Commands/addons.md
@@ -2,53 +2,182 @@
 title: "addons"
 linkTitle: "addons"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Modifies minikube addons files using subcommands like "minikube addons enable dashboard"
+  Modify minikube's kubernetes addons
 ---
 
-## Overview
 
-* **configure**:   Configures the addon w/ADDON_NAME within minikube
-* **disable**:     Disables the addon w/ADDON_NAME within minikube
-* **enable**:      Enables the addon w/ADDON_NAME within minikube
-* **list**:        Lists all available minikube addons as well as their current statuses (enabled/disabled)
-* **open**:        Opens the addon w/ADDON_NAME within minikube
+
+## minikube addons
+
+Modify minikube's kubernetes addons
+
+### Synopsis
+
+addons modifies minikube addons files using subcommands like "minikube addons enable dashboard"
+
+```
+minikube addons SUBCOMMAND [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for addons
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
 
 ## minikube addons configure
 
 Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list 
 
+### Synopsis
+
+Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list 
+
 ```
 minikube addons configure ADDON_NAME [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for configure
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube addons disable
 
 Disables the addon w/ADDON_NAME within minikube (example: minikube addons disable dashboard). For a list of available addons use: minikube addons list 
 
+### Synopsis
+
+Disables the addon w/ADDON_NAME within minikube (example: minikube addons disable dashboard). For a list of available addons use: minikube addons list 
+
 ```
 minikube addons disable ADDON_NAME [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for disable
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube addons enable
 
 Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list 
 
+### Synopsis
+
+Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list 
+
 ```
 minikube addons enable ADDON_NAME [flags]
 ```
 
-or
+### Options
 
 ```
-minikube start --addons ADDON_NAME [flags]
+  -h, --help   help for enable
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube addons help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type addons help [path to command] for full details.
+
+```
+minikube addons help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ## minikube addons list
 
 Lists all available minikube addons as well as their current statuses (enabled/disabled)
 
+### Synopsis
+
+Lists all available minikube addons as well as their current statuses (enabled/disabled)
+
 ```
 minikube addons list [flags]
 ```
@@ -60,10 +189,28 @@ minikube addons list [flags]
   -o, --output string   minikube addons list --output OUTPUT. json, list (default "list")
 ```
 
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube addons open
 
 Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list 
 
+### Synopsis
+
+Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list 
+
 ```
 minikube addons open ADDON_NAME [flags]
 ```
@@ -74,13 +221,12 @@ minikube addons open ADDON_NAME [flags]
       --format string   Format to output addons URL in.  This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}")
   -h, --help            help for open
       --https           Open the addons URL with https instead of http
-      --interval int    The time interval for each check that wait performs in seconds (default 6)
+      --interval int    The time interval for each check that wait performs in seconds (default 1)
       --url             Display the kubernetes addons URL in the CLI instead of opening it in the default browser
-      --wait int        Amount of time to wait for service in seconds (default 20)
+      --wait int        Amount of time to wait for service in seconds (default 2)
 ```
 
-
-## Options inherited from parent commands
+### Options inherited from parent commands
 
 ```
       --alsologtostderr                  log to standard error as well as files
@@ -93,3 +239,4 @@ minikube addons open ADDON_NAME [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/cache.md b/site/content/en/docs/Reference/Commands/cache.md
index 039eda9940..4a0ced0fbc 100644
--- a/site/content/en/docs/Reference/Commands/cache.md
+++ b/site/content/en/docs/Reference/Commands/cache.md
@@ -2,32 +2,146 @@
 title: "cache"
 linkTitle: "cache"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Add or delete an image from the local cache.
 ---
 
 
+
+## minikube cache
+
+Add or delete an image from the local cache.
+
+### Synopsis
+
+Add or delete an image from the local cache.
+
+### Options
+
+```
+  -h, --help   help for cache
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube cache add
 
 Add an image to local cache.
 
+### Synopsis
+
+Add an image to local cache.
+
 ```
 minikube cache add [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for add
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube cache delete
 
 Delete an image from the local cache.
 
+### Synopsis
+
+Delete an image from the local cache.
+
 ```
 minikube cache delete [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for delete
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube cache help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type cache help [path to command] for full details.
+
+```
+minikube cache help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube cache list
 
 List all available images from the local cache.
 
+### Synopsis
+
+List all available images from the local cache.
+
 ```
 minikube cache list [flags]
 ```
@@ -40,10 +154,49 @@ minikube cache list [flags]
   -h, --help            help for list
 ```
 
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube cache reload
 
+reload cached images.
+
+### Synopsis
+
 reloads images previously added using the 'cache add' subcommand
 
 ```
 minikube cache reload [flags]
-```
\ No newline at end of file
+```
+
+### Options
+
+```
+  -h, --help   help for reload
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/completion.md b/site/content/en/docs/Reference/Commands/completion.md
index 11fa3a822f..872dc8fca4 100644
--- a/site/content/en/docs/Reference/Commands/completion.md
+++ b/site/content/en/docs/Reference/Commands/completion.md
@@ -2,45 +2,50 @@
 title: "completion"
 linkTitle: "completion"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Outputs minikube shell completion for the given shell (bash or zsh)
 ---
 
 
-### Overview
+
+## minikube completion
 
 Outputs minikube shell completion for the given shell (bash or zsh)
 
-This depends on the bash-completion binary.  Example installation instructions:
+### Synopsis
+
+
+	Outputs minikube shell completion for the given shell (bash or zsh)
+
+	This depends on the bash-completion binary.  Example installation instructions:
+	OS X:
+		$ brew install bash-completion
+		$ source $(brew --prefix)/etc/bash_completion
+		$ minikube completion bash > ~/.minikube-completion  # for bash users
+		$ minikube completion zsh > ~/.minikube-completion  # for zsh users
+		$ source ~/.minikube-completion
+	Ubuntu:
+		$ apt-get install bash-completion
+		$ source /etc/bash-completion
+		$ source <(minikube completion bash) # for bash users
+		$ source <(minikube completion zsh) # for zsh users
+
+	Additionally, you may want to output the completion to a file and source in your .bashrc
+
+	Note for zsh users: [1] zsh completions are only supported in versions of zsh >= 5.2
 
-### Usage
 
 ```
 minikube completion SHELL [flags]
 ```
 
-## Example: macOS
+### Options
 
-```shell
-brew install bash-completion
-source $(brew --prefix)/etc/bash_completion
-minikube completion bash > ~/.minikube-completion  # for bash users
-$ minikube completion zsh > ~/.minikube-completion  # for zsh users
-$ source ~/.minikube-completion
 ```
-
-## Example: Ubuntu
-
-```shell
-apt-get install bash-completion
-source /etc/bash-completion
-source <(minikube completion bash) # for bash users
-source <(minikube completion zsh) # for zsh users
+  -h, --help   help for completion
 ```
 
-Additionally, you may want to output the completion to a file and source in your .bashrc
-
 ### Options inherited from parent commands
 
 ```
@@ -54,3 +59,4 @@ Additionally, you may want to output the completion to a file and source in your
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/config.md b/site/content/en/docs/Reference/Commands/config.md
index 8694d6cb0d..81eb395045 100644
--- a/site/content/en/docs/Reference/Commands/config.md
+++ b/site/content/en/docs/Reference/Commands/config.md
@@ -2,18 +2,24 @@
 title: "config"
 linkTitle: "config"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Modify minikube config
 ---
 
-### Overview
+
+
+## minikube config
+
+Modify minikube config
+
+### Synopsis
 
 config modifies minikube config files using subcommands like "minikube config set driver kvm"
-
 Configurable fields: 
 
  * driver
+ * vm-driver
  * container-runtime
  * feature-gates
  * v
@@ -41,51 +47,168 @@ Configurable fields:
  * embed-certs
  * native-ssh
 
+```
+minikube config SUBCOMMAND [flags]
+```
 
-### subcommands
+### Options
 
-- **get**: Gets the value of PROPERTY_NAME from the minikube config file
+```
+  -h, --help   help for config
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
 
 ## minikube config get
 
-Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.
+Gets the value of PROPERTY_NAME from the minikube config file
 
-### Usage
+### Synopsis
+
+Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.
 
 ```
 minikube config get PROPERTY_NAME [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for get
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube config help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type config help [path to command] for full details.
+
+```
+minikube config help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube config set
 
+Sets an individual value in a minikube config file
+
+### Synopsis
+
 Sets the PROPERTY_NAME config value to PROPERTY_VALUE
 	These values can be overwritten by flags or environment variables at runtime.
 
-### Usage
-
 ```
 minikube config set PROPERTY_NAME PROPERTY_VALUE [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for set
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube config unset
 
-unsets PROPERTY_NAME from the minikube config file.  Can be overwritten by flags or environmental variables
+unsets an individual value in a minikube config file
 
-### Usage
+### Synopsis
+
+unsets PROPERTY_NAME from the minikube config file.  Can be overwritten by flags or environmental variables
 
 ```
 minikube config unset PROPERTY_NAME [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for unset
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
 
 ## minikube config view
 
-### Overview
+Display values currently set in the minikube config file
+
+### Synopsis
 
 Display values currently set in the minikube config file.
 
-### Usage
-
 ```
 minikube config view [flags]
 ```
@@ -111,3 +234,4 @@ minikube config view [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/dashboard.md b/site/content/en/docs/Reference/Commands/dashboard.md
index 8bd21037d3..23e3c39a95 100644
--- a/site/content/en/docs/Reference/Commands/dashboard.md
+++ b/site/content/en/docs/Reference/Commands/dashboard.md
@@ -2,25 +2,33 @@
 title: "dashboard"
 linkTitle: "dashboard"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Access the Kubernetes dashboard running within the minikube cluster
+  Access the kubernetes dashboard running within the minikube cluster
 ---
 
-## Usage
+
+
+## minikube dashboard
+
+Access the kubernetes dashboard running within the minikube cluster
+
+### Synopsis
+
+Access the kubernetes dashboard running within the minikube cluster
 
 ```
 minikube dashboard [flags]
 ```
 
-## Options
+### Options
 
 ```
   -h, --help   help for dashboard
       --url    Display dashboard URL instead of opening a browser
 ```
 
-## Options inherited from parent commands
+### Options inherited from parent commands
 
 ```
       --alsologtostderr                  log to standard error as well as files
@@ -33,3 +41,4 @@ minikube dashboard [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/delete.md b/site/content/en/docs/Reference/Commands/delete.md
index eabf82953a..c025e6c244 100644
--- a/site/content/en/docs/Reference/Commands/delete.md
+++ b/site/content/en/docs/Reference/Commands/delete.md
@@ -2,44 +2,32 @@
 title: "delete"
 linkTitle: "delete"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Deletes a local Kubernetes cluster
+  Deletes a local kubernetes cluster
 ---
 
-### Overview
 
-Deletes a local Kubernetes cluster. This command deletes the VM, and removes all
+
+## minikube delete
+
+Deletes a local kubernetes cluster
+
+### Synopsis
+
+Deletes a local kubernetes cluster. This command deletes the VM, and removes all
 associated files.
 
-## Usage
-
 ```
 minikube delete [flags]
 ```
 
-##### Delete all profiles
-```
-minikube delete --all
-```
-
-##### Delete profile & `.minikube` directory
-Do note that the following command only works if you have only 1 profile. If there are multiple profiles, the command will error out.
-```
-minikube delete --purge
-```
-
-##### Delete all profiles & `.minikube` directory
-This will delete all the profiles and `.minikube` directory.
-```
-minikube delete --purge --all
-```
-
-### Flags
+### Options
 
 ```
-      --all: Set flag to delete all profiles
-      --purge: Set this flag to delete the '.minikube' folder from your user directory.
+      --all     Set flag to delete all profiles
+  -h, --help    help for delete
+      --purge   Set this flag to delete the '.minikube' folder from your user directory.
 ```
 
 ### Options inherited from parent commands
@@ -55,3 +43,4 @@ minikube delete --purge --all
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/docker-env.md b/site/content/en/docs/Reference/Commands/docker-env.md
index 2260564680..e9e215e239 100644
--- a/site/content/en/docs/Reference/Commands/docker-env.md
+++ b/site/content/en/docs/Reference/Commands/docker-env.md
@@ -2,12 +2,20 @@
 title: "docker-env"
 linkTitle: "docker-env"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Sets up docker env variables; similar to '$(docker-machine env)'
 ---
 
-### Usage
+
+
+## minikube docker-env
+
+Sets up docker env variables; similar to '$(docker-machine env)'
+
+### Synopsis
+
+Sets up docker env variables; similar to '$(docker-machine env)'.
 
 ```
 minikube docker-env [flags]
@@ -35,3 +43,4 @@ minikube docker-env [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/generate-docs.md b/site/content/en/docs/Reference/Commands/generate-docs.md
new file mode 100644
index 0000000000..c29c477553
--- /dev/null
+++ b/site/content/en/docs/Reference/Commands/generate-docs.md
@@ -0,0 +1,50 @@
+---
+title: "generate-docs"
+linkTitle: "generate-docs"
+weight: 1
+date: 2020-04-02
+description: >
+  Populates the specified folder with documentation in markdown about minikube
+---
+
+
+
+## minikube generate-docs
+
+Populates the specified folder with documentation in markdown about minikube
+
+### Synopsis
+
+Populates the specified folder with documentation in markdown about minikube
+
+```
+minikube generate-docs [flags]
+```
+
+### Examples
+
+```
+minikube generate-docs --path <FOLDER_PATH>
+```
+
+### Options
+
+```
+  -h, --help          help for generate-docs
+      --path string   The path on the file system where the docs in markdown need to be saved
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/help.md b/site/content/en/docs/Reference/Commands/help.md
new file mode 100644
index 0000000000..7c4cc4b92a
--- /dev/null
+++ b/site/content/en/docs/Reference/Commands/help.md
@@ -0,0 +1,44 @@
+---
+title: "help"
+linkTitle: "help"
+weight: 1
+date: 2020-04-02
+description: >
+  Help about any command
+---
+
+
+
+## minikube help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type minikube help [path to command] for full details.
+
+```
+minikube help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/ip.md b/site/content/en/docs/Reference/Commands/ip.md
index 020fe0ed65..1f6b4318e7 100644
--- a/site/content/en/docs/Reference/Commands/ip.md
+++ b/site/content/en/docs/Reference/Commands/ip.md
@@ -2,21 +2,31 @@
 title: "ip"
 linkTitle: "ip"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Retrieves the IP address of the running cluster
 ---
 
-### Overview
+
+
+## minikube ip
+
+Retrieves the IP address of the running cluster
+
+### Synopsis
 
 Retrieves the IP address of the running cluster, and writes it to STDOUT.
 
-### Usage
-
 ```
 minikube ip [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for ip
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -30,3 +40,4 @@ minikube ip [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/kubectl.md b/site/content/en/docs/Reference/Commands/kubectl.md
index cfca7ec2a4..3cc66801b3 100644
--- a/site/content/en/docs/Reference/Commands/kubectl.md
+++ b/site/content/en/docs/Reference/Commands/kubectl.md
@@ -2,31 +2,35 @@
 title: "kubectl"
 linkTitle: "kubectl"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Run kubectl
 ---
 
 
-### Overview
 
-Run the Kubernetes client, download it if necessary.
-Remember `--` after kubectl!
+## minikube kubectl
 
-### Usage
+Run kubectl
+
+### Synopsis
+
+Run the kubernetes client, download it if necessary. Remember -- after kubectl!
+
+Examples:
+minikube kubectl -- --help
+minikube kubectl -- get pods --namespace kube-system
 
 ```
 minikube kubectl [flags]
 ```
 
-### Examples:
+### Options
 
 ```
-minikube kubectl -- --help
-minikube kubectl -- get pods --namespace kube-system
+  -h, --help   help for kubectl
 ```
 
-
 ### Options inherited from parent commands
 
 ```
@@ -40,3 +44,4 @@ minikube kubectl -- get pods --namespace kube-system
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/logs.md b/site/content/en/docs/Reference/Commands/logs.md
index 595c7055e1..99ca38664a 100644
--- a/site/content/en/docs/Reference/Commands/logs.md
+++ b/site/content/en/docs/Reference/Commands/logs.md
@@ -2,12 +2,20 @@
 title: "logs"
 linkTitle: "logs"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Gets the logs of the running instance, used for debugging minikube, not user code
+  Gets the logs of the running instance, used for debugging minikube, not user code.
 ---
 
-## Usage
+
+
+## minikube logs
+
+Gets the logs of the running instance, used for debugging minikube, not user code.
+
+### Synopsis
+
+Gets the logs of the running instance, used for debugging minikube, not user code.
 
 ```
 minikube logs [flags]
@@ -16,10 +24,11 @@ minikube logs [flags]
 ### Options
 
 ```
-  -f, --follow       Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.
-  -h, --help         help for logs
-  -n, --length int   Number of lines back to go within the log (default 60)
-      --problems     Show only log entries which point to known problems
+  -f, --follow        Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.
+  -h, --help          help for logs
+  -n, --length int    Number of lines back to go within the log (default 60)
+      --node string   The node to get logs from. Defaults to the primary control plane.
+      --problems      Show only log entries which point to known problems
 ```
 
 ### Options inherited from parent commands
@@ -35,3 +44,4 @@ minikube logs [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/mount.md b/site/content/en/docs/Reference/Commands/mount.md
index fa85b70922..f891009b77 100644
--- a/site/content/en/docs/Reference/Commands/mount.md
+++ b/site/content/en/docs/Reference/Commands/mount.md
@@ -2,12 +2,20 @@
 title: "mount"
 linkTitle: "mount"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Mounts the specified directory into minikube
 ---
 
-### Usage
+
+
+## minikube mount
+
+Mounts the specified directory into minikube
+
+### Synopsis
+
+Mounts the specified directory into minikube.
 
 ```
 minikube mount [flags] <source directory>:<target directory>
@@ -41,3 +49,4 @@ minikube mount [flags] <source directory>:<target directory>
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/node.md b/site/content/en/docs/Reference/Commands/node.md
new file mode 100644
index 0000000000..edfd70241a
--- /dev/null
+++ b/site/content/en/docs/Reference/Commands/node.md
@@ -0,0 +1,208 @@
+---
+title: "node"
+linkTitle: "node"
+weight: 1
+date: 2020-04-02
+description: >
+  Node operations
+---
+
+
+
+## minikube node
+
+Node operations
+
+### Synopsis
+
+Operations on nodes
+
+```
+minikube node [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for node
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube node add
+
+Adds a node to the given cluster.
+
+### Synopsis
+
+Adds a node to the given cluster config, and starts it.
+
+```
+minikube node add [flags]
+```
+
+### Options
+
+```
+      --control-plane   If true, the node added will also be a control plane in addition to a worker.
+  -h, --help            help for add
+      --worker          If true, the added node will be marked for work. Defaults to true. (default true)
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube node delete
+
+Deletes a node from a cluster.
+
+### Synopsis
+
+Deletes a node from a cluster.
+
+```
+minikube node delete [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for delete
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube node help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type node help [path to command] for full details.
+
+```
+minikube node help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube node start
+
+Starts a node.
+
+### Synopsis
+
+Starts an existing stopped node in a cluster.
+
+```
+minikube node start [flags]
+```
+
+### Options
+
+```
+  -h, --help          help for start
+      --name string   The name of the node to start
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+## minikube node stop
+
+Stops a node in a cluster.
+
+### Synopsis
+
+Stops a node in a cluster.
+
+```
+minikube node stop [flags]
+```
+
+### Options
+
+```
+  -h, --help          help for stop
+      --name string   The name of the node to delete
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/options.md b/site/content/en/docs/Reference/Commands/options.md
new file mode 100644
index 0000000000..aea27a58b6
--- /dev/null
+++ b/site/content/en/docs/Reference/Commands/options.md
@@ -0,0 +1,43 @@
+---
+title: "options"
+linkTitle: "options"
+weight: 1
+date: 2020-04-02
+description: >
+  Show a list of global command-line options (applies to all commands).
+---
+
+
+
+## minikube options
+
+Show a list of global command-line options (applies to all commands).
+
+### Synopsis
+
+Show a list of global command-line options (applies to all commands).
+
+```
+minikube options [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for options
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/pause.md b/site/content/en/docs/Reference/Commands/pause.md
index 5850a5617d..ee6598b95d 100644
--- a/site/content/en/docs/Reference/Commands/pause.md
+++ b/site/content/en/docs/Reference/Commands/pause.md
@@ -2,18 +2,20 @@
 title: "pause"
 linkTitle: "pause"
 weight: 1
-date: 2020-02-05
+date: 2020-04-02
 description: >
-  pause the Kubernetes control plane or other namespaces
+  pause containers
 ---
 
-### Overview
 
-The pause command allows you to freeze containers using the Linux [cgroup freezer](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt). Once frozen, processes will no longer consume CPU cycles, but will remain in memory.
 
-By default, the pause command will pause the Kubernetes control plane (kube-system namespace), leaving your applications running. This reduces the background CPU usage of a minikube cluster to a negligible 2-3% of a CPU.
+## minikube pause
 
-### Usage
+pause containers
+
+### Synopsis
+
+pause containers
 
 ```
 minikube pause [flags]
@@ -31,6 +33,7 @@ minikube pause [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files
@@ -40,7 +43,3 @@ minikube pause [flags]
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
 
-### SEE ALSO
-
-* [unpause](unpause.md)
-
diff --git a/site/content/en/docs/Reference/Commands/podman-env.md b/site/content/en/docs/Reference/Commands/podman-env.md
new file mode 100644
index 0000000000..72bda64e09
--- /dev/null
+++ b/site/content/en/docs/Reference/Commands/podman-env.md
@@ -0,0 +1,45 @@
+---
+title: "podman-env"
+linkTitle: "podman-env"
+weight: 1
+date: 2020-04-02
+description: >
+  Sets up podman env variables; similar to '$(podman-machine env)'
+---
+
+
+
+## minikube podman-env
+
+Sets up podman env variables; similar to '$(podman-machine env)'
+
+### Synopsis
+
+Sets up podman env variables; similar to '$(podman-machine env)'.
+
+```
+minikube podman-env [flags]
+```
+
+### Options
+
+```
+  -h, --help           help for podman-env
+      --shell string   Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect
+  -u, --unset          Unset variables instead of setting them
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/profile.md b/site/content/en/docs/Reference/Commands/profile.md
index 88505fcf35..79527f5c7f 100644
--- a/site/content/en/docs/Reference/Commands/profile.md
+++ b/site/content/en/docs/Reference/Commands/profile.md
@@ -2,26 +2,30 @@
 title: "profile"
 linkTitle: "profile"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Profile gets or sets the current minikube profile
 ---
 
-### Overview
+
+
+## minikube profile
+
+Profile gets or sets the current minikube profile
+
+### Synopsis
 
 profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`
 
-### Usage
-
 ```
-minikube profile [MINIKUBE_PROFILE_NAME]
-
-You can return to the default minikube profile by running `minikube profile default` [flags]
+minikube profile [MINIKUBE_PROFILE_NAME].  You can return to the default minikube profile by running `minikube profile default` [flags]
 ```
 
-## Subcommands
+### Options
 
-- **list**: Lists all minikube profiles.
+```
+  -h, --help   help for profile
+```
 
 ### Options inherited from parent commands
 
@@ -37,12 +41,44 @@ You can return to the default minikube profile by running `minikube profile defa
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
 
+## minikube profile help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type profile help [path to command] for full details.
+
+```
+minikube profile help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
 
 ## minikube profile list
 
 Lists all minikube profiles.
 
-### Overview
+### Synopsis
 
 Lists all valid minikube profiles and detects all possible invalid profiles.
 
@@ -56,3 +92,18 @@ minikube profile list [flags]
   -h, --help            help for list
   -o, --output string   The output format. One of 'json', 'table' (default "table")
 ```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/service.md b/site/content/en/docs/Reference/Commands/service.md
index 8a7a8b164f..71ad7c1195 100644
--- a/site/content/en/docs/Reference/Commands/service.md
+++ b/site/content/en/docs/Reference/Commands/service.md
@@ -2,35 +2,35 @@
 title: "service"
 linkTitle: "service"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Gets the Kubernetes URL(s) for the specified service in your local cluster
+  Gets the kubernetes URL(s) for the specified service in your local cluster
 ---
 
-### Overview
 
-Gets the Kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.
 
-### Usage
+## minikube service
+
+Gets the kubernetes URL(s) for the specified service in your local cluster
+
+### Synopsis
+
+Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.
 
 ```
 minikube service [flags] SERVICE
 ```
 
-### Subcommands
-
-- **list**: Lists the URLs for the services in your local cluster
-
 ### Options
 
 ```
       --format string      Format to output service URL in. This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}")
   -h, --help               help for service
       --https              Open the service URL with https instead of http
-      --interval int       The initial time interval for each check that wait performs in seconds (default 6)
+      --interval int       The initial time interval for each check that wait performs in seconds (default 1)
   -n, --namespace string   The service namespace (default "default")
       --url                Display the kubernetes service URL in the CLI instead of opening it in the default browser
-      --wait int           Amount of time to wait for a service in seconds (default 20)
+      --wait int           Amount of time to wait for a service in seconds (default 2)
 ```
 
 ### Options inherited from parent commands
@@ -47,10 +47,48 @@ minikube service [flags] SERVICE
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
 
+## minikube service help
+
+Help about any command
+
+### Synopsis
+
+Help provides help for any command in the application.
+Simply type service help [path to command] for full details.
+
+```
+minikube service help [command] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for help
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --format string                    Format to output service URL in. This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
 ## minikube service list
 
 Lists the URLs for the services in your local cluster
 
+### Synopsis
+
+Lists the URLs for the services in your local cluster
+
 ```
 minikube service list [flags]
 ```
@@ -62,3 +100,18 @@ minikube service list [flags]
   -n, --namespace string   The services namespace
 ```
 
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --format string                    Format to output service URL in. This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/ssh-key.md b/site/content/en/docs/Reference/Commands/ssh-key.md
index 271c736878..3b45143bd3 100644
--- a/site/content/en/docs/Reference/Commands/ssh-key.md
+++ b/site/content/en/docs/Reference/Commands/ssh-key.md
@@ -1,18 +1,32 @@
 ---
 title: "ssh-key"
-linkTitle: "sshs-key"
+linkTitle: "ssh-key"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Retrieve the ssh identity key path of the specified cluster
 ---
 
-### Usage
+
+
+## minikube ssh-key
+
+Retrieve the ssh identity key path of the specified cluster
+
+### Synopsis
+
+Retrieve the ssh identity key path of the specified cluster.
 
 ```
 minikube ssh-key [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for ssh-key
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -26,3 +40,4 @@ minikube ssh-key [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/ssh.md b/site/content/en/docs/Reference/Commands/ssh.md
index 54d9649233..2a1ddc0f9f 100644
--- a/site/content/en/docs/Reference/Commands/ssh.md
+++ b/site/content/en/docs/Reference/Commands/ssh.md
@@ -2,13 +2,20 @@
 title: "ssh"
 linkTitle: "ssh"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'
 ---
 
 
-### Usage
+
+## minikube ssh
+
+Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'
+
+### Synopsis
+
+Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.
 
 ```
 minikube ssh [flags]
@@ -17,6 +24,22 @@ minikube ssh [flags]
 ### Options
 
 ```
-  -h, --help         help for ssh
-      --native-ssh   Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
+  -h, --help          help for ssh
+      --native-ssh    Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
+  -n, --node string   The node to ssh into. Defaults to the primary control plane.
 ```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 0a7dbecd13..18b24d65c2 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -1,95 +1 @@
----
-title: "start"
-linkTitle: "start"
-weight: 1
-date: 2019-08-01
-description: >
-  Starts a local Kubernetes cluster
----
-
-### Usage
-
-```
-minikube start [flags]
-```
-
-### Options
-
-```
-    --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
-      --apiserver-ips ipSlice             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 (default [])
-      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
-      --apiserver-names stringArray       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
-      --apiserver-port int                The apiserver listening port (default 8443)
-      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none. (default true)
-      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
-      --cpus int                          Number of CPUs allocated to the minikube VM. (default 2)
-      --cri-socket string                 The cri socket path to be used.
-      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
-      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
-      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
-      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
-      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
-      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
-      --download-only                     If true, only download and cache files for later use - don't install or start anything.
-      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
-      --embed-certs                       if true, will embed the certs in kubeconfig.
-      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
-      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
-
-     The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
-     
-     Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
-     
-     Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
-     
-      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
-      --force                             Force minikube to perform possibly dangerous operations
-  -h, --help                              help for start
-      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
-      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
-      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
-      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
-      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
-      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
-      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
-      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
-      --interactive                       Allow user prompts for more information (default true)
-      --iso-url string                    Location of the minikube iso. (default "https://storage.googleapis.com/minikube/iso/minikube-v1.7.0.iso")
-      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3)
-      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
-      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
-      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
-      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
-      --memory string                     Amount of RAM allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "2000mb")
-      --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
-      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
-      --network-plugin string             The name of the network plugin.
-      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
-      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
-      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
-      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
-      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
-      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
-      --vm-driver string                  Driver is one of: virtualbox, parallels, vmwarefusion, hyperkit, vmware, docker (experimental) (defaults to auto-detect)
-      --wait                              Block until the apiserver is servicing API requests (default true)
-      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
+---title: "start"linkTitle: "start"weight: 1date: 2020-04-02description: >  Starts a local kubernetes cluster---## minikube startStarts a local kubernetes cluster### SynopsisStarts a local kubernetes cluster```minikube start [flags]```### Options```      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.      --apiserver-ips ipSlice             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 (default [])      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")      --apiserver-names stringArray       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      --apiserver-port int                The apiserver listening port (default 8443)      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)      --driver                                  Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)      --cri-socket string                 The cri socket path to be used.      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)      --download-only                     If true, only download and cache files for later use - don't install or start anything.      --driver                                  Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state      --embed-certs                       if true, will embed the certs in kubeconfig.      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.      --force                             Force minikube to perform possibly dangerous operations  -h, --help                              help for start      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.      --install-addons                    If set, install addons. Defaults to true. (default true)      --interactive                       Allow user prompts for more information (default true)      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])      --keep-context                      This will keep the existing kubectl context and will create a minikube context.      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).      --mount                             This will start the mount daemon and automatically mount files into minikube.      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)      --network-plugin string             The name of the network plugin.      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)      --registry-mirror strings           Registry mirrors to pass to the Docker daemon      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)      --vm                                Filter to use only VM Drivers      --vm-driver driver                  DEPRECATED, use driver instead.      --wait                              Block until the apiserver is servicing API requests (default true)      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)```### Options inherited from parent commands```      --alsologtostderr                  log to standard error as well as files  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)      --log_dir string                   If non-empty, write log files in this directory      --logtostderr                      log to standard error instead of files  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)  -v, --v Level                          log level for V logs      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging```
\ No newline at end of file
diff --git a/site/content/en/docs/Reference/Commands/status.md b/site/content/en/docs/Reference/Commands/status.md
index d8c636ccf7..67da3ca3f4 100644
--- a/site/content/en/docs/Reference/Commands/status.md
+++ b/site/content/en/docs/Reference/Commands/status.md
@@ -2,19 +2,22 @@
 title: "status"
 linkTitle: "status"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Gets the status of a local Kubernetes cluster
+  Gets the status of a local kubernetes cluster
 ---
 
 
-### Overview
 
-Gets the status of a local Kubernetes cluster.
-	Exit status contains the status of minikube's VM, cluster and Kubernetes encoded on it's bits in this order from right to left.
-	Eg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for Kubernetes NOK)
+## minikube status
 
-### Usage
+Gets the status of a local kubernetes cluster
+
+### Synopsis
+
+Gets the status of a local kubernetes cluster.
+	Exit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.
+	Eg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)
 
 ```
 minikube status [flags]
@@ -23,30 +26,14 @@ minikube status [flags]
 ### Options
 
 ```
- -f, --format string   Go template format string for the status output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/
-
- For the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status (default "host: {{.Host}}\nkubelet: {{.Kubelet}}\napiserver: {{.APIServer}}\nkubeconfig: {{.Kubeconfig}}\n")
- 
+  -f, --format string   Go template format string for the status output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/
+                        For the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status (default "{{.Name}}\nhost: {{.Host}}\nkubelet: {{.Kubelet}}\napiserver: {{.APIServer}}\nkubeconfig: {{.Kubeconfig}}\n\n")
   -h, --help            help for status
   -o, --output string   minikube status --output OUTPUT. json, text (default "text")
 ```
 
 ### Options inherited from parent commands
 
-```
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-      ```
-
-### Options inherited from parent commands
-
 ```
       --alsologtostderr                  log to standard error as well as files
   -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
@@ -58,3 +45,4 @@ minikube status [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/stop.md b/site/content/en/docs/Reference/Commands/stop.md
index 0bb9e63fba..21b7717fdb 100644
--- a/site/content/en/docs/Reference/Commands/stop.md
+++ b/site/content/en/docs/Reference/Commands/stop.md
@@ -2,22 +2,32 @@
 title: "stop"
 linkTitle: "stop"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
-  Stops a running local Kubernetes cluster
+  Stops a running local kubernetes cluster
 ---
 
-### Overview
 
-Stops a local Kubernetes cluster running in Virtualbox. This command stops the VM
+
+## minikube stop
+
+Stops a running local kubernetes cluster
+
+### Synopsis
+
+Stops a local kubernetes cluster running in Virtualbox. This command stops the VM
 itself, leaving all files intact. The cluster can be started again with the "start" command.
 
-### Usage
-
 ```
 minikube stop [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for stop
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -31,3 +41,4 @@ minikube stop [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/tunnel.md b/site/content/en/docs/Reference/Commands/tunnel.md
index e33e4d80a1..4b2f73b544 100644
--- a/site/content/en/docs/Reference/Commands/tunnel.md
+++ b/site/content/en/docs/Reference/Commands/tunnel.md
@@ -2,16 +2,20 @@
 title: "tunnel"
 linkTitle: "tunnel"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   tunnel makes services of type LoadBalancer accessible on localhost
 ---
 
-### Overview
 
-tunnel creates a route to services deployed with type LoadBalancer and sets their Ingress to their ClusterIP
 
-### Usage
+## minikube tunnel
+
+tunnel makes services of type LoadBalancer accessible on localhost
+
+### Synopsis
+
+tunnel creates a route to services deployed with type LoadBalancer and sets their Ingress to their ClusterIP. for a detailed example see https://minikube.sigs.k8s.io/docs/tasks/loadbalancer
 
 ```
 minikube tunnel [flags]
diff --git a/site/content/en/docs/Reference/Commands/unpause.md b/site/content/en/docs/Reference/Commands/unpause.md
index 1b71bce9df..fc14d29c1a 100644
--- a/site/content/en/docs/Reference/Commands/unpause.md
+++ b/site/content/en/docs/Reference/Commands/unpause.md
@@ -2,13 +2,20 @@
 title: "unpause"
 linkTitle: "unpause"
 weight: 1
-date: 2020-02-05
+date: 2020-04-02
 description: >
-   unpause the Kubernetes control plane or other namespaces
-
+  unpause Kubernetes
 ---
 
-### Usage
+
+
+## minikube unpause
+
+unpause Kubernetes
+
+### Synopsis
+
+unpause Kubernetes
 
 ```
 minikube unpause [flags]
@@ -36,7 +43,3 @@ minikube unpause [flags]
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
 
-### SEE ALSO
-
-* [pause](pause.md)
-
diff --git a/site/content/en/docs/Reference/Commands/update-check.md b/site/content/en/docs/Reference/Commands/update-check.md
index 17a666bffd..0ac28ac4dc 100644
--- a/site/content/en/docs/Reference/Commands/update-check.md
+++ b/site/content/en/docs/Reference/Commands/update-check.md
@@ -2,13 +2,42 @@
 title: "update-check"
 linkTitle: "update-check"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Print current and latest version number
 ---
 
-### Usage
+
+
+## minikube update-check
+
+Print current and latest version number
+
+### Synopsis
+
+Print current and latest version number
 
 ```
 minikube update-check [flags]
 ```
+
+### Options
+
+```
+  -h, --help   help for update-check
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
diff --git a/site/content/en/docs/Reference/Commands/update-context.md b/site/content/en/docs/Reference/Commands/update-context.md
index ba6e3c0b23..cb3d1b1634 100644
--- a/site/content/en/docs/Reference/Commands/update-context.md
+++ b/site/content/en/docs/Reference/Commands/update-context.md
@@ -2,18 +2,33 @@
 title: "update-context"
 linkTitle: "update-context"
 weight: 1
-date: 2019-08-01
+date: 2020-04-02
 description: >
   Verify the IP address of the running cluster in kubeconfig.
 ---
 
-The `update-context` command retrieves the IP address of the running cluster, checks it with IP in kubeconfig, and corrects kubeconfig if incorrect:
+
+
+## minikube update-context
+
+Verify the IP address of the running cluster in kubeconfig.
+
+### Synopsis
+
+Retrieves the IP address of the running cluster, checks it
+			with IP in kubeconfig, and corrects kubeconfig if incorrect.
 
 ```
 minikube update-context [flags]
 ```
 
-## Options inherited from parent commands
+### Options
+
+```
+  -h, --help   help for update-context
+```
+
+### Options inherited from parent commands
 
 ```
       --alsologtostderr                  log to standard error as well as files
@@ -26,3 +41,4 @@ minikube update-context [flags]
   -v, --v Level                          log level for V logs
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
 ```
+
diff --git a/site/content/en/docs/Reference/Commands/version.md b/site/content/en/docs/Reference/Commands/version.md
index df909b4153..b2ba4d8614 100644
--- a/site/content/en/docs/Reference/Commands/version.md
+++ b/site/content/en/docs/Reference/Commands/version.md
@@ -1,8 +1,19 @@
+---
+title: "version"
+linkTitle: "version"
+weight: 1
+date: 2020-04-02
+description: >
+  Print the version of minikube
+---
+
+
+
 ## minikube version
 
 Print the version of minikube
 
-### Overview
+### Synopsis
 
 Print the version of minikube.
 
diff --git a/test.sh b/test.sh
index 463cca159f..21eae1dfed 100755
--- a/test.sh
+++ b/test.sh
@@ -60,10 +60,12 @@ then
     echo "mode: count" >"${COVERAGE_PATH}"
     pkgs=$(go list -f '{{ if .TestGoFiles }}{{.ImportPath}}{{end}}' ./cmd/... ./pkg/... | xargs)
     go test \
+        -v -ldflags="$MINIKUBE_LDFLAGS" \
         -tags "container_image_ostree_stub containers_image_openpgp" \
         -covermode=count \
         -coverprofile="${cov_tmp}" \
-        ${pkgs} && echo ok || ((exitcode += 32))
+        ${pkgs} \
+        && echo ok || ((exitcode += 32))
     tail -n +2 "${cov_tmp}" >>"${COVERAGE_PATH}"
 fi
 

From d578626079cb1bdda6f2244cf645ecd82129a64f Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 10:50:14 -0700
Subject: [PATCH 411/668] delete unneeded files

---
 cmd/minikube/cmd/actual   | 108 --------------------------------------
 cmd/minikube/cmd/expected | 108 --------------------------------------
 2 files changed, 216 deletions(-)
 delete mode 100644 cmd/minikube/cmd/actual
 delete mode 100644 cmd/minikube/cmd/expected

diff --git a/cmd/minikube/cmd/actual b/cmd/minikube/cmd/actual
deleted file mode 100644
index 80bc9cb864..0000000000
--- a/cmd/minikube/cmd/actual
+++ /dev/null
@@ -1,108 +0,0 @@
----
-title: "start"
-linkTitle: "start"
-weight: 1
-date: 2020-04-01
-description: >
-  Starts a local kubernetes cluster
----
-
-
-
-## minikube start
-
-Starts a local kubernetes cluster
-
-### Synopsis
-
-Starts a local kubernetes cluster
-
-```
-minikube start [flags]
-```
-
-### Options
-
-```
-      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
-      --apiserver-ips ipSlice             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 (default [])
-      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
-      --apiserver-names stringArray       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
-      --apiserver-port int                The apiserver listening port (default 8443)
-      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
-      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
-      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
-      --cri-socket string                 The cri socket path to be used.
-      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
-      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
-      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
-      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
-      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
-      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
-      --download-only                     If true, only download and cache files for later use - don't install or start anything.
-      --driver string                     Driver is one of: virtualbox, parallels, vmwarefusion, hyperkit, vmware, docker, podman (defaults to auto-detect)
-      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
-      --embed-certs                       if true, will embed the certs in kubeconfig.
-      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
-      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
-                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
-                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
-                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
-      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
-      --force                             Force minikube to perform possibly dangerous operations
-  -h, --help                              help for start
-      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
-      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
-      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
-      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
-      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)
-      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)
-      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
-      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
-      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
-      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
-      --install-addons                    If set, install addons. Defaults to true. (default true)
-      --interactive                       Allow user prompts for more information (default true)
-      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])
-      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.
-      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
-      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
-      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
-      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
-      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
-      --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
-      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
-      --network-plugin string             The name of the network plugin.
-      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
-      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
-      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
-  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)
-      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)
-      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
-      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
-      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
-      --vm                                Filter to use only VM Drivers
-      --vm-driver driver                  DEPRECATED, use driver instead.
-      --wait                              Block until the apiserver is servicing API requests (default true)
-      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
diff --git a/cmd/minikube/cmd/expected b/cmd/minikube/cmd/expected
deleted file mode 100644
index 7f612e8062..0000000000
--- a/cmd/minikube/cmd/expected
+++ /dev/null
@@ -1,108 +0,0 @@
----
-title: "start"
-linkTitle: "start"
-weight: 1
-date: 2020-04-01
-description: >
-  Starts a local kubernetes cluster
----
-
-
-
-## minikube start
-
-Starts a local kubernetes cluster
-
-### Synopsis
-
-Starts a local kubernetes cluster
-
-```
-minikube start [flags]
-```
-
-### Options
-
-```
-      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
-      --apiserver-ips ipSlice             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 (default [])
-      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
-      --apiserver-names stringArray       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
-      --apiserver-port int                The apiserver listening port (default 8443)
-      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
-      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
-      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
-      --cri-socket string                 The cri socket path to be used.
-      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
-      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
-      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
-      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
-      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
-      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
-      --download-only                     If true, only download and cache files for later use - don't install or start anything.
-      --driver string                     Driver is one of: virtualbox, parallels, vmwarefusion, hyperkit, vmware, docker, podman (experimental) (defaults to auto-detect)
-      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
-      --embed-certs                       if true, will embed the certs in kubeconfig.
-      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
-      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
-                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
-                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
-                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
-      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
-      --force                             Force minikube to perform possibly dangerous operations
-  -h, --help                              help for start
-      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
-      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
-      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
-      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
-      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)
-      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)
-      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
-      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
-      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
-      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
-      --install-addons                    If set, install addons. Defaults to true. (default true)
-      --interactive                       Allow user prompts for more information (default true)
-      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])
-      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.
-      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
-      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
-      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
-      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
-      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
-      --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
-      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
-      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
-      --network-plugin string             The name of the network plugin.
-      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
-      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
-      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
-  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)
-      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)
-      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
-      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
-      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
-      --vm                                Filter to use only VM Drivers
-      --vm-driver driver                  DEPRECATED, use driver instead.
-      --wait                              Block until the apiserver is servicing API requests (default true)
-      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-

From 5266b69dbe0299fd1d721065c0bad5f39e1967a0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 10:51:15 -0700
Subject: [PATCH 412/668] Add response to get error, disable service check on
 macOS/Windows

---
 test/integration/functional_test.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 7be17ef905..2d97a7ce66 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -335,8 +335,9 @@ func validateDashboardCmd(ctx context.Context, t *testing.T, profile string) {
 
 	resp, err := retryablehttp.Get(u.String())
 	if err != nil {
-		t.Fatalf("failed to http get %q : %v", u.String(), err)
+		t.Fatalf("failed to http get %q: %v\nresponse: %+v", u.String(), err, resp)
 	}
+
 	if resp.StatusCode != http.StatusOK {
 		body, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
@@ -617,6 +618,10 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
 		t.Errorf("expected 'service list' to contain *hello-node* but got -%q-", rr.Stdout.String())
 	}
 
+	if NeedsPortForward() {
+		t.Skipf("test is broken for port-forwarded drivers: https://github.com/kubernetes/minikube/issues/7383")
+	}
+
 	// Test --https --url mode
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "service", "--namespace=default", "--https", "--url", "hello-node"))
 	if err != nil {

From 2e9ad822fe8549b5e4643515b8036a0e8794e2f4 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 10:53:12 -0700
Subject: [PATCH 413/668] Run goimports

---
 pkg/minikube/node/start.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index c750e26623..caba685476 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -29,6 +29,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"

From 270d4cf5c08104280732cc2e4c84b8acefdcb526 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 10:57:05 -0700
Subject: [PATCH 414/668] include newline

---
 pkg/generate/rewrite.go                       |   6 +-
 .../en/docs/Reference/Commands/start.md       | 109 +++++++++++++++++-
 2 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go
index a55396b638..b19c9e4ff7 100644
--- a/pkg/generate/rewrite.go
+++ b/pkg/generate/rewrite.go
@@ -51,10 +51,12 @@ func rewriteFlag(contents, flag, description string) string {
 	lines := strings.Split(contents, "\n")
 	for i, l := range lines {
 		if strings.Contains(l, flag) {
-			spacesBetween := 42 - len(flag)
 			// docs start with a prefix of 6 spaces
 			replacement := "      "
 			replacement += flag
+			// there are 36 spaces between the start of the flag name
+			// and the description
+			spacesBetween := 36 - len(flag)
 			for i := 0; i < spacesBetween; i++ {
 				replacement += " "
 			}
@@ -62,5 +64,5 @@ func rewriteFlag(contents, flag, description string) string {
 			lines[i] = replacement
 		}
 	}
-	return strings.Join(lines, "")
+	return strings.Join(lines, "\n")
 }
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 18b24d65c2..eadbed6139 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -1 +1,108 @@
----title: "start"linkTitle: "start"weight: 1date: 2020-04-02description: >  Starts a local kubernetes cluster---## minikube startStarts a local kubernetes cluster### SynopsisStarts a local kubernetes cluster```minikube start [flags]```### Options```      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.      --apiserver-ips ipSlice             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 (default [])      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")      --apiserver-names stringArray       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      --apiserver-port int                The apiserver listening port (default 8443)      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)      --driver                                  Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)      --cri-socket string                 The cri socket path to be used.      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)      --download-only                     If true, only download and cache files for later use - don't install or start anything.      --driver                                  Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state      --embed-certs                       if true, will embed the certs in kubeconfig.      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.      --force                             Force minikube to perform possibly dangerous operations  -h, --help                              help for start      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.      --install-addons                    If set, install addons. Defaults to true. (default true)      --interactive                       Allow user prompts for more information (default true)      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])      --keep-context                      This will keep the existing kubectl context and will create a minikube context.      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).      --mount                             This will start the mount daemon and automatically mount files into minikube.      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)      --network-plugin string             The name of the network plugin.      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)      --registry-mirror strings           Registry mirrors to pass to the Docker daemon      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)      --vm                                Filter to use only VM Drivers      --vm-driver driver                  DEPRECATED, use driver instead.      --wait                              Block until the apiserver is servicing API requests (default true)      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)```### Options inherited from parent commands```      --alsologtostderr                  log to standard error as well as files  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)      --log_dir string                   If non-empty, write log files in this directory      --logtostderr                      log to standard error instead of files  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)  -v, --v Level                          log level for V logs      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging```
\ No newline at end of file
+---
+title: "start"
+linkTitle: "start"
+weight: 1
+date: 2020-04-02
+description: >
+  Starts a local kubernetes cluster
+---
+
+
+
+## minikube start
+
+Starts a local kubernetes cluster
+
+### Synopsis
+
+Starts a local kubernetes cluster
+
+```
+minikube start [flags]
+```
+
+### Options
+
+```
+      --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
+      --apiserver-ips ipSlice             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 (default [])
+      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
+      --apiserver-names stringArray       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
+      --apiserver-port int                The apiserver listening port (default 8443)
+      --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
+      --driver                            Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.
+      --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
+      --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
+      --cri-socket string                 The cri socket path to be used.
+      --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
+      --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
+      --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
+      --dns-proxy                         Enable proxy for NAT DNS requests (virtualbox driver only)
+      --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
+      --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
+      --download-only                     If true, only download and cache files for later use - don't install or start anything.
+      --driver                            Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.
+      --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
+      --embed-certs                       if true, will embed the certs in kubeconfig.
+      --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
+      --extra-config ExtraOption          A set of key=value pairs that describe configuration that may be passed to different components.
+                                          		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
+                                          		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
+                                          		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr
+      --feature-gates string              A set of key=value pairs that describe feature gates for alpha/experimental features.
+      --force                             Force minikube to perform possibly dangerous operations
+  -h, --help                              help for start
+      --host-dns-resolver                 Enable host resolver for NAT DNS requests (virtualbox driver only) (default true)
+      --host-only-cidr string             The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.99.1/24")
+      --host-only-nic-type string         NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --hyperkit-vpnkit-sock string       Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)
+      --hyperkit-vsock-ports strings      List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)
+      --hyperv-external-adapter string    External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)
+      --hyperv-use-external-switch        Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)
+      --hyperv-virtual-switch string      The hyperv virtual switch name. Defaults to first found. (hyperv driver only)
+      --image-mirror-country string       Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.
+      --image-repository string           Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers
+      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
+      --install-addons                    If set, install addons. Defaults to true. (default true)
+      --interactive                       Allow user prompts for more information (default true)
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.9.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.9.0/minikube-v1.9.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.9.0.iso])
+      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
+      --kubernetes-version string         The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.0, 'latest' for v1.18.0). Defaults to 'stable'.
+      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
+      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
+      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
+      --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
+      --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
+      --mount                             This will start the mount daemon and automatically mount files into minikube.
+      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
+      --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
+      --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
+      --network-plugin string             The name of the network plugin.
+      --nfs-share strings                 Local folders to share with Guest via NFS mounts (hyperkit driver only)
+      --nfs-shares-root string            Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares")
+      --no-vtx-check                      Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)
+  -n, --nodes int                         The number of nodes to spin up. Defaults to 1. (default 1)
+      --preload                           If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true)
+      --registry-mirror strings           Registry mirrors to pass to the Docker daemon
+      --service-cluster-ip-range string   The CIDR to be used for service cluster IPs. (default "10.96.0.0/12")
+      --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
+      --vm                                Filter to use only VM Drivers
+      --vm-driver driver                  DEPRECATED, use driver instead.
+      --wait                              Block until the apiserver is servicing API requests (default true)
+      --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
+      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+

From 7988704bed5335e582c1648ed442e455486ee7f8 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 11:01:26 -0700
Subject: [PATCH 415/668] fixups

---
 cmd/minikube/cmd/generate-docs_test.go | 2 +-
 pkg/generate/docs.go                   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index fed8fceb88..910c60aee4 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/minikube/pkg/generate"
 )
 
-func TestCommandsDocs(t *testing.T) {
+func TestGenerateDocs(t *testing.T) {
 	dir := "../../../site/content/en/docs/Reference/Commands/"
 
 	for _, sc := range RootCmd.Commands() {
diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
index c4148df033..d6d9541674 100644
--- a/pkg/generate/docs.go
+++ b/pkg/generate/docs.go
@@ -58,7 +58,7 @@ func DocForCommand(command *cobra.Command) (string, error) {
 	if err := writeSubcommands(command, buf); err != nil {
 		return "", errors.Wrap(err, "writing subcommands")
 	}
-	edited := removeHelpCommand(buf)
+	edited := removeHelpText(buf)
 	return rewriteFlags(command, edited), nil
 }
 
@@ -70,7 +70,7 @@ func DocForCommand(command *cobra.Command) (string, error) {
 // ###### Auto generated by spf13/cobra on 1-Apr-2020
 // help text which is unnecessary info after every subcommand
 // This function removes that text.
-func removeHelpCommand(buffer *bytes.Buffer) string {
+func removeHelpText(buffer *bytes.Buffer) string {
 	beginningHelpText := "### SEE ALSO"
 	endHelpText := "###### Auto generated by spf13/cobra"
 	scanner := bufio.NewScanner(buffer)
@@ -99,6 +99,7 @@ func removeHelpCommand(buffer *bytes.Buffer) string {
 	return final.String()
 }
 
+// writeSubcommands recursively appends all subcommands to the doc
 func writeSubcommands(command *cobra.Command, w io.Writer) error {
 	if err := doc.GenMarkdown(command, w); err != nil {
 		return errors.Wrapf(err, "getting markdown custom")

From 30685d56256a48c0b511b0995b083b931840def9 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 11:10:22 -0700
Subject: [PATCH 416/668] Update docs

---
 go.mod                                             |  1 +
 site/content/en/docs/Reference/Commands/node.md    | 12 +++++++-----
 site/content/en/docs/Reference/Commands/start.md   |  1 +
 site/content/en/docs/Reference/Commands/version.md |  4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 29a5ac30d5..2a00c74992 100644
--- a/go.mod
+++ b/go.mod
@@ -82,6 +82,7 @@ require (
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3
diff --git a/site/content/en/docs/Reference/Commands/node.md b/site/content/en/docs/Reference/Commands/node.md
index edfd70241a..5ff4646afa 100644
--- a/site/content/en/docs/Reference/Commands/node.md
+++ b/site/content/en/docs/Reference/Commands/node.md
@@ -56,9 +56,10 @@ minikube node add [flags]
 ### Options
 
 ```
-      --control-plane   If true, the node added will also be a control plane in addition to a worker.
-  -h, --help            help for add
-      --worker          If true, the added node will be marked for work. Defaults to true. (default true)
+      --control-plane       If true, the node added will also be a control plane in addition to a worker.
+      --delete-on-failure   If set, delete the current cluster if start fails and try again. Defaults to false.
+  -h, --help                help for add
+      --worker              If true, the added node will be marked for work. Defaults to true. (default true)
 ```
 
 ### Options inherited from parent commands
@@ -155,8 +156,9 @@ minikube node start [flags]
 ### Options
 
 ```
-  -h, --help          help for start
-      --name string   The name of the node to start
+      --delete-on-failure   If set, delete the current cluster if start fails and try again. Defaults to false.
+  -h, --help                help for start
+      --name string         The name of the node to start
 ```
 
 ### Options inherited from parent commands
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index eadbed6139..72d4db6bc9 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -34,6 +34,7 @@ minikube start [flags]
       --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
       --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
       --cri-socket string                 The cri socket path to be used.
+      --delete-on-failure                 If set, delete the current cluster if start fails and try again. Defaults to false.
       --disable-driver-mounts             Disables the filesystem mounts provided by the hypervisors
       --disk-size string                  Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g). (default "20000mb")
       --dns-domain string                 The cluster dns domain name used in the kubernetes cluster (default "cluster.local")
diff --git a/site/content/en/docs/Reference/Commands/version.md b/site/content/en/docs/Reference/Commands/version.md
index b2ba4d8614..ae8ffc28b3 100644
--- a/site/content/en/docs/Reference/Commands/version.md
+++ b/site/content/en/docs/Reference/Commands/version.md
@@ -24,7 +24,9 @@ minikube version [flags]
 ### Options
 
 ```
-  -h, --help   help for version
+  -h, --help            help for version
+  -o, --output string   One of 'yaml' or 'json'.
+      --short           Print just the version number.
 ```
 
 ### Options inherited from parent commands

From 63ffbd952e63bd7690e8d282373dc8ff8c4f7a20 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 11:29:43 -0700
Subject: [PATCH 417/668] Rewrite --mount-string since it depends on host

---
 pkg/generate/rewrite.go                          | 3 +++
 site/content/en/docs/Reference/Commands/start.md | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go
index b19c9e4ff7..b289699903 100644
--- a/pkg/generate/rewrite.go
+++ b/pkg/generate/rewrite.go
@@ -35,6 +35,9 @@ func rewriteFlags(command *cobra.Command, contents string) string {
 		"start": []rewrite{{
 			flag:        "--driver",
 			description: "Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.",
+		}, {
+			flag:        "--mount-string",
+			description: "The argument to pass the minikube mount command on start.",
 		}},
 	}
 	rws, ok := rewrites[command.Name()]
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 72d4db6bc9..536e837b39 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -75,7 +75,7 @@ minikube start [flags]
       --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
       --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
       --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
+      --mount-string                      The argument to pass the minikube mount command on start.
       --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
       --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
       --network-plugin string             The name of the network plugin.

From a3d729db6b3d780fd79415a5187cffc7b25a60d8 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 11:44:44 -0700
Subject: [PATCH 418/668] Point 'none' users toward the more user-friendly
 'docker' driver

---
 pkg/minikube/node/start.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 37202613f7..64d06dd838 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -456,9 +456,9 @@ func prepareNone() {
 	out.T(out.StartingNone, "Configuring local host environment ...")
 	if viper.GetBool(config.WantNoneDriverWarning) {
 		out.T(out.Empty, "")
-		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
-		out.WarningT("For more information, see:")
-		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.WarningT("The 'none' driver is designed for experts who need to integrate with an existing VM")
+		out.ErrT(out.Tip, "Most users should use the newer 'docker' driver instead, which does not require root!")
+		out.ErrT(out.Documentation, "For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
 		out.T(out.Empty, "")
 	}
 

From 7004c398b06777ea3d01d36c58d1b8050a16cc34 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 12:05:27 -0700
Subject: [PATCH 419/668] Don't generate documentation for hidden commands

---
 cmd/minikube/cmd/generate-docs_test.go        |  3 ++
 pkg/generate/docs.go                          |  4 ++
 .../docs/Reference/Commands/generate-docs.md  | 50 -------------------
 3 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 site/content/en/docs/Reference/Commands/generate-docs.md

diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index 910c60aee4..190bf3455d 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -31,6 +31,9 @@ func TestGenerateDocs(t *testing.T) {
 
 	for _, sc := range RootCmd.Commands() {
 		t.Run(sc.Name(), func(t *testing.T) {
+			if sc.Hidden {
+				t.Skip()
+			}
 			fp := filepath.Join(dir, fmt.Sprintf("%s.md", sc.Name()))
 			expectedContents, err := ioutil.ReadFile(fp)
 			if err != nil {
diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
index d6d9541674..064fab1df6 100644
--- a/pkg/generate/docs.go
+++ b/pkg/generate/docs.go
@@ -38,6 +38,10 @@ import (
 func Docs(root *cobra.Command, path string) error {
 	cmds := root.Commands()
 	for _, c := range cmds {
+		if c.Hidden {
+			glog.Infof("Skipping generating doc for %s as it's a hidden command", c.Name())
+			continue
+		}
 		contents, err := DocForCommand(c)
 		if err != nil {
 			return errors.Wrapf(err, "generating doc for %s", c.Name())
diff --git a/site/content/en/docs/Reference/Commands/generate-docs.md b/site/content/en/docs/Reference/Commands/generate-docs.md
deleted file mode 100644
index c29c477553..0000000000
--- a/site/content/en/docs/Reference/Commands/generate-docs.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: "generate-docs"
-linkTitle: "generate-docs"
-weight: 1
-date: 2020-04-02
-description: >
-  Populates the specified folder with documentation in markdown about minikube
----
-
-
-
-## minikube generate-docs
-
-Populates the specified folder with documentation in markdown about minikube
-
-### Synopsis
-
-Populates the specified folder with documentation in markdown about minikube
-
-```
-minikube generate-docs [flags]
-```
-
-### Examples
-
-```
-minikube generate-docs --path <FOLDER_PATH>
-```
-
-### Options
-
-```
-  -h, --help          help for generate-docs
-      --path string   The path on the file system where the docs in markdown need to be saved
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-  -b, --bootstrapper string              The name of the cluster bootstrapper that will set up the kubernetes cluster. (default "kubeadm")
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -p, --profile string                   The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-

From ae52a11692b4d478b4bf13beff3e05572128f499 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 12:27:19 -0700
Subject: [PATCH 420/668] Swap stdout/stderr in test

---
 test/integration/functional_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 6623f1f362..1571328322 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -481,7 +481,7 @@ func validateConfigCmd(ctx context.Context, t *testing.T, profile string) {
 	}{
 		{[]string{"unset", "cpus"}, "", ""},
 		{[]string{"get", "cpus"}, "", "Error: specified key could not be found in config"},
-		{[]string{"set", "cpus", "2"}, "! These changes will take effect upon a minikube delete and then a minikube start", ""},
+		{[]string{"set", "cpus", "2"}, "", "! These changes will take effect upon a minikube delete and then a minikube start"},
 		{[]string{"get", "cpus"}, "2", ""},
 		{[]string{"unset", "cpus"}, "", ""},
 		{[]string{"get", "cpus"}, "", "Error: specified key could not be found in config"},

From 6276c1cb1da7529b1f8fad712f6f9b7be56a7a72 Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 12:33:13 -0700
Subject: [PATCH 421/668] none: check for docker and root

---
 pkg/minikube/registry/drvs/none/none.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index 26542d4d28..15dddd3a8b 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -21,6 +21,7 @@ package none
 import (
 	"fmt"
 	"os/exec"
+	"os/user"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"k8s.io/minikube/pkg/drivers/none"
@@ -51,9 +52,22 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 }
 
 func status() registry.State {
-	_, err := exec.LookPath("systemctl")
-	if err != nil {
+	if _, err := exec.LookPath("systemctl"); err != nil {
 		return registry.State{Error: err, Fix: "Use a systemd based Linux distribution", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
 	}
+
+	if _, err := exec.LookPath("docker"); err != nil {
+		return registry.State{Error: err, Installed: false, Fix: "Install docker", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
+	}
+
+	u, err := user.Current()
+	if err != nil {
+		return registry.State{Error: err, Healthy: false, Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
+	}
+
+	if u.Uid != "0" {
+		return registry.State{Error: fmt.Errorf("The 'none' driver must be run as the root user"), Healthy: false, Fix: "For non-root usage, try the newer 'docker' driver", Installed: true}
+	}
+
 	return registry.State{Installed: true, Healthy: true}
 }

From 5b3834ec63b53c5a27f42ed2079103d9902a4691 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 12:39:32 -0700
Subject: [PATCH 422/668] Merge to master

---
 cmd/minikube/cmd/start.go           | 10 ++++++++--
 go.mod                              |  1 +
 pkg/minikube/driver/driver.go       | 21 +++++++++++++++++----
 pkg/minikube/driver/driver_test.go  | 16 +++++++++++++++-
 pkg/minikube/node/start.go          |  6 +++---
 pkg/minikube/out/style.go           |  1 +
 pkg/minikube/out/style_enum.go      |  1 +
 pkg/minikube/registry/global.go     |  2 ++
 test/integration/functional_test.go |  4 ++--
 9 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 883b368f42..5330c98026 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -561,9 +561,15 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
 		return ds
 	}
 
-	pick, alts := driver.Suggest(driver.Choices(viper.GetBool("vm")))
+	choices := driver.Choices(viper.GetBool("vm"))
+	pick, alts, rejects := driver.Suggest(choices)
 	if pick.Name == "" {
-		exit.WithCodeT(exit.Config, "Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/")
+		out.T(out.ThumbsDown, "Unable to pick a default driver. Here is what was considered, in preference order:")
+		for _, r := range rejects {
+			out.T(out.Option, "{{ .name }}: {{ .rejection }}", out.V{"name": r.Name, "rejection": r.Rejection})
+		}
+		out.T(out.Workaround, "Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/")
+		os.Exit(exit.Unavailable)
 	}
 
 	if len(alts) > 1 {
diff --git a/go.mod b/go.mod
index 29a5ac30d5..2a00c74992 100644
--- a/go.mod
+++ b/go.mod
@@ -82,6 +82,7 @@ require (
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index ed0cbdee23..7f67a76fe7 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -174,8 +174,8 @@ func Choices(vm bool) []registry.DriverState {
 	return options
 }
 
-// Suggest returns a suggested driver from a set of options
-func Suggest(options []registry.DriverState) (registry.DriverState, []registry.DriverState) {
+// Suggest returns a suggested driver, alternate drivers, and rejected drivers
+func Suggest(options []registry.DriverState) (registry.DriverState, []registry.DriverState, []registry.DriverState) {
 	pick := registry.DriverState{}
 	for _, ds := range options {
 		if !ds.State.Installed {
@@ -198,17 +198,30 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 	}
 
 	alternates := []registry.DriverState{}
+	rejects := []registry.DriverState{}
 	for _, ds := range options {
 		if ds != pick {
-			if !ds.State.Healthy || !ds.State.Installed {
+			glog.Errorf("%s: %s", ds.Name, ds.Rejection)
+			if !ds.State.Installed {
+				ds.Rejection = fmt.Sprintf("Not installed: %v", ds.State.Error)
+				rejects = append(rejects, ds)
 				continue
 			}
+
+			if !ds.State.Healthy {
+				ds.Rejection = fmt.Sprintf("Not healthy: %v", ds.State.Error)
+				rejects = append(rejects, ds)
+				continue
+			}
+
+			ds.Rejection = fmt.Sprintf("%s is preferred", pick.Name)
 			alternates = append(alternates, ds)
 		}
 	}
 	glog.Infof("Picked: %+v", pick)
 	glog.Infof("Alternatives: %+v", alternates)
-	return pick, alternates
+	glog.Infof("Rejects: %+v", rejects)
+	return pick, alternates, rejects
 }
 
 // Status returns the status of a driver
diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go
index 5d0bfd4009..b6afd6a62c 100644
--- a/pkg/minikube/driver/driver_test.go
+++ b/pkg/minikube/driver/driver_test.go
@@ -112,6 +112,7 @@ func TestSuggest(t *testing.T) {
 		choices []string
 		pick    string
 		alts    []string
+		rejects []string
 	}{
 		{
 			def: registry.DriverDef{
@@ -122,6 +123,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"unhealthy"},
 			pick:    "",
 			alts:    []string{},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -132,6 +134,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"discouraged", "unhealthy"},
 			pick:    "",
 			alts:    []string{"discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -142,6 +145,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"default", "discouraged", "unhealthy"},
 			pick:    "default",
 			alts:    []string{"discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 		{
 			def: registry.DriverDef{
@@ -152,6 +156,7 @@ func TestSuggest(t *testing.T) {
 			choices: []string{"preferred", "default", "discouraged", "unhealthy"},
 			pick:    "preferred",
 			alts:    []string{"default", "discouraged"},
+			rejects: []string{"unhealthy"},
 		},
 	}
 	for _, tc := range tests {
@@ -172,7 +177,7 @@ func TestSuggest(t *testing.T) {
 				t.Errorf("choices mismatch (-want +got):\n%s", diff)
 			}
 
-			pick, alts := Suggest(got)
+			pick, alts, rejects := Suggest(got)
 			if pick.Name != tc.pick {
 				t.Errorf("pick = %q, expected %q", pick.Name, tc.pick)
 			}
@@ -184,6 +189,15 @@ func TestSuggest(t *testing.T) {
 			if diff := cmp.Diff(gotAlts, tc.alts); diff != "" {
 				t.Errorf("alts mismatch (-want +got):\n%s", diff)
 			}
+
+			gotRejects := []string{}
+			for _, r := range rejects {
+				gotRejects = append(gotRejects, r.Name)
+			}
+			if diff := cmp.Diff(gotRejects, tc.rejects); diff != "" {
+				t.Errorf("rejects mismatch (-want +got):\n%s", diff)
+			}
+
 		})
 	}
 }
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index fff3f9d7ea..f2da83ecd4 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -456,9 +456,9 @@ func prepareNone() {
 	out.T(out.StartingNone, "Configuring local host environment ...")
 	if viper.GetBool(config.WantNoneDriverWarning) {
 		out.ErrT(out.Empty, "")
-		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
-		out.WarningT("For more information, see:")
-		out.ErrT(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.WarningT("The 'none' driver is designed for experts who need to integrate with an existing VM")
+		out.ErrT(out.Tip, "Most users should use the newer 'docker' driver instead, which does not require root!")
+		out.ErrT(out.Documentation, "For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
 		out.ErrT(out.Empty, "")
 	}
 
diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go
index c67188e12d..a8eee7811e 100644
--- a/pkg/minikube/out/style.go
+++ b/pkg/minikube/out/style.go
@@ -68,6 +68,7 @@ var styles = map[StyleEnum]style{
 	Launch:        {Prefix: "🚀  "},
 	Sad:           {Prefix: "😿  "},
 	ThumbsUp:      {Prefix: "👍  "},
+	ThumbsDown:    {Prefix: "👎  "},
 	Option:        {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
 	Command:       {Prefix: "    ▪ ", LowPrefix: lowIndent}, // Indented bullet
 	LogEntry:      {Prefix: "    "},                         // Indent
diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go
index 097f4452dc..1437b26823 100644
--- a/pkg/minikube/out/style_enum.go
+++ b/pkg/minikube/out/style_enum.go
@@ -41,6 +41,7 @@ const (
 	Launch
 	Sad
 	ThumbsUp
+	ThumbsDown
 	Option
 	Command
 	LogEntry
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
index 16ede79a27..3f608ef471 100644
--- a/pkg/minikube/registry/global.go
+++ b/pkg/minikube/registry/global.go
@@ -68,6 +68,8 @@ type DriverState struct {
 	Name     string
 	Priority Priority
 	State    State
+	// Rejection is why we chose not to use this driver
+	Rejection string
 }
 
 func (d DriverState) String() string {
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 1571328322..702addce46 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -774,7 +774,7 @@ func validateFileSync(ctx context.Context, t *testing.T, profile string) {
 
 	vp := vmSyncTestPath()
 	t.Logf("Checking for existence of %s within VM", vp)
-	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("sudo cat %s", vp)))
 	if err != nil {
 		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
@@ -811,7 +811,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
 	}
 	for _, vp := range paths {
 		t.Logf("Checking for existence of %s within VM", vp)
-		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("cat %s", vp)))
+		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", fmt.Sprintf("sudo cat %s", vp)))
 		if err != nil {
 			t.Errorf("failed to check existence of %q inside minikube. args %q: %v", vp, rr.Command(), err)
 		}

From 26c747137e4f5d20a0642afc86165f8bb6fafb13 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 2 Apr 2020 14:36:46 -0700
Subject: [PATCH 423/668] failback to alternate drivers if startup fails with
 automatic choice

---
 cmd/minikube/cmd/start.go  | 65 ++++++++++++++++++++++++++++----------
 go.mod                     |  1 +
 pkg/minikube/exit/exit.go  | 34 +-------------------
 pkg/minikube/node/start.go |  5 +--
 pkg/minikube/out/out.go    | 30 ++++++++++++++++++
 5 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 61965e87cb..a00c265701 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
+	"math/rand"
 	"net"
 	"net/url"
 	"os"
@@ -304,11 +305,41 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	validateSpecifiedDriver(existing)
-	ds, alts := selectDriver(existing)
+	ds, alts, specified := selectDriver(existing)
+	err = startWithDriver(cmd, ds, existing)
+	if err != nil {
+		if specified {
+			// User specified an invalid or broken driver
+			exit.WithCodeT(exit.Failure, "Startup with {{.driver}} driver failed: {{.error}}", out.V{"driver": ds.Name, "error": err})
+		}
+
+		// Walk down the rest of the options
+		for _, alt := range alts {
+			out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}.", out.V{"old_driver": ds.Name, "new_driver": alt.Name})
+			ds = alt
+			// Delete the existing cluster and try again with the next driver on the list
+			profile, err := config.LoadProfile(ClusterFlagValue())
+			if err != nil {
+				out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": ClusterFlagValue()})
+			}
+
+			err = deleteProfile(profile)
+			if err != nil {
+				out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": ClusterFlagValue()})
+			}
+			err = startWithDriver(cmd, ds, existing)
+			if err != nil {
+				continue
+			}
+		}
+	}
 
 }
 
 func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) error {
+	if rand.Int()%2 == 0 {
+		return errors.New("OH NO RANDOM FAILURE")
+	}
 	driverName := ds.Name
 	glog.Infof("selected driver: %s", driverName)
 	validateDriver(ds, existing)
@@ -328,7 +359,7 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 	k8sVersion := getKubernetesVersion(existing)
 	cc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
 	if err != nil {
-		exit.WithError("Failed to generate config", err)
+		return errors.Wrap(err, "Failed to generate config")
 	}
 
 	// This is about as far as we can go without overwriting config files
@@ -340,7 +371,7 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 	if driver.IsVM(driverName) {
 		url, err := download.ISO(viper.GetStringSlice(isoURL), cmd.Flags().Changed(isoURL))
 		if err != nil {
-			exit.WithError("Failed to cache ISO", err)
+			return errors.Wrap(err, "Failed to cache ISO")
 		}
 		cc.MinikubeISO = url
 	}
@@ -361,7 +392,10 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 
 	kubeconfig, err := node.Start(cc, n, existingAddons, true)
 	if err != nil {
-		kubeconfig = maybeDeleteAndRetry(cc, n, existingAddons, err)
+		kubeconfig, err = maybeDeleteAndRetry(cc, n, existingAddons, err)
+		if err != nil {
+			return err
+		}
 	}
 
 	numNodes := viper.GetInt(nodes)
@@ -383,7 +417,7 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 				out.Ln("") // extra newline for clarity on the command line
 				err := node.Add(&cc, n)
 				if err != nil {
-					exit.WithError("adding node", err)
+					return errors.Wrap(err, "adding node")
 				}
 			}
 		}
@@ -468,9 +502,9 @@ func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName st
 	return nil
 }
 
-func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, originalErr error) *kubeconfig.Settings {
+func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, originalErr error) (*kubeconfig.Settings, error) {
 	if viper.GetBool(deleteOnFailure) {
-		out.T(out.Warning, "Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
+		out.WarningT("Node {{.name}} failed to start, deleting and trying again.", out.V{"name": n.Name})
 		// Start failed, delete the cluster and try again
 		profile, err := config.LoadProfile(cc.Name)
 		if err != nil {
@@ -490,14 +524,13 @@ func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons
 			}
 			if err != nil {
 				// Ok we failed again, let's bail
-				exit.WithError("Start failed after cluster deletion", err)
+				return nil, err
 			}
 		}
-		return kubeconfig
+		return kubeconfig, nil
 	}
 	// Don't delete the cluster unless they ask
-	exit.WithError("startup failed", originalErr)
-	return nil
+	return nil, errors.Wrap(originalErr, "startup failed")
 }
 
 func kubectlVersion(path string) (string, error) {
@@ -525,7 +558,7 @@ func kubectlVersion(path string) (string, error) {
 	return cv.ClientVersion.GitVersion, nil
 }
 
-func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []registry.DriverState) {
+func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []registry.DriverState, bool) {
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
 
@@ -534,7 +567,7 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 		old := hostDriver(existing)
 		ds := driver.Status(old)
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on existing profile`, out.V{"driver": ds.String()})
-		return ds, nil
+		return ds, nil, true
 	}
 
 	// Default to looking at the new driver parameter
@@ -554,7 +587,7 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
 		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
-		return ds, nil
+		return ds, nil, true
 	}
 
 	// Fallback to old driver parameter
@@ -564,7 +597,7 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 			exit.WithCodeT(exit.Unavailable, "The driver '{{.driver}}' is not supported on {{.os}}", out.V{"driver": d, "os": runtime.GOOS})
 		}
 		out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
-		return ds, nil
+		return ds, nil, true
 	}
 
 	pick, alts := driver.Suggest(driver.Choices(viper.GetBool("vm")))
@@ -581,7 +614,7 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 	} else {
 		out.T(out.Sparkle, `Automatically selected the {{.driver}} driver`, out.V{"driver": pick.String()})
 	}
-	return pick, alts
+	return pick, alts, false
 }
 
 // hostDriver returns the actual driver used by a libmachine host, which can differ from our config
diff --git a/go.mod b/go.mod
index 29a5ac30d5..2a00c74992 100644
--- a/go.mod
+++ b/go.mod
@@ -82,6 +82,7 @@ require (
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3
diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go
index 221001f86e..77b2cb5c44 100644
--- a/pkg/minikube/exit/exit.go
+++ b/pkg/minikube/exit/exit.go
@@ -18,14 +18,11 @@ limitations under the License.
 package exit
 
 import (
-	"fmt"
 	"os"
 	"runtime"
 
-	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/problem"
-	"k8s.io/minikube/pkg/minikube/translate"
 )
 
 // Exit codes based on sysexits(3)
@@ -40,9 +37,6 @@ const (
 	IO          = 74 // IO represents an I/O error
 	Config      = 78 // Config represents an unconfigured or misconfigured state
 	Permissions = 77 // Permissions represents a permissions error
-
-	// MaxLogEntries controls the number of log entries to show for each source
-	MaxLogEntries = 3
 )
 
 // UsageT outputs a templated usage error and exits with error code 64
@@ -63,7 +57,7 @@ func WithError(msg string, err error) {
 	if p != nil {
 		WithProblem(msg, err, p)
 	}
-	displayError(msg, err)
+	out.DisplayError(msg, err)
 	os.Exit(Software)
 }
 
@@ -79,29 +73,3 @@ func WithProblem(msg string, err error, p *problem.Problem) {
 	}
 	os.Exit(Config)
 }
-
-// WithLogEntries outputs an error along with any important log entries, and exits.
-func WithLogEntries(msg string, err error, entries map[string][]string) {
-	displayError(msg, err)
-
-	for name, lines := range entries {
-		out.T(out.FailureType, "Problems detected in {{.entry}}:", out.V{"entry": name})
-		if len(lines) > MaxLogEntries {
-			lines = lines[:MaxLogEntries]
-		}
-		for _, l := range lines {
-			out.T(out.LogEntry, l)
-		}
-	}
-	os.Exit(Software)
-}
-
-func displayError(msg string, err error) {
-	// use Warning because Error will display a duplicate message to stderr
-	glog.Warningf(fmt.Sprintf("%s: %v", msg, err))
-	out.ErrT(out.Empty, "")
-	out.FatalT("{{.msg}}: {{.err}}", out.V{"msg": translate.T(msg), "err": err})
-	out.ErrT(out.Empty, "")
-	out.ErrT(out.Sad, "minikube is exiting due to an error. If the above message is not useful, open an issue:")
-	out.ErrT(out.URL, "https://github.com/kubernetes/minikube/issues/new/choose")
-}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 37202613f7..5b66e1286a 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -86,7 +86,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
 	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
 	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
-		exit.WithError("Failed to save config", err)
+		return nil, errors.Wrap(err, "Failed to save config")
 	}
 
 	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
@@ -120,7 +120,8 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		bs = setupKubeAdm(machineAPI, cc, n)
 		err = bs.StartCluster(cc)
 		if err != nil {
-			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
+			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
+			return nil, err
 		}
 
 		// write the kubeconfig to the file system after everything required (like certs) are created by the bootstrapper
diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
index 38c817339b..253eb09b4e 100644
--- a/pkg/minikube/out/out.go
+++ b/pkg/minikube/out/out.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/golang/glog"
 	isatty "github.com/mattn/go-isatty"
+	"k8s.io/minikube/pkg/minikube/translate"
 )
 
 // By design, this package uses global references to language and output objects, in preference
@@ -51,6 +52,9 @@ var (
 	OverrideEnv = "MINIKUBE_IN_STYLE"
 )
 
+// MaxLogEntries controls the number of log entries to show for each source
+const MaxLogEntries = 3
+
 // fdWriter is the subset of file.File that implements io.Writer and Fd()
 type fdWriter interface {
 	io.Writer
@@ -175,3 +179,29 @@ func wantsColor(fd uintptr) bool {
 	glog.Infof("isatty.IsTerminal(%d) = %v\n", fd, isT)
 	return isT
 }
+
+// LogEntries outputs an error along with any important log entries.
+func LogEntries(msg string, err error, entries map[string][]string) {
+	DisplayError(msg, err)
+
+	for name, lines := range entries {
+		T(FailureType, "Problems detected in {{.entry}}:", V{"entry": name})
+		if len(lines) > MaxLogEntries {
+			lines = lines[:MaxLogEntries]
+		}
+		for _, l := range lines {
+			T(LogEntry, l)
+		}
+	}
+}
+
+// DisplayError
+func DisplayError(msg string, err error) {
+	// use Warning because Error will display a duplicate message to stderr
+	glog.Warningf(fmt.Sprintf("%s: %v", msg, err))
+	ErrT(Empty, "")
+	FatalT("{{.msg}}: {{.err}}", V{"msg": translate.T(msg), "err": err})
+	ErrT(Empty, "")
+	ErrT(Sad, "minikube is exiting due to an error. If the above message is not useful, open an issue:")
+	ErrT(URL, "https://github.com/kubernetes/minikube/issues/new/choose")
+}

From 4ace23cd2c029f12c1d176b475375ab3dea544c2 Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 14:36:57 -0700
Subject: [PATCH 424/668] error message lint

---
 pkg/minikube/registry/drvs/none/none.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index 15dddd3a8b..fd7e42a6de 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -66,7 +66,7 @@ func status() registry.State {
 	}
 
 	if u.Uid != "0" {
-		return registry.State{Error: fmt.Errorf("The 'none' driver must be run as the root user"), Healthy: false, Fix: "For non-root usage, try the newer 'docker' driver", Installed: true}
+		return registry.State{Error: fmt.Errorf("the 'none' driver must be run as the root user"), Healthy: false, Fix: "For non-root usage, try the newer 'docker' driver", Installed: true}
 	}
 
 	return registry.State{Installed: true, Healthy: true}

From dd957ff2f7b6182ad5100aff1ed8041a518a88c9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 2 Apr 2020 14:47:18 -0700
Subject: [PATCH 425/668] make sure to print error on failure

---
 cmd/minikube/cmd/start.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 2361c7fe45..08bccc971d 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -307,12 +307,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	validateSpecifiedDriver(existing)
 	ds, alts, specified := selectDriver(existing)
 	err = startWithDriver(cmd, ds, existing)
-	if err != nil {
-		if specified {
-			// User specified an invalid or broken driver
-			exit.WithCodeT(exit.Failure, "Startup with {{.driver}} driver failed: {{.error}}", out.V{"driver": ds.Name, "error": err})
-		}
-
+	if err != nil && !specified {
 		// Walk down the rest of the options
 		for _, alt := range alts {
 			out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}.", out.V{"old_driver": ds.Name, "new_driver": alt.Name})
@@ -330,10 +325,16 @@ func runStart(cmd *cobra.Command, args []string) {
 			err = startWithDriver(cmd, ds, existing)
 			if err != nil {
 				continue
+			} else {
+				// Success!
+				os.Exit(0)
 			}
 		}
 	}
 
+	// Use the most recent error
+	exit.WithError("startup failed", err)
+
 }
 
 func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) error {

From b66447ea13408330fd50a70df2a190d2ba76650d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 2 Apr 2020 14:48:28 -0700
Subject: [PATCH 426/668] remove random failure for testing

---
 cmd/minikube/cmd/start.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 08bccc971d..f41ac63030 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
-	"math/rand"
 	"net"
 	"net/url"
 	"os"
@@ -338,9 +337,6 @@ func runStart(cmd *cobra.Command, args []string) {
 }
 
 func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) error {
-	if rand.Int()%2 == 0 {
-		return errors.New("OH NO RANDOM FAILURE")
-	}
 	driverName := ds.Name
 	glog.Infof("selected driver: %s", driverName)
 	validateDriver(ds, existing)

From 31f225d90e25be34288ba4e341d10483949c4fa9 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 2 Apr 2020 15:16:11 -0700
Subject: [PATCH 427/668] fix lint

---
 cmd/minikube/cmd/node_add.go   | 6 +++++-
 cmd/minikube/cmd/node_start.go | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
index fa0f96bb3e..3344065794 100644
--- a/cmd/minikube/cmd/node_add.go
+++ b/cmd/minikube/cmd/node_add.go
@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -54,7 +55,10 @@ var nodeAddCmd = &cobra.Command{
 		}
 
 		if err := node.Add(cc, n); err != nil {
-			maybeDeleteAndRetry(*cc, n, nil, err)
+			_, err := maybeDeleteAndRetry(*cc, n, nil, err)
+			if err != nil {
+				exit.WithError("failed to add node", err)
+			}
 		}
 
 		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": cc.Name})
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 3b2782263b..f6e70d9b84 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -51,7 +51,10 @@ var nodeStartCmd = &cobra.Command{
 
 		_, err = node.Start(*cc, *n, nil, false)
 		if err != nil {
-			maybeDeleteAndRetry(*cc, *n, nil, err)
+			_, err := maybeDeleteAndRetry(*cc, *n, nil, err)
+			if err != nil {
+				exit.WithError("failed to start node", err)
+			}
 		}
 	},
 }

From 7296c2687b911075ab6108a689b0dceb3e1dc6ee Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 15:31:58 -0700
Subject: [PATCH 428/668] Update err map for v1.9.x

---
 pkg/minikube/problem/err_map.go | 111 ++++++++++++++++++++++++++++----
 1 file changed, 97 insertions(+), 14 deletions(-)

diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index 75a02575ca..b79da7f1dc 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -55,7 +55,42 @@ var vmProblems = map[string]match{
 		Issues:        []int{6098},
 		ShowIssueLink: true,
 	},
-
+	"FILE_IN_USE": {
+		Regexp: re(`The process cannot access the file because it is being used by another process`),
+		Advice: "Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager",
+		URL:    "https://docs.docker.com/machine/drivers/hyper-v/",
+		GOOS:   []string{"windows"},
+		Issues: []int{7300},
+	},
+	"CREATE_TIMEOUT": {
+		Regexp: re(`create host timed out in 120`),
+		Advice: "Try 'minikube delete', and disable any conflicting VPN or firewall software",
+		Issues: []int{7072},
+	},
+	"IMAGE_ARCH": {
+		Regexp: re(`Error: incompatible image architecture`),
+		Advice: "This driver does not yet work on your architecture. Maybe try --driver=none",
+		GOOS:   []string{"linux"},
+		Issues: []int{7071},
+	},
+	// Docker
+	"DOCKER_WSL2_MOUNT": {
+		Regexp: re(`cannot find cgroup mount destination: unknown`),
+		Advice: "Run: 'sudo mkdir /sys/fs/cgroup/systemd && sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'",
+		URL:    "https://github.com/microsoft/WSL/issues/4189",
+		Issues: []int{5392},
+		GOOS:   []string{"linux"},
+	},
+	"DOCKER_READONLY": {
+		Regexp: re(`mkdir /var/lib/docker/volumes.*: read-only file system`),
+		Advice: "Restart Docker",
+		Issues: []int{6825},
+	},
+	"DOCKER_CHROMEOS": {
+		Regexp: re(`Container.*is not running.*chown docker:docker`),
+		Advice: "minikube is not yet compatible with ChromeOS",
+		Issues: []int{6411},
+	},
 	// Hyperkit
 	"HYPERKIT_NO_IP": {
 		Regexp: re(`IP address never found in dhcp leases file Temporary Error: Could not find an IP address for`),
@@ -82,7 +117,6 @@ var vmProblems = map[string]match{
 		Issues: []int{6079, 5780},
 		GOOS:   []string{"darwin"},
 	},
-
 	// Hyper-V
 	"HYPERV_NO_VSWITCH": {
 		Regexp: re(`no External vswitch found. A valid vswitch must be available for this command to run.`),
@@ -98,24 +132,29 @@ var vmProblems = map[string]match{
 	},
 	"HYPERV_POWERSHELL_NOT_FOUND": {
 		Regexp: re(`Powershell was not found in the path`),
-		Advice: "To start minikube with HyperV Powershell must be in your PATH`",
+		Advice: "To start minikube with Hyper-V, Powershell must be in your PATH`",
 		URL:    "https://docs.docker.com/machine/drivers/hyper-v/",
 		GOOS:   []string{"windows"},
 	},
 	"HYPERV_AS_ADMIN": {
 		Regexp: re(`Hyper-v commands have to be run as an Administrator`),
-		Advice: "Run the minikube command as an Administrator",
+		Advice: "Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.",
 		URL:    "https://rominirani.com/docker-machine-windows-10-hyper-v-troubleshooting-tips-367c1ea73c24",
 		Issues: []int{4511},
 		GOOS:   []string{"windows"},
 	},
+	"HYPERV_NEEDS_ESC": {
+		Regexp: re(`The requested operation requires elevation.`),
+		Advice: "Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.",
+		Issues: []int{7347},
+		GOOS:   []string{"windows"},
+	},
 	"HYPERV_FILE_DELETE_FAILURE": {
 		Regexp: re(`Unable to remove machine directory`),
 		Advice: "You may need to stop the Hyper-V Manager and run `minikube delete` again.",
 		Issues: []int{6804},
 		GOOS:   []string{"windows"},
 	},
-
 	// KVM
 	"KVM2_NOT_FOUND": {
 		Regexp: re(`Driver "kvm2" not found. Do you have the plugin binary .* accessible in your PATH`),
@@ -179,7 +218,12 @@ var vmProblems = map[string]match{
 		GOOS:   []string{"linux"},
 		Issues: []int{5950},
 	},
-
+	"KVM_OOM": {
+		Regexp: re(`cannot set up guest memory.*Cannot allocate memory`),
+		Advice: "Choose a smaller value for --memory, such as 2000",
+		GOOS:   []string{"linux"},
+		Issues: []int{6366},
+	},
 	// None
 	"NONE_APISERVER_MISSING": {
 		Regexp: re(`apiserver process never appeared`),
@@ -226,7 +270,6 @@ var vmProblems = map[string]match{
 		Issues: []int{6083, 5636},
 		GOOS:   []string{"linux"},
 	},
-
 	// VirtualBox
 	"VBOX_BLOCKED": {
 		Regexp: re(`NS_ERROR_FAILURE.*0x80004005`),
@@ -291,21 +334,29 @@ var vmProblems = map[string]match{
 		Advice: "The VM that minikube is configured for no longer exists. Run 'minikube delete'",
 		Issues: []int{4694},
 	},
+}
+
+var vmProblems5 = map[string]match{
 	"VBOX_VTX_DISABLED": {
 		Regexp: re(`This computer doesn't have VT-X/AMD-v enabled`),
-		Advice: "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.",
+		Advice: "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.",
 		Issues: []int{3900, 4730},
 	},
 	"VERR_VERR_VMX_DISABLED": {
 		Regexp: re(`VT-x is disabled.*VERR_VMX_MSR_ALL_VMX_DISABLED`),
-		Advice: "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.",
+		Advice: "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.",
 		Issues: []int{5282, 5456},
 	},
 	"VBOX_VERR_VMX_NO_VMX": {
 		Regexp: re(`VT-x is not available.*VERR_VMX_NO_VMX`),
-		Advice: "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS",
+		Advice: "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS",
 		Issues: []int{1994, 5326},
 	},
+	"VERR_SVM_DISABLED": {
+		Regexp: re(`VERR_SVM_DISABLED`),
+		Advice: "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS",
+		Issues: []int{7074},
+	},
 	"VBOX_HOST_NETWORK": {
 		Regexp: re(`Error setting up host only network on machine start.*Unspecified error`),
 		Advice: "VirtualBox cannot create a network, probably because it conflicts with an existing network that minikube no longer knows about. Try running 'minikube delete'",
@@ -355,10 +406,10 @@ var netProblems = map[string]match{
 		Issues: []int{3922, 6109, 6123},
 	},
 	"PULL_TIMEOUT_EXCEEDED": {
-		Regexp: re(`failed to pull image.*Client.Timeout exceeded while awaiting headers`),
-		Advice: "A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.",
+		Regexp: re(`ImagePull.*Timeout exceeded while awaiting headers`),
+		Advice: "A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.",
 		URL:    proxyDoc,
-		Issues: []int{3898},
+		Issues: []int{3898, 6070},
 	},
 	"SSH_AUTH_FAILURE": {
 		Regexp: re(`ssh: handshake failed: ssh: unable to authenticate.*, no supported methods remain`),
@@ -388,6 +439,12 @@ var netProblems = map[string]match{
 		Issues: []int{6107},
 		URL:    proxyDoc,
 	},
+	"NOT_A_TLS_HANDSHAKE": {
+		Regexp: re(`tls: first record does not look like a TLS handshake`),
+		Advice: "Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy",
+		Issues: []int{7286},
+		URL:    proxyDoc,
+	},
 }
 
 // deployProblems are Kubernetes deployment problems.
@@ -407,7 +464,7 @@ var deployProblems = map[string]match{
 	},
 	"APISERVER_MISSING": {
 		Regexp: re(`apiserver process never appeared`),
-		Advice: "Check that the provided apiserver flags are valid",
+		Advice: "Check that the provided apiserver flags are valid, and that SELinux is disabled",
 		Issues: []int{4536, 6014},
 	},
 	"APISERVER_TIMEOUT": {
@@ -446,6 +503,21 @@ var deployProblems = map[string]match{
 		Advice: "Confirm that you have a working internet connection and that your VM has not run out of resources by using: 'minikube logs'",
 		Issues: []int{4749},
 	},
+	"CERT_NOT_SIGNED_BY_CA": {
+		Regexp: re(`not signed by CA certificate ca: crypto/rsa: verification error`),
+		Advice: "Try 'minikube delete' to force new SSL certificates to be installed",
+		Issues: []int{6596},
+	},
+	"DOCKER_RESTART_FAILED": {
+		Regexp: re(`systemctl -f restart docker`),
+		Advice: "Remove the incompatible --docker-opt flag if one was provided",
+		Issues: []int{7070},
+	},
+	"WAITING_FOR_SSH": {
+		Regexp: re(`waiting for SSH to be available`),
+		Advice: "Try 'minikube delete', and disable any conflicting VPN or firewall software",
+		Issues: []int{4617},
+	},
 }
 
 // osProblems are operating-system specific issues
@@ -472,6 +544,12 @@ var osProblems = map[string]match{
 		GOOS:   []string{"darwin", "linux"},
 		Issues: []int{5714},
 	},
+	"JUJU_LOCK_DENIED": {
+		Regexp: re(`unable to open /tmp/juju.*: permission denied`),
+		Advice: "Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'",
+		GOOS:   []string{"linux"},
+		Issues: []int{6391},
+	},
 }
 
 // stateProblems are issues relating to local state
@@ -491,4 +569,9 @@ var stateProblems = map[string]match{
 		Advice: "The minikube VM is offline. Please run 'minikube start' to start it again.",
 		Issues: []int{3849, 3648},
 	},
+	"DASHBOARD_ROLE_REF": {
+		Regexp: re(`dashboard.*cannot change roleRef`),
+		Advice: "Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'",
+		Issues: []int{7256},
+	},
 }

From e089c0c0f8de9991469f51812a5583997d96966c Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 15:53:04 -0700
Subject: [PATCH 429/668] Replace 120 with \d

---
 pkg/minikube/problem/err_map.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index b79da7f1dc..c322c9f94f 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -63,7 +63,7 @@ var vmProblems = map[string]match{
 		Issues: []int{7300},
 	},
 	"CREATE_TIMEOUT": {
-		Regexp: re(`create host timed out in 120`),
+		Regexp: re(`create host timed out in \d`),
 		Advice: "Try 'minikube delete', and disable any conflicting VPN or firewall software",
 		Issues: []int{7072},
 	},
@@ -175,12 +175,12 @@ var vmProblems = map[string]match{
 		GOOS:   []string{"linux"},
 	},
 	"KVM2_RESTART_NO_IP": {
-		Regexp: re(`Error starting stopped host: Machine didn't return an IP after 120 seconds`),
+		Regexp: re(`Error starting stopped host: Machine didn't return an IP after \d+ seconds`),
 		Advice: "The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.",
 		Issues: []int{3901, 3434},
 	},
 	"KVM2_START_NO_IP": {
-		Regexp: re(`Error in driver during machine creation: Machine didn't return an IP after 120 seconds`),
+		Regexp: re(`Error in driver during machine creation: Machine didn't return an IP after \d+ seconds`),
 		Advice: "Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none",
 		URL:    "https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/",
 		Issues: []int{4249, 3566},

From 4476cf12d389552325f8995bc513de87922c1ad0 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 16:04:32 -0700
Subject: [PATCH 430/668] Remove testing dict

---
 pkg/minikube/problem/err_map.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkg/minikube/problem/err_map.go b/pkg/minikube/problem/err_map.go
index c322c9f94f..da6f8fee95 100644
--- a/pkg/minikube/problem/err_map.go
+++ b/pkg/minikube/problem/err_map.go
@@ -334,9 +334,6 @@ var vmProblems = map[string]match{
 		Advice: "The VM that minikube is configured for no longer exists. Run 'minikube delete'",
 		Issues: []int{4694},
 	},
-}
-
-var vmProblems5 = map[string]match{
 	"VBOX_VTX_DISABLED": {
 		Regexp: re(`This computer doesn't have VT-X/AMD-v enabled`),
 		Advice: "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.",

From ac878e4a6ce89060f69a95c49ac04d407cceba5c Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 16:39:08 -0700
Subject: [PATCH 431/668] Bump version to v1.9.1

---
 CHANGELOG.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile     |  4 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0829a83f7..1823aebf00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,53 @@
 # Release Notes
 
-## Version 1.9.0- 2020-03-26
+## Version 1.9.1 - 2020-04-02
+
+Improvements:
+
+* add delete-on-failure flag [#7345](https://github.com/kubernetes/minikube/pull/7345)
+* Run dashboard with internal kubectl if not in path [#7299](https://github.com/kubernetes/minikube/pull/7299)
+* Implement options for the minikube version command [#7325](https://github.com/kubernetes/minikube/pull/7325)
+* service list cmd: display target port and name  [#6879](https://github.com/kubernetes/minikube/pull/6879)
+* none: check for docker and root uid [#7388](https://github.com/kubernetes/minikube/pull/7388)
+* Update Japanese translations [#7359](https://github.com/kubernetes/minikube/pull/7359)
+* Add rejection reason to 'unable to find driver' error [#7379](https://github.com/kubernetes/minikube/pull/7379)
+
+Bug fixes:
+
+* Make eviction and image GC settings consistent across kubeadm API versions [#7364](https://github.com/kubernetes/minikube/pull/7364)
+* Move errors and warnings to output to stderr [#7382](https://github.com/kubernetes/minikube/pull/7382)
+* Correct assumptions for forwarded hostname & IP handling [#7360](https://github.com/kubernetes/minikube/pull/7360)
+* Run sudo for file display due to umask [#7384](https://github.com/kubernetes/minikube/pull/7384)
+* Make live cache pushes non-fatal in case of stop/delete race [#7362](https://github.com/kubernetes/minikube/pull/7362)
+* Extend maximum stop retry from 30s to 120s [#7363](https://github.com/kubernetes/minikube/pull/7363)
+* Use kubectl version --short if --output=json fails [#7356](https://github.com/kubernetes/minikube/pull/7356)
+* Fix embed certs by updating kubeconfig after certs are populated [#7309](https://github.com/kubernetes/minikube/pull/7309)
+* none: Use LookPath to verify conntrack install [#7305](https://github.com/kubernetes/minikube/pull/7305)
+* Show all global flags in options command [#7292](https://github.com/kubernetes/minikube/pull/7292)
+* Fix null deref in start host err [#7278](https://github.com/kubernetes/minikube/pull/7278)
+* Fix StartHost error formatting mistake, improve err msg [#7277](https://github.com/kubernetes/minikube/pull/7277)
+* Increase Docker "slow" timeouts to 15s [#7268](https://github.com/kubernetes/minikube/pull/7268)
+* mustload: Replace DriverIP with Forwarded(IP|Port) [#7310](https://github.com/kubernetes/minikube/pull/7310)
+
+Thank you to our contributors for this release!
+
+- Anders F Björklund
+- Dan Lorenc
+- Eberhard Wolff
+- John Laswell
+- Marcin Niemira
+- Medya Ghazizadeh
+- Prasad Katti
+- Priya Wadhwa
+- Sharif Elgamal
+- Thomas Strömberg
+- Vincent Link
+- anencore94
+- priyawadhwa
+- re;i
+- tomocy
+
+## Version 1.9.0 - 2020-03-26
 
 New features & improvements
 
diff --git a/Makefile b/Makefile
index 049427610c..18611604e2 100755
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 9
-VERSION_BUILD ?= 0
+VERSION_BUILD ?= 1
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
+ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 RPM_VERSION ?= $(DEB_VERSION)

From a1cded8ccd8c990ac113c6fe2e220645ff422671 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 16:41:08 -0700
Subject: [PATCH 432/668] Shorten list

---
 CHANGELOG.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1823aebf00..4de903d0ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,26 +8,22 @@ Improvements:
 * Run dashboard with internal kubectl if not in path [#7299](https://github.com/kubernetes/minikube/pull/7299)
 * Implement options for the minikube version command [#7325](https://github.com/kubernetes/minikube/pull/7325)
 * service list cmd: display target port and name  [#6879](https://github.com/kubernetes/minikube/pull/6879)
-* none: check for docker and root uid [#7388](https://github.com/kubernetes/minikube/pull/7388)
-* Update Japanese translations [#7359](https://github.com/kubernetes/minikube/pull/7359)
 * Add rejection reason to 'unable to find driver' error [#7379](https://github.com/kubernetes/minikube/pull/7379)
+* Update Japanese translations [#7359](https://github.com/kubernetes/minikube/pull/7359)
 
 Bug fixes:
 
 * Make eviction and image GC settings consistent across kubeadm API versions [#7364](https://github.com/kubernetes/minikube/pull/7364)
 * Move errors and warnings to output to stderr [#7382](https://github.com/kubernetes/minikube/pull/7382)
 * Correct assumptions for forwarded hostname & IP handling [#7360](https://github.com/kubernetes/minikube/pull/7360)
-* Run sudo for file display due to umask [#7384](https://github.com/kubernetes/minikube/pull/7384)
-* Make live cache pushes non-fatal in case of stop/delete race [#7362](https://github.com/kubernetes/minikube/pull/7362)
 * Extend maximum stop retry from 30s to 120s [#7363](https://github.com/kubernetes/minikube/pull/7363)
 * Use kubectl version --short if --output=json fails [#7356](https://github.com/kubernetes/minikube/pull/7356)
 * Fix embed certs by updating kubeconfig after certs are populated [#7309](https://github.com/kubernetes/minikube/pull/7309)
 * none: Use LookPath to verify conntrack install [#7305](https://github.com/kubernetes/minikube/pull/7305)
 * Show all global flags in options command [#7292](https://github.com/kubernetes/minikube/pull/7292)
 * Fix null deref in start host err [#7278](https://github.com/kubernetes/minikube/pull/7278)
-* Fix StartHost error formatting mistake, improve err msg [#7277](https://github.com/kubernetes/minikube/pull/7277)
 * Increase Docker "slow" timeouts to 15s [#7268](https://github.com/kubernetes/minikube/pull/7268)
-* mustload: Replace DriverIP with Forwarded(IP|Port) [#7310](https://github.com/kubernetes/minikube/pull/7310)
+* none: check for docker and root uid [#7388](https://github.com/kubernetes/minikube/pull/7388)
 
 Thank you to our contributors for this release!
 

From 60fde94e9f62d4e911a645918a95ca01d66d7744 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 16:46:58 -0700
Subject: [PATCH 433/668] parallelize updating cluster and setting up certs

---
 pkg/minikube/node/start.go | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 11695485d0..af77da4cd4 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -23,6 +23,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/blang/semver"
@@ -239,12 +240,24 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node)
 		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
 	}
 	// Loads cached images, generates config files, download binaries
-	if err := bs.UpdateCluster(cfg); err != nil {
-		exit.WithError("Failed to update cluster", err)
-	}
-	if err := bs.SetupCerts(cfg.KubernetesConfig, n); err != nil {
-		exit.WithError("Failed to setup certs", err)
-	}
+	// update cluster and set up certs in parallel
+	var parallel sync.WaitGroup
+	parallel.Add(2)
+	go func() {
+		if err := bs.UpdateCluster(cfg); err != nil {
+			exit.WithError("Failed to update cluster", err)
+		}
+		parallel.Done()
+	}()
+
+	go func() {
+		if err := bs.SetupCerts(cfg.KubernetesConfig, n); err != nil {
+			exit.WithError("Failed to setup certs", err)
+		}
+		parallel.Done()
+	}()
+
+	parallel.Wait()
 	return bs
 }
 

From db00506d6799f96b8a84eb563c7847792c354ca1 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:00:06 -0700
Subject: [PATCH 434/668] dont allow enabling ingress addon for docker on mac
 and windows

---
 pkg/addons/addons.go                             | 6 ++++++
 site/content/en/docs/Reference/Drivers/docker.md | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index a3b1600a3d..3f6abd08bd 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -19,6 +19,7 @@ package addons
 import (
 	"fmt"
 	"path"
+	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -122,6 +123,11 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 		}
 	}
 
+	// to match both ingress and ingress-dns adons
+	if strings.HasPrefix(name, "ingress") && enable && driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" {
+		exit.UsageT("Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver. meanwhile a different driver such as 'hyperkit' or 'virtualbox' or 'hypev'. To track the update on this feature being worked on please check https://github.com/kubernetes/minikube/issues/7332", out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})
+	}
+
 	if strings.HasPrefix(name, "istio") && enable {
 		minMem := 8192
 		minCPUs := 4
diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index afd0a970b7..ec2b49a2c0 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -18,4 +18,8 @@ The Docker driver is the newest minikube driver. which runs kubernetes in contai
 - Cross platform (linux, macos, windows)
 - No hypervisor required when run on Linux.
 
+## Known Issues.
 
+- The 'ingress' and 'ingress-dns' addons is only supported on Linux and they are  not supported in Docker Driver on MacOS and Windows yet. to get updates on the work in progress please check [issue page](https://github.com/kubernetes/minikube/issues/7332)
+
+- a known [docker issue for MacOs](https://github.com/docker/for-mac/issues/1835), a containers on Docker on MacOS might hang and get stuck while other containers can get created. The current workaround is restarting docker.
\ No newline at end of file

From bcc295193ca1c73246be31ea468ee716d7c43b0d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:07:24 -0700
Subject: [PATCH 435/668] fix english

---
 site/content/en/docs/Reference/Drivers/docker.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/Reference/Drivers/docker.md b/site/content/en/docs/Reference/Drivers/docker.md
index ec2b49a2c0..7c0c0c2470 100644
--- a/site/content/en/docs/Reference/Drivers/docker.md
+++ b/site/content/en/docs/Reference/Drivers/docker.md
@@ -20,6 +20,7 @@ The Docker driver is the newest minikube driver. which runs kubernetes in contai
 
 ## Known Issues.
 
-- The 'ingress' and 'ingress-dns' addons is only supported on Linux and they are  not supported in Docker Driver on MacOS and Windows yet. to get updates on the work in progress please check [issue page](https://github.com/kubernetes/minikube/issues/7332)
+- The 'ingress' and 'ingress-dns' addons are only supported on Linux. 
+these addons are not supported for Docker Driver on MacOS and Windows yet. to get updates on the work in progress please check [issue page](https://github.com/kubernetes/minikube/issues/7332)
 
 - a known [docker issue for MacOs](https://github.com/docker/for-mac/issues/1835), a containers on Docker on MacOS might hang and get stuck while other containers can get created. The current workaround is restarting docker.
\ No newline at end of file

From 77d2b5008706445f6da37f9340b3664d2dd830cb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:16:00 -0700
Subject: [PATCH 436/668] break down the lines

---
 pkg/addons/addons.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 3f6abd08bd..94e87940a1 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -125,7 +125,11 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 
 	// to match both ingress and ingress-dns adons
 	if strings.HasPrefix(name, "ingress") && enable && driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" {
-		exit.UsageT("Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver. meanwhile a different driver such as 'hyperkit' or 'virtualbox' or 'hypev'. To track the update on this feature being worked on please check https://github.com/kubernetes/minikube/issues/7332", out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})
+		exit.UsageT(`Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.
+you can use a different driver such as hyperkit or virtualbox or hypev.
+
+To track the update on this work in progress feature please check:
+https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})
 	}
 
 	if strings.HasPrefix(name, "istio") && enable {

From 9fd64967438a1c9d76d8e09bfd230b0f99b7f3e0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:19:45 -0700
Subject: [PATCH 437/668] improve messge

---
 pkg/addons/addons.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 94e87940a1..8312207792 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -126,7 +126,9 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 	// to match both ingress and ingress-dns adons
 	if strings.HasPrefix(name, "ingress") && enable && driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" {
 		exit.UsageT(`Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.
-you can use a different driver such as hyperkit or virtualbox or hypev.
+Alternatively to use this addon you can use a vm-based driver:
+
+		'minikube start --vm=true'
 
 To track the update on this work in progress feature please check:
 https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})

From 3f16f275405700de478260a543cabeadf7227194 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:20:25 -0700
Subject: [PATCH 438/668] less tab

---
 pkg/addons/addons.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 8312207792..63ae1507df 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -128,7 +128,7 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 		exit.UsageT(`Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.
 Alternatively to use this addon you can use a vm-based driver:
 
-		'minikube start --vm=true'
+	'minikube start --vm=true'
 
 To track the update on this work in progress feature please check:
 https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})

From f4950bc76d2da09a9c97b8a2a343c01bf4a2f3bc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 22:17:42 -0700
Subject: [PATCH 439/668] break down kverify package to files

---
 .../bootstrapper/bsutil/kverify/api_server.go | 173 +++++++++++++++++
 .../bootstrapper/bsutil/kverify/default_sa.go |  56 ++++++
 .../bootstrapper/bsutil/kverify/kverify.go    | 177 +++++++++---------
 .../bsutil/kverify/system_pods.go             | 114 +++++++++++
 4 files changed, 430 insertions(+), 90 deletions(-)
 create mode 100644 pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
 create mode 100644 pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
 create mode 100644 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
new file mode 100644
index 0000000000..3a4e3a871b
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
@@ -0,0 +1,173 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package kverify verifies a running kubernetes cluster is healthy
+package kverify
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"net/http"
+	"os/exec"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/docker/machine/libmachine/state"
+	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/util/wait"
+	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+)
+
+// WaitForHealthyAPIServer waits for api server status to be running
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
+	glog.Infof("waiting for apiserver healthz status ...")
+	hStart := time.Now()
+
+	healthz := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during healthz check")
+		}
+
+		if time.Since(start) > minLogCheckTime {
+			announceProblems(r, bs, cfg, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
+		status, err := apiServerHealthz(net.ParseIP(ip), port)
+		if err != nil {
+			glog.Warningf("status: %v", err)
+			return false, nil
+		}
+		if status != state.Running {
+			return false, nil
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
+		return fmt.Errorf("apiserver healthz never reported healthy")
+	}
+	glog.Infof("duration metric: took %s to wait for apiserver healthz status ...", time.Since(hStart))
+	return nil
+}
+
+// WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
+func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, timeout time.Duration) error {
+	glog.Infof("waiting for apiserver process to appear ...")
+	err := wait.PollImmediate(time.Millisecond*500, timeout, func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during process check")
+		}
+
+		if time.Since(start) > minLogCheckTime {
+			announceProblems(r, bs, cfg, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
+		if _, ierr := apiServerPID(cr); ierr != nil {
+			return false, nil
+		}
+		return true, nil
+	})
+	if err != nil {
+		return fmt.Errorf("apiserver process never appeared")
+	}
+	glog.Infof("duration metric: took %s to wait for apiserver process to appear ...", time.Since(start))
+	return nil
+}
+
+// apiServerPID returns our best guess to the apiserver pid
+func apiServerPID(cr command.Runner) (int, error) {
+	rr, err := cr.RunCmd(exec.Command("sudo", "pgrep", "-xnf", "kube-apiserver.*minikube.*"))
+	if err != nil {
+		return 0, err
+	}
+	s := strings.TrimSpace(rr.Stdout.String())
+	return strconv.Atoi(s)
+}
+
+// APIServerStatus returns apiserver status in libmachine style state.State
+func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
+	glog.Infof("Checking apiserver status ...")
+
+	pid, err := apiServerPID(cr)
+	if err != nil {
+		glog.Warningf("stopped: unable to get apiserver pid: %v", err)
+		return state.Stopped, nil
+	}
+
+	// Get the freezer cgroup entry for this pid
+	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
+	if err != nil {
+		glog.Warningf("unable to find freezer cgroup: %v", err)
+		return apiServerHealthz(ip, port)
+
+	}
+	freezer := strings.TrimSpace(rr.Stdout.String())
+	glog.Infof("apiserver freezer: %q", freezer)
+	fparts := strings.Split(freezer, ":")
+	if len(fparts) != 3 {
+		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
+		return apiServerHealthz(ip, port)
+	}
+
+	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
+	if err != nil {
+		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
+		return apiServerHealthz(ip, port)
+	}
+
+	fs := strings.TrimSpace(rr.Stdout.String())
+	glog.Infof("freezer state: %q", fs)
+	if fs == "FREEZING" || fs == "FROZEN" {
+		return state.Paused, nil
+	}
+	return apiServerHealthz(ip, port)
+}
+
+// apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
+func apiServerHealthz(ip net.IP, port int) (state.State, error) {
+	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(ip.String(), fmt.Sprint(port)))
+	glog.Infof("Checking apiserver healthz at %s ...", url)
+	// To avoid: x509: certificate signed by unknown authority
+	tr := &http.Transport{
+		Proxy:           nil, // To avoid connectiv issue if http(s)_proxy is set.
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+	client := &http.Client{Transport: tr}
+	resp, err := client.Get(url)
+	// Connection refused, usually.
+	if err != nil {
+		glog.Infof("stopped: %s: %v", url, err)
+		return state.Stopped, nil
+	}
+	if resp.StatusCode == http.StatusUnauthorized {
+		glog.Errorf("%s returned code %d (unauthorized). Please ensure that your apiserver authorization settings make sense!", url, resp.StatusCode)
+		return state.Error, nil
+	}
+	if resp.StatusCode != http.StatusOK {
+		glog.Warningf("%s response: %v %+v", url, err, resp)
+		return state.Error, nil
+	}
+	return state.Running, nil
+}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
new file mode 100644
index 0000000000..214b097f73
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package kverify verifies a running kubernetes cluster is healthy
+package kverify
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/minikube/pkg/util/retry"
+)
+
+// WaitForDefaultSA waits for the default service account to be created.
+func WaitForDefaultSA(cs *kubernetes.Clientset) error {
+	glog.Info("waiting for default service account to be created ...")
+	pStart := time.Now()
+	saReady := func() error {
+		// equivalent to manual check of 'kubectl --context profile get serviceaccount default'
+		sas, err := cs.CoreV1().ServiceAccounts("default").List(meta.ListOptions{})
+		if err != nil {
+			glog.Infof("temproary error waiting for default SA: %v", err)
+			return err
+		}
+		for _, sa := range sas.Items {
+			if sa.Name == "default" {
+				glog.Infof("found service account: %q", sa.Name)
+				return nil
+			}
+		}
+		return fmt.Errorf("couldn't find default service account")
+	}
+	if err := retry.Expo(saReady, 500*time.Millisecond, 30*time.Second); err != nil {
+		return errors.Wrapf(err, "waited %s for SA", time.Since(pStart))
+	}
+
+	glog.Infof("duration metric: took %s for default service account to be created ...", time.Since(pStart))
+	return nil
+}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index b7bf7fd5c5..40a4e96bfc 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2019 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,24 +18,14 @@ limitations under the License.
 package kverify
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net"
-	"net/http"
 	"os/exec"
-	"path"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
-	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -44,86 +34,23 @@ import (
 	"k8s.io/minikube/pkg/minikube/logs"
 )
 
+const (
+	// APIServer is the name used in the flags for k8s api server
+	APIServer = "apiserver"
+	// SystemPod is the name used in the flags for pods in the kube system
+	SystemPods = "system_pods"
+	// DefaultSA is the name used in the flags for default service account
+	DefaultSA = "default_sa"
+)
+
+// DefaultWaits is the default components to wait for
+var DefaultWaits = []string{APIServer, SystemPods}
+
+// AvailableWaits is list of possible components that user can choose to wait for
+var AvailableWaits = []string{APIServer, SystemPods, DefaultSA}
+
 // minLogCheckTime how long to wait before spamming error logs to console
-const minLogCheckTime = 60 * time.Second
-
-// WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
-func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, timeout time.Duration) error {
-	glog.Infof("waiting for apiserver process to appear ...")
-	err := wait.PollImmediate(time.Millisecond*500, timeout, func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during process check")
-		}
-
-		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cfg, cr)
-			time.Sleep(kconst.APICallRetryInterval * 5)
-		}
-
-		if _, ierr := apiServerPID(cr); ierr != nil {
-			return false, nil
-		}
-
-		return true, nil
-	})
-	if err != nil {
-		return fmt.Errorf("apiserver process never appeared")
-	}
-	glog.Infof("duration metric: took %s to wait for apiserver process to appear ...", time.Since(start))
-	return nil
-}
-
-// apiServerPID returns our best guess to the apiserver pid
-func apiServerPID(cr command.Runner) (int, error) {
-	rr, err := cr.RunCmd(exec.Command("sudo", "pgrep", "-xnf", "kube-apiserver.*minikube.*"))
-	if err != nil {
-		return 0, err
-	}
-	s := strings.TrimSpace(rr.Stdout.String())
-	return strconv.Atoi(s)
-}
-
-// ExpectedComponentsRunning returns whether or not all expected components are running
-func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
-	expected := []string{
-		"kube-dns", // coredns
-		"etcd",
-		"kube-apiserver",
-		"kube-controller-manager",
-		"kube-proxy",
-		"kube-scheduler",
-	}
-
-	found := map[string]bool{}
-
-	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
-	if err != nil {
-		return err
-	}
-
-	for _, pod := range pods.Items {
-		glog.Infof("found pod: %s", podStatusMsg(pod))
-		if pod.Status.Phase != core.PodRunning {
-			continue
-		}
-		for k, v := range pod.ObjectMeta.Labels {
-			if k == "component" || k == "k8s-app" {
-				found[v] = true
-			}
-		}
-	}
-
-	missing := []string{}
-	for _, e := range expected {
-		if !found[e] {
-			missing = append(missing, e)
-		}
-	}
-	if len(missing) > 0 {
-		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
-	}
-	return nil
-}
+const minLogCheckTime = 30 * time.Second
 
 // podStatusMsg returns a human-readable pod status, for generating debug status
 func podStatusMsg(pod core.Pod) string {
@@ -253,6 +180,7 @@ func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg conf
 	}
 }
 
+<<<<<<< HEAD
 // APIServerStatus returns apiserver status in libmachine style state.State
 func APIServerStatus(cr command.Runner, hostname string, port int) (state.State, error) {
 	glog.Infof("Checking apiserver status ...")
@@ -319,6 +247,75 @@ func apiServerHealthz(hostname string, port int) (state.State, error) {
 	return state.Running, nil
 }
 
+||||||| merged common ancestors
+// APIServerStatus returns apiserver status in libmachine style state.State
+func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
+	glog.Infof("Checking apiserver status ...")
+
+	pid, err := apiServerPID(cr)
+	if err != nil {
+		glog.Warningf("stopped: unable to get apiserver pid: %v", err)
+		return state.Stopped, nil
+	}
+
+	// Get the freezer cgroup entry for this pid
+	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
+	if err != nil {
+		glog.Warningf("unable to find freezer cgroup: %v", err)
+		return apiServerHealthz(ip, port)
+
+	}
+	freezer := strings.TrimSpace(rr.Stdout.String())
+	glog.Infof("apiserver freezer: %q", freezer)
+	fparts := strings.Split(freezer, ":")
+	if len(fparts) != 3 {
+		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
+		return apiServerHealthz(ip, port)
+	}
+
+	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
+	if err != nil {
+		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
+		return apiServerHealthz(ip, port)
+	}
+
+	fs := strings.TrimSpace(rr.Stdout.String())
+	glog.Infof("freezer state: %q", fs)
+	if fs == "FREEZING" || fs == "FROZEN" {
+		return state.Paused, nil
+	}
+	return apiServerHealthz(ip, port)
+}
+
+// apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
+func apiServerHealthz(ip net.IP, port int) (state.State, error) {
+	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(ip.String(), fmt.Sprint(port)))
+	glog.Infof("Checking apiserver healthz at %s ...", url)
+	// To avoid: x509: certificate signed by unknown authority
+	tr := &http.Transport{
+		Proxy:           nil, // To avoid connectiv issue if http(s)_proxy is set.
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+	client := &http.Client{Transport: tr}
+	resp, err := client.Get(url)
+	// Connection refused, usually.
+	if err != nil {
+		glog.Infof("stopped: %s: %v", url, err)
+		return state.Stopped, nil
+	}
+	if resp.StatusCode == http.StatusUnauthorized {
+		glog.Errorf("%s returned code %d (unauthorized). Please ensure that your apiserver authorization settings make sense!", url, resp.StatusCode)
+		return state.Error, nil
+	}
+	if resp.StatusCode != http.StatusOK {
+		glog.Warningf("%s response: %v %+v", url, err, resp)
+		return state.Error, nil
+	}
+	return state.Running, nil
+}
+
+=======
+>>>>>>> break down kverify package to files
 // KubeletStatus checks the kubelet status
 func KubeletStatus(cr command.Runner) (state.State, error) {
 	glog.Infof("Checking kubelet status ...")
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
new file mode 100644
index 0000000000..700b8f2d83
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -0,0 +1,114 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package kverify verifies a running kubernetes cluster is healthy
+package kverify
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/golang/glog"
+	core "k8s.io/api/core/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/kubernetes"
+	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+)
+
+// WaitForSystemPods verifies essential pods for running kurnetes is running
+func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
+	glog.Info("waiting for kube-system pods to appear ...")
+	pStart := time.Now()
+
+	podList := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during pod check")
+		}
+		if time.Since(start) > minLogCheckTime {
+			announceProblems(r, bs, cfg, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
+		// Wait for any system pod, as waiting for apiserver may block until etcd
+		pods, err := client.CoreV1().Pods("kube-system").List(meta.ListOptions{})
+		if err != nil {
+			glog.Warningf("pod list returned error: %v", err)
+			return false, nil
+		}
+		glog.Infof("%d kube-system pods found", len(pods.Items))
+		for _, pod := range pods.Items {
+			glog.Infof(podStatusMsg(pod))
+		}
+
+		if len(pods.Items) < 2 {
+			return false, nil
+		}
+		return true, nil
+	}
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, podList); err != nil {
+		return fmt.Errorf("apiserver never returned a pod list")
+	}
+	glog.Infof("duration metric: took %s to wait for pod list to return data ...", time.Since(pStart))
+	return nil
+}
+
+// ExpectedComponentsRunning returns whether or not all expected components are running
+func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
+	expected := []string{
+		"kube-dns", // coredns
+		"etcd",
+		"kube-apiserver",
+		"kube-controller-manager",
+		"kube-proxy",
+		"kube-scheduler",
+	}
+
+	found := map[string]bool{}
+
+	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
+	if err != nil {
+		return err
+	}
+
+	for _, pod := range pods.Items {
+		glog.Infof("found pod: %s", podStatusMsg(pod))
+		if pod.Status.Phase != core.PodRunning {
+			continue
+		}
+		for k, v := range pod.ObjectMeta.Labels {
+			if k == "component" || k == "k8s-app" {
+				found[v] = true
+			}
+		}
+	}
+
+	missing := []string{}
+	for _, e := range expected {
+		if !found[e] {
+			missing = append(missing, e)
+		}
+	}
+	if len(missing) > 0 {
+		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
+	}
+	return nil
+}

From e4eae47e8695f9992f13d885e7ff8413d0fd0e98 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 23:28:40 -0700
Subject: [PATCH 440/668] interpret wait flags

---
 cmd/minikube/cmd/start.go                     | 47 ++++++++++++++++++-
 .../bootstrapper/bsutil/kverify/kverify.go    | 29 ++++++++----
 2 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 16a3140279..eac228b10b 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -44,6 +44,7 @@ import (
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
@@ -109,7 +110,7 @@ const (
 	downloadOnly            = "download-only"
 	dnsProxy                = "dns-proxy"
 	hostDNSResolver         = "host-dns-resolver"
-	waitUntilHealthy        = "wait"
+	waitComponents          = "wait"
 	force                   = "force"
 	dryRun                  = "dry-run"
 	interactive             = "interactive"
@@ -171,7 +172,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().Bool(waitUntilHealthy, true, "Block until the apiserver is servicing API requests")
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to wait to verify after start. defaults to %q, available options: %q . can also specify 'all' or 'none'", kverify.DefaultWaitsKeys, kverify.AllWaitsKeys))
 	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
@@ -1200,3 +1201,45 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 	}
 	return nv
 }
+
+// interpretWaitFlag interprets the wait flag and respects the legacy minikube users
+// returns 	waitForAPI, waitForSysPod, waitForSA
+func interpretWaitFlag(cmd cobra.Command) map[string]bool {
+	if !cmd.Flags().Changed(waitComponents) {
+		glog.Infof("Wait Components : %+v", kverify.DefaultWaits)
+		return kverify.DefaultWaits
+	}
+
+	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
+	if err != nil {
+		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultWaits)
+		return kverify.DefaultWaits
+	}
+
+	// before minikube 1.9.0, wait flag was boolean
+	if (len(waitFlags) == 1 && waitFlags[0] == "true") || (len(waitFlags) == 1 && waitFlags[0] == "all") {
+		return kverify.AllWaitsCompo
+	}
+
+	// respecting legacy flag format --wait=false
+	// before minikube 1.9.0, wait flag was boolean
+	if (len(waitFlags) == 1 && waitFlags[0] == "false") || len(waitFlags) == 1 && waitFlags[0] == "none" {
+		return kverify.NoWaitsCompo
+	}
+
+	waitCompos := map[string]bool{}
+	for _, wc := range waitFlags {
+		seen := false
+		for _, valid := range kverify.AllValidWaitsList {
+			if wc == valid {
+				waitCompos[wc] = true
+				seen = true
+				continue
+			}
+		}
+		if !seen {
+			glog.Warning("invalid wait component flag %q. valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
+		}
+	}
+	return waitCompos
+}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 40a4e96bfc..806a07b199 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -35,19 +35,28 @@ import (
 )
 
 const (
-	// APIServer is the name used in the flags for k8s api server
-	APIServer = "apiserver"
-	// SystemPod is the name used in the flags for pods in the kube system
-	SystemPods = "system_pods"
-	// DefaultSA is the name used in the flags for default service account
-	DefaultSA = "default_sa"
+	// APIServerWait is the name used in the flags for k8s api server
+	APIServerWait = "apiserver"
+	// SystemPodsWait is the name used in the flags for pods in the kube system
+	SystemPodsWait = "system_pods"
+	// DefaultSAWait is the name used in the flags for default service account
+	DefaultSAWait = "default_sa"
 )
 
-// DefaultWaits is the default components to wait for
-var DefaultWaits = []string{APIServer, SystemPods}
+// DefaultWaits is map of the the default components to wait for
+var DefaultWaits = map[string]bool{APIServerWait: true, SystemPodsWait: true}
 
-// AvailableWaits is list of possible components that user can choose to wait for
-var AvailableWaits = []string{APIServer, SystemPods, DefaultSA}
+// DefaultWaitsKeys is list of all default components to wait for
+var DefaultWaitsKeys = []string{APIServerWait, SystemPodsWait}
+
+// NoWaitsCompo is map of componets to wait for if specified 'none' or 'false'
+var NoWaitsCompo = map[string]bool{}
+
+// AllWaitsCompo is map for waiting for all components.
+var AllWaitsCompo = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultSAWait: true}
+
+// AllValidWaitsList list of all valid components to wait for
+var AllValidWaitsList = []string{APIServerWait, SystemPodsWait, DefaultSAWait}
 
 // minLogCheckTime how long to wait before spamming error logs to console
 const minLogCheckTime = 30 * time.Second

From 3b39b271aca93c6176b55569617f97c6f1430ede Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 23:30:27 -0700
Subject: [PATCH 441/668] fix interpret wait

---
 cmd/minikube/cmd/start.go                           | 6 +++---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index eac228b10b..93bc8c4e33 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1203,7 +1203,7 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 }
 
 // interpretWaitFlag interprets the wait flag and respects the legacy minikube users
-// returns 	waitForAPI, waitForSysPod, waitForSA
+// returns map of components to wait for
 func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	if !cmd.Flags().Changed(waitComponents) {
 		glog.Infof("Wait Components : %+v", kverify.DefaultWaits)
@@ -1224,10 +1224,10 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	// respecting legacy flag format --wait=false
 	// before minikube 1.9.0, wait flag was boolean
 	if (len(waitFlags) == 1 && waitFlags[0] == "false") || len(waitFlags) == 1 && waitFlags[0] == "none" {
-		return kverify.NoWaitsCompo
+		return kverify.NoWaitsCompos
 	}
 
-	waitCompos := map[string]bool{}
+	waitCompos := kverify.NoWaitsCompos
 	for _, wc := range waitFlags {
 		seen := false
 		for _, valid := range kverify.AllValidWaitsList {
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 806a07b199..4987e82b58 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -49,8 +49,8 @@ var DefaultWaits = map[string]bool{APIServerWait: true, SystemPodsWait: true}
 // DefaultWaitsKeys is list of all default components to wait for
 var DefaultWaitsKeys = []string{APIServerWait, SystemPodsWait}
 
-// NoWaitsCompo is map of componets to wait for if specified 'none' or 'false'
-var NoWaitsCompo = map[string]bool{}
+// NoWaitsCompos is map of componets to wait for if specified 'none' or 'false'
+var NoWaitsCompos = map[string]bool{}
 
 // AllWaitsCompo is map for waiting for all components.
 var AllWaitsCompo = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultSAWait: true}

From 1df01b587c336832f90c614f46afa14f6a4cb97b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 23:44:17 -0700
Subject: [PATCH 442/668] add wait

---
 pkg/minikube/config/types.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index 97c2a13039..ef3b2d41cc 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -65,6 +65,7 @@ type ClusterConfig struct {
 	KubernetesConfig        KubernetesConfig
 	Nodes                   []Node
 	Addons                  map[string]bool
+	WaitForCompos           map[string]bool // map of components to verify and wait for after start.
 }
 
 // KubernetesConfig contains the parameters used to configure the VM Kubernetes.

From f49a7a2c5e81812028b3b8c68e76295ed4dda938 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 00:22:39 -0700
Subject: [PATCH 443/668] add new wait logic to kubeadm

---
 .../bootstrapper/bsutil/kverify/default_sa.go |  2 +-
 .../bootstrapper/bsutil/kverify/kverify.go    | 10 ++---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  | 45 +++++++++++++------
 pkg/minikube/node/start.go                    |  2 +-
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index 214b097f73..239d01604a 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Kubernetes Authors All rights reserved.
+Copyright 2016 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 4987e82b58..6198e20208 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -39,8 +39,8 @@ const (
 	APIServerWait = "apiserver"
 	// SystemPodsWait is the name used in the flags for pods in the kube system
 	SystemPodsWait = "system_pods"
-	// DefaultSAWait is the name used in the flags for default service account
-	DefaultSAWait = "default_sa"
+	// DefaultServiceAccountWait is the name used in the flags for default service account
+	DefaultServiceAccountWait = "default_sa"
 )
 
 // DefaultWaits is map of the the default components to wait for
@@ -50,13 +50,13 @@ var DefaultWaits = map[string]bool{APIServerWait: true, SystemPodsWait: true}
 var DefaultWaitsKeys = []string{APIServerWait, SystemPodsWait}
 
 // NoWaitsCompos is map of componets to wait for if specified 'none' or 'false'
-var NoWaitsCompos = map[string]bool{}
+var NoWaitsCompos = map[string]bool{APIServerWait: false, SystemPodsWait: false, DefaultServiceAccountWait: false}
 
 // AllWaitsCompo is map for waiting for all components.
-var AllWaitsCompo = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultSAWait: true}
+var AllWaitsCompo = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultServiceAccountWait: true}
 
 // AllValidWaitsList list of all valid components to wait for
-var AllValidWaitsList = []string{APIServerWait, SystemPodsWait, DefaultSAWait}
+var AllValidWaitsList = []string{APIServerWait, SystemPodsWait, DefaultServiceAccountWait}
 
 // minLogCheckTime how long to wait before spamming error logs to console
 const minLogCheckTime = 30 * time.Second
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 63fcab2ebd..49881c61cc 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -341,38 +341,55 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 // WaitForNode blocks until the node appears to be healthy
 func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, timeout time.Duration) error {
 	start := time.Now()
-
 	if !n.ControlPlane {
 		glog.Infof("%s is not a control plane, nothing to wait for", n.Name)
 		return nil
 	}
+	if cfg.WaitForCompos == kverify.NoWaitsCompos {
+		glog.Infof("skip waiting for components based on config.")
+		return nil
+	}
 
 	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
-		return err
-	}
-
-	if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, start, timeout); err != nil {
-		return err
+		return errors.Wrap(err, "new cruntime")
 	}
 
 	hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "get control plane endpoint")
 	}
 
-	client, err := k.client(hostname, port)
-	if err != nil {
-		return errors.Wrap(err, "get k8s client")
+	if cfg.WaitForCompos[kverify.APIServerWait] {
+		if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, start, timeout); err != nil {
+			return errors.Wrap(err, "wait for apiserver proc")
+		}
+
+		if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, start, ip, port, timeout); err != nil {
+			return errors.Wrap(err, "wait for healthy API server")
+		}
 	}
 
-	if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, hostname, port, timeout); err != nil {
-		return err
+	if cfg.WaitForCompos[kverify.SystemPodsWait] {
+		client, err := k.client(ip, port)
+		if err != nil {
+			return errors.Wrap(err, "get k8s client")
+		}
+		if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
+			return errors.Wrap(err, "waiting for system pods")
+		}
 	}
 
-	if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
-		return errors.Wrap(err, "waiting for system pods")
+	if cfg.WaitForCompos[kverify.DefaultServiceAccountWait] {
+		client, err := k.client(ip, port)
+		if err != nil {
+			return errors.Wrap(err, "get k8s client")
+		}
+		if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
+			return errors.Wrap(err, "waiting for system pods")
+		}
 	}
+	glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.WaitForCompos)
 	return nil
 }
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 11695485d0..137cd669ee 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -156,7 +156,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if viper.GetBool(waitUntilHealthy) && !preExists {
+		if !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}

From 4c8f79d823281208be0e8666648352914e8edf71 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 00:48:40 -0700
Subject: [PATCH 444/668] add wait logic to kubeadm

---
 cmd/minikube/cmd/start.go                     |   4 +-
 .../bootstrapper/bsutil/kverify/api_server.go |  37 ++-
 .../bootstrapper/bsutil/kverify/kverify.go    | 245 +-----------------
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |   8 +-
 4 files changed, 50 insertions(+), 244 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 93bc8c4e33..82112c1f21 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -172,7 +172,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to wait to verify after start. defaults to %q, available options: %q . can also specify 'all' or 'none'", kverify.DefaultWaitsKeys, kverify.AllWaitsKeys))
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to wait to verify after start. defaults to %q, available options: %q . can also specify 'all' or 'none'", kverify.DefaultWaitsKeys, kverify.AllValidWaitsList))
 	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
@@ -1218,7 +1218,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 
 	// before minikube 1.9.0, wait flag was boolean
 	if (len(waitFlags) == 1 && waitFlags[0] == "true") || (len(waitFlags) == 1 && waitFlags[0] == "all") {
-		return kverify.AllWaitsCompo
+		return kverify.AllWaitsCompos
 	}
 
 	// respecting legacy flag format --wait=false
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
index 3a4e3a871b..ae1dcc9c46 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
@@ -30,7 +30,10 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/version"
+	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -39,7 +42,7 @@ import (
 )
 
 // WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, ip string, port int, timeout time.Duration) error {
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, ip string, port int, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver healthz status ...")
 	hStart := time.Now()
 
@@ -67,7 +70,23 @@ func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
 		return fmt.Errorf("apiserver healthz never reported healthy")
 	}
-	glog.Infof("duration metric: took %s to wait for apiserver healthz status ...", time.Since(hStart))
+
+	vcheck := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during version check")
+		}
+		if err := APIServerVersionMatch(client, cfg.KubernetesConfig.KubernetesVersion); err != nil {
+			glog.Warningf("api server version match failed: %v", err)
+			return false, nil
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, vcheck); err != nil {
+		return fmt.Errorf("controlPlane never updated to %s", cfg.KubernetesConfig.KubernetesVersion)
+	}
+
+	glog.Infof("duration metric: took %s to wait for apiserver health ...", time.Since(hStart))
 	return nil
 }
 
@@ -87,6 +106,7 @@ func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, c
 		if _, ierr := apiServerPID(cr); ierr != nil {
 			return false, nil
 		}
+
 		return true, nil
 	})
 	if err != nil {
@@ -171,3 +191,16 @@ func apiServerHealthz(ip net.IP, port int) (state.State, error) {
 	}
 	return state.Running, nil
 }
+
+// APIServerVersionMatch checks if the server version matches the expected
+func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
+	vi, err := client.ServerVersion()
+	if err != nil {
+		return errors.Wrap(err, "server version")
+	}
+	glog.Infof("control plane version: %s", vi)
+	if version.CompareKubeAwareVersionStrings(vi.String(), expected) != 0 {
+		return fmt.Errorf("controlPane = %q, expected: %q", vi.String(), expected)
+	}
+	return nil
+}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 6198e20208..3b6cba2988 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -35,6 +35,8 @@ import (
 )
 
 const (
+	// minLogCheckTime how long to wait before spamming error logs to console
+	minLogCheckTime = 30 * time.Second
 	// APIServerWait is the name used in the flags for k8s api server
 	APIServerWait = "apiserver"
 	// SystemPodsWait is the name used in the flags for pods in the kube system
@@ -52,15 +54,12 @@ var DefaultWaitsKeys = []string{APIServerWait, SystemPodsWait}
 // NoWaitsCompos is map of componets to wait for if specified 'none' or 'false'
 var NoWaitsCompos = map[string]bool{APIServerWait: false, SystemPodsWait: false, DefaultServiceAccountWait: false}
 
-// AllWaitsCompo is map for waiting for all components.
-var AllWaitsCompo = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultServiceAccountWait: true}
+// AllWaitsCompos is map for waiting for all components.
+var AllWaitsCompos = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultServiceAccountWait: true}
 
 // AllValidWaitsList list of all valid components to wait for
 var AllValidWaitsList = []string{APIServerWait, SystemPodsWait, DefaultServiceAccountWait}
 
-// minLogCheckTime how long to wait before spamming error logs to console
-const minLogCheckTime = 30 * time.Second
-
 // podStatusMsg returns a human-readable pod status, for generating debug status
 func podStatusMsg(pod core.Pod) string {
 	var sb strings.Builder
@@ -81,103 +80,9 @@ func podStatusMsg(pod core.Pod) string {
 	return sb.String()
 }
 
-// WaitForSystemPods verifies essential pods for running kurnetes is running
-func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, timeout time.Duration) error {
-	glog.Info("waiting for kube-system pods to appear ...")
-	pStart := time.Now()
-
-	podList := func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during pod check")
-		}
-		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cfg, cr)
-			time.Sleep(kconst.APICallRetryInterval * 5)
-		}
-
-		// Wait for any system pod, as waiting for apiserver may block until etcd
-		pods, err := client.CoreV1().Pods("kube-system").List(meta.ListOptions{})
-		if err != nil {
-			glog.Warningf("pod list returned error: %v", err)
-			return false, nil
-		}
-		glog.Infof("%d kube-system pods found", len(pods.Items))
-		for _, pod := range pods.Items {
-			glog.Infof(podStatusMsg(pod))
-		}
-
-		if len(pods.Items) < 2 {
-			return false, nil
-		}
-		return true, nil
-	}
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, podList); err != nil {
-		return fmt.Errorf("apiserver never returned a pod list")
-	}
-	glog.Infof("duration metric: took %s to wait for pod list to return data ...", time.Since(pStart))
-	return nil
-}
-
-// WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, hostname string, port int, timeout time.Duration) error {
-	glog.Infof("waiting for apiserver healthz status ...")
-	hStart := time.Now()
-
-	healthz := func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during healthz check")
-		}
-
-		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cfg, cr)
-			time.Sleep(kconst.APICallRetryInterval * 5)
-		}
-
-		status, err := apiServerHealthz(hostname, port)
-		if err != nil {
-			glog.Warningf("status: %v", err)
-			return false, nil
-		}
-		if status != state.Running {
-			return false, nil
-		}
-		return true, nil
-	}
-
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
-		return fmt.Errorf("apiserver healthz never reported healthy")
-	}
-
-	vcheck := func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during version check")
-		}
-		if err := APIServerVersionMatch(client, cfg.KubernetesConfig.KubernetesVersion); err != nil {
-			glog.Warningf("api server version match failed: %v", err)
-			return false, nil
-		}
-		return true, nil
-	}
-
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, vcheck); err != nil {
-		return fmt.Errorf("controlPlane never updated to %s", cfg.KubernetesConfig.KubernetesVersion)
-	}
-
-	glog.Infof("duration metric: took %s to wait for apiserver health ...", time.Since(hStart))
-	return nil
-}
-
-// APIServerVersionMatch checks if the server version matches the expected
-func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
-	vi, err := client.ServerVersion()
-	if err != nil {
-		return errors.Wrap(err, "server version")
-	}
-	glog.Infof("control plane version: %s", vi)
-	if version.CompareKubeAwareVersionStrings(vi.String(), expected) != 0 {
-		return fmt.Errorf("controlPane = %q, expected: %q", vi.String(), expected)
-	}
-	return nil
+// DontWait will return true if the config is no need to wait
+func DontWait(wcs map[string]bool) bool {
+	return wcs[APIServerWait] == false && wcs[SystemPodsWait] == false && wcs[DefaultServiceAccountWait] == false
 }
 
 // announceProblems checks for problems, and slows polling down if any are found
@@ -189,142 +94,6 @@ func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg conf
 	}
 }
 
-<<<<<<< HEAD
-// APIServerStatus returns apiserver status in libmachine style state.State
-func APIServerStatus(cr command.Runner, hostname string, port int) (state.State, error) {
-	glog.Infof("Checking apiserver status ...")
-
-	pid, err := apiServerPID(cr)
-	if err != nil {
-		glog.Warningf("stopped: unable to get apiserver pid: %v", err)
-		return state.Stopped, nil
-	}
-
-	// Get the freezer cgroup entry for this pid
-	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
-	if err != nil {
-		glog.Warningf("unable to find freezer cgroup: %v", err)
-		return apiServerHealthz(hostname, port)
-
-	}
-	freezer := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("apiserver freezer: %q", freezer)
-	fparts := strings.Split(freezer, ":")
-	if len(fparts) != 3 {
-		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
-		return apiServerHealthz(hostname, port)
-	}
-
-	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
-	if err != nil {
-		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
-		return apiServerHealthz(hostname, port)
-	}
-
-	fs := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("freezer state: %q", fs)
-	if fs == "FREEZING" || fs == "FROZEN" {
-		return state.Paused, nil
-	}
-	return apiServerHealthz(hostname, port)
-}
-
-// apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
-func apiServerHealthz(hostname string, port int) (state.State, error) {
-	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(hostname, fmt.Sprint(port)))
-	glog.Infof("Checking apiserver healthz at %s ...", url)
-	// To avoid: x509: certificate signed by unknown authority
-	tr := &http.Transport{
-		Proxy:           nil, // To avoid connectiv issue if http(s)_proxy is set.
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-	resp, err := client.Get(url)
-	// Connection refused, usually.
-	if err != nil {
-		glog.Infof("stopped: %s: %v", url, err)
-		return state.Stopped, nil
-	}
-	if resp.StatusCode == http.StatusUnauthorized {
-		glog.Errorf("%s returned code %d (unauthorized). Please ensure that your apiserver authorization settings make sense!", url, resp.StatusCode)
-		return state.Error, nil
-	}
-	if resp.StatusCode != http.StatusOK {
-		glog.Warningf("%s response: %v %+v", url, err, resp)
-		return state.Error, nil
-	}
-	return state.Running, nil
-}
-
-||||||| merged common ancestors
-// APIServerStatus returns apiserver status in libmachine style state.State
-func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
-	glog.Infof("Checking apiserver status ...")
-
-	pid, err := apiServerPID(cr)
-	if err != nil {
-		glog.Warningf("stopped: unable to get apiserver pid: %v", err)
-		return state.Stopped, nil
-	}
-
-	// Get the freezer cgroup entry for this pid
-	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
-	if err != nil {
-		glog.Warningf("unable to find freezer cgroup: %v", err)
-		return apiServerHealthz(ip, port)
-
-	}
-	freezer := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("apiserver freezer: %q", freezer)
-	fparts := strings.Split(freezer, ":")
-	if len(fparts) != 3 {
-		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
-		return apiServerHealthz(ip, port)
-	}
-
-	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
-	if err != nil {
-		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
-		return apiServerHealthz(ip, port)
-	}
-
-	fs := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("freezer state: %q", fs)
-	if fs == "FREEZING" || fs == "FROZEN" {
-		return state.Paused, nil
-	}
-	return apiServerHealthz(ip, port)
-}
-
-// apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
-func apiServerHealthz(ip net.IP, port int) (state.State, error) {
-	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(ip.String(), fmt.Sprint(port)))
-	glog.Infof("Checking apiserver healthz at %s ...", url)
-	// To avoid: x509: certificate signed by unknown authority
-	tr := &http.Transport{
-		Proxy:           nil, // To avoid connectiv issue if http(s)_proxy is set.
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-	resp, err := client.Get(url)
-	// Connection refused, usually.
-	if err != nil {
-		glog.Infof("stopped: %s: %v", url, err)
-		return state.Stopped, nil
-	}
-	if resp.StatusCode == http.StatusUnauthorized {
-		glog.Errorf("%s returned code %d (unauthorized). Please ensure that your apiserver authorization settings make sense!", url, resp.StatusCode)
-		return state.Error, nil
-	}
-	if resp.StatusCode != http.StatusOK {
-		glog.Warningf("%s response: %v %+v", url, err, resp)
-		return state.Error, nil
-	}
-	return state.Running, nil
-}
-
-=======
->>>>>>> break down kverify package to files
 // KubeletStatus checks the kubelet status
 func KubeletStatus(cr command.Runner) (state.State, error) {
 	glog.Infof("Checking kubelet status ...")
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 49881c61cc..f0d9a0882b 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -345,7 +345,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		glog.Infof("%s is not a control plane, nothing to wait for", n.Name)
 		return nil
 	}
-	if cfg.WaitForCompos == kverify.NoWaitsCompos {
+	if kverify.DontWait(cfg.WaitForCompos) {
 		glog.Infof("skip waiting for components based on config.")
 		return nil
 	}
@@ -361,11 +361,15 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 	}
 
 	if cfg.WaitForCompos[kverify.APIServerWait] {
+		client, err := k.client(ip, port)
+		if err != nil {
+			return errors.Wrap(err, "get k8s client")
+		}
 		if err := kverify.WaitForAPIServerProcess(cr, k, cfg, k.c, start, timeout); err != nil {
 			return errors.Wrap(err, "wait for apiserver proc")
 		}
 
-		if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, start, ip, port, timeout); err != nil {
+		if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, ip, port, timeout); err != nil {
 			return errors.Wrap(err, "wait for healthy API server")
 		}
 	}

From d6b3cc6109f44684984666f47187b9ad3b972103 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 01:07:34 -0700
Subject: [PATCH 445/668] lint

---
 cmd/minikube/cmd/start.go                           | 5 +++--
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 2 +-
 pkg/minikube/node/start.go                          | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 82112c1f21..691d41f4b1 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -172,7 +172,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to wait to verify after start. defaults to %q, available options: %q . can also specify 'all' or 'none'", kverify.DefaultWaitsKeys, kverify.AllValidWaitsList))
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitsKeys, ","), strings.Join(kverify.AllValidWaitsList, ",")))
 	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
@@ -1069,6 +1069,7 @@ func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repositor
 		},
 		Nodes: []config.Node{cp},
 	}
+	cfg.WaitForCompos = interpretWaitFlag(*cmd)
 	return cfg, cp, nil
 }
 
@@ -1238,7 +1239,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 			}
 		}
 		if !seen {
-			glog.Warning("invalid wait component flag %q. valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
+			glog.Warningf("The value %q is invalid for --wait flag s! valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
 		}
 	}
 	return waitCompos
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 3b6cba2988..95e5d77355 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -82,7 +82,7 @@ func podStatusMsg(pod core.Pod) string {
 
 // DontWait will return true if the config is no need to wait
 func DontWait(wcs map[string]bool) bool {
-	return wcs[APIServerWait] == false && wcs[SystemPodsWait] == false && wcs[DefaultServiceAccountWait] == false
+	return !wcs[APIServerWait] && !wcs[SystemPodsWait] && !wcs[DefaultServiceAccountWait]
 }
 
 // announceProblems checks for problems, and slows polling down if any are found
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 137cd669ee..e0c1a9d7b1 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -35,6 +35,7 @@ import (
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -56,7 +57,6 @@ import (
 
 const (
 	waitTimeout      = "wait-timeout"
-	waitUntilHealthy = "wait"
 	embedCerts       = "embed-certs"
 	keepContext      = "keep-context"
 	imageRepository  = "image-repository"
@@ -156,7 +156,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if !preExists {
+		if kverify.DontWait(cc.WaitForCompos) || !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}

From 9fc36a6d4eecc7ffbcdf66b0b38f16b828c91942 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 01:10:39 -0700
Subject: [PATCH 446/668] typo

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 691d41f4b1..98d9598202 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1239,7 +1239,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 			}
 		}
 		if !seen {
-			glog.Warningf("The value %q is invalid for --wait flag s! valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
+			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
 		}
 	}
 	return waitCompos

From 9335d28c43f183f6fed702b13925d517abfa5ec0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 01:11:55 -0700
Subject: [PATCH 447/668] fix the years

---
 pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go  | 2 +-
 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index 239d01604a..214b097f73 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2020 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 700b8f2d83..1efae9b19e 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2020 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From e18ce70e0f96843c77c114455799c34ae0d6fb9a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 01:13:24 -0700
Subject: [PATCH 448/668] fix negated logic

---
 pkg/minikube/node/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index e0c1a9d7b1..6bc29cb68b 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -156,7 +156,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if kverify.DontWait(cc.WaitForCompos) || !preExists {
+		if !kverify.DontWait(cc.WaitForCompos) && !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}

From 89f2b9db6ee99f50c7f9d7dc09652f205f83ffa8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:52:54 -0700
Subject: [PATCH 449/668] rename

---
 .../bootstrapper/bsutil/kverify/{kverify.go => kverify2.go}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkg/minikube/bootstrapper/bsutil/kverify/{kverify.go => kverify2.go} (100%)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify2.go
similarity index 100%
rename from pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
rename to pkg/minikube/bootstrapper/bsutil/kverify/kverify2.go

From 86c9d2b747575e917087c669759ae1d92ba146bb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 17:53:20 -0700
Subject: [PATCH 450/668] rename

---
 pkg/minikube/bootstrapper/kubeadm/{kubeadm.go => kubeadm2.go} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkg/minikube/bootstrapper/kubeadm/{kubeadm.go => kubeadm2.go} (100%)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm2.go
similarity index 100%
rename from pkg/minikube/bootstrapper/kubeadm/kubeadm.go
rename to pkg/minikube/bootstrapper/kubeadm/kubeadm2.go

From 62ca22a66297b51e9007503becf35477d9c5fad3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 18:58:51 -0700
Subject: [PATCH 451/668] refactor and rebase

---
 cmd/minikube/cmd/start.go                     |  20 +--
 .../bootstrapper/bsutil/kverify/api_server.go | 138 +++++++++---------
 .../bootstrapper/bsutil/kverify/default_sa.go |   2 +-
 .../kverify/{kverify2.go => kverify.go}       |  92 +++++++++---
 .../bsutil/kverify/system_pods.go             |  44 ------
 .../kubeadm/{kubeadm2.go => kubeadm.go}       |  22 ++-
 pkg/minikube/node/start.go                    |   2 +-
 7 files changed, 159 insertions(+), 161 deletions(-)
 rename pkg/minikube/bootstrapper/bsutil/kverify/{kverify2.go => kverify.go} (50%)
 rename pkg/minikube/bootstrapper/kubeadm/{kubeadm2.go => kubeadm.go} (98%)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 98d9598202..3a62c10809 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -172,7 +172,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitsKeys, fmt.Sprintf("comma separated list of kuberentes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitsKeys, ","), strings.Join(kverify.AllValidWaitsList, ",")))
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of kuberentes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllValidWaitList, ",")))
 	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
@@ -1207,31 +1207,31 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 // returns map of components to wait for
 func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	if !cmd.Flags().Changed(waitComponents) {
-		glog.Infof("Wait Components : %+v", kverify.DefaultWaits)
-		return kverify.DefaultWaits
+		glog.Infof("Wait Components : %+v", kverify.DefaultWaitComponents)
+		return kverify.DefaultWaitComponents
 	}
 
 	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
 	if err != nil {
-		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultWaits)
-		return kverify.DefaultWaits
+		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultWaitComponents)
+		return kverify.DefaultWaitComponents
 	}
 
 	// before minikube 1.9.0, wait flag was boolean
 	if (len(waitFlags) == 1 && waitFlags[0] == "true") || (len(waitFlags) == 1 && waitFlags[0] == "all") {
-		return kverify.AllWaitsCompos
+		return kverify.AllWaitComponents
 	}
 
 	// respecting legacy flag format --wait=false
 	// before minikube 1.9.0, wait flag was boolean
 	if (len(waitFlags) == 1 && waitFlags[0] == "false") || len(waitFlags) == 1 && waitFlags[0] == "none" {
-		return kverify.NoWaitsCompos
+		return kverify.NoWaitComponents
 	}
 
-	waitCompos := kverify.NoWaitsCompos
+	waitCompos := kverify.NoWaitComponents
 	for _, wc := range waitFlags {
 		seen := false
-		for _, valid := range kverify.AllValidWaitsList {
+		for _, valid := range kverify.AllValidWaitList {
 			if wc == valid {
 				waitCompos[wc] = true
 				seen = true
@@ -1239,7 +1239,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 			}
 		}
 		if !seen {
-			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllValidWaitsList, ","))
+			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllValidWaitList, ","))
 		}
 	}
 	return waitCompos
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
index ae1dcc9c46..6aa6763a26 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
@@ -41,55 +41,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/cruntime"
 )
 
-// WaitForHealthyAPIServer waits for api server status to be running
-func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, ip string, port int, timeout time.Duration) error {
-	glog.Infof("waiting for apiserver healthz status ...")
-	hStart := time.Now()
-
-	healthz := func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during healthz check")
-		}
-
-		if time.Since(start) > minLogCheckTime {
-			announceProblems(r, bs, cfg, cr)
-			time.Sleep(kconst.APICallRetryInterval * 5)
-		}
-
-		status, err := apiServerHealthz(net.ParseIP(ip), port)
-		if err != nil {
-			glog.Warningf("status: %v", err)
-			return false, nil
-		}
-		if status != state.Running {
-			return false, nil
-		}
-		return true, nil
-	}
-
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
-		return fmt.Errorf("apiserver healthz never reported healthy")
-	}
-
-	vcheck := func() (bool, error) {
-		if time.Since(start) > timeout {
-			return false, fmt.Errorf("cluster wait timed out during version check")
-		}
-		if err := APIServerVersionMatch(client, cfg.KubernetesConfig.KubernetesVersion); err != nil {
-			glog.Warningf("api server version match failed: %v", err)
-			return false, nil
-		}
-		return true, nil
-	}
-
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, vcheck); err != nil {
-		return fmt.Errorf("controlPlane never updated to %s", cfg.KubernetesConfig.KubernetesVersion)
-	}
-
-	glog.Infof("duration metric: took %s to wait for apiserver health ...", time.Since(hStart))
-	return nil
-}
-
 // WaitForAPIServerProcess waits for api server to be healthy returns error if it doesn't
 func WaitForAPIServerProcess(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, start time.Time, timeout time.Duration) error {
 	glog.Infof("waiting for apiserver process to appear ...")
@@ -126,8 +77,70 @@ func apiServerPID(cr command.Runner) (int, error) {
 	return strconv.Atoi(s)
 }
 
+// WaitForHealthyAPIServer waits for api server status to be running
+func WaitForHealthyAPIServer(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner, client *kubernetes.Clientset, start time.Time, hostname string, port int, timeout time.Duration) error {
+	glog.Infof("waiting for apiserver healthz status ...")
+	hStart := time.Now()
+
+	healthz := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during healthz check")
+		}
+
+		if time.Since(start) > minLogCheckTime {
+			announceProblems(r, bs, cfg, cr)
+			time.Sleep(kconst.APICallRetryInterval * 5)
+		}
+
+		status, err := apiServerHealthz(hostname, port)
+		if err != nil {
+			glog.Warningf("status: %v", err)
+			return false, nil
+		}
+		if status != state.Running {
+			return false, nil
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, healthz); err != nil {
+		return fmt.Errorf("apiserver healthz never reported healthy")
+	}
+
+	vcheck := func() (bool, error) {
+		if time.Since(start) > timeout {
+			return false, fmt.Errorf("cluster wait timed out during version check")
+		}
+		if err := APIServerVersionMatch(client, cfg.KubernetesConfig.KubernetesVersion); err != nil {
+			glog.Warningf("api server version match failed: %v", err)
+			return false, nil
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, vcheck); err != nil {
+		return fmt.Errorf("controlPlane never updated to %s", cfg.KubernetesConfig.KubernetesVersion)
+	}
+
+	glog.Infof("duration metric: took %s to wait for apiserver health ...", time.Since(hStart))
+	return nil
+}
+
+// APIServerVersionMatch checks if the server version matches the expected
+func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
+	vi, err := client.ServerVersion()
+	if err != nil {
+		return errors.Wrap(err, "server version")
+	}
+	glog.Infof("control plane version: %s", vi)
+	if version.CompareKubeAwareVersionStrings(vi.String(), expected) != 0 {
+		return fmt.Errorf("controlPane = %q, expected: %q", vi.String(), expected)
+	}
+	return nil
+}
+
 // APIServerStatus returns apiserver status in libmachine style state.State
-func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error) {
+func APIServerStatus(cr command.Runner, hostname string, port int) (state.State, error) {
 	glog.Infof("Checking apiserver status ...")
 
 	pid, err := apiServerPID(cr)
@@ -140,7 +153,7 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	rr, err := cr.RunCmd(exec.Command("sudo", "egrep", "^[0-9]+:freezer:", fmt.Sprintf("/proc/%d/cgroup", pid)))
 	if err != nil {
 		glog.Warningf("unable to find freezer cgroup: %v", err)
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 
 	}
 	freezer := strings.TrimSpace(rr.Stdout.String())
@@ -148,13 +161,13 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	fparts := strings.Split(freezer, ":")
 	if len(fparts) != 3 {
 		glog.Warningf("unable to parse freezer - found %d parts: %s", len(fparts), freezer)
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 	}
 
 	rr, err = cr.RunCmd(exec.Command("sudo", "cat", path.Join("/sys/fs/cgroup/freezer", fparts[2], "freezer.state")))
 	if err != nil {
 		glog.Errorf("unable to get freezer state: %s", rr.Stderr.String())
-		return apiServerHealthz(ip, port)
+		return apiServerHealthz(hostname, port)
 	}
 
 	fs := strings.TrimSpace(rr.Stdout.String())
@@ -162,12 +175,12 @@ func APIServerStatus(cr command.Runner, ip net.IP, port int) (state.State, error
 	if fs == "FREEZING" || fs == "FROZEN" {
 		return state.Paused, nil
 	}
-	return apiServerHealthz(ip, port)
+	return apiServerHealthz(hostname, port)
 }
 
 // apiServerHealthz hits the /healthz endpoint and returns libmachine style state.State
-func apiServerHealthz(ip net.IP, port int) (state.State, error) {
-	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(ip.String(), fmt.Sprint(port)))
+func apiServerHealthz(hostname string, port int) (state.State, error) {
+	url := fmt.Sprintf("https://%s/healthz", net.JoinHostPort(hostname, fmt.Sprint(port)))
 	glog.Infof("Checking apiserver healthz at %s ...", url)
 	// To avoid: x509: certificate signed by unknown authority
 	tr := &http.Transport{
@@ -191,16 +204,3 @@ func apiServerHealthz(ip net.IP, port int) (state.State, error) {
 	}
 	return state.Running, nil
 }
-
-// APIServerVersionMatch checks if the server version matches the expected
-func APIServerVersionMatch(client *kubernetes.Clientset, expected string) error {
-	vi, err := client.ServerVersion()
-	if err != nil {
-		return errors.Wrap(err, "server version")
-	}
-	glog.Infof("control plane version: %s", vi)
-	if version.CompareKubeAwareVersionStrings(vi.String(), expected) != 0 {
-		return fmt.Errorf("controlPane = %q, expected: %q", vi.String(), expected)
-	}
-	return nil
-}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index 214b097f73..3b2105c7e5 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -47,7 +47,7 @@ func WaitForDefaultSA(cs *kubernetes.Clientset) error {
 		}
 		return fmt.Errorf("couldn't find default service account")
 	}
-	if err := retry.Expo(saReady, 500*time.Millisecond, 30*time.Second); err != nil {
+	if err := retry.Expo(saReady, 500*time.Millisecond, 60*time.Second); err != nil {
 		return errors.Wrapf(err, "waited %s for SA", time.Since(pStart))
 	}
 
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify2.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
similarity index 50%
rename from pkg/minikube/bootstrapper/bsutil/kverify/kverify2.go
rename to pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 95e5d77355..6f735e268e 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify2.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Kubernetes Authors All rights reserved.
+Copyright 2016 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	core "k8s.io/api/core/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -34,31 +36,78 @@ import (
 	"k8s.io/minikube/pkg/minikube/logs"
 )
 
+// minLogCheckTime how long to wait before spamming error logs to console
+const minLogCheckTime = 60 * time.Second
+
 const (
-	// minLogCheckTime how long to wait before spamming error logs to console
-	minLogCheckTime = 30 * time.Second
-	// APIServerWait is the name used in the flags for k8s api server
-	APIServerWait = "apiserver"
-	// SystemPodsWait is the name used in the flags for pods in the kube system
-	SystemPodsWait = "system_pods"
-	// DefaultServiceAccountWait is the name used in the flags for default service account
-	DefaultServiceAccountWait = "default_sa"
+	// APIServerWaitKey is the name used in the flags for k8s api server
+	APIServerWaitKey = "apiserver"
+	// SystemPodsWaitKey is the name used in the flags for pods in the kube system
+	SystemPodsWaitKey = "system_pods"
+	// DefaultSAWaitKey is the name used in the flags for default service account
+	DefaultSAWaitKey = "default_sa"
 )
 
-// DefaultWaits is map of the the default components to wait for
-var DefaultWaits = map[string]bool{APIServerWait: true, SystemPodsWait: true}
+//  vars related to the --wait flag
+var (
+	// DefaultWaitComponents is map of the the default components to wait for
+	DefaultWaitComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true}
+	// NoWaitComponents is map of componets to wait for if specified 'none' or 'false'
+	NoWaitComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false}
+	// AllWaitComponents is map for waiting for all components.
+	AllWaitComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true}
+	// DefaultWaitList is list of all default components to wait for
+	DefaultWaitList = []string{APIServerWaitKey, SystemPodsWaitKey}
+	// AllValidWaitList list of all valid components to wait for
+	AllValidWaitList = []string{APIServerWaitKey, SystemPodsWaitKey, DefaultSAWaitKey}
+)
 
-// DefaultWaitsKeys is list of all default components to wait for
-var DefaultWaitsKeys = []string{APIServerWait, SystemPodsWait}
+// ShouldWait will return true if the config says need to wait
+func ShouldWait(wcs map[string]bool) bool {
+	return wcs[APIServerWaitKey] || wcs[SystemPodsWaitKey] || wcs[DefaultSAWaitKey]
+}
 
-// NoWaitsCompos is map of componets to wait for if specified 'none' or 'false'
-var NoWaitsCompos = map[string]bool{APIServerWait: false, SystemPodsWait: false, DefaultServiceAccountWait: false}
+// ExpectedComponentsRunning returns whether or not all expected components are running
+func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
+	expected := []string{
+		"kube-dns", // coredns
+		"etcd",
+		"kube-apiserver",
+		"kube-controller-manager",
+		"kube-proxy",
+		"kube-scheduler",
+	}
 
-// AllWaitsCompos is map for waiting for all components.
-var AllWaitsCompos = map[string]bool{APIServerWait: true, SystemPodsWait: true, DefaultServiceAccountWait: true}
+	found := map[string]bool{}
 
-// AllValidWaitsList list of all valid components to wait for
-var AllValidWaitsList = []string{APIServerWait, SystemPodsWait, DefaultServiceAccountWait}
+	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
+	if err != nil {
+		return err
+	}
+
+	for _, pod := range pods.Items {
+		glog.Infof("found pod: %s", podStatusMsg(pod))
+		if pod.Status.Phase != core.PodRunning {
+			continue
+		}
+		for k, v := range pod.ObjectMeta.Labels {
+			if k == "component" || k == "k8s-app" {
+				found[v] = true
+			}
+		}
+	}
+
+	missing := []string{}
+	for _, e := range expected {
+		if !found[e] {
+			missing = append(missing, e)
+		}
+	}
+	if len(missing) > 0 {
+		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
+	}
+	return nil
+}
 
 // podStatusMsg returns a human-readable pod status, for generating debug status
 func podStatusMsg(pod core.Pod) string {
@@ -80,11 +129,6 @@ func podStatusMsg(pod core.Pod) string {
 	return sb.String()
 }
 
-// DontWait will return true if the config is no need to wait
-func DontWait(wcs map[string]bool) bool {
-	return !wcs[APIServerWait] && !wcs[SystemPodsWait] && !wcs[DefaultServiceAccountWait]
-}
-
 // announceProblems checks for problems, and slows polling down if any are found
 func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner) {
 	problems := logs.FindProblems(r, bs, cfg, cr)
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 1efae9b19e..9993044ae7 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -19,11 +19,9 @@ package kverify
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/golang/glog"
-	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -70,45 +68,3 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 	glog.Infof("duration metric: took %s to wait for pod list to return data ...", time.Since(pStart))
 	return nil
 }
-
-// ExpectedComponentsRunning returns whether or not all expected components are running
-func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
-	expected := []string{
-		"kube-dns", // coredns
-		"etcd",
-		"kube-apiserver",
-		"kube-controller-manager",
-		"kube-proxy",
-		"kube-scheduler",
-	}
-
-	found := map[string]bool{}
-
-	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
-	if err != nil {
-		return err
-	}
-
-	for _, pod := range pods.Items {
-		glog.Infof("found pod: %s", podStatusMsg(pod))
-		if pod.Status.Phase != core.PodRunning {
-			continue
-		}
-		for k, v := range pod.ObjectMeta.Labels {
-			if k == "component" || k == "k8s-app" {
-				found[v] = true
-			}
-		}
-	}
-
-	missing := []string{}
-	for _, e := range expected {
-		if !found[e] {
-			missing = append(missing, e)
-		}
-	}
-	if len(missing) > 0 {
-		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
-	}
-	return nil
-}
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm2.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
similarity index 98%
rename from pkg/minikube/bootstrapper/kubeadm/kubeadm2.go
rename to pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index f0d9a0882b..dcab2a8799 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm2.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -1,12 +1,9 @@
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
     http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -341,18 +338,19 @@ func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error
 // WaitForNode blocks until the node appears to be healthy
 func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, timeout time.Duration) error {
 	start := time.Now()
+
 	if !n.ControlPlane {
 		glog.Infof("%s is not a control plane, nothing to wait for", n.Name)
 		return nil
 	}
-	if kverify.DontWait(cfg.WaitForCompos) {
+	if !kverify.ShouldWait(cfg.WaitForCompos) {
 		glog.Infof("skip waiting for components based on config.")
 		return nil
 	}
 
 	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
-		return errors.Wrap(err, "new cruntime")
+		return err
 	}
 
 	hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver)
@@ -360,8 +358,8 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return errors.Wrap(err, "get control plane endpoint")
 	}
 
-	if cfg.WaitForCompos[kverify.APIServerWait] {
-		client, err := k.client(ip, port)
+	if cfg.WaitForCompos[kverify.APIServerWaitKey] {
+		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
 		}
@@ -369,13 +367,13 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 			return errors.Wrap(err, "wait for apiserver proc")
 		}
 
-		if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, ip, port, timeout); err != nil {
+		if err := kverify.WaitForHealthyAPIServer(cr, k, cfg, k.c, client, start, hostname, port, timeout); err != nil {
 			return errors.Wrap(err, "wait for healthy API server")
 		}
 	}
 
-	if cfg.WaitForCompos[kverify.SystemPodsWait] {
-		client, err := k.client(ip, port)
+	if cfg.WaitForCompos[kverify.SystemPodsWaitKey] {
+		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
 		}
@@ -384,8 +382,8 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		}
 	}
 
-	if cfg.WaitForCompos[kverify.DefaultServiceAccountWait] {
-		client, err := k.client(ip, port)
+	if cfg.WaitForCompos[kverify.DefaultSAWaitKey] {
+		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
 		}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 6bc29cb68b..8bc2da45a1 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -156,7 +156,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if !kverify.DontWait(cc.WaitForCompos) && !preExists {
+		if kverify.ShouldWait(cc.WaitForCompos) && !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}

From 4de1197927713dd5b53a27f2ec997631838f369f Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 2 Apr 2020 19:06:50 -0700
Subject: [PATCH 452/668] add comment to makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a0a19584cd..4e312436e1 100755
--- a/Makefile
+++ b/Makefile
@@ -271,7 +271,7 @@ test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go ## Tr
 	MINIKUBE_LDFLAGS="${MINIKUBE_LDFLAGS}" ./test.sh
 
 .PHONY: generate-docs
-generate-docs: out/minikube
+generate-docs: out/minikube ## Automatically generate commands documentation.
 	out/minikube generate-docs --path ./site/content/en/docs/Reference/Commands/
 
 .PHONY: extract

From 5f6b547a1dc827e9be5f562ab8ceb9db0e2294d1 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 19:18:06 -0700
Subject: [PATCH 453/668] add time out for wait for default sa

---
 pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go | 8 ++++++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go           | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index 3b2105c7e5..b5b9ca89a5 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -29,10 +29,14 @@ import (
 )
 
 // WaitForDefaultSA waits for the default service account to be created.
-func WaitForDefaultSA(cs *kubernetes.Clientset) error {
+func WaitForDefaultSA(cs *kubernetes.Clientset, timeout time.Duration) error {
 	glog.Info("waiting for default service account to be created ...")
-	pStart := time.Now()
+	start := time.Now()
 	saReady := func() error {
+		if time.Since(start) > timeout {
+			glog.Error("exceeded max time to wait to verify cluster during waiting for default service account. will skip waiting.")
+			return nil
+		}
 		// equivalent to manual check of 'kubectl --context profile get serviceaccount default'
 		sas, err := cs.CoreV1().ServiceAccounts("default").List(meta.ListOptions{})
 		if err != nil {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index dcab2a8799..1d13c3edba 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -350,7 +350,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 
 	cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "create runtme-manager %s", cfg.KubernetesConfig.ContainerRuntime)
 	}
 
 	hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver)
@@ -387,8 +387,8 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
 		}
-		if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
-			return errors.Wrap(err, "waiting for system pods")
+		if err := kverify.WaitForDefaultSA(client, timeout); err != nil {
+			return errors.Wrap(err, "waiting for default service account")
 		}
 	}
 	glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.WaitForCompos)

From 90c251d7e9daa6c900858a1935bbd99c5579ec0e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 19:19:23 -0700
Subject: [PATCH 454/668] lint

---
 pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index b5b9ca89a5..16d527e95b 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -51,10 +51,10 @@ func WaitForDefaultSA(cs *kubernetes.Clientset, timeout time.Duration) error {
 		}
 		return fmt.Errorf("couldn't find default service account")
 	}
-	if err := retry.Expo(saReady, 500*time.Millisecond, 60*time.Second); err != nil {
-		return errors.Wrapf(err, "waited %s for SA", time.Since(pStart))
+	if err := retry.Expo(saReady, 500*time.Millisecond, 120*time.Second); err != nil {
+		return errors.Wrapf(err, "waited %s for SA", time.Since(start))
 	}
 
-	glog.Infof("duration metric: took %s for default service account to be created ...", time.Since(pStart))
+	glog.Infof("duration metric: took %s for default service account to be created ...", time.Since(start))
 	return nil
 }

From fa9d47ae18e46ea11b191ebce262966f3a7567de Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 19:21:30 -0700
Subject: [PATCH 455/668] reuse timeout

---
 pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
index 16d527e95b..453edff703 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
@@ -33,10 +33,6 @@ func WaitForDefaultSA(cs *kubernetes.Clientset, timeout time.Duration) error {
 	glog.Info("waiting for default service account to be created ...")
 	start := time.Now()
 	saReady := func() error {
-		if time.Since(start) > timeout {
-			glog.Error("exceeded max time to wait to verify cluster during waiting for default service account. will skip waiting.")
-			return nil
-		}
 		// equivalent to manual check of 'kubectl --context profile get serviceaccount default'
 		sas, err := cs.CoreV1().ServiceAccounts("default").List(meta.ListOptions{})
 		if err != nil {
@@ -51,7 +47,7 @@ func WaitForDefaultSA(cs *kubernetes.Clientset, timeout time.Duration) error {
 		}
 		return fmt.Errorf("couldn't find default service account")
 	}
-	if err := retry.Expo(saReady, 500*time.Millisecond, 120*time.Second); err != nil {
+	if err := retry.Expo(saReady, 500*time.Millisecond, timeout); err != nil {
 		return errors.Wrapf(err, "waited %s for SA", time.Since(start))
 	}
 

From e9435dc7c2fd314400d0c86682516af1aa2bae18 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 2 Apr 2020 19:39:25 -0700
Subject: [PATCH 456/668] Update releases.json to include v1.9.1

---
 deploy/minikube/releases.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json
index 2bb7364fcf..54fb495aa9 100644
--- a/deploy/minikube/releases.json
+++ b/deploy/minikube/releases.json
@@ -1,4 +1,12 @@
 [
+  {
+      "name": "v1.9.1",
+      "checksums": {
+          "darwin": "ac8855ea54e798fa6f00e8c251b55c3d2a54e3b80e896162958a5ac7b0e3f60b",
+          "linux": "7174c881289a7302a05d477c67cc1ef5b48153e825089d6c0d0bcfaebe33d42a",
+          "windows": "91d15b2ef8f357aa463ae16de59f6e018120398f492ba4e35cd77f21acb27d5c"
+      }
+  },
   {
       "name": "v1.9.0",
       "checksums": {

From 92089980eb5d486217e28a038d84b6ad4a3e42b1 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Thu, 2 Apr 2020 20:13:38 -0700
Subject: [PATCH 457/668] Add example showing how to upgrade k8s version

Stop-gap solution for #6122 until we have a separate page which discusses how to upgrade a minikube cluster.
---
 site/content/en/docs/Examples/_index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/content/en/docs/Examples/_index.md b/site/content/en/docs/Examples/_index.md
index c9e665ae05..6aaeb7c36e 100755
--- a/site/content/en/docs/Examples/_index.md
+++ b/site/content/en/docs/Examples/_index.md
@@ -28,6 +28,10 @@ minikube makes it easy to open this exposed endpoint in your browser:
 
 `minikube service hello-minikube`
 
+Upgrade your cluster:
+
+`minikube start --kubernetes-version=latest`
+
 Start a second local cluster (_note: This will not work if minikube is using the bare-metal/none driver_):
 
 `minikube start -p cluster2`

From 7b52f156ebbbd93a9e34555f26119327973a50c7 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 20:54:53 -0700
Subject: [PATCH 458/668] Update docs to v1.9.1

---
 site/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/config.toml b/site/config.toml
index e0c6e2a4bc..589179538c 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -76,7 +76,7 @@ weight = 1
 [params]
 copyright = "The Kubernetes Authors -- "
 # The latest release of minikube
-latest_release = "1.9.0"
+latest_release = "1.9.1"
 
 privacy_policy = ""
 

From 29dbb5c033659cf62d7455a17c5df09f73cb43cd Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 2 Apr 2020 20:55:11 -0700
Subject: [PATCH 459/668] cd to SRC_DIR to avoid brew error

---
 hack/jenkins/release_update_brew.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hack/jenkins/release_update_brew.sh b/hack/jenkins/release_update_brew.sh
index 1ea538c8d6..ee10433ec5 100755
--- a/hack/jenkins/release_update_brew.sh
+++ b/hack/jenkins/release_update_brew.sh
@@ -45,6 +45,9 @@ export HOMEBREW_GITHUB_API_TOKEN="${access_token}"
 # sh -c "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install.sh)"
 export PATH=/home/linuxbrew/.linuxbrew/bin:$PATH
 
+# avoid "error: you need to resolve your current index first" message
+cd "${SRC_DIR}"
+
 brew bump-formula-pr \
   --strict minikube \
   --revision="${revision}" \

From 74551841cce9e93821468a72f2723a9c78f11c83 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 23:41:45 -0700
Subject: [PATCH 460/668] address review comments

---
 cmd/minikube/cmd/start.go                     | 38 +++++++++----------
 .../bootstrapper/bsutil/kverify/kverify.go    | 18 ++++-----
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  5 ++-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 3a62c10809..681e59b269 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -172,7 +172,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
 	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
 	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of kuberentes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllValidWaitList, ",")))
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllComponentsList, ",")))
 	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
 	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
 	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
@@ -1207,40 +1207,40 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 // returns map of components to wait for
 func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	if !cmd.Flags().Changed(waitComponents) {
-		glog.Infof("Wait Components : %+v", kverify.DefaultWaitComponents)
-		return kverify.DefaultWaitComponents
+		glog.Infof("Wait Components : %+v", kverify.DefaultComponents)
+		return kverify.DefaultComponents
 	}
 
 	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
 	if err != nil {
-		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultWaitComponents)
-		return kverify.DefaultWaitComponents
+		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultComponents)
+		return kverify.DefaultComponents
 	}
 
-	// before minikube 1.9.0, wait flag was boolean
-	if (len(waitFlags) == 1 && waitFlags[0] == "true") || (len(waitFlags) == 1 && waitFlags[0] == "all") {
-		return kverify.AllWaitComponents
+	if len(waitFlags) == 1 {
+		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
+		if waitFlags[0] == "false" || waitFlags[0] == "none" {
+			return kverify.NoComponents
+		}
+		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
+		if waitFlags[0] == "true" || waitFlags[0] == "all" {
+			return kverify.AllComponents
+		}
 	}
 
-	// respecting legacy flag format --wait=false
-	// before minikube 1.9.0, wait flag was boolean
-	if (len(waitFlags) == 1 && waitFlags[0] == "false") || len(waitFlags) == 1 && waitFlags[0] == "none" {
-		return kverify.NoWaitComponents
-	}
-
-	waitCompos := kverify.NoWaitComponents
+	waitComponents := kverify.NoComponents
 	for _, wc := range waitFlags {
 		seen := false
-		for _, valid := range kverify.AllValidWaitList {
+		for _, valid := range kverify.AllComponentsList {
 			if wc == valid {
-				waitCompos[wc] = true
+				waitComponents[wc] = true
 				seen = true
 				continue
 			}
 		}
 		if !seen {
-			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllValidWaitList, ","))
+			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllComponentsList, ","))
 		}
 	}
-	return waitCompos
+	return waitComponents
 }
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 6f735e268e..b6b9db9340 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2020 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -50,16 +50,16 @@ const (
 
 //  vars related to the --wait flag
 var (
-	// DefaultWaitComponents is map of the the default components to wait for
-	DefaultWaitComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true}
+	// DefaultComponents is map of the the default components to wait for
+	DefaultComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true}
 	// NoWaitComponents is map of componets to wait for if specified 'none' or 'false'
-	NoWaitComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false}
-	// AllWaitComponents is map for waiting for all components.
-	AllWaitComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true}
-	// DefaultWaitList is list of all default components to wait for
+	NoComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false}
+	// AllComponents is map for waiting for all components.
+	AllComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true}
+	// DefaultWaitList is list of all default components to wait for. only names to be used for start flags.
 	DefaultWaitList = []string{APIServerWaitKey, SystemPodsWaitKey}
-	// AllValidWaitList list of all valid components to wait for
-	AllValidWaitList = []string{APIServerWaitKey, SystemPodsWaitKey, DefaultSAWaitKey}
+	// AllComponentsList list of all valid components keys to wait for. only names to be used used for start flags.
+	AllComponentsList = []string{APIServerWaitKey, SystemPodsWaitKey, DefaultSAWaitKey}
 )
 
 // ShouldWait will return true if the config says need to wait
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 1d13c3edba..c16723fb50 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -1,9 +1,12 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From 989cae55492e5fa7826b49ae66aa20492ca706b2 Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Sat, 4 Apr 2020 02:04:29 +0900
Subject: [PATCH 461/668] Run make extract

---
 translations/de.json    | 69 ++++++++++++++++++++++++-----------------
 translations/es.json    | 69 ++++++++++++++++++++++++-----------------
 translations/fr.json    | 69 ++++++++++++++++++++++++-----------------
 translations/ja.json    | 64 ++++++++++++++++++++++++--------------
 translations/ko.json    | 64 ++++++++++++++++++++++++--------------
 translations/pl.json    | 68 ++++++++++++++++++++++++----------------
 translations/zh-CN.json | 64 ++++++++++++++++++++++++--------------
 7 files changed, 287 insertions(+), 180 deletions(-)

diff --git a/translations/de.json b/translations/de.json
index 89c9dde056..7aeb9e8e8a 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
 	"'none' driver does not support 'minikube docker-env' command": "",
@@ -8,7 +9,7 @@
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
 	"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": "",
@@ -35,6 +36,7 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "",
@@ -48,9 +50,10 @@
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "",
-	"Check that the provided apiserver flags are valid": "",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -95,6 +98,7 @@
 	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -115,7 +119,6 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Umgebungsvariablen, die an den Docker-Daemon übergeben werden. (Format: Schlüssel = Wert)",
-	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "Fehler beim Prüfen der Treiberversion: {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
@@ -144,7 +147,6 @@
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Fehler: Sie haben Kubernetes v{{.new}} ausgewählt, aber auf dem vorhandenen Cluster für Ihr Profil wird Kubernetes v{{.old}} ausgeführt. Zerstörungsfreie Downgrades werden nicht unterstützt. Sie können jedoch mit einer der folgenden Optionen fortfahren:\n* Erstellen Sie den Cluster mit Kubernetes v{{.new}} neu: Führen Sie \"minikube delete {{.profile}}\" und dann \"minikube start {{.profile}} - kubernetes-version = {{.new}}\" aus.\n* Erstellen Sie einen zweiten Cluster mit Kubernetes v{{.new}}: Führen Sie \"minikube start -p \u003cnew name\u003e --kubernetes-version = {{.new}}\" aus.\n* Verwenden Sie den vorhandenen Cluster mit Kubernetes v {{.old}} oder höher: Führen Sie \"minikube start {{.profile}} --kubernetes-version = {{.old}}\" aus.",
-	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
@@ -160,6 +162,7 @@
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Fehler beim Ändern der Berechtigungen für {{.minikube_dir_path}}: {{.error}}",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "Fehler beim Löschen des Clusters: {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "Fehler beim Löschen des Clusters: {{.error}}",
 	"Failed to delete images": "",
@@ -174,17 +177,14 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Fehler beim Beenden des Bereitstellungsprozesses: {{.error}}",
 	"Failed to list cached images": "",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY Env konnte nicht festgelegt werden. Benutzen Sie `export NO_PROXY = $ NO_PROXY, {{. Ip}}",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
-	"Failed to setup kubeconfig": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -193,6 +193,7 @@
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Für beste Ergebnisse installieren Sie kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "Für beste Ergebnisse installieren Sie kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For more information, see:": "Weitere Informationen:",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "minikube zwingen, möglicherweise gefährliche Operationen durchzuführen",
 	"Found network options:": "Gefundene Netzwerkoptionen:",
@@ -205,8 +206,6 @@
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -217,6 +216,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -259,6 +259,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "",
@@ -268,9 +269,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -282,6 +285,7 @@
 	"Number of CPUs allocated to the minikube VM": "Anzahl der CPUs, die der minikube-VM zugeordnet sind",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -307,12 +311,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "{{.profile_name}}\" wird über SSH ausgeschaltet...",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Vorbereiten von Kubernetes {{.k8sVersion}} auf {{.runtime}} {{.runtimeVersion}}...",
 	"Print current and latest version number": "",
+	"Print just the version number.": "",
 	"Print the version of minikube": "",
 	"Print the version of minikube.": "",
 	"Problems detected in {{.entry}}:": "",
 	"Problems detected in {{.name}}:": "",
 	"Profile gets or sets the current minikube profile": "",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Geben Sie die VM-UUID an, um die MAC-Adresse wiederherzustellen (nur Hyperkit-Treiber)",
 	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
@@ -321,8 +326,10 @@
 	"Registry mirrors to pass to the Docker daemon": "Registry-Mirror, die an den Docker-Daemon übergeben werden",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "Kubernetes mit {{.bootstrapper}} neu starten...",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "",
 	"Removing {{.directory}} ...": "{{.directory}} wird entfernt...",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
@@ -331,6 +338,7 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "Die angeforderte Speicherzuweisung {{.requested_size}} liegt unter dem zulässigen Mindestwert von {{.minimum_size}}.",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
@@ -339,14 +347,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
@@ -375,7 +385,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -399,6 +409,7 @@
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Der Cluster \"{{.name}}\" wurde gelöscht.",
 	"The \"{{.name}}\" cluster has been deleted.__1": "Der Cluster \"{{.name}}\" wurde gelöscht.",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "Der Treiber \"Keine\" bietet eine eingeschränkte Isolation und beeinträchtigt möglicherweise Sicherheit und Zuverlässigkeit des Systems.",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
@@ -414,10 +425,10 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "Der Überwachungsport des API-Servers",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Der API-Servername, der im generierten Zertifikat für Kubernetes verwendet wird. Damit kann der API-Server von außerhalb des Computers verfügbar gemacht werden.",
 	"The argument to pass the minikube mount command on start": "Das Argument, um den Bereitstellungsbefehl für minikube beim Start zu übergeben",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "Der DNS-Domänenname des Clusters, der im Kubernetes-Cluster verwendet wird",
 	"The container runtime to be used (docker, crio, containerd)": "Die zu verwendende Container-Laufzeit (Docker, Crio, Containerd)",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -463,6 +474,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Dies kann auch automatisch erfolgen, indem Sie die env var CHANGE_MINIKUBE_NONE_USER = true setzen",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Dadurch wird der vorhandene Kubectl-Kontext beibehalten und ein minikube-Kontext erstellt.",
 	"This will start the mount daemon and automatically mount files into minikube": "Dadurch wird der Mount-Daemon gestartet und die Dateien werden automatisch in minikube geladen",
@@ -478,12 +490,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Möglicherweise müssen Sie Kubectl- oder minikube-Befehle verschieben, um sie als eigenen Nutzer zu verwenden. Um beispielsweise Ihre eigenen Einstellungen zu überschreiben, führen Sie aus:",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
 	"Unable to find control plane": "",
@@ -495,8 +509,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
@@ -508,6 +521,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to pull images, which may be OK: {{.error}}": "Bilder können nicht abgerufen werden, was möglicherweise kein Problem darstellt: {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -521,7 +535,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Upgrade von Kubernetes {{.old}} auf {{.new}}",
@@ -557,8 +570,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Warten Sie vor dem Beenden, bis die Kerndienste von Kubernetes fehlerfrei arbeiten",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Als Root für die NFS-Freigaben wird standardmäßig /nfsshares verwendet (nur Hyperkit-Treiber)",
@@ -571,10 +583,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -595,21 +608,20 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Konfiguration von Kubectl und minikube wird in {{.home_folder}} gespeichert",
-	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
 	"libmachine failed": "",
 	"logdir set failed": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -629,7 +641,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -653,9 +665,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/es.json b/translations/es.json
index f4d3dfce4d..467989826f 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist": "El perfil \"{{.name}}\" no existe",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "",
@@ -9,7 +10,7 @@
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
 	"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": "",
@@ -36,6 +37,7 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "",
@@ -49,9 +51,10 @@
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "",
-	"Check that the provided apiserver flags are valid": "",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -96,6 +99,7 @@
 	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -116,7 +120,6 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Variables de entorno que se transferirán al daemon de Docker. Formato: clave=valor",
-	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "No se ha podido comprobar la versión del controlador: {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
@@ -145,7 +148,6 @@
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Error: Has seleccionado Kubernetes {{.new}}, pero el clúster de tu perfil utiliza la versión {{.old}}. No se puede cambiar a una versión inferior sin eliminar todos los datos y recursos pertinentes, pero dispones de las siguientes opciones para continuar con la operación:\n* Volver a crear el clúster con Kubernetes {{.new}}: ejecuta \"minikube delete {{.profile}}\" y, luego, \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Crear un segundo clúster con Kubernetes {{.new}}: ejecuta \"minikube start -p \u003cnuevo nombre\u003e --kubernetes-version={{.new}}\"\n* Reutilizar el clúster actual con Kubernetes {{.old}} o una versión posterior: ejecuta \"minikube start {{.profile}} --kubernetes-version={{.old}}",
-	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
@@ -161,6 +163,7 @@
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "No se han podido cambiar los permisos de {{.minikube_dir_path}}: {{.error}}",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "No se ha podido eliminar el clúster: {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "No se ha podido eliminar el clúster: {{.error}}",
 	"Failed to delete images": "",
@@ -175,17 +178,14 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "No se ha podido detener el proceso de activación: {{.error}}",
 	"Failed to list cached images": "",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "No se ha podido definir la variable de entorno NO_PROXY. Utiliza export NO_PROXY=$NO_PROXY,{{.ip}}",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
-	"Failed to setup kubeconfig": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -194,6 +194,7 @@
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Para disfrutar de un funcionamiento óptimo, instala kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "Para disfrutar de un funcionamiento óptimo, instala kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For more information, see:": "Para obtener más información, consulta lo siguiente:",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "Permite forzar minikube para que realice operaciones potencialmente peligrosas",
 	"Found network options:": "Se han encontrado las siguientes opciones de red:",
@@ -206,8 +207,6 @@
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -218,6 +217,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -260,6 +260,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "",
@@ -269,9 +270,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -283,6 +286,7 @@
 	"Number of CPUs allocated to the minikube VM": "Número de CPU asignadas a la VM de minikube",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -308,12 +312,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "Apagando \"{{.profile_name}}\" mediante SSH...",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Preparando Kubernetes {{.k8sVersion}} en {{.runtime}} {{.runtimeVersion}}...",
 	"Print current and latest version number": "",
+	"Print just the version number.": "",
 	"Print the version of minikube": "",
 	"Print the version of minikube.": "",
 	"Problems detected in {{.entry}}:": "",
 	"Problems detected in {{.name}}:": "",
 	"Profile gets or sets the current minikube profile": "",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Permite especificar un UUID de VM para restaurar la dirección MAC (solo con el controlador de hyperkit)",
 	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
@@ -322,8 +327,10 @@
 	"Registry mirrors to pass to the Docker daemon": "Réplicas del registro que se transferirán al daemon de Docker",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "Reiniciando Kubernetes con {{.bootstrapper}}...",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "",
 	"Removing {{.directory}} ...": "Eliminando {{.directory}}...",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
@@ -332,6 +339,7 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "El valor de la asignación de memoria de {{.requested_size}} solicitada es inferior al valor mínimo de {{.minimum_size}}",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
@@ -340,14 +348,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
@@ -376,7 +386,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -400,6 +410,7 @@
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Se ha eliminado el clúster \"{{.name}}\".",
 	"The \"{{.name}}\" cluster has been deleted.__1": "Se ha eliminado el clúster \"{{.name}}\".",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "La opción de controlador \"none\" proporciona un aislamiento limitado y puede reducir la seguridad y la fiabilidad del sistema.",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
@@ -415,10 +426,10 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "El puerto de escucha del apiserver",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "El nombre del apiserver del certificado de Kubernetes generado. Se puede utilizar para que sea posible acceder al apiserver desde fuera de la máquina",
 	"The argument to pass the minikube mount command on start": "El argumento para ejecutar el comando de activación de minikube durante el inicio",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "El nombre de dominio de DNS del clúster de Kubernetes",
 	"The container runtime to be used (docker, crio, containerd)": "El entorno de ejecución del contenedor (Docker, cri-o, containerd)",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -464,6 +475,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "El proceso se puede automatizar si se define la variable de entorno CHANGE_MINIKUBE_NONE_USER=true",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Se conservará el contexto de kubectl actual y se creará uno de minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Se iniciará el daemon de activación y se activarán automáticamente los archivos en minikube",
@@ -479,12 +491,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Para usar comandos de kubectl o minikube como tu propio usuario, puede que debas reubicarlos. Por ejemplo, para sobrescribir tu configuración, ejecuta:",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
 	"Unable to find control plane": "",
@@ -496,8 +510,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
@@ -509,6 +522,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to pull images, which may be OK: {{.error}}": "No se ha podido recuperar imágenes, que podrían estar en buen estado: {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -522,7 +536,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Actualizando la versión de Kubernetes de {{.old}} a {{.new}}",
@@ -558,8 +571,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Espera hasta que los servicios principales de Kubernetes se encuentren en buen estado antes de salir",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Ruta en la raíz de los recursos compartidos de NFS. Su valor predeterminado es /nfsshares (solo con el controlador de hyperkit)",
@@ -572,10 +584,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -596,21 +609,20 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "La configuración de kubectl y de minikube se almacenará en {{.home_folder}}",
-	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
 	"libmachine failed": "",
 	"logdir set failed": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -630,7 +642,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -654,9 +666,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/fr.json b/translations/fr.json
index 3488e4e0e7..d227ca5c8d 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "\"{{.machineName}} n'exist pas, rien a arrêter.",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "Le profil \"{{.name}}\" n'existe pas, tentative de suppression quand même.",
 	"'none' driver does not support 'minikube docker-env' command": "",
@@ -8,7 +9,7 @@
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
 	"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": "",
@@ -35,6 +36,7 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "Choix automatique du driver {{.driver}}",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du driver {{.driver}}. Autres choix: {{.alternatives}}",
 	"Available Commands": "",
@@ -48,9 +50,10 @@
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "",
-	"Check that the provided apiserver flags are valid": "",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -93,6 +96,7 @@
 	"Downloading Kubernetes {{.version}} preload ...": "",
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -113,7 +117,6 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Variables d'environment à transmettre au daemon Docker (format : clé = valeur).",
-	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "Erreur lors de la vérification de la version du driver : {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
@@ -142,7 +145,6 @@
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
-	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
@@ -158,6 +160,7 @@
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Échec de la modification des autorisations pour {{.minikube_dir_path}} : {{.error}}",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "Échec de la suppression du cluster : {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "Échec de la suppression du cluster : {{.error}}",
 	"Failed to delete images": "",
@@ -172,17 +175,14 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Échec de l'arrêt du processus d'installation : {{.error}}",
 	"Failed to list cached images": "",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "Échec de la définition de NO_PROXY Env. Veuillez utiliser `export NO_PROXY=$NO_PROXY,{{.ip}}.",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
-	"Failed to setup kubeconfig": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -191,6 +191,7 @@
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Pour des résultats optimaux, installez kubectl à l'adresse suivante : https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "Pour des résultats optimaux, installez kubectl à l'adresse suivante : https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For more information, see:": "Pour en savoir plus, consultez les pages suivantes :",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "Oblige minikube à réaliser des opérations possiblement dangereuses.",
 	"Found network options:": "Options de réseau trouvées :",
@@ -203,8 +204,6 @@
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -215,6 +214,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -257,6 +257,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "",
@@ -266,9 +267,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "Le noeud \"{{.node_name}}\" est arrêté.",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -280,6 +283,7 @@
 	"Number of CPUs allocated to the minikube VM": "Nombre de processeurs alloués à la VM minikube.",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -305,12 +309,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "Mise hors tension du profil \"{{.profile_name}}\" via SSH…",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Préparation de Kubernetes {{.k8sVersion}} sur {{.runtime}} {{.runtimeVersion}}...",
 	"Print current and latest version number": "",
+	"Print just the version number.": "",
 	"Print the version of minikube": "",
 	"Print the version of minikube.": "",
 	"Problems detected in {{.entry}}:": "",
 	"Problems detected in {{.name}}:": "",
 	"Profile gets or sets the current minikube profile": "",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Fournit l'identifiant unique universel (UUID) de la VM pour restaurer l'adresse MAC (pilote hyperkit uniquement).",
 	"Pulling base image ...": "",
 	"Pulling images ...": "Extraction des images... ",
@@ -320,8 +325,10 @@
 	"Registry mirrors to pass to the Docker daemon": "Miroirs de dépôt à transmettre au daemon Docker.",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "Redémarrage de Kubernetes à l'aide de {{.bootstrapper}}…",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "Le cluster \"{{.name}}\" a été supprimé.",
 	"Removing {{.directory}} ...": "Suppression du répertoire {{.directory}}…",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
@@ -330,6 +337,7 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "L'allocation de mémoire demandée ({{.requested_size}}) est inférieure au minimum autorisé ({{.minimum_size}}).",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
@@ -338,14 +346,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
@@ -374,7 +384,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -396,6 +406,7 @@
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "Le pilote \"{{.driver_name}}\" nécessite de disposer de droits racine. Veuillez exécuter minikube à l'aide de \"sudo minikube --vm-driver={{.driver_name}}\".",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "L'isolation fournie par le pilote \"none\" (aucun) est limitée, ce qui peut diminuer la sécurité et la fiabilité du système.",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
@@ -411,10 +422,10 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "Port d'écoute du serveur d'API.",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Nom du serveur d'API utilisé dans le certificat généré pour Kubernetes. Vous pouvez l'utiliser si vous souhaitez que le serveur d'API soit disponible en dehors de la machine.",
 	"The argument to pass the minikube mount command on start": "Argument à transmettre à la commande d'installation de minikube au démarrage.",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "Nom du domaine DNS du cluster utilisé dans le cluster Kubernetes.",
 	"The container runtime to be used (docker, crio, containerd)": "environment d'exécution du conteneur à utiliser (docker, crio, containerd).",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -460,6 +471,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "Cela permet de conserver le contexte kubectl existent et de créer un contexte minikube.",
 	"This will start the mount daemon and automatically mount files into minikube": "Cela permet de lancer le daemon d'installation et d'installer automatiquement les fichiers dans minikube.",
@@ -475,12 +487,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "Pour utiliser les commandes kubectl ou minikube sous votre propre nom d'utilisateur, vous devrez peut-être les déplacer. Par exemple, pour écraser vos propres paramètres, exécutez la commande suivante :",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
 	"Unable to find control plane": "",
@@ -492,8 +506,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
@@ -505,6 +518,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to pull images, which may be OK: {{.error}}": "Impossible d'extraire des images, qui sont peut-être au bon format : {{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -518,7 +532,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Mise à niveau de Kubernetes de la version {{.old}} à la version {{.new}}…",
@@ -555,8 +568,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Avant de quitter, veuillez patienter jusqu'à ce que les principaux services Kubernetes soient opérationnels.",
 	"Waiting for SSH access ...": "En attente de l'accès SSH...",
@@ -571,10 +583,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -595,21 +608,20 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Les configurations kubectl et minikube seront stockées dans le dossier {{.home_folder}}.",
-	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
 	"libmachine failed": "",
 	"logdir set failed": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -629,7 +641,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -653,9 +665,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/ja.json b/translations/ja.json
index 9d24358ff4..2e7540b398 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "「{{.minikube_addon}}」アドオンは無効化されています",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "「{{.machineName}}」は存在しません。停止すべき対象がありません",
 	"\"{{.minikube_addon}}\" was successfully disabled": "「{{.minikube_addon}}」が無効化されました",
 	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "「{{.name}}」というクラスターは存在しません。クリーンアップ処理を続行します",
@@ -14,6 +15,7 @@
 	"'none' driver does not support 'minikube ssh' command": "「none」ドライバーは「minikube ssh」コマンドをサポートしていません",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "「{{.driver}}」ドライバーがエラーを報告しました: {{.error}}",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN、あるいはファイアウォールによって、minkube VM への HTTP アクセスが干渉されています。他の手段として、別の VM を試してみてください: https://minikube.sigs.k8s.io/docs/start/",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "ファイアウォールによって、Docker minikube VM はインターネットと繋がることができません。 プロキシを使用するように設定する必要があるかもしれません",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "ファイアウォールによって、minikube は外側への HTTPS リクエストをすることができません。HTTPS_PROXY 環境変数の値を変える必要があるかもしれません",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "ファイアウォールによって、minikube がインターネットに繋がることができてない可能性があります。minikube がプロキシーを使うように設定する必要があるかもしれません",
@@ -41,6 +43,7 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "利用可能なコマンド",
@@ -54,9 +57,10 @@
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "",
-	"Check that the provided apiserver flags are valid": "",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -101,6 +105,7 @@
 	"Downloading Kubernetes {{.version}} preload ...": "Kubernetes {{.version}} のダウンロードの準備をしています",
 	"Downloading VM boot image ...": "VM ブートイメージをダウンロードしています...",
 	"Downloading driver {{.driver}}:": "{{.driver}} ドライバをダウンロードしています:",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "`registry-creds-acr` シークレット作成中にエラーが発生しました",
 	"ERROR creating `registry-creds-dpr` secret": "`registry-creds-dpr` シークレット作成中にエラーが発生しました",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "`registry-creds-ecr` シークレット作成中にエラーが発生しました。{{.error}}",
@@ -166,6 +171,7 @@
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "{{.minikube_dir_path}} に対する権限を変更できませんでした。{{.error}}",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "クラスタを削除できませんでした。{{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "クラスタを削除できませんでした。{{.error}}",
 	"Failed to delete images": "",
@@ -180,17 +186,14 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "マウント プロセスを強制終了できませんでした。{{.error}}",
 	"Failed to list cached images": "",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to save config": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "NO_PROXY 環境変数を設定できませんでした。「export NO_PROXY=$NO_PROXY,{{.ip}}」を使用してください",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
 	"Failed to setup certs": "",
-	"Failed to setup kubeconfig": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -199,6 +202,7 @@
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "最適な結果を得るには、kubectl を次のサイト https://kubernetes.io/docs/tasks/tools/install-kubectl/ からインストールしてください",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "最適な結果を得るには、kubectl を次のサイト https://kubernetes.io/docs/tasks/tools/install-kubectl/ からインストールしてください",
 	"For more information, see:": "詳細については、次をご覧ください",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "minikube で危険な可能性のある操作を強制的に実行します",
 	"Found network options:": "ネットワーク オプションが見つかりました",
@@ -223,6 +227,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -265,6 +270,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "minikube の設定を修正しています",
 	"Modify minikube's kubernetes addons": "minikube の Kubernetes アドオンを修正しています",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "マウントタイプ:   {{.name}}",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "",
@@ -274,9 +280,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "「{{.node_name}}」ノードが停止しました。",
 	"Node operations": "ノードの運用",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "{{.name}} ノードは削除されました。",
 	"Node {{.nodeName}} does not exist.": "{{.name}} ノードは存在しません。",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -288,6 +296,7 @@
 	"Number of CPUs allocated to the minikube VM": "minikube VM に割り当てられた CPU の数",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "OS は {{.pretty_name}} です。",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -313,12 +322,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "SSH 経由で「{{.profile_name}}」の電源をオフにしています...",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "{{.runtime}} {{.runtimeVersion}} で Kubernetes {{.k8sVersion}} を準備しています...",
 	"Print current and latest version number": "",
+	"Print just the version number.": "",
 	"Print the version of minikube": "",
 	"Print the version of minikube.": "",
 	"Problems detected in {{.entry}}:": "",
 	"Problems detected in {{.name}}:": "",
 	"Profile gets or sets the current minikube profile": "",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "MAC アドレスを復元するための VM UUID を指定します（hyperkit ドライバのみ）",
 	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
@@ -327,8 +337,10 @@
 	"Registry mirrors to pass to the Docker daemon": "Docker デーモンに渡すレジストリ ミラー",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "{{.bootstrapper}} を使用して Kubernetes を再起動しています...",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "",
 	"Removing {{.directory}} ...": "{{.directory}} を削除しています...",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
@@ -337,6 +349,7 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "リクエストされたメモリ割り当て {{.requested_size}} が許可される最小値 {{.minimum_size}} 未満です",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
@@ -345,14 +358,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
@@ -381,7 +396,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -405,6 +420,7 @@
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスタが削除されました",
 	"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスタが削除されました",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバに「none」を指定すると、分離が制限され、システムのセキュリティと信頼性が低下する可能性があります",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
@@ -420,10 +436,10 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "API サーバー リスニング ポート",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Kubernetes 用に生成された証明書で使用される API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します",
 	"The argument to pass the minikube mount command on start": "起動時に minikube マウント コマンドを渡す引数",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスタで使用されるクラスタ DNS ドメイン名",
 	"The container runtime to be used (docker, crio, containerd)": "使用されるコンテナ ランタイム（docker、crio、containerd）",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -469,6 +485,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます",
 	"This will start the mount daemon and automatically mount files into minikube": "これによりマウント デーモンが起動し、ファイルが minikube に自動的にマウントされます",
@@ -484,12 +501,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "kubectl か minikube コマンドを独自のユーザーとして使用するには、そのコマンドの再配置が必要な場合があります。たとえば、独自の設定を上書きするには、以下を実行します",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
 	"Unable to find control plane": "",
@@ -501,8 +520,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
@@ -514,6 +532,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to pull images, which may be OK: {{.error}}": "イメージを pull できませんが、問題ありません。{{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -527,7 +546,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Kubernetes を {{.old}} から {{.new}} にアップグレードしています",
@@ -563,8 +581,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "Kubernetes コアサービスが正常になるまで待機してから終了してください",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "NFS 共有のルートに指定する場所。デフォルトは /nfsshares（hyperkit ドライバのみ）",
@@ -577,10 +594,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -601,21 +619,20 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl と minikube の構成は {{.home_folder}} に保存されます",
-	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
 	"libmachine failed": "",
 	"logdir set failed": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -635,7 +652,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -659,9 +676,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/ko.json b/translations/ko.json
index 60b64b1e19..c7f4872972 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "\"The '{{.minikube_addon}}' 이 비활성화되었습니다",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.name}}\" profile does not exist": "\"{{.name}}\" 프로필이 존재하지 않습니다",
 	"\"{{.name}}\" profile does not exist, trying anyways.": "\"{{.name}}\" 프로필이 존재하지 않습니다, 그럼에도 불구하고 시도합니다",
@@ -13,7 +14,7 @@
 	"'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 드라이버가 다음 이슈를 기록하였습니다: {{.error}}",
 	"'{{.profile}}' is not running": "'{{.profile}}' 이 실행 중이지 않습니다",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
 	"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": "",
@@ -37,6 +38,7 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "VirtualBox 와 같은 또 다른 하이퍼바이저가 KVM 과 충돌이 발생합니다. 다른 하이퍼바이저를 중단하거나 --driver 로 변경하세요",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "자동적으로 {{.driver}} 드라이버가 선택되었습니다",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "자동적으로 {{.driver}} 드라이버가 선택되었습니다. 다른 드라이버 목록: {{.alternates}}",
 	"Available Commands": "사용 가능한 커맨드",
@@ -51,8 +53,10 @@
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "minikube 가 실행 중인지 그리고 정확한 네임스페이스를 (-n 플래그로) 명시하였는지 확인하세요",
 	"Check that the provided apiserver flags are valid": "주어진 apiserver 플래그가 유효한지 확인하세요",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "입력한 --kubernetes-version 이 'v'로 시작하는지 확인하세요. 예시: 'v1.1.14'",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "환경 설정 및 관리 커맨드:",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -95,6 +99,7 @@
 	"Downloading VM boot image ...": "가상 머신 부트 이미지 다운로드 중 ...",
 	"Downloading driver {{.driver}}:": "드라이버 {{.driver}} 다운로드 중 :",
 	"Downloading {{.name}} {{.version}}": "{{.name}} {{.version}} 다운로드 중",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "registry-creds-acr` secret 생성 오류",
 	"ERROR creating `registry-creds-dpr` secret": "`registry-creds-dpr` secret 생성 오류",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "`registry-creds-ecr` secret 생성 오류: {{.error}}",
@@ -151,7 +156,6 @@
 	"Error starting node": "노드 시작 오류",
 	"Error while setting kubectl current context :  {{.error}}": "kubectl current context 설정 오류 : {{.error}}",
 	"Error writing mount pid": "",
-	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "예시",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
@@ -168,6 +172,7 @@
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "{{.minikube_dir_path}} 의 권한 변경에 실패하였습니다: {{.error}}",
 	"Failed to check if machine exists": "머신이 존재하는지 확인하는 데 실패하였습니다",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "클러스터 제거에 실패하였습니다: {{.error}}",
 	"Failed to delete images": "이미지 제거에 실패하였습니다",
 	"Failed to delete images from config": "컨피그로부터 이미지 제거에 실패하였습니다",
@@ -183,7 +188,6 @@
 	"Failed to get service URL: {{.error}}": "서비스 URL 조회에 실패하였습니다: {{.error}}",
 	"Failed to kill mount process: {{.error}}": "마운트 프로세스 중지에 실패하였습니다: {{.error}}",
 	"Failed to list cached images": "캐시된 이미지를 조회하는 데 실패하였습니다",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "캐시된 이미지를 다시 불러오는 데 실패하였습니다",
 	"Failed to save config": "컨피그 저장에 실패하였습니다",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
@@ -193,7 +197,6 @@
 	"Failed to stop node {{.name}}": "노드 {{.name}} 중지에 실패하였습니다",
 	"Failed to update cluster": "클러스터를 수정하는 데 실패하였습니다",
 	"Failed to update config": "컨피그를 수정하는 데 실패하였습니다",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "마운트 해제에 실패하였습니다: {{.error}}",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -201,6 +204,7 @@
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"For more information, see:": "더 많은 정보를 보려면, 다음을 참고하세요:",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "",
 	"Found network options:": "네트워크 옵션을 찾았습니다",
@@ -213,9 +217,7 @@
 	"Gets the status of a local kubernetes cluster": "",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
 	"Getting machine config failed": "머신 컨피그 조회 실패",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -226,6 +228,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -265,6 +268,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "Minikube 는 로컬 쿠버네티스 클러스터 관리 툴입니다",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "특정 디렉토리를 minikube 에 마운트합니다",
@@ -274,9 +278,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -287,6 +293,7 @@
 	"Number of CPUs allocated to Kubernetes.": "",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -311,12 +318,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "쿠버네티스 {{.k8sVersion}} 을 {{.runtime}} {{.runtimeVersion}} 런타임으로 설치하는 중",
 	"Print current and latest version number": "현재 그리고 최신 버전을 출력합니다",
+	"Print just the version number.": "",
 	"Print the version of minikube": "minikube 의 버전을 출력합니다",
 	"Print the version of minikube.": "minikube 의 버전을 출력합니다.",
 	"Problems detected in {{.entry}}:": "",
 	"Problems detected in {{.name}}:": "",
 	"Profile gets or sets the current minikube profile": "",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "",
 	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
@@ -325,13 +333,16 @@
 	"Registry mirrors to pass to the Docker daemon": "",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "\"{{.name}}\" 클러스터 관련 정보가 모두 삭제되었습니다",
 	"Removing {{.directory}} ...": "",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "",
@@ -340,14 +351,17 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "kubectl 을 실행합니다",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
 	"Run the minikube command as an Administrator": "minikube 명령어를 관리자 권한으로 실행합니다",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "설정이 실패하였습니다",
@@ -376,7 +390,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting node": "노드를 시작하는 중",
 	"Starting tunnel for service {{.service}}.": "",
@@ -398,7 +412,7 @@
 	"Target directory {{.path}} must be an absolute path": "타겟 폴더 {{.path}} 는 절대 경로여야 합니다",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되어야 합니다. minikube 를 다음과 같이 실행하세요 'sudo minikube --driver={{.driver_name}}'",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되면 안 됩니다",
-	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
 	"The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
@@ -413,8 +427,8 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "",
 	"The container runtime to be used (docker, crio, containerd).": "",
 	"The control plane for \"{{.name}}\" is paused!": "",
@@ -454,6 +468,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
@@ -466,12 +481,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "무효한 프로필 {{.profile}} 를 삭제하는 중",
 	"Unable to bind flags": "flags 를 합칠 수 없습니다",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "대시보드를 활성화할 수 없습니다",
 	"Unable to fetch latest version info": "최신 버전 정보를 가져올 수 없습니다",
 	"Unable to find control plane": "",
@@ -482,8 +499,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "현재 사용자를 조회할 수 없습니다",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "런타임을 조회할 수 없습니다",
 	"Unable to get the status of the {{.name}} cluster.": "{{.name}} 클러스터의 상태를 조회할 수 없습니다",
@@ -496,6 +512,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to remove machine directory": "",
 	"Unable to remove machine directory: %v": "머신 디렉토리를 제거할 수 없습니다: %v",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -510,7 +527,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Usage": "",
@@ -544,8 +560,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Waiting for cluster to come online ...": "클러스터가 사용 가능하기까지 기다리는 중 ...",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "",
@@ -558,10 +573,12 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "service 이름을 명시해야 합니다",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "호스트가 KVM 가상화를 지원하지 않습니다. qemu-kvm 이 설치되었는지 확인 후, 문제 디버그를 위해 'virt-host-validate' 를 실행하세요",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "호스트가 가상화를 지원하지 않습니다. 가상 머신 안에서 minikube 를 실행 중인 경우, '--driver=none' 로 시도하세요. 그렇지 않다면, BIOS 에서 가상화를 활성화하세요",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "minikube config 가 미지원 드라이버를 참조하고 있습니다. ~/.minikube 를 제거한 후, 다시 시도하세요",
 	"Your minikube vm is not running, try minikube start.": "minikube 가상 머신이 실행 중이 아닙니다, minikube start 를 시도하세요",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -584,13 +601,12 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"getting config": "컨피그 조회 중",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "프로필을 생성하려면 다음 커맨드를 입력하세요: minikube start -p {{.profile_name}}\"",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl 과 minikube 환경 정보는 {{.home_folder}} 에 저장될 것입니다",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "kubectl 이 PATH 에 없습니다, 하지만 이는 대시보드에서 필요로 합니다. 설치 가이드:https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -602,6 +618,7 @@
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -621,7 +638,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -645,9 +662,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "zsh 완성이 실패하였습니다",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "{{.driver}} 가 설치되지 않았습니다",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/pl.json b/translations/pl.json
index af836caa5c..ced1165241 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.minikube_addon}}\" was successfully disabled": "\"{{.minikube_addon}}\" został wyłaczony",
 	"\"{{.name}}\" profile does not exist": "Profil \"{{.name}}\" nie istnieje",
@@ -13,7 +14,7 @@
 	"'none' driver does not support 'minikube ssh' command": "sterownik 'none' nie wspiera komendy 'minikube ssh'",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
-	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "",
 	"A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "",
 	"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": "",
@@ -38,6 +39,7 @@
 	"Amount of time to wait for a service in seconds": "Czas oczekiwania na serwis w sekundach",
 	"Amount of time to wait for service in seconds": "Czas oczekiwania na servis w sekundach",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the {{.driver}} driver": "",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "Dostępne polecenia",
@@ -51,9 +53,10 @@
 	"Check output of 'journalctl -xeu kubelet', try passing --extra-config=kubelet.cgroup-driver=systemd to minikube start": "",
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "Upewnij się że minikube zpstało uruchomione i że podano poprawną przestrzeń nazw(-n flag) celem zamontowania",
-	"Check that the provided apiserver flags are valid": "",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "Upewnij się że --kubernetes-version ma 'v' z przodu. Na przykład `v1.1.14`",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "Polecenia konfiguracji i zarządzania",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "",
@@ -101,6 +104,7 @@
 	"Downloading VM boot image ...": "Pobieranie obrazu maszyny wirtualnej ...",
 	"Downloading driver {{.driver}}:": "",
 	"Downloading {{.name}} {{.version}}": "Pobieranie {{.name}} {{.version}}",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
@@ -120,7 +124,6 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Zmienne środowiskowe do przekazania do demona docker (format: klucz-wartość)",
-	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "Błąd podczas sprawdzania wersij sterownika : {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
@@ -150,7 +153,6 @@
 	"Error while setting kubectl current context :  {{.error}}": "Błąd podczas ustawiania kontekstu kubectl: {{.error}}",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Erreur : Vous avez sélectionné Kubernetes v{{.new}}, mais le cluster existent pour votre profil exécute Kubernetes v{{.old}}. Les rétrogradations non-destructives ne sont pas compatibles. Toutefois, vous pouvez poursuivre le processus en réalisant l'une des trois actions suivantes :\n* Créer à nouveau le cluster en utilisant Kubernetes v{{.new}} – exécutez \"minikube delete {{.profile}}\", puis \"minikube start {{.profile}} --kubernetes-version={{.new}}\".\n* Créer un second cluster avec Kubernetes v{{.new}} – exécutez \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\".\n* Réutiliser le cluster existent avec Kubernetes v{{.old}} ou version ultérieure – exécutez \"minikube start {{.profile}} --kubernetes-version={{.old}}\".",
-	"Error: [{{.id}}] {{.error}}": "",
 	"Examples": "Przykłady",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
 	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
@@ -166,6 +168,7 @@
 	"Failed to cache kubectl": "",
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "Nie udało się zmienić uprawnień pliku {{.minikube_dir_path}}: {{.error}}",
 	"Failed to check main repository and mirrors for images for images": "",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "",
 	"Failed to delete images": "",
 	"Failed to delete images from config": "",
@@ -180,7 +183,6 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to kill mount process: {{.error}}": "Zabicie procesu nie powiodło się: {{.error}}",
 	"Failed to list cached images": "",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "",
 	"Failed to remove profile": "Usunięcie profilu nie powiodło się",
 	"Failed to save config": "Zapisywanie konfiguracji nie powiodło się",
@@ -190,14 +192,13 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "Aktualizacja klastra nie powiodła się",
 	"Failed to update config": "Aktualizacja konfiguracji nie powiodła się",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
-	"For more information, see:": "",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "",
 	"Force minikube to perform possibly dangerous operations": "Wymuś wykonanie potencjalnie niebezpiecznych operacji",
 	"Found network options:": "Wykryto opcje sieciowe:",
@@ -210,8 +211,6 @@
 	"Gets the status of a local kubernetes cluster": "Pobiera aktualny status klastra kubernetesa",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -222,6 +221,7 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -264,6 +264,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "",
 	"Modify minikube's kubernetes addons": "",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "Montuje podany katalog wewnątrz minikube",
@@ -273,9 +274,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -288,6 +291,7 @@
 	"Number of CPUs allocated to the minikube VM.": "Liczba procesorów przypisana do maszyny wirtualnej minikube",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -313,12 +317,13 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "przygowowywanie Kubernetesa {{.k8sVersion}} na {{.runtime}} {{.runtimeVersion}}...",
 	"Print current and latest version number": "Wyświetl aktualna i najnowszą wersję",
+	"Print just the version number.": "",
 	"Print the version of minikube": "Wyświetl wersję minikube",
 	"Print the version of minikube.": "Wyświetl wersję minikube",
 	"Problems detected in {{.entry}}:": "Wykryto problem w {{.name}}",
 	"Problems detected in {{.name}}:": "Wykryto problem w {{.name}}",
 	"Profile gets or sets the current minikube profile": "Pobiera lub ustawia aktywny profil minikube",
-	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "",
 	"Pulling base image ...": "",
 	"Reboot to complete VirtualBox installation, and verify that VirtualBox is not blocked by your system": "Uruchom ponownie komputer aby zakończyć instalacje VirtualBox'a i upewnij się że nie jest on blokowany przez twój system",
@@ -328,13 +333,16 @@
 	"Registry mirrors to pass to the Docker daemon": "",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "Powiązane problemy",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "",
 	"Removing {{.directory}} ...": "",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "",
 	"Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "",
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "Pozyskuje ścieżkę do klucza ssh dla wyspecyfikowanego klastra",
@@ -343,14 +351,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "Pobiera adres IP aktualnie uruchomionego klastra i wypisuje go do STDOUT",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "Uruchamia kubectl",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "",
 	"Set failed": "",
@@ -379,7 +389,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -403,7 +413,7 @@
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.": "Sterownik \"{{.driver_name}}\" wymaga uprawnień root'a. Użyj 'sudo minikube --vm-driver={{.driver_name}}'",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Klaster \"{{.name}}\" został usunięty",
-	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The '{{.addonName}}' addon is enabled": "",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
 	"The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
@@ -418,8 +428,8 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "API nasłuchuje na porcie:",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "Domena dns clastra użyta przez kubernetesa",
 	"The container runtime to be used (docker, crio, containerd)": "Runtime konteneryzacji (docker, crio, containerd).",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -464,6 +474,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "",
 	"This will start the mount daemon and automatically mount files into minikube.": "",
@@ -477,12 +488,15 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To start minikube with HyperV Powershell must be in your PATH`": "Aby uruchomić minikube z HyperV Powershell musi znajdować się w zmiennej PATH",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "",
 	"Troubleshooting Commands:": "",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "",
 	"Unable to bind flags": "",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
 	"Unable to find control plane": "",
@@ -493,8 +507,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to kill mount process: {{.error}}": "",
@@ -506,6 +519,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
 	"Unable to start VM": "Nie można uruchomić maszyny wirtualnej",
@@ -519,7 +533,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Usage": "",
@@ -555,8 +568,7 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Wait failed: {{.error}}": "",
 	"Waiting for SSH access ...": "Oczekiwanie na połaczenie SSH...",
 	"Waiting for:": "Oczekiwanie na :",
@@ -570,10 +582,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "Musisz podać nazwę serwisu",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Twoje środowisko nie wspiera virtualizacji KVM. Upewnij się że qemu-kvm jest zainstalowane i uruchom 'virt-host-validate' aby rozwiązać problem.",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -594,12 +607,11 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "Nie udało się otworzyć przeglądarki: {{.error}}",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "konfiguracja minikube i kubectl będzie przechowywana w katalogu {{.home_dir}}",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "kubectl nie zostało odnaleźione w zmiennej środowiskowej ${PATH}. Instrukcja instalacji:  https://kubernetes.io/docs/tasks/tools/install-kubectl/",
@@ -609,6 +621,7 @@
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
@@ -628,7 +641,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -653,10 +666,11 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.addonName}} was successfully enabled": "{{.addonName}} został aktywowany pomyślnie",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 21e79c6e35..81b6d51bb9 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -1,5 +1,6 @@
 {
 	"\"The '{{.minikube_addon}}' addon is disabled": "",
+	"\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "",
 	"\"{{.machineName}}\" does not exist, nothing to stop": "",
 	"\"{{.minikube_addon}}\" was successfully disabled": "已成功禁用 \"{{.minikube_addon}}\"",
 	"\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "\"{{.name}}\" 集群不存在，将继续清理",
@@ -14,6 +15,7 @@
 	"'none' driver does not support 'minikube ssh' command": "'none' 驱动不支持 'minikube ssh' 命令",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 驱动程序报告了一个问题： {{.error}}",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN 或者防火墙正在干扰对 minikube 虚拟机的 HTTP 访问。或者，您可以使用其它的虚拟机驱动：https://minikube.sigs.k8s.io/docs/start/",
+	"A firewall is blocking Docker the minikube VM from reaching the image repository. You may need to select --image-repository, or use a proxy.": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网。您可能需要对其进行配置为使用代理",
 	"A firewall is blocking Docker within the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网，您可能需要对其进行配置为使用代理",
 	"A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "防火墙正在干扰 minikube 发送 HTTPS 请求的能力，您可能需要改变 HTTPS_PROXY 环境变量的值",
@@ -44,6 +46,7 @@
 	"Amount of time to wait for service in seconds": "等待服务的时间（单位秒）",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --vm-driver to switch to it.": "另外一个管理程序与 KVM 产生了冲突，如 VirtualBox。请停止其他的管理程序",
+	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
 	"Automatically selected the '{{.driver}}' driver": "自动选择 '{{.driver}}' 驱动",
 	"Automatically selected the '{{.driver}}' driver (alternates: {{.alternates}})": "自动选择 '{{.driver}}' 驱动（可选项：{{.alternates}}）",
 	"Automatically selected the {{.driver}} driver": "",
@@ -60,10 +63,12 @@
 	"Check that SELinux is disabled, and that the provided apiserver flags are valid": "检查 SELinux 是否禁用，且提供的 apiserver 标志是否有效",
 	"Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "检测 minikube 是否正在运行，以及是否根据需要指定了正确的 namespace （-n 标志）",
 	"Check that the provided apiserver flags are valid": "检查提供的 apiserver 标志是否有效",
+	"Check that the provided apiserver flags are valid, and that SELinux is disabled": "",
 	"Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "检测您的 --kubernetes-version 前面是否有 'v'， 例如：'v1.1.14",
 	"Check that your apiserver flags are valid, or run 'minikube delete'": "请检查您的 apiserver 标志是否有效，或者允许 'minikube delete'",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --driver=none": "",
 	"Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --vm-driver=none": "检查您的防火墙规则是否存在干扰，然后运行 'virt-host-validate' 以检查 KVM 配置问题，如果在虚拟机中运行minikube，请考虑使用 --vm-driver=none",
+	"Choose a smaller value for --memory, such as 2000": "",
 	"Configuration and Management Commands:": "配置和管理命令：",
 	"Configure a default route on this Linux host, or use another --driver that does not require it": "",
 	"Configure a default route on this Linux host, or use another --vm-driver that does not require it": "为当前 Linux 主机配置一个默认的路由, 或者使用另一个不需要他的 --vm-driver",
@@ -115,6 +120,7 @@
 	"Downloading VM boot image ...": "正在下载 VM boot image...",
 	"Downloading driver {{.driver}}:": "正在下载驱动 {{.driver}}:",
 	"Downloading {{.name}} {{.version}}": "正在下载 {{.name}} {{.version}}",
+	"Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.\nAlternatively to use this addon you can use a vm-based driver:\n\n\t'minikube start --vm=true'\n\nTo track the update on this work in progress feature please check:\nhttps://github.com/kubernetes/minikube/issues/7332": "",
 	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "创建 `registry-creds-dpr` secret 时出错",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "创建 `registry-creds-ecr` secret 时出错：{{.error}}",
@@ -137,7 +143,6 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "确保 /etc/libvirt/qemu.conf 中列出的用户具备访问您 home 目录的权限",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "确保您配置的 HTTPS_PROXY 指向了 HTTPS 代理而不是 HTTP 代理",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "传递给 Docker 守护进程的环境变量。（格式：键值对）",
-	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "检查驱动程序版本时出错：{{.error}}",
 	"Error converting status to json": "转换状态为 json 时出错",
 	"Error creating list template": "创建 list template 时出错",
@@ -208,6 +213,7 @@
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "未能更改 {{.minikube_dir_path}} 的权限：{{.error}}",
 	"Failed to check if machine exists": "无法检测机器是否存在",
 	"Failed to check main repository and mirrors for images for images": "无法检测主仓库和镜像仓库中的镜像",
+	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster: {{.error}}": "未能删除集群：{{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "未能删除集群：{{.error}}",
 	"Failed to delete images": "删除镜像时失败",
@@ -224,7 +230,6 @@
 	"Failed to get service URL: {{.error}}": "获取 service URL 失败：{{.error}}",
 	"Failed to kill mount process: {{.error}}": "未能终止装载进程：{{.error}}",
 	"Failed to list cached images": "无法列出缓存镜像",
-	"Failed to parse kubernetes version": "",
 	"Failed to reload cached images": "重新加载缓存镜像失败",
 	"Failed to remove profile": "无法删除配置文件",
 	"Failed to save config": "无法保存配置",
@@ -235,7 +240,6 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "更新 cluster 失败",
 	"Failed to update config": "更新 config 失败",
-	"Failed to update kubeconfig file.": "",
 	"Failed unmount: {{.error}}": "unmount 失败：{{.error}}",
 	"File permissions used for the mount": "用于 mount 的文件权限",
 	"Filter to use only VM Drivers": "",
@@ -244,6 +248,7 @@
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For more information, see:": "如需了解详情，请参阅：",
+	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
 	"Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "强制为指定的 shell 配置环境：[fish, cmd, powershell, tcsh, bash, zsh]，默认为 auto-detect",
 	"Force minikube to perform possibly dangerous operations": "强制 minikube 执行可能有风险的操作",
 	"Found network options:": "找到的网络选项：",
@@ -256,9 +261,7 @@
 	"Gets the status of a local kubernetes cluster": "获取本地 kubernetes 集群状态",
 	"Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "",
 	"Gets the value of PROPERTY_NAME from the minikube config file": "",
-	"Getting bootstrapper": "",
 	"Getting machine config failed": "获取机器配置失败",
-	"Getting primary control plane": "",
 	"Global Flags": "",
 	"Go template format string for the cache list output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#CacheListTemplate": "",
 	"Go template format string for the config view output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "",
@@ -271,6 +274,7 @@
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "Hyperkit 的网络挂了。升级到最新的 hyperkit 版本以及/或者 Docker 桌面版。或者，你可以通过 --vm-driver 切换其他选项",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "如果设置了，将自动更新驱动到最新版本。默认为 true。",
+	"If set, delete the current cluster if start fails and try again. Defaults to false.": "",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
 	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
@@ -313,6 +317,7 @@
 	"Minikube is a tool for managing local Kubernetes clusters.": "",
 	"Modify minikube config": "修改 minikube 配置",
 	"Modify minikube's kubernetes addons": "修改 minikube 的 kubernetes 插件",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
 	"Mount type:   {{.name}}": "",
 	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
 	"Mounts the specified directory into minikube": "将指定的目录挂载到 minikube",
@@ -322,9 +327,11 @@
 	"NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)": "网卡类型仅用于主机网络。Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM 之一，或 virtio(仅限 VirtualBox 驱动程序)",
 	"NOTE: This process must stay alive for the mount to be accessible ...": "",
 	"Networking and Connectivity Commands:": "网络和连接命令：",
+	"No changes required for the \"{{.context}}\" context": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node \"{{.node_name}}\" stopped.": "",
 	"Node operations": "",
+	"Node {{.name}} failed to start, deleting and trying again.": "",
 	"Node {{.name}} was successfully deleted.": "",
 	"Node {{.nodeName}} does not exist.": "",
 	"Non-destructive downgrades are not supported, but you can proceed with one of the following options:\n\n  1) Recreate the cluster with Kubernetes v{{.new}}, by running:\n\n    minikube delete{{.profile}}\n    minikube start{{.profile}} --kubernetes-version={{.new}}\n\n  2) Create a second cluster with Kubernetes v{{.new}}, by running:\n\n    minikube start -p {{.suggestedName}} --kubernetes-version={{.new}}\n\n  3) Use the existing cluster at version Kubernetes v{{.old}}, by running:\n\n    minikube start{{.profile}} --kubernetes-version={{.old}}": "",
@@ -336,6 +343,7 @@
 	"Number of CPUs allocated to the minikube VM": "分配给 minikube 虚拟机的 CPU 的数量",
 	"Number of lines back to go within the log": "",
 	"OS release is {{.pretty_name}}": "",
+	"One of 'yaml' or 'json'.": "",
 	"Open the addons URL with https instead of http": "",
 	"Open the service URL with https instead of http": "",
 	"Opening kubernetes service  {{.namespace_name}}/{{.service_name}} in default browser...": "",
@@ -361,12 +369,14 @@
 	"Powering off \"{{.profile_name}}\" via SSH ...": "正在通过 SSH 关闭“{{.profile_name}}”…",
 	"Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "正在 {{.runtime}} {{.runtimeVersion}} 中准备 Kubernetes {{.k8sVersion}}…",
 	"Print current and latest version number": "打印当前和最新版本版本",
+	"Print just the version number.": "",
 	"Print the version of minikube": "打印 minikube 版本",
 	"Print the version of minikube.": "打印 minikube 版本。",
 	"Problems detected in {{.entry}}:": "在 {{.entry}} 中 检测到问题：",
 	"Problems detected in {{.name}}:": "在 {{.name}} 中 检测到问题：",
 	"Profile gets or sets the current minikube profile": "获取或设置当前的 minikube 配置文件",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "配置文件名称 \"{{.profilename}}\" 是 minikube 的一个关键字。使用 minikube delete -p \u003cprofile name\u003e 命令 删除配置文件",
+	"Profile name \"{{.profilename}}\" is reserved keyword. To delete this profile, run: \"{{.cmd}}\"": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "提供虚拟机 UUID 以恢复 MAC 地址（仅限 hyperkit 驱动程序）",
 	"Pulling base image ...": "",
 	"Pulling images ...": "拉取镜像 ...",
@@ -377,8 +387,10 @@
 	"Registry mirrors to pass to the Docker daemon": "传递给 Docker 守护进程的注册表镜像",
 	"Reinstall VirtualBox and reboot. Alternatively, try the kvm2 driver: https://minikube.sigs.k8s.io/docs/reference/drivers/kvm2/": "",
 	"Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "",
+	"Related issue: {{.url}}": "",
 	"Related issues:": "相关问题：",
 	"Relaunching Kubernetes using {{.bootstrapper}} ...": "正在使用 {{.bootstrapper}} 重新启动 Kubernetes…",
+	"Remove the incompatible --docker-opt flag if one was provided": "",
 	"Removed all traces of the \"{{.name}}\" cluster.": "",
 	"Removing {{.directory}} ...": "正在移除 {{.directory}}…",
 	"Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "请求的 CPU 数量 {{.requested_cpus}} 小于允许的最小值 {{.minimum_cpus}}",
@@ -387,6 +399,7 @@
 	"Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommended}}MB. Kubernetes may crash unexpectedly.": "",
 	"Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "请求的内存分配 {{.requested_size}} 小于允许的 {{.minimum_size}} 最小值",
 	"Requested memory allocation {{.requested}}MB is less than the usable minimum of {{.minimum}}MB": "",
+	"Restart Docker": "",
 	"Restarting existing {{.driver_name}} {{.machine_type}} for \"{{.cluster}}\" ...": "",
 	"Restarting the {{.name}} service may improve performance.": "",
 	"Retrieve the ssh identity key path of the specified cluster": "检索指定集群的 ssh 密钥路径",
@@ -395,14 +408,16 @@
 	"Retrieves the IP address of the running cluster, and writes it to STDOUT.": "",
 	"Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "",
 	"Returns the value of PROPERTY_NAME from the minikube config file.  Can be overwritten at runtime by flags or environmental variables.": "",
+	"Right-click the PowerShell icon and select Run as Administrator to open PowerShell in elevated mode.": "",
 	"Run 'kubectl describe pod coredns -n kube-system' and check for a firewall or DNS conflict": "",
 	"Run 'minikube delete' to delete the stale VM, or and ensure that minikube is running as the same user you are issuing this command with": "执行 'minikube delete' 以删除过时的虚拟机，或者确保 minikube 以与您发出此命令的用户相同的用户身份运行",
+	"Run 'sudo sysctl fs.protected_regular=1', or try a driver which does not require root, such as '--driver=docker'": "",
 	"Run kubectl": "运行 kubectl",
 	"Run minikube from the C: drive.": "",
 	"Run the kubernetes client, download it if necessary. Remember -- after kubectl!\n\nExamples:\nminikube kubectl -- --help\nminikube kubectl -- get pods --namespace kube-system": "",
-	"Run the minikube command as an Administrator": "",
-	"Run: \"{{.delete}}\", then \"{{.start}} --alsologtostderr -v=1\" to try again with more logging": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "执行 'chmod 600 $HOME/.kube/config'",
+	"Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "",
+	"Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
 	"Selecting '{{.driver}}' driver from existing profile (alternates: {{.alternates}})": "从现有配置文件中选择 '{{.driver}}' 驱动程序 （可选：{{.alternates}}）",
 	"Selecting '{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "从用户配置中选择 {{.driver}}' 驱动程序（可选：{{.alternates}}）",
@@ -433,7 +448,7 @@
 	"Specify the 9p version that the mount should use": "",
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
-	"StartHost failed again: {{.error}}": "",
+	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
@@ -461,6 +476,7 @@
 	"The \"{{.name}}\" cluster has been deleted.__1": "“{{.name}}”集群已删除。",
 	"The 'none' driver does not respect the --cpus flag": "'none' 驱动程序不遵循 --cpus 标志",
 	"The 'none' driver does not respect the --memory flag": "'none' 驱动程序不遵循 --memory 标志",
+	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "“none”驱动程序提供有限的隔离功能，并且可能会降低系统安全性和可靠性。",
 	"The '{{.addonName}}' addon is enabled": "启动 '{{.addonName}}' 插件",
 	"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "'{{.driver}}' 驱动程序需要提升权限，将执行以下命令：\\n\\n{{ .example }}\\n",
@@ -476,10 +492,10 @@
 	"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
 	"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
 	"The apiserver listening port": "apiserver 侦听端口",
-	"The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine": "",
 	"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "在为 kubernetes 生成的证书中使用的 apiserver 名称。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver 名称",
 	"The argument to pass the minikube mount command on start": "用于在启动时传递 minikube 装载命令的参数",
 	"The argument to pass the minikube mount command on start.": "",
+	"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
 	"The cluster dns domain name used in the kubernetes cluster": "kubernetes 集群中使用的集群 dns 域名",
 	"The container runtime to be used (docker, crio, containerd)": "需要使用的容器运行时（docker、crio、containerd）",
 	"The container runtime to be used (docker, crio, containerd).": "",
@@ -525,6 +541,7 @@
 	"This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "",
 	"This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "此操作还可通过设置环境变量 CHANGE_MINIKUBE_NONE_USER=true 自动完成",
 	"This control plane is not running! (state={{.state}})": "",
+	"This driver does not yet work on your architecture. Maybe try --driver=none": "",
 	"This is unusual - you may want to investigate using \"{{.command}}\"": "",
 	"This will keep the existing kubectl context and will create a minikube context.": "这将保留现有 kubectl 上下文并创建 minikube 上下文。",
 	"This will start the mount daemon and automatically mount files into minikube": "这将启动装载守护进程并将文件自动装载到 minikube 中",
@@ -540,12 +557,14 @@
 	"To proceed, either:\n\n1) Delete the existing \"{{.name}}\" cluster using: '{{.delcommand}}'\n\n* or *\n\n2) Start the existing \"{{.name}}\" cluster using: '{{.command}} --driver={{.old}}'": "",
 	"To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "",
 	"To see addons list for other profiles use: `minikube addons -p name list`": "",
-	"To start minikube with HyperV Powershell must be in your PATH`": "",
+	"To start minikube with Hyper-V, Powershell must be in your PATH`": "",
 	"To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "如需以您自己的用户身份使用 kubectl 或 minikube 命令，您可能需要重新定位该命令。例如，如需覆盖您的自定义设置，请运行：",
 	"Troubleshooting Commands:": "故障排除命令ƒ",
+	"Try 'minikube delete' to force new SSL certificates to be installed": "",
+	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "",
+	"Try specifying a --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Trying to delete invalid profile {{.profile}}": "尝试删除无效的配置文件 {{.profile}}",
 	"Unable to bind flags": "无法绑定标志",
-	"Unable to determine a default driver to use. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "",
 	"Unable to determine a default driver to use. Try specifying --vm-driver, or see https://minikube.sigs.k8s.io/docs/start/": "无法确定要使用的默认驱动。尝试通过 --vm-dirver 指定，或者查阅 https://minikube.sigs.k8s.io/docs/start/",
 	"Unable to enable dashboard": "",
 	"Unable to fetch latest version info": "",
@@ -558,8 +577,7 @@
 	"Unable to get command runner": "",
 	"Unable to get control plane status: {{.error}}": "",
 	"Unable to get current user": "",
-	"Unable to get driver IP": "",
-	"Unable to get forwarded port": "",
+	"Unable to get forwarded endpoint": "",
 	"Unable to get machine status": "",
 	"Unable to get runtime": "",
 	"Unable to get the status of the {{.name}} cluster.": "无法获取 {{.name}} 集群状态。",
@@ -572,6 +590,7 @@
 	"Unable to parse default Kubernetes version from constants: {{.error}}": "无法从常量中解析默认的 Kubernetes 版本号： {{.error}}",
 	"Unable to parse memory '{{.memory}}': {{.error}}": "",
 	"Unable to parse oldest Kubernetes version from constants: {{.error}}": "无法从常量中解析最旧的 Kubernetes 版本号： {{.error}}",
+	"Unable to pick a default driver. Here is what was considered, in preference order:": "",
 	"Unable to pull images, which may be OK: {{.error}}": "无法拉取镜像，有可能是正常状况：{{.error}}",
 	"Unable to remove machine directory": "",
 	"Unable to restart cluster, will reset it: {{.error}}": "",
@@ -586,7 +605,6 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating node": "",
 	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "正在从 Kubernetes {{.old}} 升级到 {{.new}}",
@@ -626,9 +644,8 @@
 	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
 	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
 	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "VirtualBox 无法找到他的网络接口。尝试升级到最新版本并重启。",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
 	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--vm-driver=none'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "您的计算机禁用了虚拟化支持。如果您正在虚拟机内运行 minikube, 尝试 '--vm-driver=none'。否则，请参阅系统BIOS手册了解如何启用虚拟化。",
-	"Wait failed": "",
 	"Wait failed: {{.error}}": "",
 	"Wait until Kubernetes core services are healthy before exiting": "等到 Kubernetes 核心服务正常运行再退出",
 	"Waiting for cluster to come online ...": "等待集群上线...",
@@ -644,10 +661,11 @@
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
 	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
 	"Your minikube vm is not running, try minikube start.": "",
+	"[{{.id}}] {{.msg}} {{.error}}": "",
 	"adding node": "",
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
@@ -669,21 +687,20 @@
 	"error parsing the input ip address for mount": "",
 	"error starting tunnel": "",
 	"error stopping tunnel": "",
+	"error: --output must be 'yaml' or 'json'": "",
 	"failed to open browser: {{.error}}": "",
-	"generating join token": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
 	"initialization failed, will try again: {{.error}}": "",
-	"joining cluster": "",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "kubeadm 检测一个到与其他进程的 TCP 端口冲突：或许是另外的本地安装的 Kubernetes 导致。执行 lsof -p\u003cport\u003e  查找并杀死这些进程",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl 和 minikube 配置将存储在 {{.home_folder}} 中",
-	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
 	"libmachine failed": "",
 	"logdir set failed": "",
 	"max time to wait per Kubernetes core services to be healthy.": "每个 Kubernetes 核心服务保持健康所需的最长时间。",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "由于出错 minikube 正在退出。如果以上信息没有帮助，请提交问题反馈：",
+	"minikube is not yet compatible with ChromeOS": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube is unable to connect to the VM: {{.error}}\n\nThis is likely due to one of two reasons:\n\n- VPN or firewall interference\n- {{.hypervisor}} network configuration issue\n\nSuggested workarounds:\n\n- Disable your local VPN or firewall software\n- Configure your local VPN or firewall to allow access to {{.ip}}\n- Restart or reinstall {{.hypervisor}}\n- Use an alternative --vm-driver": "minikube 无法连接到虚拟机：{{.error}}\n\n可能是由于以下两个原因之一导致：\n\n-VPN 或防火墙冲突\n- {{.hypervisor}} 网络配置问题\n建议的方案：\n\n- 禁用本地的 VPN 或者防火墙软件\n- 配置本地 VPN 或防火墙软件，放行 {{.ip}}\n- 重启或者重装 {{.hypervisor}}\n- 使用另外的 --vm-driver",
@@ -704,7 +721,7 @@
 	"retrieving node": "",
 	"saving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
-	"setting up certs": "",
+	"startup failed": "",
 	"stat failed": "",
 	"status json failure": "",
 	"status text failure": "",
@@ -728,9 +745,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "",
 	"usage: minikube delete": "",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"version json failure": "",
+	"version yaml failure": "",
 	"zsh completion failed": "",
-	"{{.cluster}} IP has been updated to point at {{.ip}}": "",
-	"{{.cluster}} IP was already correctly configured for {{.ip}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
 	"{{.driver}} does not appear to be installed": "似乎并未安装 {{.driver}}",
 	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "似乎并未安装 {{.driver}}，但已被当前的配置文件指定。请执行 'minikube delete' 或者安装 {{.driver}}",

From 5377039e9f80a85f32a7bfd93421690f15cbdd8c Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Sat, 4 Apr 2020 02:06:48 +0900
Subject: [PATCH 462/668] Update some Japanese translations

---
 translations/ja.json | 76 +++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/translations/ja.json b/translations/ja.json
index 2e7540b398..283f67846d 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -649,46 +649,48 @@
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
-	"retrieving node": "",
-	"saving node": "",
-	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
+	"retrieving node": "ノードを取得しています",
+	"saving node": "ノードを保存しています",
+	"service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort を持っていません",
 	"startup failed": "",
-	"stat failed": "",
-	"status json failure": "",
-	"status text failure": "",
-	"toom any arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
-	"tunnel creates a route to services deployed with type LoadBalancer and sets their Ingress to their ClusterIP. for a detailed example see https://minikube.sigs.k8s.io/docs/tasks/loadbalancer": "",
-	"tunnel makes services of type LoadBalancer accessible on localhost": "",
-	"unable to bind flags": "",
-	"unable to delete minikube config folder": "",
-	"unable to set logtostderr": "",
-	"unpause Kubernetes": "",
-	"unset failed": "",
-	"unsets PROPERTY_NAME from the minikube config file.  Can be overwritten by flags or environmental variables": "",
-	"unsets an individual value in a minikube config file": "",
-	"unsupported or missing driver: {{.name}}": "",
-	"update config": "",
-	"usage: minikube addons configure ADDON_NAME": "",
-	"usage: minikube addons disable ADDON_NAME": "",
-	"usage: minikube addons enable ADDON_NAME": "",
-	"usage: minikube addons list": "",
-	"usage: minikube addons open ADDON_NAME": "",
-	"usage: minikube config unset PROPERTY_NAME": "",
-	"usage: minikube delete": "",
-	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "",
+	"stat failed": "stat が失敗しました",
+	"status json failure": "ステータスは JSON エラーです",
+	"status text failure": "ステータスはテキストエラーです",
+	"toom any arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "引数の数（{{.ArgCount}}）が多すぎます。\\n使用方法: minikube config set PROPERTY_NAME PROPERTY_VALUE",
+	"tunnel creates a route to services deployed with type LoadBalancer and sets their Ingress to their ClusterIP. for a detailed example see https://minikube.sigs.k8s.io/docs/tasks/loadbalancer": "tunnel によってタイプが LoadBalancer なサービスへのルーティングが作成され、Ingress をサービスの ClusterIP へと向けさせます。より詳細な例は以下を参照してください。https://minikube.sigs.k8s.io/docs/tasks/loadbalancer",
+	"tunnel makes services of type LoadBalancer accessible on localhost": "tunnel によってタイプが LoadBalancer なサービスが localhost からアクセス可能になります",
+	"unable to bind flags": "フラグをバインドすることができませんでした",
+	"unable to delete minikube config folder": "minikube の設定フォルダーを削除できませんでした",
+	"unable to set logtostderr": "logtostderr を設定することができませんでした",
+	"unpause Kubernetes": "Kubernetes を再開させます",
+	"unset failed": "取り消しが失敗しました",
+	"unsets PROPERTY_NAME from the minikube config file.  Can be overwritten by flags or environmental variables": "minikube の設定ファイルから PROPERTY_NAME の値を取り消します。フラグ、あるいは環境変数で上書き可能です",
+	"unsets an individual value in a minikube config file": "minikube の設定ファイルの個々の値を取り消します",
+	"unsupported or missing driver: {{.name}}": "サポートしていない、あるいは不足しているドライバーです: {{.name}}",
+	"update config": "設定を更新します",
+	"usage: minikube addons configure ADDON_NAME": "使用方法: minikube addons configure ADDON_NAME",
+	"usage: minikube addons disable ADDON_NAME": "使用方法: minikube addons disable ADDON_NAME",
+	"usage: minikube addons enable ADDON_NAME": "使用方法: minikube addons enable ADDON_NAME",
+	"usage: minikube addons list": "使用方法: minikube addons list",
+	"usage: minikube addons open ADDON_NAME": "使用方法: minikube addons open ADDON_NAME",
+	"usage: minikube config unset PROPERTY_NAME": "使用方法: minikube config unset PROPERTY_NAME",
+	"usage: minikube delete": "使用方法: minikube delete",
+	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "使用方法: minikube profile [MINIKUBE_PROFILE_NAME]",
 	"version json failure": "",
 	"version yaml failure": "",
-	"zsh completion failed": "",
+	"zsh completion failed": "zsh の補完が失敗しました",
 	"{{ .name }}: {{ .rejection }}": "",
-	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
-	"{{.driver}} does not appear to be installed": "",
-	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "",
-	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "",
-	"{{.name}} has no available configuration options": "",
-	"{{.name}} is already running": "",
-	"{{.name}} was successfully configured": "",
-	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "",
+	"{{.cluster}} IP has been updated to point at {{.ip}}": "{{.cluster}} の IP アドレスは {{.ip}} へと更新されました",
+	"{{.cluster}} IP was already correctly configured for {{.ip}}": "{{.cluster}} の IP アドレスは {{.ip}} としてすでに正常に設定されています",
+	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} 「 {{.cluster}} 」 {{.machine_type}} がありません。再生成します。",
+	"{{.driver}} does not appear to be installed": "{{.driver}} がインストールされていないようです",
+	"{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "{{.driver}} がインストールされていないようですが、既存のプロフィールから指定されています。「 minikube delete 」を実行、あるいは {{.driver}} をインストールしてください",
+	"{{.extra_option_component_name}}.{{.key}}={{.value}}": "{{.extra_option_component_name}}.{{.key}}={{.value}}",
+	"{{.name}} has no available configuration options": "{{.name}} には利用可能なオプションがありません",
+	"{{.name}} is already running": "{{.name}} はすでに起動しています",
+	"{{.name}} was successfully configured": "{{.name}} は正常に設定されました",
+	"{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "{{.path}} のバージョンは {{.client_version}}です。 {{.cluster_version}} の Kubernetes とは互換性がないかもしれません",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.platform}} 上の {{.prefix}}minikube {{.version}}",
-	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
-	"{{.url}} is not accessible: {{.error}}": ""
+	"{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} はまだサポートされていなファイルシステムです。とにかくやってみます！",
+	"{{.url}} is not accessible: {{.error}}": "{{.url}} はアクセス可能ではありません。 {{.error}}"
 }
\ No newline at end of file

From ecbe344ac210336979a908103d2ddf847f482dea Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 3 Apr 2020 16:55:02 -0700
Subject: [PATCH 463/668] Remove noisy debug statement from logs

---
 pkg/minikube/driver/driver.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 93406a354e..77b44e15ef 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -208,7 +208,6 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 	rejects := []registry.DriverState{}
 	for _, ds := range options {
 		if ds != pick {
-			glog.Errorf("%s: %s", ds.Name, ds.Rejection)
 			if !ds.State.Installed {
 				ds.Rejection = fmt.Sprintf("Not installed: %v", ds.State.Error)
 				rejects = append(rejects, ds)

From 3d037a887164f157d2ec149943a7a6959cc2420b Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 3 Apr 2020 17:46:42 -0700
Subject: [PATCH 464/668] only failback to next driver if provisioning fails

---
 cmd/minikube/cmd/node_start.go |  17 ++++-
 cmd/minikube/cmd/start.go      |  92 +++++++++++++++++-------
 pkg/minikube/node/node.go      |  16 ++++-
 pkg/minikube/node/start.go     | 125 +++++++++++++++++++--------------
 4 files changed, 168 insertions(+), 82 deletions(-)

diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index f6e70d9b84..0b4a918ce1 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -49,7 +49,22 @@ var nodeStartCmd = &cobra.Command{
 			exit.WithError("retrieving node", err)
 		}
 
-		_, err = node.Start(*cc, *n, nil, false)
+		r, p, m, h, err := node.Provision(*cc, *n, false)
+		if err != nil {
+			exit.WithError("provisioning host for node", err)
+		}
+
+		s := node.Starter{
+			Runner:         r,
+			PreExists:      p,
+			MachineAPI:     m,
+			Host:           h,
+			Cfg:            *cc,
+			Node:           *n,
+			ExistingAddons: nil,
+		}
+
+		_, err = node.Start(s, false)
 		if err != nil {
 			_, err := maybeDeleteAndRetry(*cc, *n, nil, err)
 			if err != nil {
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index f41ac63030..c776b1efbb 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -305,38 +305,49 @@ func runStart(cmd *cobra.Command, args []string) {
 
 	validateSpecifiedDriver(existing)
 	ds, alts, specified := selectDriver(existing)
-	err = startWithDriver(cmd, ds, existing)
+	starter, err := provisionWithDriver(cmd, ds, existing)
 	if err != nil && !specified {
+		success := false
 		// Walk down the rest of the options
 		for _, alt := range alts {
-			out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}.", out.V{"old_driver": ds.Name, "new_driver": alt.Name})
+			out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}: {{.error}}", out.V{"old_driver": ds.Name, "new_driver": alt.Name, "error": err})
 			ds = alt
 			// Delete the existing cluster and try again with the next driver on the list
 			profile, err := config.LoadProfile(ClusterFlagValue())
 			if err != nil {
-				out.ErrT(out.Meh, `"{{.name}}" profile does not exist, trying anyways.`, out.V{"name": ClusterFlagValue()})
+				glog.Warningf("%s profile does not exist, trying anyways.", ClusterFlagValue())
 			}
 
 			err = deleteProfile(profile)
 			if err != nil {
 				out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": ClusterFlagValue()})
 			}
-			err = startWithDriver(cmd, ds, existing)
+			starter, err = provisionWithDriver(cmd, ds, existing)
 			if err != nil {
 				continue
 			} else {
 				// Success!
-				os.Exit(0)
+				success = true
+				break
 			}
 		}
+		if !success {
+			exit.WithError("error provisioning host", err)
+		}
 	}
 
-	// Use the most recent error
-	exit.WithError("startup failed", err)
+	kubeconfig, err := startWithDriver(starter, existing)
+	if err != nil {
+		exit.WithError("failed to start node", err)
+	}
+
+	if err := showKubectlInfo(kubeconfig, starter.Node.KubernetesVersion, starter.Cfg.Name); err != nil {
+		glog.Errorf("kubectl info: %v", err)
+	}
 
 }
 
-func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) error {
+func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) (node.Starter, error) {
 	driverName := ds.Name
 	glog.Infof("selected driver: %s", driverName)
 	validateDriver(ds, existing)
@@ -356,19 +367,19 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 	k8sVersion := getKubernetesVersion(existing)
 	cc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
 	if err != nil {
-		return errors.Wrap(err, "Failed to generate config")
+		return node.Starter{}, errors.Wrap(err, "Failed to generate config")
 	}
 
 	// This is about as far as we can go without overwriting config files
 	if viper.GetBool(dryRun) {
 		out.T(out.DryRun, `dry-run validation complete!`)
-		return nil
+		return node.Starter{}, nil
 	}
 
 	if driver.IsVM(driverName) {
 		url, err := download.ISO(viper.GetStringSlice(isoURL), cmd.Flags().Changed(isoURL))
 		if err != nil {
-			return errors.Wrap(err, "Failed to cache ISO")
+			return node.Starter{}, errors.Wrap(err, "Failed to cache ISO")
 		}
 		cc.MinikubeISO = url
 	}
@@ -387,11 +398,29 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 		}
 	}
 
-	kubeconfig, err := node.Start(cc, n, existingAddons, true)
+	mRunner, preExists, mAPI, host, err := node.Provision(cc, n, true)
 	if err != nil {
-		kubeconfig, err = maybeDeleteAndRetry(cc, n, existingAddons, err)
+		return node.Starter{}, err
+	}
+
+	return node.Starter{
+		Runner:         mRunner,
+		PreExists:      preExists,
+		MachineAPI:     mAPI,
+		Host:           host,
+		ExistingAddons: existingAddons,
+		Cfg:            cc,
+		Node:           n,
+	}, nil
+}
+
+func startWithDriver(starter node.Starter, existing *config.ClusterConfig) (*kubeconfig.Settings, error) {
+
+	kubeconfig, err := node.Start(starter, true)
+	if err != nil {
+		kubeconfig, err = maybeDeleteAndRetry(starter.Cfg, starter.Node, starter.ExistingAddons, err)
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 
@@ -400,7 +429,7 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 		numNodes = len(existing.Nodes)
 	}
 	if numNodes > 1 {
-		if driver.BareMetal(driverName) {
+		if driver.BareMetal(starter.Cfg.Driver) {
 			exit.WithCodeT(exit.Config, "The none driver is not compatible with multi-node clusters.")
 		} else {
 			for i := 1; i < numNodes; i++ {
@@ -409,22 +438,18 @@ func startWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *conf
 					Name:              nodeName,
 					Worker:            true,
 					ControlPlane:      false,
-					KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
+					KubernetesVersion: starter.Cfg.KubernetesConfig.KubernetesVersion,
 				}
 				out.Ln("") // extra newline for clarity on the command line
-				err := node.Add(&cc, n)
+				err := node.Add(&starter.Cfg, n)
 				if err != nil {
-					return errors.Wrap(err, "adding node")
+					return nil, errors.Wrap(err, "adding node")
 				}
 			}
 		}
 	}
 
-	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
-		glog.Errorf("kubectl info: %v", err)
-	}
-
-	return nil
+	return kubeconfig, nil
 }
 
 func updateDriver(driverName string) {
@@ -514,9 +539,24 @@ func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons
 		}
 
 		var kubeconfig *kubeconfig.Settings
-		for _, v := range cc.Nodes {
-			k, err := node.Start(cc, v, existingAddons, v.ControlPlane)
-			if v.ControlPlane {
+		for _, n := range cc.Nodes {
+			r, p, m, h, err := node.Provision(cc, n, n.ControlPlane)
+			s := node.Starter{
+				Runner:         r,
+				PreExists:      p,
+				MachineAPI:     m,
+				Host:           h,
+				Cfg:            cc,
+				Node:           n,
+				ExistingAddons: existingAddons,
+			}
+			if err != nil {
+				// Ok we failed again, let's bail
+				return nil, err
+			}
+
+			k, err := node.Start(s, n.ControlPlane)
+			if n.ControlPlane {
 				kubeconfig = k
 			}
 			if err != nil {
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 411275f3de..6f6e383844 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -39,7 +39,21 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		return errors.Wrap(err, "save node")
 	}
 
-	_, err := Start(*cc, n, nil, false)
+	r, p, m, h, err := Provision(*cc, n, false)
+	if err != nil {
+		return err
+	}
+	s := Starter{
+		Runner:         r,
+		PreExists:      p,
+		MachineAPI:     m,
+		Host:           h,
+		Cfg:            *cc,
+		Node:           n,
+		ExistingAddons: nil,
+	}
+
+	_, err = Start(s, false)
 	return err
 }
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index e0ad51f5a9..66c75a89c2 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -63,63 +63,50 @@ const (
 	containerRuntime = "container-runtime"
 )
 
+var (
+	kicGroup   errgroup.Group
+	cacheGroup errgroup.Group
+)
+
+// Starter is a struct with all the necessary information to start a node
+type Starter struct {
+	Runner         command.Runner
+	PreExists      bool
+	MachineAPI     libmachine.API
+	Host           *host.Host
+	Cfg            config.ClusterConfig
+	Node           config.Node
+	ExistingAddons map[string]bool
+}
+
 // Start spins up a guest and starts the kubernetes node.
-func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) (*kubeconfig.Settings, error) {
-	cp := ""
-	if apiServer {
-		cp = "control plane "
-	}
-
-	out.T(out.ThumbsUp, "Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}", out.V{"controlPlane": cp, "name": n.Name, "cluster": cc.Name})
-
-	var kicGroup errgroup.Group
-	if driver.IsKIC(cc.Driver) {
-		beginDownloadKicArtifacts(&kicGroup)
-	}
-
-	var cacheGroup errgroup.Group
-	if !driver.BareMetal(cc.Driver) {
-		beginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
-	}
-
-	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
-	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
-		return nil, errors.Wrap(err, "Failed to save config")
-	}
-
-	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
-	waitDownloadKicArtifacts(&kicGroup)
-
-	mRunner, preExists, machineAPI, host := startMachine(&cc, &n)
-	defer machineAPI.Close()
-
+func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 	// wait for preloaded tarball to finish downloading before configuring runtimes
 	waitCacheRequiredImages(&cacheGroup)
 
-	sv, err := util.ParseKubernetesVersion(n.KubernetesVersion)
+	sv, err := util.ParseKubernetesVersion(starter.Node.KubernetesVersion)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to parse kubernetes version")
 	}
 
 	// configure the runtime (docker, containerd, crio)
-	cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
-	showVersionInfo(n.KubernetesVersion, cr)
+	cr := configureRuntimes(starter.Runner, starter.Cfg.Driver, starter.Cfg.KubernetesConfig, sv)
+	showVersionInfo(starter.Node.KubernetesVersion, cr)
 
 	var bs bootstrapper.Bootstrapper
 	var kcs *kubeconfig.Settings
 	if apiServer {
 		// Must be written before bootstrap, otherwise health checks may flake due to stale IP
-		kcs = setupKubeconfig(host, &cc, &n, cc.Name)
+		kcs = setupKubeconfig(starter.Host, &starter.Cfg, &starter.Node, starter.Cfg.Name)
 		if err != nil {
 			return nil, errors.Wrap(err, "Failed to setup kubeconfig")
 		}
 
 		// setup kubeadm (must come after setupKubeconfig)
-		bs = setupKubeAdm(machineAPI, cc, n)
-		err = bs.StartCluster(cc)
+		bs = setupKubeAdm(starter.MachineAPI, starter.Cfg, starter.Node)
+		err = bs.StartCluster(starter.Cfg)
 		if err != nil {
-			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
+			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, starter.Cfg, starter.Runner))
 			return nil, err
 		}
 
@@ -128,12 +115,12 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 			return nil, errors.Wrap(err, "Failed to update kubeconfig file.")
 		}
 	} else {
-		bs, err = cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, n)
+		bs, err = cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), starter.Cfg, starter.Node)
 		if err != nil {
 			return nil, errors.Wrap(err, "Failed to get bootstrapper")
 		}
 
-		if err = bs.SetupCerts(cc.KubernetesConfig, n); err != nil {
+		if err = bs.SetupCerts(starter.Cfg.KubernetesConfig, starter.Node); err != nil {
 			return nil, errors.Wrap(err, "setting up certs")
 		}
 	}
@@ -145,43 +132,43 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 
 	// enable addons, both old and new!
-	if existingAddons != nil {
-		addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList)
+	if starter.ExistingAddons != nil {
+		addons.Start(viper.GetString(config.ProfileName), starter.ExistingAddons, config.AddonList)
 	}
 
 	if apiServer {
 		// special ops for none , like change minikube directory.
 		// multinode super doesn't work on the none driver
-		if cc.Driver == driver.None && len(cc.Nodes) == 1 {
+		if starter.Cfg.Driver == driver.None && len(starter.Cfg.Nodes) == 1 {
 			prepareNone()
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if viper.GetBool(waitUntilHealthy) && !preExists {
-			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
+		if viper.GetBool(waitUntilHealthy) && !starter.PreExists {
+			if err := bs.WaitForNode(starter.Cfg, starter.Node, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}
 		}
 	} else {
-		if err := bs.UpdateNode(cc, n, cr); err != nil {
+		if err := bs.UpdateNode(starter.Cfg, starter.Node, cr); err != nil {
 			return nil, errors.Wrap(err, "Updating node")
 		}
 
-		cp, err := config.PrimaryControlPlane(&cc)
+		cp, err := config.PrimaryControlPlane(&starter.Cfg)
 		if err != nil {
 			return nil, errors.Wrap(err, "Getting primary control plane")
 		}
-		cpBs, err := cluster.Bootstrapper(machineAPI, viper.GetString(cmdcfg.Bootstrapper), cc, cp)
+		cpBs, err := cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), starter.Cfg, cp)
 		if err != nil {
 			return nil, errors.Wrap(err, "Getting bootstrapper")
 		}
 
-		joinCmd, err := cpBs.GenerateToken(cc)
+		joinCmd, err := cpBs.GenerateToken(starter.Cfg)
 		if err != nil {
 			return nil, errors.Wrap(err, "generating join token")
 		}
 
-		if err = bs.JoinCluster(cc, n, joinCmd); err != nil {
+		if err = bs.JoinCluster(starter.Cfg, starter.Node, joinCmd); err != nil {
 			return nil, errors.Wrap(err, "joining cluster")
 		}
 	}
@@ -189,6 +176,36 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	return kcs, 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) {
+	cp := ""
+	if apiServer {
+		cp = "control plane "
+	}
+
+	out.T(out.ThumbsUp, "Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}", out.V{"controlPlane": cp, "name": n.Name, "cluster": cc.Name})
+
+	if driver.IsKIC(cc.Driver) {
+		beginDownloadKicArtifacts(&kicGroup)
+	}
+
+	if !driver.BareMetal(cc.Driver) {
+		beginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
+	}
+
+	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
+	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
+		return nil, false, nil, nil, errors.Wrap(err, "Failed to save config")
+	}
+
+	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
+	waitDownloadKicArtifacts(&kicGroup)
+
+	return startMachine(&cc, &n)
+
+}
+
 // ConfigureRuntimes does what needs to happen to get a runtime going.
 func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
 	co := cruntime.Config{
@@ -281,15 +298,15 @@ func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string,
 }
 
 // StartMachine starts a VM
-func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host, err error) {
 	m, err := machine.NewAPIClient()
 	if err != nil {
-		exit.WithError("Failed to get machine client", err)
+		return nil, false, nil, nil, errors.Wrap(err, "Failed to get machine client")
 	}
 	host, preExists = startHost(m, *cfg, *node)
 	runner, err = machine.CommandRunner(host)
 	if err != nil {
-		exit.WithError("Failed to get command runner", err)
+		return runner, preExists, m, host, errors.Wrap(err, "Failed to get command runner")
 	}
 
 	ip := validateNetwork(host, runner)
@@ -304,10 +321,10 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 	node.IP = ip
 	err = config.SaveNode(cfg, node)
 	if err != nil {
-		exit.WithError("saving node", err)
+		return nil, false, nil, nil, errors.Wrap(err, "saving node")
 	}
 
-	return runner, preExists, m, host
+	return runner, preExists, m, host, err
 }
 
 // startHost starts a new minikube host using a VM or None

From 4221e63e131d4552caa5cb6b20fb36b1184290d3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 18:43:37 -0700
Subject: [PATCH 465/668] add logs for wait components

---
 cmd/minikube/cmd/start.go                    |  7 +++++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 10 +++++-----
 pkg/minikube/config/types.go                 |  2 +-
 pkg/minikube/node/start.go                   |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 681e59b269..75ac54f825 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1069,7 +1069,7 @@ func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repositor
 		},
 		Nodes: []config.Node{cp},
 	}
-	cfg.WaitForCompos = interpretWaitFlag(*cmd)
+	cfg.VerifyComponents = interpretWaitFlag(*cmd)
 	return cfg, cp, nil
 }
 
@@ -1207,7 +1207,7 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 // returns map of components to wait for
 func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	if !cmd.Flags().Changed(waitComponents) {
-		glog.Infof("Wait Components : %+v", kverify.DefaultComponents)
+		glog.Infof("Wait components to verify : %+v", kverify.DefaultComponents)
 		return kverify.DefaultComponents
 	}
 
@@ -1220,10 +1220,12 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	if len(waitFlags) == 1 {
 		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
 		if waitFlags[0] == "false" || waitFlags[0] == "none" {
+			glog.Infof("Waiting for no components: %+v", kverify.NoComponents)
 			return kverify.NoComponents
 		}
 		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
 		if waitFlags[0] == "true" || waitFlags[0] == "all" {
+			glog.Infof("Waiting for all components: %+v", kverify.AllComponents)
 			return kverify.AllComponents
 		}
 	}
@@ -1242,5 +1244,6 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllComponentsList, ","))
 		}
 	}
+	glog.Infof("Waiting for components: %+v", waitComponents)
 	return waitComponents
 }
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index c16723fb50..e8d76def91 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -346,7 +346,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		glog.Infof("%s is not a control plane, nothing to wait for", n.Name)
 		return nil
 	}
-	if !kverify.ShouldWait(cfg.WaitForCompos) {
+	if !kverify.ShouldWait(cfg.VerifyComponents) {
 		glog.Infof("skip waiting for components based on config.")
 		return nil
 	}
@@ -361,7 +361,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		return errors.Wrap(err, "get control plane endpoint")
 	}
 
-	if cfg.WaitForCompos[kverify.APIServerWaitKey] {
+	if cfg.VerifyComponents[kverify.APIServerWaitKey] {
 		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
@@ -375,7 +375,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		}
 	}
 
-	if cfg.WaitForCompos[kverify.SystemPodsWaitKey] {
+	if cfg.VerifyComponents[kverify.SystemPodsWaitKey] {
 		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
@@ -385,7 +385,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		}
 	}
 
-	if cfg.WaitForCompos[kverify.DefaultSAWaitKey] {
+	if cfg.VerifyComponents[kverify.DefaultSAWaitKey] {
 		client, err := k.client(hostname, port)
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
@@ -394,7 +394,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 			return errors.Wrap(err, "waiting for default service account")
 		}
 	}
-	glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.WaitForCompos)
+	glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.VerifyComponents)
 	return nil
 }
 
diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
index ef3b2d41cc..95991d5f33 100644
--- a/pkg/minikube/config/types.go
+++ b/pkg/minikube/config/types.go
@@ -65,7 +65,7 @@ type ClusterConfig struct {
 	KubernetesConfig        KubernetesConfig
 	Nodes                   []Node
 	Addons                  map[string]bool
-	WaitForCompos           map[string]bool // map of components to verify and wait for after start.
+	VerifyComponents        map[string]bool // map of components to verify and wait for after start.
 }
 
 // KubernetesConfig contains the parameters used to configure the VM Kubernetes.
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 8bc2da45a1..e43e464d43 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -156,7 +156,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 
 		// Skip pre-existing, because we already waited for health
-		if kverify.ShouldWait(cc.WaitForCompos) && !preExists {
+		if kverify.ShouldWait(cc.VerifyComponents) && !preExists {
 			if err := bs.WaitForNode(cc, n, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}

From 478d1833314e38882f13760c992e51f2e9e3b17e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 18:46:18 -0700
Subject: [PATCH 466/668] use all components list in should wait

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index b6b9db9340..15b89c6cdc 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -64,7 +64,12 @@ var (
 
 // ShouldWait will return true if the config says need to wait
 func ShouldWait(wcs map[string]bool) bool {
-	return wcs[APIServerWaitKey] || wcs[SystemPodsWaitKey] || wcs[DefaultSAWaitKey]
+	for _, c := range AllComponentsList {
+		if wcs[c] {
+			return true
+		}
+	}
+	return false
 }
 
 // ExpectedComponentsRunning returns whether or not all expected components are running

From 77d1da04a2b45fdae15243d346b981b1d0b4f38a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 18:48:39 -0700
Subject: [PATCH 467/668] change log level for err

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 75ac54f825..0a42f5e979 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1213,7 +1213,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 
 	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
 	if err != nil {
-		glog.Infof("failed to get wait from flags, will use default wait components : %+v", kverify.DefaultComponents)
+		glog.Warningf("Failed to read --wait from flags: %v.\n Moving on will use the default wait components: %+v", err, kverify.DefaultComponents)
 		return kverify.DefaultComponents
 	}
 

From 1c516924ef8cfe808c12ec799ba87490331f4229 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 2 Apr 2020 19:44:09 -0700
Subject: [PATCH 468/668] go import and gofmt

---
 cmd/minikube/cmd/config/configure.go   | 18 +++++++++---------
 deploy/minikube/release_sanity_test.go |  1 -
 pkg/minikube/config/config_test.go     |  8 ++++----
 pkg/minikube/service/service_test.go   | 24 ++++++++++++------------
 pkg/util/crypto.go                     |  2 +-
 5 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go
index 412fa1204d..80c61d1c99 100644
--- a/cmd/minikube/cmd/config/configure.go
+++ b/cmd/minikube/cmd/config/configure.go
@@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"aws-assume-role":       awsRole,
 				},
 				map[string]string{
-					"app":                           "registry-creds",
-					"cloud":                         "ecr",
+					"app":   "registry-creds",
+					"cloud": "ecr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{
 				"registry-creds-gcr",
 				map[string]string{
 					"application_default_credentials.json": gcrApplicationDefaultCredentials,
-					"gcrurl":                               gcrURL,
+					"gcrurl": gcrURL,
 				},
 				map[string]string{
-					"app":                           "registry-creds",
-					"cloud":                         "gcr",
+					"app":   "registry-creds",
+					"cloud": "gcr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass,
 				},
 				map[string]string{
-					"app":                           "registry-creds",
-					"cloud":                         "dpr",
+					"app":   "registry-creds",
+					"cloud": "dpr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"ACR_PASSWORD":  acrPassword,
 				},
 				map[string]string{
-					"app":                           "registry-creds",
-					"cloud":                         "acr",
+					"app":   "registry-creds",
+					"cloud": "acr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
diff --git a/deploy/minikube/release_sanity_test.go b/deploy/minikube/release_sanity_test.go
index 22bb29d9c7..8817606af5 100644
--- a/deploy/minikube/release_sanity_test.go
+++ b/deploy/minikube/release_sanity_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 
 	retryablehttp "github.com/hashicorp/go-retryablehttp"
-	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/notify"
 	"k8s.io/minikube/pkg/util"
 )
diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go
index 028d094443..a9548bb2c5 100644
--- a/pkg/minikube/config/config_test.go
+++ b/pkg/minikube/config/config_test.go
@@ -50,10 +50,10 @@ var configTestCases = []configTestCase{
     "v": 5
 }`,
 		config: map[string]interface{}{
-			"driver":                    "test-driver",
-			"cpus":                      4,
-			"disk-size":                 "20g",
-			"v":                         5,
+			"driver":    "test-driver",
+			"cpus":      4,
+			"disk-size": "20g",
+			"v":         5,
 			"show-libmachine-logs":      true,
 			"log_dir":                   "/etc/hosts",
 			"ReminderWaitPeriodInHours": 99,
diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go
index 449c55343b..dc7a9a273a 100644
--- a/pkg/minikube/service/service_test.go
+++ b/pkg/minikube/service/service_test.go
@@ -370,30 +370,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) {
 		expectedIsHTTPSchemedURL        bool
 	}{
 		{
-			description:                     "no https for http schemed with no https option",
-			bareURLString:                   "http://192.168.99.100:30563",
-			https:                           false,
+			description:   "no https for http schemed with no https option",
+			bareURLString: "http://192.168.99.100:30563",
+			https:         false,
 			expectedHTTPSFormattedURLString: "http://192.168.99.100:30563",
 			expectedIsHTTPSchemedURL:        true,
 		},
 		{
-			description:                     "no https for non-http schemed with no https option",
-			bareURLString:                   "xyz.http.myservice:30563",
-			https:                           false,
+			description:   "no https for non-http schemed with no https option",
+			bareURLString: "xyz.http.myservice:30563",
+			https:         false,
 			expectedHTTPSFormattedURLString: "xyz.http.myservice:30563",
 			expectedIsHTTPSchemedURL:        false,
 		},
 		{
-			description:                     "https for http schemed with https option",
-			bareURLString:                   "http://192.168.99.100:30563",
-			https:                           true,
+			description:   "https for http schemed with https option",
+			bareURLString: "http://192.168.99.100:30563",
+			https:         true,
 			expectedHTTPSFormattedURLString: "https://192.168.99.100:30563",
 			expectedIsHTTPSchemedURL:        true,
 		},
 		{
-			description:                     "no https for non-http schemed with https option and http substring",
-			bareURLString:                   "xyz.http.myservice:30563",
-			https:                           true,
+			description:   "no https for non-http schemed with https option and http substring",
+			bareURLString: "xyz.http.myservice:30563",
+			https:         true,
 			expectedHTTPSFormattedURLString: "xyz.http.myservice:30563",
 			expectedIsHTTPSchemedURL:        false,
 		},
diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go
index 417417e215..500b9813e0 100644
--- a/pkg/util/crypto.go
+++ b/pkg/util/crypto.go
@@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error {
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
 		BasicConstraintsValid: true,
-		IsCA:                  true,
+		IsCA: true,
 	}
 
 	return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv)

From 62e3b74652056341a97acfaa7a33a4efe4cdef23 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 00:08:32 -0700
Subject: [PATCH 469/668] adjust github actions

---
 .github/workflows/main.yml          | 6 +++---
 test/integration/functional_test.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf6ed4730b..928f2638c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -127,7 +127,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -216,7 +216,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -459,7 +459,7 @@ jobs:
           chmod a+x e2e-*
           chmod a+x minikube-*
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=30m -test.v -timeout-multiplier=1 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 61f3569951..7ddbe72fb5 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -731,7 +731,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
 		rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;"))
 		return err
 	}
-	if err = retry.Expo(mysql, 1*time.Second, Seconds(200)); err != nil {
+	if err = retry.Expo(mysql, 1*time.Second, Minutes(5)); err != nil {
 		t.Errorf("failed to exec 'mysql -ppassword -e show databases;': %v", err)
 	}
 }

From 31ee6650de8963d3793a3111a132bd6cf398a522 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 00:09:51 -0700
Subject: [PATCH 470/668] go import after gofmt

---
 cmd/minikube/cmd/config/configure.go | 18 +++++++++---------
 m.sh                                 |  7 +++++++
 pkg/minikube/config/config_test.go   |  8 ++++----
 pkg/minikube/service/service_test.go | 24 ++++++++++++------------
 pkg/util/crypto.go                   |  2 +-
 5 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100755 m.sh

diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go
index 80c61d1c99..412fa1204d 100644
--- a/cmd/minikube/cmd/config/configure.go
+++ b/cmd/minikube/cmd/config/configure.go
@@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"aws-assume-role":       awsRole,
 				},
 				map[string]string{
-					"app":   "registry-creds",
-					"cloud": "ecr",
+					"app":                           "registry-creds",
+					"cloud":                         "ecr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{
 				"registry-creds-gcr",
 				map[string]string{
 					"application_default_credentials.json": gcrApplicationDefaultCredentials,
-					"gcrurl": gcrURL,
+					"gcrurl":                               gcrURL,
 				},
 				map[string]string{
-					"app":   "registry-creds",
-					"cloud": "gcr",
+					"app":                           "registry-creds",
+					"cloud":                         "gcr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass,
 				},
 				map[string]string{
-					"app":   "registry-creds",
-					"cloud": "dpr",
+					"app":                           "registry-creds",
+					"cloud":                         "dpr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
@@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{
 					"ACR_PASSWORD":  acrPassword,
 				},
 				map[string]string{
-					"app":   "registry-creds",
-					"cloud": "acr",
+					"app":                           "registry-creds",
+					"cloud":                         "acr",
 					"kubernetes.io/minikube-addons": "registry-creds",
 				})
 
diff --git a/m.sh b/m.sh
new file mode 100755
index 0000000000..8a4e4b7562
--- /dev/null
+++ b/m.sh
@@ -0,0 +1,7 @@
+for file in $(find . -type f -name "*.go")
+do
+    if [[ -f $file ]]; then
+        gofmt -w $file      
+        goimports -w $file      
+    fi
+done
\ No newline at end of file
diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go
index a9548bb2c5..028d094443 100644
--- a/pkg/minikube/config/config_test.go
+++ b/pkg/minikube/config/config_test.go
@@ -50,10 +50,10 @@ var configTestCases = []configTestCase{
     "v": 5
 }`,
 		config: map[string]interface{}{
-			"driver":    "test-driver",
-			"cpus":      4,
-			"disk-size": "20g",
-			"v":         5,
+			"driver":                    "test-driver",
+			"cpus":                      4,
+			"disk-size":                 "20g",
+			"v":                         5,
 			"show-libmachine-logs":      true,
 			"log_dir":                   "/etc/hosts",
 			"ReminderWaitPeriodInHours": 99,
diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go
index dc7a9a273a..449c55343b 100644
--- a/pkg/minikube/service/service_test.go
+++ b/pkg/minikube/service/service_test.go
@@ -370,30 +370,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) {
 		expectedIsHTTPSchemedURL        bool
 	}{
 		{
-			description:   "no https for http schemed with no https option",
-			bareURLString: "http://192.168.99.100:30563",
-			https:         false,
+			description:                     "no https for http schemed with no https option",
+			bareURLString:                   "http://192.168.99.100:30563",
+			https:                           false,
 			expectedHTTPSFormattedURLString: "http://192.168.99.100:30563",
 			expectedIsHTTPSchemedURL:        true,
 		},
 		{
-			description:   "no https for non-http schemed with no https option",
-			bareURLString: "xyz.http.myservice:30563",
-			https:         false,
+			description:                     "no https for non-http schemed with no https option",
+			bareURLString:                   "xyz.http.myservice:30563",
+			https:                           false,
 			expectedHTTPSFormattedURLString: "xyz.http.myservice:30563",
 			expectedIsHTTPSchemedURL:        false,
 		},
 		{
-			description:   "https for http schemed with https option",
-			bareURLString: "http://192.168.99.100:30563",
-			https:         true,
+			description:                     "https for http schemed with https option",
+			bareURLString:                   "http://192.168.99.100:30563",
+			https:                           true,
 			expectedHTTPSFormattedURLString: "https://192.168.99.100:30563",
 			expectedIsHTTPSchemedURL:        true,
 		},
 		{
-			description:   "no https for non-http schemed with https option and http substring",
-			bareURLString: "xyz.http.myservice:30563",
-			https:         true,
+			description:                     "no https for non-http schemed with https option and http substring",
+			bareURLString:                   "xyz.http.myservice:30563",
+			https:                           true,
 			expectedHTTPSFormattedURLString: "xyz.http.myservice:30563",
 			expectedIsHTTPSchemedURL:        false,
 		},
diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go
index 500b9813e0..417417e215 100644
--- a/pkg/util/crypto.go
+++ b/pkg/util/crypto.go
@@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error {
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 
 	return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv)

From b346fd9890c7c5d448e970f7c9c799f8f3b20abb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 00:10:03 -0700
Subject: [PATCH 471/668] remove script

---
 m.sh | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100755 m.sh

diff --git a/m.sh b/m.sh
deleted file mode 100755
index 8a4e4b7562..0000000000
--- a/m.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-for file in $(find . -type f -name "*.go")
-do
-    if [[ -f $file ]]; then
-        gofmt -w $file      
-        goimports -w $file      
-    fi
-done
\ No newline at end of file

From 0ccb077a7f05900354e2f70a0304a7a5e01edad3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 20:56:33 -0700
Subject: [PATCH 472/668] adjust none

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 928f2638c3..ca58baa169 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -127,7 +127,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -216,7 +216,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -297,7 +297,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))
@@ -378,7 +378,7 @@ jobs:
         chmod a+x e2e-*
         chmod a+x minikube-*
         START_TIME=$(date -u +%s)
-        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+        KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
         END_TIME=$(date -u +%s)
         TIME_ELAPSED=$(($END_TIME-$START_TIME))
         min=$((${TIME_ELAPSED}/60))

From 8f51d7de588b526e8a5ded2e58b54fefd51993bc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 19:08:41 -0700
Subject: [PATCH 473/668] adjust warn if slow for ps and volume

---
 pkg/drivers/kic/oci/oci.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index a1265dbe24..08bb981e28 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -234,21 +234,26 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 }
 
 // WarnIfSlow runs an oci command, warning about performance issues
-func WarnIfSlow(arg ...string) ([]byte, error) {
+func WarnIfSlow(args ...string) ([]byte, error) {
 	killTime := 15 * time.Second
 	warnTime := 2 * time.Second
 
+	if args[1] == "volume" || args[1] == "ps" { // volume and ps requires more time than inspect
+		killTime = 30 * time.Second
+		warnTime = 3 * time.Second
+	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), killTime)
 	defer cancel()
 
 	start := time.Now()
-	glog.Infof("executing with %s timeout: %v", arg, killTime)
-	cmd := exec.CommandContext(ctx, arg[0], arg[1:]...)
+	glog.Infof("executing with %s timeout: %v", args, killTime)
+	cmd := exec.CommandContext(ctx, args[0], args[1:]...)
 	stdout, err := cmd.Output()
 	d := time.Since(start)
 	if d > warnTime {
 		out.WarningT(`Executing "{{.command}}" took an unusually long time: {{.duration}}`, out.V{"command": strings.Join(cmd.Args, " "), "duration": d})
-		out.ErrT(out.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": arg[0]})
+		out.ErrT(out.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": args[0]})
 	}
 
 	if ctx.Err() == context.DeadlineExceeded {

From a62d611e0b27e513f0f3dd662bd0377f54aa92cb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 19:09:45 -0700
Subject: [PATCH 474/668] adjust kill time

---
 pkg/drivers/kic/oci/oci.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 08bb981e28..1db19fa73e 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -235,7 +235,7 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 
 // WarnIfSlow runs an oci command, warning about performance issues
 func WarnIfSlow(args ...string) ([]byte, error) {
-	killTime := 15 * time.Second
+	killTime := 18 * time.Second
 	warnTime := 2 * time.Second
 
 	if args[1] == "volume" || args[1] == "ps" { // volume and ps requires more time than inspect

From a0263c2513607485bb06c1840167a078b0a29730 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 3 Apr 2020 20:50:26 -0700
Subject: [PATCH 475/668] adjust more

---
 pkg/drivers/kic/oci/oci.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 1db19fa73e..29b6ddbd9b 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -235,7 +235,7 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 
 // WarnIfSlow runs an oci command, warning about performance issues
 func WarnIfSlow(args ...string) ([]byte, error) {
-	killTime := 18 * time.Second
+	killTime := 19 * time.Second
 	warnTime := 2 * time.Second
 
 	if args[1] == "volume" || args[1] == "ps" { // volume and ps requires more time than inspect

From e4fb49304a77de55338b07de15f71f09f2aec9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sat, 4 Apr 2020 12:47:04 +0200
Subject: [PATCH 476/668] Make node start message easier to translate

---
 pkg/minikube/node/start.go | 7 +++----
 translations/de.json       | 3 ++-
 translations/es.json       | 3 ++-
 translations/fr.json       | 3 ++-
 translations/ja.json       | 3 ++-
 translations/ko.json       | 3 ++-
 translations/pl.json       | 3 ++-
 translations/zh-CN.json    | 3 ++-
 8 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index a2b4d5864f..9f4dbbd0bf 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -66,13 +66,12 @@ const (
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) (*kubeconfig.Settings, error) {
-	cp := ""
 	if apiServer {
-		cp = "control plane "
+		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
+	} else {
+		out.T(out.ThumbsUp, "Starting node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
 	}
 
-	out.T(out.ThumbsUp, "Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}", out.V{"controlPlane": cp, "name": n.Name, "cluster": cc.Name})
-
 	var kicGroup errgroup.Group
 	if driver.IsKIC(cc.Driver) {
 		beginDownloadKicArtifacts(&kicGroup)
diff --git a/translations/de.json b/translations/de.json
index 7aeb9e8e8a..747def2375 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -387,8 +387,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Startet einen lokalen Kubernetes-Cluster",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
diff --git a/translations/es.json b/translations/es.json
index 467989826f..4aecf8975d 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -388,8 +388,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Inicia un clúster de Kubernetes local",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
diff --git a/translations/fr.json b/translations/fr.json
index d227ca5c8d..872710c938 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -386,8 +386,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Démarre un cluster Kubernetes local.",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
diff --git a/translations/ja.json b/translations/ja.json
index 283f67846d..d32dafaa95 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -398,8 +398,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "ローカルの Kubernetes クラスタを起動します",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
diff --git a/translations/ko.json b/translations/ko.json
index c7f4872972..8c20c92de6 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -392,9 +392,10 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
 	"Starting node": "노드를 시작하는 중",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "로컬 쿠버네티스 클러스터를 시작합니다",
 	"Starts a node.": "노드를 시작합니다",
 	"Starts an existing stopped node in a cluster.": "클러스터의 중지된 노드를 시작합니다",
diff --git a/translations/pl.json b/translations/pl.json
index ced1165241..f7ddd5fe7d 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -391,8 +391,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "Uruchamianie lokalnego klastra kubernetesa",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 81b6d51bb9..1174030a21 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -450,8 +450,9 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
+	"Starting node {{.name}} in cluster {{.cluster}}": "",
 	"Starting tunnel for service {{.service}}.": "",
-	"Starting {{.controlPlane}}node {{.name}} in cluster {{.cluster}}": "",
 	"Starts a local kubernetes cluster": "启动本地 kubernetes 集群",
 	"Starts a node.": "",
 	"Starts an existing stopped node in a cluster.": "",

From 1b78a7b8a99ad6a3c62b8d22f57120d614d17935 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 10:53:59 -0700
Subject: [PATCH 477/668] Version bump: v1.9.2

---
 CHANGELOG.md | 18 ++++++++++++++++++
 Makefile     |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4de903d0ac..11bcc13997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Release Notes
 
+## Version 1.9.2 - 2020-04-04
+
+Minor improvements:
+
+* UX: Remove noisy debug statement [#7407](https://github.com/kubernetes/minikube/pull/7407)
+* Feature: Make --wait more flexible [#7375](https://github.com/kubernetes/minikube/pull/7375)
+* Docker: adjust warn if slow for ps and volume [#7410](https://github.com/kubernetes/minikube/pull/7410)
+* Localization: Update Japanese translations [#7403](https://github.com/kubernetes/minikube/pull/7403)
+* Performance: Parallelize updating cluster and setting up certs [#7394](https://github.com/kubernetes/minikube/pull/7394)
+* Addons: allow ingress addon for docker/podman drivers only on linux for now [#7393](https://github.com/kubernetes/minikube/pull/7393)
+
+- Anders F Björklund
+- Medya Ghazizadeh
+- Prasad Katti
+- Priya Wadhwa
+- Thomas Strömberg
+- tomocy
+
 ## Version 1.9.1 - 2020-04-02
 
 Improvements:
diff --git a/Makefile b/Makefile
index 18611604e2..f3468feabc 100755
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 9
-VERSION_BUILD ?= 1
+VERSION_BUILD ?= 2
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 

From 2419cb72c7b29afefb0836f913086fc29e099f30 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 12:41:54 -0700
Subject: [PATCH 478/668] Add test for multi-node without errors

---
 test/integration/no_error_shown_test.go | 62 +++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 test/integration/no_error_shown_test.go

diff --git a/test/integration/no_error_shown_test.go b/test/integration/no_error_shown_test.go
new file mode 100644
index 0000000000..59a9529f90
--- /dev/null
+++ b/test/integration/no_error_shown_test.go
@@ -0,0 +1,62 @@
+// +build integration
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+	"context"
+	"os/exec"
+	"strings"
+	"testing"
+)
+
+// TestMultiNodeNoError asserts that there are no errors displayed
+func TestMultiNodeNoError(t *testing.T) {
+	if NoneDriver() {
+		t.Skip("none driver always shows a warning")
+	}
+	MaybeParallel(t)
+
+	if NeedsPortForward() {
+		t.Skip("Docker for Desktop can be noisy")
+	}
+
+	profile := UniqueProfileName("no-error")
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(20))
+	defer CleanupWithLogs(t, profile, cancel)
+
+	// Use the most verbose logging for the simplest test. If it fails, something is very wrong.
+	args := append([]string{"start", "-p", profile, "--memory=1900", "-n=2", "--wait=false"}, StartArgs()...)
+
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
+	if err != nil {
+		t.Errorf("failed to start minikube with args: %q : %v", rr.Command(), err)
+	}
+
+	if rr.Stderr.Len() > 0 {
+		t.Errorf("unexpected stderr: %v", rr.Stderr.String())
+	}
+
+	stdout := rr.Stdout.String()
+	keywords := []string{"error", "fail", "warning", "conflict"}
+	for _, keyword := range keywords {
+		if strings.Contains(stdout, keyword) {
+			t.Errorf("unexpected %q in stdout: %s", keyword, stdout)
+		}
+	}
+}

From c922c16b97fedd9f388b60433152cdb364bed547 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 12:50:44 -0700
Subject: [PATCH 479/668] Make this single-node for now

---
 test/integration/no_error_shown_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/no_error_shown_test.go b/test/integration/no_error_shown_test.go
index 59a9529f90..299ff9d2ac 100644
--- a/test/integration/no_error_shown_test.go
+++ b/test/integration/no_error_shown_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 )
 
-// TestMultiNodeNoError asserts that there are no errors displayed
-func TestMultiNodeNoError(t *testing.T) {
+// TestNoErrorShown asserts that there are no errors displayed
+func TestNoErrorShown(t *testing.T) {
 	if NoneDriver() {
 		t.Skip("none driver always shows a warning")
 	}
@@ -40,8 +40,8 @@ func TestMultiNodeNoError(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(20))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	// Use the most verbose logging for the simplest test. If it fails, something is very wrong.
-	args := append([]string{"start", "-p", profile, "--memory=1900", "-n=2", "--wait=false"}, StartArgs()...)
+	// TODO: make this multi-node once it's stable
+	args := append([]string{"start", "-p", profile, "--memory=1900", "--wait=false"}, StartArgs()...)
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {

From 3a32ce67106a58dc393285280bed310e18d58014 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 13:24:31 -0700
Subject: [PATCH 480/668] Improve test

---
 test/integration/no_error_shown_test.go | 37 +++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/test/integration/no_error_shown_test.go b/test/integration/no_error_shown_test.go
index 299ff9d2ac..9f28855377 100644
--- a/test/integration/no_error_shown_test.go
+++ b/test/integration/no_error_shown_test.go
@@ -25,38 +25,45 @@ import (
 	"testing"
 )
 
-// TestNoErrorShown asserts that there are no errors displayed
+// TestMultiNodeNoErrorShown asserts that there are no errors displayed
 func TestNoErrorShown(t *testing.T) {
 	if NoneDriver() {
 		t.Skip("none driver always shows a warning")
 	}
 	MaybeParallel(t)
 
-	if NeedsPortForward() {
-		t.Skip("Docker for Desktop can be noisy")
-	}
-
-	profile := UniqueProfileName("no-error")
-	ctx, cancel := context.WithTimeout(context.Background(), Minutes(20))
+	profile := UniqueProfileName("nospam")
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(25))
 	defer CleanupWithLogs(t, profile, cancel)
 
 	// TODO: make this multi-node once it's stable
-	args := append([]string{"start", "-p", profile, "--memory=1900", "--wait=false"}, StartArgs()...)
+	args := append([]string{"start", "-p", profile, "-n=1", "--memory=2250", "--wait=false"}, StartArgs()...)
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
 		t.Errorf("failed to start minikube with args: %q : %v", rr.Command(), err)
 	}
 
-	if rr.Stderr.Len() > 0 {
-		t.Errorf("unexpected stderr: %v", rr.Stderr.String())
+	for _, line := range strings.Split(rr.Stderr.String(), "\n") {
+		if strings.HasPrefix(line, "E") {
+			t.Errorf("unexpected error log in stderr: %q", line)
+			continue
+		}
+
+		if strings.Contains(line, "kubectl") || strings.Contains(line, "slow") || strings.Contains(line, "long time") {
+			continue
+		}
+		if len(strings.TrimSpace(line)) > 0 {
+			t.Errorf("unexpected stderr line: %q", line)
+		}
 	}
 
-	stdout := rr.Stdout.String()
-	keywords := []string{"error", "fail", "warning", "conflict"}
-	for _, keyword := range keywords {
-		if strings.Contains(stdout, keyword) {
-			t.Errorf("unexpected %q in stdout: %s", keyword, stdout)
+	for _, line := range strings.Split(rr.Stdout.String(), "\n") {
+		keywords := []string{"error", "fail", "warning", "conflict"}
+		for _, keyword := range keywords {
+			if strings.Contains(line, keyword) {
+				t.Errorf("unexpected %q in stdout line: %q", keyword, line)
+			}
 		}
 	}
 }

From f0620c2cca8db631faf6b4d16a40e647961823d2 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Sat, 4 Apr 2020 14:05:19 -0700
Subject: [PATCH 481/668] Update releases.json to include v1.9.2

---
 deploy/minikube/releases.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json
index 54fb495aa9..fa48b6ded3 100644
--- a/deploy/minikube/releases.json
+++ b/deploy/minikube/releases.json
@@ -1,4 +1,12 @@
 [
+  {
+      "name": "v1.9.2",
+      "checksums": {
+          "darwin": "f27016246850b3145e1509e98f7ed060fd9575ac4d455c7bdc15277734372e85",
+          "linux": "3121f933bf8d608befb24628a045ce536658738c14618504ba46c92e656ea6b5",
+          "windows": "426586f33d88a484fdc5a3b326b0651d57860e9305a4f9d4180640e3beccaf6b"
+      }
+  },
   {
       "name": "v1.9.1",
       "checksums": {

From d434f914142f77f4690988914c1fbd6a637a9270 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 16:25:53 -0700
Subject: [PATCH 482/668] Get final bits out of the way for code review.

---
 site/config.toml                              |  19 +++
 site/content/en/_index.html                   | 115 +-----------------
 site/content/en/docs/Commands/_index.md       |   2 +-
 .../en/docs/Contributing/building/_index.md   |   5 +
 .../{building.en.md => building/binaries.md}  |   0
 .../docs/Contributing/{ => building}/iso.md   |   2 +-
 .../en/docs/Contributing/principles.en.md     |  15 +--
 .../en/docs/Contributing/releasing/_index.md  |   5 +
 .../binaries.md}                              |  19 +--
 .../Contributing/{ => releasing}/gvisor.md    |   0
 .../en/docs/Contributing/releasing/iso.md     |  19 +++
 site/content/en/docs/Drivers/_index.md        |   2 -
 site/content/en/docs/Drivers/docker.md        |  14 +--
 site/content/en/docs/Drivers/hyperkit.md      |   8 +-
 site/content/en/docs/Drivers/hyperv.md        |   9 +-
 .../en/docs/Drivers/includes/podman_usage.inc |   2 +-
 site/content/en/docs/Drivers/kvm2.md          |   9 +-
 site/content/en/docs/Drivers/none.md          |  14 ++-
 site/content/en/docs/Drivers/parallels.md     |   8 +-
 site/content/en/docs/Drivers/podman.md        |  20 ++-
 site/content/en/docs/Drivers/virtualbox.md    |  10 +-
 site/content/en/docs/Drivers/vmware.md        |   8 +-
 site/content/en/docs/FAQ/_index.md            |   4 +-
 .../en/docs/Handbook/Installation/_index.md   |   7 --
 .../Installation/includes/post_install.inc    |  22 ----
 .../en/docs/Handbook/Installation/linux.md    |  77 ------------
 .../en/docs/Handbook/Installation/macos.md    |  74 -----------
 .../en/docs/Handbook/Installation/windows.md  |  52 --------
 site/content/en/docs/Handbook/_index.md       |   4 +-
 site/content/en/docs/Handbook/accessing.md    |   3 +
 site/content/en/docs/Handbook/controls.md     |   2 +-
 site/content/en/docs/Handbook/dashboard.md    |   2 +
 site/content/en/docs/Handbook/deploying.md    |   2 +
 site/content/en/docs/Handbook/filesync.md     |   2 +
 site/content/en/docs/Handbook/host-access.md  |   2 +
 site/content/en/docs/Handbook/mount.md        |   2 +
 site/content/en/docs/Handbook/pushing.md      |  11 +-
 site/content/en/docs/Handbook/registry.md     |   8 +-
 site/content/en/docs/Tutorials/_index.md      |   3 +-
 .../content/en/docs/Tutorials/audit-policy.md |   4 +-
 .../en/docs/Tutorials/openid_connect_auth.md  |   2 +-
 site/content/en/docs/_index.md                |  56 +++------
 .../en/{ => docs}/featured-background.jpg     | Bin
 site/content/en/{ => docs}/logo.png           | Bin
 site/content/en/{ => docs}/start.png          | Bin
 site/layouts/partials/community-links.html    |   2 +-
 site/layouts/partials/section-index.html      |  39 ++++++
 site/layouts/partials/sidebar-tree.html       | 106 ++++++++++++----
 site/static/images/screenshot.png             | Bin 0 -> 130043 bytes
 49 files changed, 279 insertions(+), 512 deletions(-)
 create mode 100644 site/content/en/docs/Contributing/building/_index.md
 rename site/content/en/docs/Contributing/{building.en.md => building/binaries.md} (100%)
 rename site/content/en/docs/Contributing/{ => building}/iso.md (99%)
 create mode 100644 site/content/en/docs/Contributing/releasing/_index.md
 rename site/content/en/docs/Contributing/{releasing.en.md => releasing/binaries.md} (86%)
 rename site/content/en/docs/Contributing/{ => releasing}/gvisor.md (100%)
 create mode 100644 site/content/en/docs/Contributing/releasing/iso.md
 delete mode 100644 site/content/en/docs/Handbook/Installation/_index.md
 delete mode 100644 site/content/en/docs/Handbook/Installation/includes/post_install.inc
 delete mode 100644 site/content/en/docs/Handbook/Installation/linux.md
 delete mode 100644 site/content/en/docs/Handbook/Installation/macos.md
 delete mode 100644 site/content/en/docs/Handbook/Installation/windows.md
 rename site/content/en/{ => docs}/featured-background.jpg (100%)
 rename site/content/en/{ => docs}/logo.png (100%)
 rename site/content/en/{ => docs}/start.png (100%)
 create mode 100644 site/layouts/partials/section-index.html
 create mode 100644 site/static/images/screenshot.png

diff --git a/site/config.toml b/site/config.toml
index 589179538c..7848140bf2 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -143,3 +143,22 @@ no = 'Sorry to hear that. Please <a href="https://github.com/kubernetes/minikube
 	url = "https://groups.google.com/forum/#!forum/minikube-dev"
 	icon = "fa fa-envelope"
 	desc = "Contact the minikube Dev's here"
+
+
+# Related pages - does not appear to work yet
+[related]
+    threshold = 80
+    includeNewer = true
+    toLower = true
+
+  [[related.indices]]
+    name  = "crosslink"
+    weight = 100
+    includeNewer = true
+
+  [[related.indices]]
+    name  = "keywords"
+    weight = 50
+    includeNewer = true
+
+    
\ No newline at end of file
diff --git a/site/content/en/_index.html b/site/content/en/_index.html
index 96d2b078d6..fb120425cc 100644
--- a/site/content/en/_index.html
+++ b/site/content/en/_index.html
@@ -1,122 +1,15 @@
 ---
 title: "minikube"
-resources:
-- src: "logo.png"
-  title: "logo"
-
-- src: "start.png"
-  title: "start"
 ---
 
-<style>
-	.imagesizing {
-		width:auto;
-		text-align:center;
-		padding:10px;
-	}
-	img {
-		max-width:100%;
-		height:auto;
-	}
-</style>
-
-<!-- Welcome to minikube -->
-<section class="row td-box td-box--white position-relative td-box--gradient td-box--height-auto">
-	<div class="container td-arrow-down">
-		<div class="row">
-			<div class="col-sm-8">
-				<h1>Welcome to minikube!</h1>
-				<p class="lead mt-5" style="text: nowrap">Local Kubernetes, focused on application development &amp; education</p>
-				<a class="btn btn-lg btn-primary mr-3 mb-4" href="/docs/start">
-					Get Started <i class="fas fa-arrow-alt-circle-right ml-2"></i>
- 				</a>
-  			    <a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://github.com/kubernetes/minikube">
-				    View Repository <i class="fab fa-github ml-2 "></i>
-                </a>
-			</div>
-			<div class="col">
-				{{< imgproc "logo" Fit "220x220" >}}{{< /imgproc >}}
-			</div>
-		</div>
-	</div>
-</section>
-
 
 <!-- Sales pitch -->
 {{< blocks/lead >}}
-
-<div class="container">
-<h2>Instantly productive.</h2>
-
-A single command away from reproducing your production environment, from the comfort of localhost.
-	<div class = "imagesizing">
-		<img src="start.png"/>
-	</div>
-	<h3>Highlights</h3>
-<ul class="fa-ul">
-<li><i class="fas fa-check"></i> Always supports the latest Kubernetes release (as well as previous versions)</li>
-<li><i class="fas fa-check"></i> Cross-platform (Linux, macOS, Windows)</li>
-<li><i class="fas fa-check"></i> Infinitely configurable local development environment</li>
-<li><i class="fas fa-check"></i> Multiple container runtimes (crio, containerd, docker, gvisor)</li>
-<li><i class="fas fa-check"></i> Provides a Docker API endpoint</li>
-</ul>
-</div>
-
-
+This page has moved to <a href="/docs">/docs</a>
+<script language="javascript">
+  window.location.replace("/docs");
+</script>
 
 {{< /blocks/lead >}}
 
 
-{{< blocks/section color="white" >}}
-{{% blocks/feature icon="fa-star" title="Developer focused" %}}
-- [LoadBalancer emulation](https://minikube.sigs.k8s.io/docs/Handbook/loadbalancer/)
-- [Addons Marketplace](https://minikube.sigs.k8s.io/docs/Handbook/addons/)
-- [Integrated Dashboard](https://minikube.sigs.k8s.io/docs/Handbook/dashboard/)
-- [GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/)
-- Reusable Docker daemon
-{{% /blocks/feature %}}
-
-{{% blocks/feature icon="fa-cogs" title="Infinitely configurable" %}}
-- Any container runtime
-- Any Kubernetes version
-- Any apiserver, kubelet, controller, etcd, proxy, or scheduler option
-{{% /blocks/feature %}}
-
-{{% blocks/feature icon="fa-thumbs-up" title="Cross-platform" %}}
-- KVM
-- Docker
-- HyperKit
-- Bare-metal
-- VirtualBox
-- Hyper-V
-- VMware
-- Podman
-{{% /blocks/feature %}}
-{{< /blocks/section >}}
-
-{{< blocks/section color="light" >}}
-{{% blocks/feature icon="fab fa-slack" title="Chat with us on Slack" %}}
-  <a class="text-white" href="https://slack.kubernetes.io">
-    <button type="button" class="btn btn-secondary" style="width:150px; margin-top: 12px;">Chat</button>
-  </a>
-
-The #minikube channel is ready to answer your questions.
-{{% /blocks/feature %}}
-
-{{% blocks/feature icon="fab fa-github" title="Contributions welcome" %}}
-  <a class="text-white" href="/docs/contributing">
-    <button type="button" class="btn btn-secondary" style="width:150px; margin-top: 12px;">Contribute</button>
-  </a>
-
-Want to join the fun on Github? New users are always welcome!
-{{% /blocks/feature %}}
-
-{{% blocks/feature icon="fas fa-bullhorn" title="Make your voice heard" %}}
- <a class="text-white" href="https://forms.gle/Gg3hG5ZySw8c1C24A">
-    <button type="button" class="btn btn-secondary" style="width:150px; margin-top: 12px;">Survey</button>
- </a>
-
-Have time for 5 quick questions? We would love to hear from you.
-
-{{% /blocks/feature %}}
-{{< /blocks/section >}}
diff --git a/site/content/en/docs/Commands/_index.md b/site/content/en/docs/Commands/_index.md
index a2accbac1b..2ecd64a746 100644
--- a/site/content/en/docs/Commands/_index.md
+++ b/site/content/en/docs/Commands/_index.md
@@ -1,7 +1,7 @@
 ---
 title: "Commands"
 linkTitle: "Commands"
-weight: 2
+weight: 5
 date: 2019-08-01
 description: >
   minikube command reference
diff --git a/site/content/en/docs/Contributing/building/_index.md b/site/content/en/docs/Contributing/building/_index.md
new file mode 100644
index 0000000000..c9faa7ba02
--- /dev/null
+++ b/site/content/en/docs/Contributing/building/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Building"
+linkTitle: "Building"
+weight: 2
+---
diff --git a/site/content/en/docs/Contributing/building.en.md b/site/content/en/docs/Contributing/building/binaries.md
similarity index 100%
rename from site/content/en/docs/Contributing/building.en.md
rename to site/content/en/docs/Contributing/building/binaries.md
diff --git a/site/content/en/docs/Contributing/iso.md b/site/content/en/docs/Contributing/building/iso.md
similarity index 99%
rename from site/content/en/docs/Contributing/iso.md
rename to site/content/en/docs/Contributing/building/iso.md
index f764d05388..3d5eabe70b 100644
--- a/site/content/en/docs/Contributing/iso.md
+++ b/site/content/en/docs/Contributing/building/iso.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "ISO"
+linkTitle: "ISO Build"
 title: "Building the minikube ISO"
 date: 2019-08-09
 weight: 4
diff --git a/site/content/en/docs/Contributing/principles.en.md b/site/content/en/docs/Contributing/principles.en.md
index 7ba4e884ed..a97404e6a1 100644
--- a/site/content/en/docs/Contributing/principles.en.md
+++ b/site/content/en/docs/Contributing/principles.en.md
@@ -1,17 +1,18 @@
 ---
 title: "Principles"
-date: 2019-06-18T15:31:58+08:00
+aliases:
+ - /docs/concepts/principles
 ---
 
 The primary goal of minikube is to make it simple to run Kubernetes locally, for day-to-day development workflows and learning purposes. Here are the guiding principles for minikube, in rough priority order:
 
 1.  Inclusive and community-driven
-1.  User-friendly
-1.  Support all Kubernetes features
-1.  Cross-platform
-1.  Reliable
-1.  High Performance
-1.  Developer Focused
+2.  User-friendly
+3.  Support all Kubernetes features
+4.  Cross-platform
+5.  Reliable
+6.  High Performance
+7.  Developer Focused
 
 Here are some specific minikube features that align with our goal:
 
diff --git a/site/content/en/docs/Contributing/releasing/_index.md b/site/content/en/docs/Contributing/releasing/_index.md
new file mode 100644
index 0000000000..0c2338eea5
--- /dev/null
+++ b/site/content/en/docs/Contributing/releasing/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Releasing"
+linkTitle: "Releasing"
+weight: 99
+---
diff --git a/site/content/en/docs/Contributing/releasing.en.md b/site/content/en/docs/Contributing/releasing/binaries.md
similarity index 86%
rename from site/content/en/docs/Contributing/releasing.en.md
rename to site/content/en/docs/Contributing/releasing/binaries.md
index e4d8a3a52c..1f5702dfed 100644
--- a/site/content/en/docs/Contributing/releasing.en.md
+++ b/site/content/en/docs/Contributing/releasing/binaries.md
@@ -1,9 +1,8 @@
 ---
-title: "Releasing"
-date: 2019-07-31
+title: "Binaries"
 weight: 9
 description: >
-  How to release minikube
+  How to release minikube binaries
 ---
 
 ## Preparation
@@ -16,19 +15,7 @@ description: >
 
 ## Build a new ISO
 
-Major releases always get a new ISO. Minor bugfixes may or may not require it: check for changes in the `deploy/iso` folder.
-To check, run `git log -- deploy/iso` from the root directory and see if there has been a commit since the most recent release.
-
-Note: you can build the ISO using the `hack/jenkins/build_iso.sh` script locally.
-
-* Navigate to the minikube ISO jenkins job
-* Ensure that you are logged in (top right)
-* Click "▶️ Build with Parameters" (left)
-* For `ISO_VERSION`, type in the intended release version (same as the minikube binary's version)
-* For `ISO_BUCKET`, type in `minikube/iso`
-* Click *Build*
-
-The build will take roughly 50 minutes.
+Major releases always get a new ISO. See [ISO release instructions]({{<ref "iso.md">}})
 
 ## Update Makefile
 
diff --git a/site/content/en/docs/Contributing/gvisor.md b/site/content/en/docs/Contributing/releasing/gvisor.md
similarity index 100%
rename from site/content/en/docs/Contributing/gvisor.md
rename to site/content/en/docs/Contributing/releasing/gvisor.md
diff --git a/site/content/en/docs/Contributing/releasing/iso.md b/site/content/en/docs/Contributing/releasing/iso.md
new file mode 100644
index 0000000000..5c1fdc1963
--- /dev/null
+++ b/site/content/en/docs/Contributing/releasing/iso.md
@@ -0,0 +1,19 @@
+---
+title: "ISO"
+description: >
+  How to release a new minikube ISO
+---
+
+Major releases always get a new ISO. Minor bugfixes may or may not require it: check for changes in the `deploy/iso` folder.
+To check, run `git log -- deploy/iso` from the root directory and see if there has been a commit since the most recent release.
+
+Note: you can build the ISO using the `hack/jenkins/build_iso.sh` script locally.
+
+* Navigate to the minikube ISO jenkins job
+* Ensure that you are logged in (top right)
+* Click "▶️ Build with Parameters" (left)
+* For `ISO_VERSION`, type in the intended release version (same as the minikube binary's version)
+* For `ISO_BUCKET`, type in `minikube/iso`
+* Click *Build*
+
+The build will take roughly 50 minutes.
diff --git a/site/content/en/docs/Drivers/_index.md b/site/content/en/docs/Drivers/_index.md
index c1c0adb612..7efc0914c9 100644
--- a/site/content/en/docs/Drivers/_index.md
+++ b/site/content/en/docs/Drivers/_index.md
@@ -2,8 +2,6 @@
 title: "Drivers"
 linkTitle: "Drivers"
 weight: 8
-date: 2017-01-05
-date: 2018-08-05
 description: >
   Configuring various minikube drivers
 ---
diff --git a/site/content/en/docs/Drivers/docker.md b/site/content/en/docs/Drivers/docker.md
index 803899e7cf..4c82cf36f5 100644
--- a/site/content/en/docs/Drivers/docker.md
+++ b/site/content/en/docs/Drivers/docker.md
@@ -1,26 +1,24 @@
 ---
 title: "docker"
-linkTitle: "docker"
 weight: 3
-date: 2020-02-05
-description: >
-  Docker driver 
+aliases:
+    - /docs/reference/drivers/docker
 ---
 
 ## Overview
 
 The Docker driver is the newest minikube driver. which runs kubernetes in container VM-free ! with full feature parity with minikube in VM.
 
-{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
-
+{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
 
 ## Special features
+
 - Cross platform (linux, macos, windows)
 - No hypervisor required when run on Linux.
 
 ## Known Issues.
 
-- The 'ingress' and 'ingress-dns' addons are only supported on Linux. 
+- The 'ingress' and 'ingress-dns' addons are only supported on Linux.
 these addons are not supported for Docker Driver on MacOS and Windows yet. to get updates on the work in progress please check [issue page](https://github.com/kubernetes/minikube/issues/7332)
 
-- a known [docker issue for MacOs](https://github.com/docker/for-mac/issues/1835), a containers on Docker on MacOS might hang and get stuck while other containers can get created. The current workaround is restarting docker.
\ No newline at end of file
+- a known [docker issue for macOS](https://github.com/docker/for-mac/issues/1835), a containers on Docker on MacOS might hang and get stuck while other containers can get created. The current workaround is restarting docker.
diff --git a/site/content/en/docs/Drivers/hyperkit.md b/site/content/en/docs/Drivers/hyperkit.md
index 4831bbf536..49be1a066f 100644
--- a/site/content/en/docs/Drivers/hyperkit.md
+++ b/site/content/en/docs/Drivers/hyperkit.md
@@ -1,17 +1,15 @@
 ---
 title: "hyperkit"
-linkTitle: "hyperkit"
 weight: 1
-date: 2018-08-08
-description: >
-  HyperKit driver
+aliases:
+    - /docs/reference/drivers/hyperkit
 ---
 
 ## Overview
 
 [HyperKit](https://github.com/moby/hyperkit) is an open-source hypervisor for macOS hypervisor, optimized for lightweight virtual machines and container deployment.
 
-{{% readfile file="/docs/Drivers/includes/hyperkit_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/hyperkit_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Drivers/hyperv.md b/site/content/en/docs/Drivers/hyperv.md
index deac57d470..78d5528ecd 100644
--- a/site/content/en/docs/Drivers/hyperv.md
+++ b/site/content/en/docs/Drivers/hyperv.md
@@ -1,17 +1,14 @@
 ---
 title: "hyperv"
-linkTitle: "hyperv"
 weight: 2
-date: 2017-01-05
-date: 2018-08-05
-description: >
-  Microsoft Hyper-V driver
+aliases:
+    - /docs/reference/drivers/hyperv
 ---
 ## Overview
 
 Hyper-V is a native hypervisor built in to modern versions of Microsoft Windows.
 
-{{% readfile file="/docs/Drivers/includes/hyperv_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/hyperv_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Drivers/includes/podman_usage.inc b/site/content/en/docs/Drivers/includes/podman_usage.inc
index 0d2db84e06..186c5bb604 100644
--- a/site/content/en/docs/Drivers/includes/podman_usage.inc
+++ b/site/content/en/docs/Drivers/includes/podman_usage.inc
@@ -1,7 +1,7 @@
 ## experimental
 
 This is an experimental driver. please use it only for experimental reasons.
-for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/docs/Drivers/docker).
+for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/Drivers/docker).
 
 ## Install Podman
 
diff --git a/site/content/en/docs/Drivers/kvm2.md b/site/content/en/docs/Drivers/kvm2.md
index d56b4d8e84..b447745524 100644
--- a/site/content/en/docs/Drivers/kvm2.md
+++ b/site/content/en/docs/Drivers/kvm2.md
@@ -1,11 +1,10 @@
 ---
 title: "kvm2"
-linkTitle: "kvm2"
 weight: 2
-date: 2017-01-05
-date: 2018-08-05
 description: >
   Linux KVM (Kernel-based Virtual Machine) driver
+aliases:
+    - /docs/reference/drivers/kvm2
 ---
 
 
@@ -13,11 +12,11 @@ description: >
 
 [KVM (Kernel-based Virtual Machine)](https://www.linux-kvm.org/page/Main_Page) is a full virtualization solution for Linux on x86 hardware containing virtualization extensions. To work with KVM, minikube uses the [libvirt virtualization API](https://libvirt.org/)
 
-{{% readfile file="/docs/Drivers/includes/kvm2_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/kvm2_usage.inc" %}}
 
 ## Check virtualization support
 
-{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
+{{% readfile file="/docs/drivers/includes/check_virtualization_linux.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Drivers/none.md b/site/content/en/docs/Drivers/none.md
index 2a5ffd9207..363c950db5 100644
--- a/site/content/en/docs/Drivers/none.md
+++ b/site/content/en/docs/Drivers/none.md
@@ -1,18 +1,22 @@
 ---
 title: "none"
-linkTitle: "none"
 weight: 3
-date: 2017-01-05
-date: 2018-08-05
 description: >
   Linux none (bare-metal) driver
+aliases:
+    - /docs/reference/drivers/none
 ---
 
 ## Overview
 
-This document is written for system integrators who are familiar with minikube, and wish to run it within a customized VM environment. The `none` driver allows advanced minikube users to skip VM creation, allowing minikube to be run on a user-supplied VM.
+{{% pageinfo %}}
+Most users of this driver should consider the newer [Docker driver]({{< ref "docker.md" >}}), as it is
+significantly easier to configure and does not require root access. The 'none' driver is recommended for advanced users only.
+{{% /pageinfo %}}
 
-{{% readfile file="/docs/Drivers/includes/none_usage.inc" %}}
+This document is written for system integrators who wish to run minikube within a customized VM environment. The `none` driver allows advanced minikube users to skip VM creation, allowing minikube to be run on a user-supplied VM.
+
+{{% readfile file="/docs/drivers/includes/none_usage.inc" %}}
 
 ## Issues
 
diff --git a/site/content/en/docs/Drivers/parallels.md b/site/content/en/docs/Drivers/parallels.md
index b345fd6011..6498a913a1 100644
--- a/site/content/en/docs/Drivers/parallels.md
+++ b/site/content/en/docs/Drivers/parallels.md
@@ -1,17 +1,15 @@
 ---
 title: "parallels"
-linkTitle: "parallels"
 weight: 4
-date: 2018-08-08
-description: >
-  Parallels driver
+aliases:
+    - /docs/reference/drivers/parallels
 ---
 
 ## Overview
 
 The Parallels driver is particularly useful for users who own Parallels Desktop, as it does not require VT-x hardware support.
 
-{{% readfile file="/docs/Drivers/includes/parallels_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/parallels_usage.inc" %}}
 
 ## Issues
 
diff --git a/site/content/en/docs/Drivers/podman.md b/site/content/en/docs/Drivers/podman.md
index b07ad7655e..93854fa899 100644
--- a/site/content/en/docs/Drivers/podman.md
+++ b/site/content/en/docs/Drivers/podman.md
@@ -1,26 +1,22 @@
 ---
 title: "podman"
-linkTitle: "podman"
 weight: 3
-date: 2020-03-26
-description: >
-  Podman driver 
+aliases:
+    - /docs/reference/drivers/podman
 ---
 
 ## Overview
 
-The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](https://minikube.sigs.k8s.io/docs/Drivers/docker/) driver.
-podman driver is currently experimental. 
-and only supported on Linux and MacOs (with a remote podman server)
+{{% pageinfo %}}
+This driver is experimental and in active development. Help wanted!
+{{% /pageinfo %}}
 
+The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is  experimental, and only supported on Linux and macOS (with a remote podman server)
 
 ## Try it with CRI-O container runtime.
+
 ```shell
 minikube start --driver=podman --container-runtime=cri-o
 ```
 
-
-{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
-
-
-
+{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
diff --git a/site/content/en/docs/Drivers/virtualbox.md b/site/content/en/docs/Drivers/virtualbox.md
index 695f820893..b9158788ad 100644
--- a/site/content/en/docs/Drivers/virtualbox.md
+++ b/site/content/en/docs/Drivers/virtualbox.md
@@ -1,17 +1,15 @@
 ---
 title: "virtualbox"
-linkTitle: "virtualbox"
 weight: 5
-date: 2018-08-08
-description: >
-  VirtualBox driver
+aliases:
+  - /docs/reference/drivers/virtualbox
 ---
 
 ## Overview
 
-VirtualBox is the oldest and most stable VM driver for minikube.
+VirtualBox is minikube's original driver. It may not provide the fastest start-up time, but it is the most stable driver available for users of Microsoft Windows Home.
 
-{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
 
 ## Special features
 
diff --git a/site/content/en/docs/Drivers/vmware.md b/site/content/en/docs/Drivers/vmware.md
index cd57cdaf5b..89403bd4b3 100644
--- a/site/content/en/docs/Drivers/vmware.md
+++ b/site/content/en/docs/Drivers/vmware.md
@@ -1,10 +1,8 @@
 ---
 title: "vmware"
-linkTitle: "vmware"
 weight: 6
-date: 2018-08-08
-description: >
-  VMware driver
+aliases:
+    - /docs/reference/drivers/vmware
 ---
 
 ## Overview
@@ -13,7 +11,7 @@ The vmware driver supports virtualization across all VMware based hypervisors.
 
 {{% tabs %}}
 {{% tab "macOS" %}}
-{{% readfile file="/docs/Drivers/includes/vmware_macos_usage.inc" %}}
+{{% readfile file="/docs/drivers/includes/vmware_macos_usage.inc" %}}
 {{% /tab %}}
 {{% tab "Linux" %}}
 No documentation is available yet.
diff --git a/site/content/en/docs/FAQ/_index.md b/site/content/en/docs/FAQ/_index.md
index 94c90fcc46..321bff9bae 100644
--- a/site/content/en/docs/FAQ/_index.md
+++ b/site/content/en/docs/FAQ/_index.md
@@ -1,7 +1,7 @@
 ---
 title: "FAQ"
 linkTitle: "FAQ"
-weight: 5
+weight: 3
 description: >
   Questions that come up regularly
 ---
@@ -14,6 +14,6 @@ description: >
 
 The easiest approach is to use the `docker` driver, as the backend service always runs as `root`.
 
-`none` users may want to try `CHANGE_MINIKUBE_NONE_USER=true`,  where kubectl and such will still work: [see environment variables](https://minikube.sigs.k8s.io/docs/reference/environment_variables/)
+`none` users may want to try `CHANGE_MINIKUBE_NONE_USER=true`,  where kubectl and such will still work: [see environment variables](https://minikube.sigs.k8s.io/reference/environment_variables/)
 
 Alternatively, configure `sudo` to never prompt for the commands issued by minikube.
diff --git a/site/content/en/docs/Handbook/Installation/_index.md b/site/content/en/docs/Handbook/Installation/_index.md
deleted file mode 100644
index dfd645c030..0000000000
--- a/site/content/en/docs/Handbook/Installation/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: "Installation"
-linkTitle: "Installation"
-weight: 1
-description: >
-  How to install minikube
----
diff --git a/site/content/en/docs/Handbook/Installation/includes/post_install.inc b/site/content/en/docs/Handbook/Installation/includes/post_install.inc
deleted file mode 100644
index 03ed41bb61..0000000000
--- a/site/content/en/docs/Handbook/Installation/includes/post_install.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-## Getting to know Kubernetes
-
-Once started, you can use any regular Kubernetes command to interact with your minikube cluster. For example, you can see the pod states by running:
-
-```shell
- kubectl get po -A
-```
-
-## Increasing memory allocation
-
-minikube auto-selects the memory size based on your system up to 6000mb. For larger 
-deployments, increase the memory allocation using the `--memory` flag, or make the setting persistent using:
-
-```shell
-minikube config set memory 8096
-```
-
-## Where to go next?
-
-Visit the [examples](/docs/examples) page to get an idea of what you can do with minikube.
-
-📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
\ No newline at end of file
diff --git a/site/content/en/docs/Handbook/Installation/linux.md b/site/content/en/docs/Handbook/Installation/linux.md
deleted file mode 100644
index f214ce56cb..0000000000
--- a/site/content/en/docs/Handbook/Installation/linux.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: "Linux"
-linkTitle: "Linux"
-weight: 1
----
-
-## Installation
-
-{{% tabs %}}
-{{% tab "Direct" %}}
-
-Download and install minikube to /usr/local/bin:
-
-```shell
- curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
-   && sudo install minikube-linux-amd64 /usr/local/bin/minikube
-```
-{{% /tab %}}
-{{% tab "Debian/Ubuntu (deb)" %}}
-
-Download and install minikube:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_{{< latest >}}-0_amd64.deb \
- && sudo dpkg -i minikube_{{< latest >}}-0_amd64.deb
- ```
-
-{{% /tab %}}
-
-{{% tab "Fedora/Red Hat (rpm)" %}}
-
-Download and install minikube:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< latest >}}-0.x86_64.rpm \
- && sudo rpm -ivh minikube-{{< latest >}}-0.x86_64.rpm
- ```
-
-{{% /tab %}}
-{{% /tabs %}}
-
-## Driver Setup
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-## Check container support
-{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-
-{{% tab "KVM" %}}
-## Check virtualization support
-{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
-
-{{% readfile file="/docs/Drivers/includes/kvm2_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-## Check virtualization support
-{{% readfile file="/docs/Drivers/includes/check_virtualization_linux.inc" %}}
-
-{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% tab "None (bare-metal)" %}}
-## Check baremetal support
-{{% readfile file="/docs/Drivers/includes/check_baremetal_linux.inc" %}}
-
-If you are already running minikube from inside a VM, it is possible to skip the creation of an additional VM layer by using the `none` driver.
-
-{{% readfile file="/docs/Drivers/includes/none_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
-{{% /tab %}}
-
-
-{{% /tabs %}}
-
-{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Handbook/Installation/macos.md b/site/content/en/docs/Handbook/Installation/macos.md
deleted file mode 100644
index 15e4665b3f..0000000000
--- a/site/content/en/docs/Handbook/Installation/macos.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: "macOS"
-linkTitle: "macOS"
-weight: 2
----
-
-### Prerequisites
-
-* macOS 10.12 (Sierra)
-* A hypervisor such as Hyperkit, Parallels, VirtualBox, or VMware Fusion
-
-### Installation
-
-{{% tabs %}}
-{{% tab "Brew" %}}
-
-If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and install minikube:
-
-```shell
-brew install minikube
-```
-
-{{% /tab %}}
-{{% tab "Direct" %}}
-
-Download and install minikube to /usr/local/bin:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 \
-  && sudo install minikube-darwin-amd64 /usr/local/bin/minikube
-```
-{{% /tab %}}
-{{% /tabs %}}
-
-### Upgrading minikube
-
-{{% tabs %}}
-{{% tab "Brew" %}}
-
-If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and upgrade minikube:
-
-```shell
-brew update
-brew upgrade minikube
-```
-
-{{% /tab %}}
-{{% /tabs %}}
-
-## Hypervisor Setup
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Hyperkit" %}}
-{{% readfile file="/docs/Drivers/includes/hyperkit_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Parallels" %}}
-{{% readfile file="/docs/Drivers/includes/parallels_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VMware" %}}
-{{% readfile file="/docs/Drivers/includes/vmware_macos_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/Drivers/includes/podman_usage.inc" %}}
-{{% /tab %}}
-
-{{% /tabs %}}
-
-{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Handbook/Installation/windows.md b/site/content/en/docs/Handbook/Installation/windows.md
deleted file mode 100644
index 3ca2eafbc2..0000000000
--- a/site/content/en/docs/Handbook/Installation/windows.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: "Windows"
-linkTitle: "Windows"
-weight: 3
----
-
-### Prerequisites
-
-* Windows 8 or above
-* 4GB of RAM
-
-### Installation
-
-{{% tabs %}}
-{{% tab "Direct" %}}
-Download and run the [minikube installer](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe)
-{{% /tab %}}
-
-{{% tab "Chocolatey" %}}
-
-If the [Chocolatey Package Manager](https://chocolatey.org/) is installed, use it to install minikube:
-
-```shell
-choco install minikube
-```
-
-After it has installed, close the current CLI session and reopen it. minikube should have been added to your path automatically.
-{{% /tab %}}
-{{% /tabs %}}
-
-
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-{{% readfile file="/docs/Drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-
-{{% tab "Hyper-V" %}}
-## Check Hypervisor 
-{{% readfile file="/docs/Drivers/includes/check_virtualization_windows.inc" %}}
-
-{{% readfile file="/docs/Drivers/includes/hyperv_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-## Check Hypervisor 
-{{% readfile file="/docs/Drivers/includes/check_virtualization_windows.inc" %}}
-
-{{% readfile file="/docs/Drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% /tabs %}}
-
-{{% readfile file="/docs/Handbook/Installation/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/Handbook/_index.md b/site/content/en/docs/Handbook/_index.md
index 314dfc61b7..d73d6c2a8c 100644
--- a/site/content/en/docs/Handbook/_index.md
+++ b/site/content/en/docs/Handbook/_index.md
@@ -1,6 +1,8 @@
 ---
 title: "Handbook"
-weight: 1
+weight: 2
 description: >
   How to perform common tasks with minikube
+aliases:
+  - /docs/start/examples/
 ---
diff --git a/site/content/en/docs/Handbook/accessing.md b/site/content/en/docs/Handbook/accessing.md
index ae0f550a17..5df12ed3df 100644
--- a/site/content/en/docs/Handbook/accessing.md
+++ b/site/content/en/docs/Handbook/accessing.md
@@ -3,6 +3,9 @@ title: "Accessing apps"
 weight: 3
 description: >
   How to access applications running within minikube
+aliases:
+ - /docs/tasks/loadbalancer
+ - /docs/tasks/nodeport
 ---
 
 There are two major categories of services in Kubernetes:
diff --git a/site/content/en/docs/Handbook/controls.md b/site/content/en/docs/Handbook/controls.md
index b388372fa9..537f2478c6 100755
--- a/site/content/en/docs/Handbook/controls.md
+++ b/site/content/en/docs/Handbook/controls.md
@@ -1,7 +1,7 @@
 
 ---
 title: "Basic controls"
-weight: 1
+weight: 2
 description: >
   See minikube in action!
 ---
diff --git a/site/content/en/docs/Handbook/dashboard.md b/site/content/en/docs/Handbook/dashboard.md
index 7252f2d8e5..b0dd904408 100644
--- a/site/content/en/docs/Handbook/dashboard.md
+++ b/site/content/en/docs/Handbook/dashboard.md
@@ -3,6 +3,8 @@ title: "Dashboard"
 weight: 4
 description: >
   Dashboard
+aliases:
+  - /docs/tasks/dashboard/
 ---
 
 minikube has integrated support for the [Kubernetes Dashboard UI](https://github.com/kubernetes/dashboard).
diff --git a/site/content/en/docs/Handbook/deploying.md b/site/content/en/docs/Handbook/deploying.md
index d96b30cb87..209d12b1a9 100644
--- a/site/content/en/docs/Handbook/deploying.md
+++ b/site/content/en/docs/Handbook/deploying.md
@@ -3,6 +3,8 @@ title: "Deploying apps"
 weight: 2
 description: >
   How to deploy an application to minikube
+aliases:
+  - /docs/tasks/addons
 ---
 
 ## kubectl
diff --git a/site/content/en/docs/Handbook/filesync.md b/site/content/en/docs/Handbook/filesync.md
index e88ad0c66c..bfa1551349 100644
--- a/site/content/en/docs/Handbook/filesync.md
+++ b/site/content/en/docs/Handbook/filesync.md
@@ -3,6 +3,8 @@ title: "File Sync"
 weight: 12
 description: >
   How to sync files into minikube
+aliases:
+  - /docs/tasks/sync/
 ---
 
 ## Built-in sync
diff --git a/site/content/en/docs/Handbook/host-access.md b/site/content/en/docs/Handbook/host-access.md
index 596477a1ee..da419d0c94 100644
--- a/site/content/en/docs/Handbook/host-access.md
+++ b/site/content/en/docs/Handbook/host-access.md
@@ -4,6 +4,8 @@ date: 2017-01-05
 weight: 9
 description: >
   How to access host resources from a pod
+aliases:
+  - docs/tasks/accessing-host-resources/
 ---
 
 {{% pageinfo %}}
diff --git a/site/content/en/docs/Handbook/mount.md b/site/content/en/docs/Handbook/mount.md
index c4000894b0..40033f5bcd 100644
--- a/site/content/en/docs/Handbook/mount.md
+++ b/site/content/en/docs/Handbook/mount.md
@@ -4,6 +4,8 @@ date: 2017-01-05
 weight: 11
 description: >
   How to mount a host directory into the VM
+aliases:
+  - /docs/tasks/mount
 ---
 
 ## 9P Mounts
diff --git a/site/content/en/docs/Handbook/pushing.md b/site/content/en/docs/Handbook/pushing.md
index f8cbb5e75f..64f385e7f5 100644
--- a/site/content/en/docs/Handbook/pushing.md
+++ b/site/content/en/docs/Handbook/pushing.md
@@ -3,6 +3,11 @@ title: "Pushing images"
 weight: 5
 description: >
   There are many ways to push images into minikube.
+aliases:
+ - /docs/tasks/building
+ - /docs/tasks/caching
+ - /docs/tasks/podman_service
+ - /docs/tasks/docker_daemon
 ---
 
 ## Cached Images
@@ -30,7 +35,7 @@ minikube cache delete <image name>
 
 For more information, see:
 
-* [Reference: cache command]({{< ref "/docs/Commands/cache.md" >}})
+* [Reference: cache command]({{< ref "/docs/commands/cache.md" >}})
 
 You must be using minikube with the container runtime set to Docker. This is the default setting.
 
@@ -71,11 +76,11 @@ Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPre
 
 ## Pushing to an in-cluster Registry
 
-For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/docs/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
+For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
 
 Ensure that docker is configured to use `192.168.39.0/24` as insecure registry. Refer [here](https://docs.docker.com/registry/insecure/) for instructions.
 
-Ensure that `192.168.39.0/24` is enabled as insecure registry in minikube. Refer [here](https://minikube.sigs.k8s.io/docs/Handbook/registry/insecure/) for instructions..
+Ensure that `192.168.39.0/24` is enabled as insecure registry in minikube. Refer [here](https://minikube.sigs.k8s.io/Handbook/registry/insecure/) for instructions..
 
 Enable minikube registry addon:
 
diff --git a/site/content/en/docs/Handbook/registry.md b/site/content/en/docs/Handbook/registry.md
index f5776c4795..5d6d8d8385 100644
--- a/site/content/en/docs/Handbook/registry.md
+++ b/site/content/en/docs/Handbook/registry.md
@@ -2,9 +2,13 @@
 title: "Registries"
 linkTitle: "Registries"
 weight: 6
-date: 2017-01-05
 description: >
-  How to interact with Docker registries.
+  How to interact with registries
+aliases:
+ - /docs/tasks/registry
+ - /docs/tasks/docker_registry
+ - /docs/tasks/registry/private
+ - /docs/tasks/registry/insecure
 ---
 
 ## Using a Private Registry
diff --git a/site/content/en/docs/Tutorials/_index.md b/site/content/en/docs/Tutorials/_index.md
index 9bd77be263..83db8c6e1f 100755
--- a/site/content/en/docs/Tutorials/_index.md
+++ b/site/content/en/docs/Tutorials/_index.md
@@ -1,7 +1,6 @@
 ---
 title: "Tutorials"
-weight: 9
-date: 2017-01-04
+weight: 4
 description: >
   Contributed end-to-end tutorials using minikube
 ---
diff --git a/site/content/en/docs/Tutorials/audit-policy.md b/site/content/en/docs/Tutorials/audit-policy.md
index fee350cb8e..973986f0bb 100644
--- a/site/content/en/docs/Tutorials/audit-policy.md
+++ b/site/content/en/docs/Tutorials/audit-policy.md
@@ -34,6 +34,6 @@ minikube start \
 kubectl logs kube-apiserver-minikube -n  kube-system | grep audit.k8s.io/v1
 ```
 
-The [Audit Policy](https://kubernetes.io/docs/Handbook/debug-application-cluster/audit/#audit-policy) used in this tutorial is very minimal and quite verbose. As a next step you might want to finetune the `audit-policy.yaml` file. To get the changes applied you need to stop and start minikube. Restarting minikube triggers the [file sync mechanism](https://minikube.sigs.k8s.io/docs/Handbook/sync/) that copies the yaml file onto the minikube node and causes the API server to read the changed policy file.
+The [Audit Policy](https://kubernetes.io/docs/Handbook/debug-application-cluster/audit/#audit-policy) used in this tutorial is very minimal and quite verbose. As a next step you might want to finetune the `audit-policy.yaml` file. To get the changes applied you need to stop and start minikube. Restarting minikube triggers the [file sync mechanism](https://minikube.sigs.k8s.io/Handbook/sync/) that copies the yaml file onto the minikube node and causes the API server to read the changed policy file.
 
-Note: Currently there is no dedicated directory to store the `audit-policy.yaml` file in `~/.minikube/`. Using the `~/.minikube/files/etc/ssl/certs` directory is a workaround! This workaround works like this: By putting the file into a sub-directory of `~/.minikube/files/`, the [file sync mechanism](https://minikube.sigs.k8s.io/docs/Handbook/sync/) gets triggered and copies the `audit-policy.yaml` file from the host onto the minikube node. When the API server container gets started by `kubeadm` I'll mount the `/etc/ssl/certs` directory from the minikube node into the container. This is the reason why the `audit-policy.yaml` file has to be stored in the ssl certs directory: It's one of the directories that get mounted from the minikube node into the container.
+Note: Currently there is no dedicated directory to store the `audit-policy.yaml` file in `~/.minikube/`. Using the `~/.minikube/files/etc/ssl/certs` directory is a workaround! This workaround works like this: By putting the file into a sub-directory of `~/.minikube/files/`, the [file sync mechanism](https://minikube.sigs.k8s.io/Handbook/sync/) gets triggered and copies the `audit-policy.yaml` file from the host onto the minikube node. When the API server container gets started by `kubeadm` I'll mount the `/etc/ssl/certs` directory from the minikube node into the container. This is the reason why the `audit-policy.yaml` file has to be stored in the ssl certs directory: It's one of the directories that get mounted from the minikube node into the container.
diff --git a/site/content/en/docs/Tutorials/openid_connect_auth.md b/site/content/en/docs/Tutorials/openid_connect_auth.md
index 46fbe28968..769155c296 100644
--- a/site/content/en/docs/Tutorials/openid_connect_auth.md
+++ b/site/content/en/docs/Tutorials/openid_connect_auth.md
@@ -13,7 +13,7 @@ Read more about OpenID Connect Authentication for Kubernetes here: <https://kube
 
 ## Configuring the API Server
 
-Configuration values can be passed to the API server using the `--extra-config` flag on the `minikube start` command. See [configuring_kubernetes.md](https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/) for more details.
+Configuration values can be passed to the API server using the `--extra-config` flag on the `minikube start` command. See [configuring_kubernetes.md](https://minikube.sigs.k8s.io/reference/configuration/kubernetes/) for more details.
 
 The following example configures your Minikube cluster to support RBAC and OIDC:
 
diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md
index 4cfbecadf9..8d9db894e7 100755
--- a/site/content/en/docs/_index.md
+++ b/site/content/en/docs/_index.md
@@ -1,54 +1,26 @@
 ---
 title: "Welcome!"
 linkTitle: "Documentation"
-weight: 1
-menu:
-  main:
-    weight: 1
-description: >
-  What is minikube?
 no_list: true
+weight: 1
+aliases:
+  - /docs/overview
 ---
 
 minikube implements a local Kubernetes cluster on macOS, Linux, and Windows.
 
-minikube's [primary goals](https://minikube.sigs.k8s.io/docs/concepts/principles/) are to be the best tool for local Kubernetes application development and to support all Kubernetes features that fit.
+![Screenshot](/images/screenshot.png)
 
-minikube runs the latest stable release of Kubernetes, with support for standard Kubernetes features like:
+## Highlights
 
-* [LoadBalancer](https://minikube.sigs.k8s.io/docs/Handbook/loadbalancer/) - using `minikube tunnel`
-* Multi-cluster - using `minikube start -p <name>`
-* NodePorts - using `minikube service`
-* [Persistent Volumes](https://minikube.sigs.k8s.io/docs/reference/persistent_volumes/)
-* Ingress
-* RBAC
-* [Dashboard](https://minikube.sigs.k8s.io/docs/Handbook/dashboard/) - `minikube dashboard`
-* [Container runtimes](https://minikube.sigs.k8s.io/docs/reference/runtimes/) - `start --container-runtime`
-* [Configure apiserver and kubelet options](https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/) via command-line flags
+* Supports the latest Kubernetes release (+6 previous minor versions)
+* Cross-platform (Linux, macOS, Windows)
+* Deploy as a VM, a container, or on bare-metal
+* Multiple container runtimes (CRI-O, containerd, docker)
+* Docker API endpoint for blazing fast image pushes
+* Advanced features such as [LoadBalancer](https://minikube.sigs.k8s.io/Handbook/loadbalancer/), filesystem mounts, and FeatureGates
+* [Addons](https://minikube.sigs.k8s.io/Handbook/addons/) for easily installed Kubernetes applications
 
-As well as developer-friendly features:
+## Survey
 
-* [Addons](https://minikube.sigs.k8s.io/docs/Handbook/addons/) - a marketplace for developers to share configurations for running services on minikube
-* [GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/) - for machine learning
-* [Filesystem mounts](https://minikube.sigs.k8s.io/docs/Handbook/mount/)
-* Automatic failure analysis
-
-## Why do I want it?
-
-If you would like to develop Kubernetes applications:
-
-* locally
-* offline
-* using the latest version of Kubernetes
-
-Then minikube is for you.
-
-* **What is it good for?** Developing local Kubernetes applications
-* **What is it not good for?** Production Kubernetes deployments
-
-## Where should I go next?
-
-* [Getting Started](/docs/start/): Get started with minikube
-* [Examples](/docs/examples/): Check out some minikube examples!
-
-📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
+Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A) so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
diff --git a/site/content/en/featured-background.jpg b/site/content/en/docs/featured-background.jpg
similarity index 100%
rename from site/content/en/featured-background.jpg
rename to site/content/en/docs/featured-background.jpg
diff --git a/site/content/en/logo.png b/site/content/en/docs/logo.png
similarity index 100%
rename from site/content/en/logo.png
rename to site/content/en/docs/logo.png
diff --git a/site/content/en/start.png b/site/content/en/docs/start.png
similarity index 100%
rename from site/content/en/start.png
rename to site/content/en/docs/start.png
diff --git a/site/layouts/partials/community-links.html b/site/layouts/partials/community-links.html
index 9c5545d4dc..409b78a16e 100644
--- a/site/layouts/partials/community-links.html
+++ b/site/layouts/partials/community-links.html
@@ -14,7 +14,7 @@
 {{ with index $links "developer"}}
 {{ template "community-links-list"  . }}
 {{ end }}
-<p>You can find out how to contribute to these docs in our <a href="/docs/contributing/guide">Contributing Guide</a>.
+<p>You can find out how to contribute to these docs in our <a href="/contributing/guide">Contributing Guide</a>.
 </div>
 </section>
 
diff --git a/site/layouts/partials/section-index.html b/site/layouts/partials/section-index.html
new file mode 100644
index 0000000000..ffea5611c7
--- /dev/null
+++ b/site/layouts/partials/section-index.html
@@ -0,0 +1,39 @@
+{{ $related := .Site.RegularPages.Related . | first 3 }}
+{{ with $related }}
+<h3>See Also</h3>
+<ul>
+	{{ range . }}
+	<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+	{{ end }}
+</ul>
+{{ end }}
+
+<div class="section-index">
+    {{ $pages := (where .Site.Pages "Section" .Section).ByWeight }}
+    {{ $parent := .Page }}
+    {{ if $parent.Params.no_list }}
+    {{/* If no_list is true we don't show a list of subpages */}}
+    {{ else if $parent.Params.simple_list }}
+    {{/* If simple_list is true we show a bulleted list of subpages */}}
+        <ul>
+            {{ range $pages }}
+                {{ if eq .Parent $parent }}
+                    <li><a href="{{ .RelPermalink }}">{{- .Title -}}</a></li>
+                {{ end }}
+            {{ end }}
+        </ul>
+    {{ else }}
+    {{/* Otherwise we show a nice formatted list of subpages with page descriptions */}}
+    <hr class="panel-line">
+        {{ range $pages }}
+            {{ if eq .Parent $parent }}
+                <div class="entry">
+                    <h5>
+                        <a href="{{ .RelPermalink }}">{{- .Title -}}</a>
+                    </h5>
+                    <p>{{ .Description | markdownify }}</p>
+                </div>
+            {{ end }}
+        {{ end }}
+    {{ end }}
+</div>
diff --git a/site/layouts/partials/sidebar-tree.html b/site/layouts/partials/sidebar-tree.html
index 7e1fcf4c80..555bf037b5 100644
--- a/site/layouts/partials/sidebar-tree.html
+++ b/site/layouts/partials/sidebar-tree.html
@@ -1,3 +1,5 @@
+<!-- note, this is only used in /docs -->
+
 {{/* minikube hack: temporarily forked from docsy/layouts/partials/sidebar-tree.html for hugo v0.69 compatibility */}}
 
 {{/* We cache this partial for bigger sites and set the active class client side. */}}
@@ -19,41 +21,91 @@
     {{ template "section-tree-nav-section" (dict "page" . "section" .FirstSection "delayActive" $shouldDelayActive)  }}
   </nav>
 </div>
+
+
+<!-- this gets called for every section -->
 {{ define "section-tree-nav-section" }}
 {{ $s := .section }}
 {{ $p := .page }}
 {{ $shouldDelayActive := .delayActive }}
-{{ $active := eq $p.CurrentSection $s }}
-{{ $show := or (and (not $p.Site.Params.ui.sidebar_menu_compact) ($p.IsAncestor $s)) ($p.IsDescendant $s) }}
+{{ $activeSection := eq $p.CurrentSection $s }}
 
-{{/* minikube hack: Override $show due to a Hugo upgrade bug */}}
-{{ $show = true }}
+{{/* minikube hack: Override $showSection due to a Hugo upgrade bug */}}
+{{ $showSection := false }}
+{{ $expandSection := false }}
+{{ $sid := $s.RelPermalink | anchorize }}
+{{ $sectionParent := $s.Parent.Title | anchorize }}
+{{ $csid := $p.CurrentSection.Title | anchorize }}
+
+{{ if $p.IsDescendant $s }}
+  <!-- page is within current section -->
+  {{ $showSection = true }}
+{{ else if eq $sectionParent "minikube" }}
+  <!-- top-level section -->
+  {{ $showSection = true }}
+{{ else if eq $sectionParent "welcome" }}
+  <!-- top-level documentation -->
+  {{ $showSection = true }}
+{{ else if eq $sectionParent "handbook" }}
+  <!-- handbook link -->
+  {{ $showSection = true }}
+{{ else if eq $p.CurrentSection $s.Parent }}
+  <!-- page is in current sections parent -->
+  {{ $showSection = true }}
+{{ else if $p.Parent.IsAncestor $s }}
+  <!-- page is in current section -->
+  {{ if eq $s $p.CurrentSection }}
+    {{ $showSection = true }}
+  {{ end }}
+
+{{ end }}
+
+<!-- only show top-level sections, or sections within the current section -->
 {{/* end minikube hack */}}
 
 {{ $sid := $s.RelPermalink | anchorize }}
-<ul class="td-sidebar-nav__section pr-md-3">
-  <li class="td-sidebar-nav__section-title">
-    <a href="{{ $s.RelPermalink }}" class="align-left pl-0 pr-2{{ if not $show }} collapsed{{ end }}{{ if $active}} active{{ end }} td-sidebar-link td-sidebar-link__section">{{ $s.LinkTitle }}</a>
-  </li>
-  <ul>
-    <li class="collapse {{ if $show }}show{{ end }}" id="{{ $sid }}">
-      {{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
-      {{ $pages := $pages | first 50 }}
-      {{ range $pages }}
-      {{ if .IsPage }}
-        {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }}
-
-        {{/* minikube hack: Override $active due to a Hugo upgrade bug */}}
-        {{ if $active }}
-            {{ $activePage := eq . $p }}
-            <a class="td-sidebar-link td-sidebar-link__page {{ if $activePage }} active{{ end }}" id="{{ $mid }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
-        {{ end }}
-        {{/* end minikube hack */}}
-      {{ else }}
-          {{ template "section-tree-nav-section" (dict "page" $p "section" .) }}
-      {{ end }}
-      {{ end }}
+{{ if $showSection }}
+  <ul class="td-sidebar-nav__section pr-md-3">
+    <li class="td-sidebar-nav__section-title">
+      <!-- Link for subections -->
+      <a href="{{ $s.RelPermalink }}" class="align-left pl-0 pr-2{{ if not $expandSection }} collapsed{{ end }}{{ if $activeSection}} active{{ end }} td-sidebar-link td-sidebar-link__section">{{ $s.LinkTitle }}</a>
     </li>
+    <ul>
+      <li class="collapse {{ if $showSection }}show{{ end }}" id="{{ $sid }}">
+        {{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
+        {{ $pages := $pages | first 50 }}
+        {{ range $pages }}
+        {{ if .IsPage }}
+          {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }}
+
+          {{/* minikube hack: Override $activeSection due to a Hugo upgrade bug */}}
+          {{ $showPage := false }}
+          {{ $activePage := false }}
+
+          <!-- always show pages in the current section -->
+          {{ if $activeSection }}
+              {{ $showPage = true }}
+              {{ $activePage := eq . $p }}
+          {{ end }}
+
+          <!-- show handbook unless we are in a very long section -->
+          {{ if eq $s.Title "Handbook" }}
+            {{ if lt (len $p.CurrentSection.Pages) 8 }}
+              {{ $showPage = true }}
+            {{ end }}
+          {{ end }}
+
+          {{ if $showPage }}
+            <a class="td-sidebar-link td-sidebar-link__page {{ if $activePage }} active{{ end }}" id="{{ $mid }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
+          {{ end }}
+
+          {{/* end minikube hack */}}
+        {{ else }}
+            {{ template "section-tree-nav-section" (dict "page" $p "section" .) }}
+        {{ end }}
+        {{ end }}
+      </li>
+    </ul>
   </ul>
-</ul>
+  {{ end }}
 {{ end }}
diff --git a/site/static/images/screenshot.png b/site/static/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6f14a111aefbe82d1e5891679eb2b1391a51868
GIT binary patch
literal 130043
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
B2O$6e

literal 0
HcmV?d00001


From cf61a83425bbaa6c64b6394faeda23d1137d9225 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 18:08:51 -0700
Subject: [PATCH 483/668] Move start page back

---
 site/content/en/docs/start/_index.md          |  8 ++
 .../en/docs/start/includes/post_install.inc   | 22 ++++++
 site/content/en/docs/start/linux.md           | 79 +++++++++++++++++++
 site/content/en/docs/start/macos.md           | 76 ++++++++++++++++++
 site/content/en/docs/start/windows.md         | 56 +++++++++++++
 5 files changed, 241 insertions(+)
 create mode 100644 site/content/en/docs/start/_index.md
 create mode 100644 site/content/en/docs/start/includes/post_install.inc
 create mode 100644 site/content/en/docs/start/linux.md
 create mode 100644 site/content/en/docs/start/macos.md
 create mode 100644 site/content/en/docs/start/windows.md

diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md
new file mode 100644
index 0000000000..6d58d2df6d
--- /dev/null
+++ b/site/content/en/docs/start/_index.md
@@ -0,0 +1,8 @@
+---
+title: "Get Started!"
+weight: 1
+description: >
+  How to install minikube
+aliases:
+  - /docs/start
+---
diff --git a/site/content/en/docs/start/includes/post_install.inc b/site/content/en/docs/start/includes/post_install.inc
new file mode 100644
index 0000000000..03ed41bb61
--- /dev/null
+++ b/site/content/en/docs/start/includes/post_install.inc
@@ -0,0 +1,22 @@
+## Getting to know Kubernetes
+
+Once started, you can use any regular Kubernetes command to interact with your minikube cluster. For example, you can see the pod states by running:
+
+```shell
+ kubectl get po -A
+```
+
+## Increasing memory allocation
+
+minikube auto-selects the memory size based on your system up to 6000mb. For larger 
+deployments, increase the memory allocation using the `--memory` flag, or make the setting persistent using:
+
+```shell
+minikube config set memory 8096
+```
+
+## Where to go next?
+
+Visit the [examples](/docs/examples) page to get an idea of what you can do with minikube.
+
+📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
\ No newline at end of file
diff --git a/site/content/en/docs/start/linux.md b/site/content/en/docs/start/linux.md
new file mode 100644
index 0000000000..d4036af85c
--- /dev/null
+++ b/site/content/en/docs/start/linux.md
@@ -0,0 +1,79 @@
+---
+title: "Linux"
+linkTitle: "Linux"
+weight: 1
+aliases:
+  - /docs/start/linux/
+---
+
+## Installation
+
+{{% tabs %}}
+{{% tab "Direct" %}}
+
+Download and install minikube to /usr/local/bin:
+
+```shell
+ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
+   && sudo install minikube-linux-amd64 /usr/local/bin/minikube
+```
+{{% /tab %}}
+{{% tab "Debian/Ubuntu (deb)" %}}
+
+Download and install minikube:
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_{{< latest >}}-0_amd64.deb \
+ && sudo dpkg -i minikube_{{< latest >}}-0_amd64.deb
+ ```
+
+{{% /tab %}}
+
+{{% tab "Fedora/Red Hat (rpm)" %}}
+
+Download and install minikube:
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< latest >}}-0.x86_64.rpm \
+ && sudo rpm -ivh minikube-{{< latest >}}-0.x86_64.rpm
+ ```
+
+{{% /tab %}}
+{{% /tabs %}}
+
+## Driver Setup
+
+{{% tabs %}}
+{{% tab "Docker" %}}
+## Check container support
+{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
+
+{{% tab "KVM" %}}
+## Check virtualization support
+{{% readfile file="/docs/drivers/includes/check_virtualization_linux.inc" %}}
+
+{{% readfile file="/docs/drivers/includes/kvm2_usage.inc" %}}
+{{% /tab %}}
+{{% tab "VirtualBox" %}}
+## Check virtualization support
+{{% readfile file="/docs/drivers/includes/check_virtualization_linux.inc" %}}
+
+{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
+{{% /tab %}}
+{{% tab "None (bare-metal)" %}}
+## Check baremetal support
+{{% readfile file="/docs/drivers/includes/check_baremetal_linux.inc" %}}
+
+If you are already running minikube from inside a VM, it is possible to skip the creation of an additional VM layer by using the `none` driver.
+
+{{% readfile file="/docs/drivers/includes/none_usage.inc" %}}
+{{% /tab %}}
+{{% tab "Podman (experimental)" %}}
+{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
+{{% /tab %}}
+
+
+{{% /tabs %}}
+
+{{% readfile file="/docs/start/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/start/macos.md b/site/content/en/docs/start/macos.md
new file mode 100644
index 0000000000..5350cbe2d0
--- /dev/null
+++ b/site/content/en/docs/start/macos.md
@@ -0,0 +1,76 @@
+---
+title: "macOS"
+linkTitle: "macOS"
+weight: 2
+aliases:
+  - /docs/start/macos/
+---
+
+### Prerequisites
+
+* macOS 10.12 (Sierra)
+* A hypervisor such as Hyperkit, Parallels, VirtualBox, or VMware Fusion
+
+### Installation
+
+{{% tabs %}}
+{{% tab "Brew" %}}
+
+If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and install minikube:
+
+```shell
+brew install minikube
+```
+
+{{% /tab %}}
+{{% tab "Direct" %}}
+
+Download and install minikube to /usr/local/bin:
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 \
+  && sudo install minikube-darwin-amd64 /usr/local/bin/minikube
+```
+{{% /tab %}}
+{{% /tabs %}}
+
+### Upgrading minikube
+
+{{% tabs %}}
+{{% tab "Brew" %}}
+
+If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and upgrade minikube:
+
+```shell
+brew update
+brew upgrade minikube
+```
+
+{{% /tab %}}
+{{% /tabs %}}
+
+## Hypervisor Setup
+
+{{% tabs %}}
+{{% tab "Docker" %}}
+{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
+{{% tab "Hyperkit" %}}
+{{% readfile file="/docs/drivers/includes/hyperkit_usage.inc" %}}
+{{% /tab %}}
+{{% tab "VirtualBox" %}}
+{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
+{{% /tab %}}
+{{% tab "Parallels" %}}
+{{% readfile file="/docs/drivers/includes/parallels_usage.inc" %}}
+{{% /tab %}}
+{{% tab "VMware" %}}
+{{% readfile file="/docs/drivers/includes/vmware_macos_usage.inc" %}}
+{{% /tab %}}
+{{% tab "Podman (experimental)" %}}
+{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
+{{% /tab %}}
+
+{{% /tabs %}}
+
+{{% readfile file="/docs/start/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/start/windows.md b/site/content/en/docs/start/windows.md
new file mode 100644
index 0000000000..7e31831846
--- /dev/null
+++ b/site/content/en/docs/start/windows.md
@@ -0,0 +1,56 @@
+---
+title: "Windows"
+linkTitle: "Windows"
+weight: 3
+aliases:
+  - /docs/start/windows/
+---
+
+### Prerequisites
+
+* Windows 8 or above
+* 4GB of RAM
+
+### Installation
+
+{{% tabs %}}
+{{% tab "Direct" %}}
+Download and run the [minikube installer](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe)
+{{% /tab %}}
+
+{{% tab "Chocolatey" %}}
+
+If the [Chocolatey Package Manager](https://chocolatey.org/) is installed, use it to install minikube:
+
+```shell
+choco install minikube
+```
+
+After it has installed, close the current CLI session and reopen it. minikube should have been added to your path automatically.
+{{% /tab %}}
+{{% /tabs %}}
+
+{{% tabs %}}
+{{% tab "Docker" %}}
+{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
+{{% /tab %}}
+
+{{% tab "Hyper-V" %}}
+
+## Check Hypervisor 
+
+{{% readfile file="/docs/drivers/includes/check_virtualization_windows.inc" %}}
+
+{{% readfile file="/docs/drivers/includes/hyperv_usage.inc" %}}
+{{% /tab %}}
+{{% tab "VirtualBox" %}}
+
+## Check Hypervisor
+
+{{% readfile file="/docs/drivers/includes/check_virtualization_windows.inc" %}}
+
+{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
+{{% /tab %}}
+{{% /tabs %}}
+
+{{% readfile file="/docs/start/includes/post_install.inc" %}}

From 4593ac3558ccbfc05b09fbd6b0a29d6e4c4aa9bf Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Sat, 4 Apr 2020 20:30:07 -0700
Subject: [PATCH 484/668] Change directory case

---
 site/content/en/docs/{Commands => commands}/_index.md             | 0
 site/content/en/docs/{Commands => commands}/addons.md             | 0
 site/content/en/docs/{Commands => commands}/cache.md              | 0
 site/content/en/docs/{Commands => commands}/completion.md         | 0
 site/content/en/docs/{Commands => commands}/config.md             | 0
 site/content/en/docs/{Commands => commands}/dashboard.md          | 0
 site/content/en/docs/{Commands => commands}/delete.md             | 0
 site/content/en/docs/{Commands => commands}/docker-env.md         | 0
 site/content/en/docs/{Commands => commands}/ip.md                 | 0
 site/content/en/docs/{Commands => commands}/kubectl.md            | 0
 site/content/en/docs/{Commands => commands}/logs.md               | 0
 site/content/en/docs/{Commands => commands}/mount.md              | 0
 site/content/en/docs/{Commands => commands}/pause.md              | 0
 site/content/en/docs/{Commands => commands}/profile.md            | 0
 site/content/en/docs/{Commands => commands}/service.md            | 0
 site/content/en/docs/{Commands => commands}/ssh-key.md            | 0
 site/content/en/docs/{Commands => commands}/ssh.md                | 0
 site/content/en/docs/{Commands => commands}/start.md              | 0
 site/content/en/docs/{Commands => commands}/status.md             | 0
 site/content/en/docs/{Commands => commands}/stop.md               | 0
 site/content/en/docs/{Commands => commands}/tunnel.md             | 0
 site/content/en/docs/{Commands => commands}/unpause.md            | 0
 site/content/en/docs/{Commands => commands}/update-check.md       | 0
 site/content/en/docs/{Commands => commands}/update-context.md     | 0
 site/content/en/docs/{Commands => commands}/version.md            | 0
 site/content/en/docs/{Contributing => contrib}/_index.md          | 0
 site/content/en/docs/{Contributing => contrib}/addons.en.md       | 0
 site/content/en/docs/{Contributing => contrib}/building/_index.md | 0
 .../en/docs/{Contributing => contrib}/building/binaries.md        | 0
 site/content/en/docs/{Contributing => contrib}/building/iso.md    | 0
 .../content/en/docs/{Contributing => contrib}/documentation.en.md | 0
 site/content/en/docs/{Contributing => contrib}/drivers.en.md      | 0
 site/content/en/docs/{Contributing => contrib}/guide.en.md        | 0
 site/content/en/docs/{Contributing => contrib}/principles.en.md   | 0
 .../content/en/docs/{Contributing => contrib}/releasing/_index.md | 0
 .../en/docs/{Contributing => contrib}/releasing/binaries.md       | 0
 .../content/en/docs/{Contributing => contrib}/releasing/gvisor.md | 0
 site/content/en/docs/{Contributing => contrib}/releasing/iso.md   | 0
 site/content/en/docs/{Contributing => contrib}/roadmap.en.md      | 0
 site/content/en/docs/{Contributing => contrib}/testing.en.md      | 0
 site/content/en/docs/{Contributing => contrib}/translations.md    | 0
 site/content/en/docs/{Contributing => contrib}/triage.md          | 0
 site/content/en/docs/{Drivers => drivers}/_index.md               | 0
 site/content/en/docs/{Drivers => drivers}/docker.md               | 0
 site/content/en/docs/{Drivers => drivers}/hyperkit.md             | 0
 site/content/en/docs/{Drivers => drivers}/hyperv.md               | 0
 .../docs/{Drivers => drivers}/includes/check_baremetal_linux.inc  | 0
 .../{Drivers => drivers}/includes/check_virtualization_linux.inc  | 0
 .../includes/check_virtualization_windows.inc                     | 0
 .../en/docs/{Drivers => drivers}/includes/docker_usage.inc        | 0
 .../en/docs/{Drivers => drivers}/includes/hyperkit_usage.inc      | 0
 .../en/docs/{Drivers => drivers}/includes/hyperv_usage.inc        | 0
 site/content/en/docs/{Drivers => drivers}/includes/kvm2_usage.inc | 0
 site/content/en/docs/{Drivers => drivers}/includes/none_usage.inc | 0
 .../en/docs/{Drivers => drivers}/includes/parallels_usage.inc     | 0
 .../en/docs/{Drivers => drivers}/includes/podman_usage.inc        | 0
 .../en/docs/{Drivers => drivers}/includes/virtualbox_usage.inc    | 0
 .../en/docs/{Drivers => drivers}/includes/vmware_macos_usage.inc  | 0
 site/content/en/docs/{Drivers => drivers}/kvm2.md                 | 0
 site/content/en/docs/{Drivers => drivers}/none.md                 | 0
 site/content/en/docs/{Drivers => drivers}/parallels.md            | 0
 site/content/en/docs/{Drivers => drivers}/podman.md               | 0
 site/content/en/docs/{Drivers => drivers}/virtualbox.md           | 0
 site/content/en/docs/{Drivers => drivers}/vmware.md               | 0
 site/content/en/docs/{FAQ => faq}/_index.md                       | 0
 site/content/en/docs/{Handbook => handbook}/_index.md             | 0
 site/content/en/docs/{Handbook => handbook}/accessing.md          | 0
 site/content/en/docs/{Handbook => handbook}/config.md             | 0
 site/content/en/docs/{Handbook => handbook}/controls.md           | 0
 site/content/en/docs/{Handbook => handbook}/dashboard.md          | 0
 site/content/en/docs/{Handbook => handbook}/deploying.md          | 0
 site/content/en/docs/{Handbook => handbook}/filesync.md           | 0
 site/content/en/docs/{Handbook => handbook}/host-access.md        | 0
 site/content/en/docs/{Handbook => handbook}/mount.md              | 0
 site/content/en/docs/{Handbook => handbook}/offline.md            | 0
 site/content/en/docs/{Handbook => handbook}/persistent_volumes.md | 0
 site/content/en/docs/{Handbook => handbook}/pushing.md            | 0
 site/content/en/docs/{Handbook => handbook}/registry.md           | 0
 site/content/en/docs/{Handbook => handbook}/troubleshooting.md    | 0
 .../en/docs/{Handbook => handbook}/uninstalling_minikube.md       | 0
 site/content/en/docs/{Handbook => handbook}/untrusted_certs.md    | 0
 site/content/en/docs/{Handbook => handbook}/vpn_and_proxy.md      | 0
 site/content/en/docs/{Tutorials => tutorials}/_index.md           | 0
 site/content/en/docs/{Tutorials => tutorials}/audit-policy.md     | 0
 .../{Tutorials => tutorials}/configuring_creds_for_aws_ecr.md     | 0
 .../en/docs/{Tutorials => tutorials}/continuous_integration.md    | 0
 .../en/docs/{Tutorials => tutorials}/ebpf_tools_in_minikube.md    | 0
 .../en/docs/{Tutorials => tutorials}/nginx_tcp_udp_ingress.md     | 0
 site/content/en/docs/{Tutorials => tutorials}/nvidia_gpu.md       | 0
 .../en/docs/{Tutorials => tutorials}/openid_connect_auth.md       | 0
 site/content/en/docs/{Tutorials => tutorials}/using_psp.md        | 0
 91 files changed, 0 insertions(+), 0 deletions(-)
 rename site/content/en/docs/{Commands => commands}/_index.md (100%)
 rename site/content/en/docs/{Commands => commands}/addons.md (100%)
 rename site/content/en/docs/{Commands => commands}/cache.md (100%)
 rename site/content/en/docs/{Commands => commands}/completion.md (100%)
 rename site/content/en/docs/{Commands => commands}/config.md (100%)
 rename site/content/en/docs/{Commands => commands}/dashboard.md (100%)
 rename site/content/en/docs/{Commands => commands}/delete.md (100%)
 rename site/content/en/docs/{Commands => commands}/docker-env.md (100%)
 rename site/content/en/docs/{Commands => commands}/ip.md (100%)
 rename site/content/en/docs/{Commands => commands}/kubectl.md (100%)
 rename site/content/en/docs/{Commands => commands}/logs.md (100%)
 rename site/content/en/docs/{Commands => commands}/mount.md (100%)
 rename site/content/en/docs/{Commands => commands}/pause.md (100%)
 rename site/content/en/docs/{Commands => commands}/profile.md (100%)
 rename site/content/en/docs/{Commands => commands}/service.md (100%)
 rename site/content/en/docs/{Commands => commands}/ssh-key.md (100%)
 rename site/content/en/docs/{Commands => commands}/ssh.md (100%)
 rename site/content/en/docs/{Commands => commands}/start.md (100%)
 rename site/content/en/docs/{Commands => commands}/status.md (100%)
 rename site/content/en/docs/{Commands => commands}/stop.md (100%)
 rename site/content/en/docs/{Commands => commands}/tunnel.md (100%)
 rename site/content/en/docs/{Commands => commands}/unpause.md (100%)
 rename site/content/en/docs/{Commands => commands}/update-check.md (100%)
 rename site/content/en/docs/{Commands => commands}/update-context.md (100%)
 rename site/content/en/docs/{Commands => commands}/version.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/_index.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/addons.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/building/_index.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/building/binaries.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/building/iso.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/documentation.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/drivers.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/guide.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/principles.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/releasing/_index.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/releasing/binaries.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/releasing/gvisor.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/releasing/iso.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/roadmap.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/testing.en.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/translations.md (100%)
 rename site/content/en/docs/{Contributing => contrib}/triage.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/_index.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/docker.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/hyperkit.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/hyperv.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/check_baremetal_linux.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/check_virtualization_linux.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/check_virtualization_windows.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/docker_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/hyperkit_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/hyperv_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/kvm2_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/none_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/parallels_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/podman_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/virtualbox_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/includes/vmware_macos_usage.inc (100%)
 rename site/content/en/docs/{Drivers => drivers}/kvm2.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/none.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/parallels.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/podman.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/virtualbox.md (100%)
 rename site/content/en/docs/{Drivers => drivers}/vmware.md (100%)
 rename site/content/en/docs/{FAQ => faq}/_index.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/_index.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/accessing.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/config.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/controls.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/dashboard.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/deploying.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/filesync.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/host-access.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/mount.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/offline.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/persistent_volumes.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/pushing.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/registry.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/troubleshooting.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/uninstalling_minikube.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/untrusted_certs.md (100%)
 rename site/content/en/docs/{Handbook => handbook}/vpn_and_proxy.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/_index.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/audit-policy.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/configuring_creds_for_aws_ecr.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/continuous_integration.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/ebpf_tools_in_minikube.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/nginx_tcp_udp_ingress.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/nvidia_gpu.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/openid_connect_auth.md (100%)
 rename site/content/en/docs/{Tutorials => tutorials}/using_psp.md (100%)

diff --git a/site/content/en/docs/Commands/_index.md b/site/content/en/docs/commands/_index.md
similarity index 100%
rename from site/content/en/docs/Commands/_index.md
rename to site/content/en/docs/commands/_index.md
diff --git a/site/content/en/docs/Commands/addons.md b/site/content/en/docs/commands/addons.md
similarity index 100%
rename from site/content/en/docs/Commands/addons.md
rename to site/content/en/docs/commands/addons.md
diff --git a/site/content/en/docs/Commands/cache.md b/site/content/en/docs/commands/cache.md
similarity index 100%
rename from site/content/en/docs/Commands/cache.md
rename to site/content/en/docs/commands/cache.md
diff --git a/site/content/en/docs/Commands/completion.md b/site/content/en/docs/commands/completion.md
similarity index 100%
rename from site/content/en/docs/Commands/completion.md
rename to site/content/en/docs/commands/completion.md
diff --git a/site/content/en/docs/Commands/config.md b/site/content/en/docs/commands/config.md
similarity index 100%
rename from site/content/en/docs/Commands/config.md
rename to site/content/en/docs/commands/config.md
diff --git a/site/content/en/docs/Commands/dashboard.md b/site/content/en/docs/commands/dashboard.md
similarity index 100%
rename from site/content/en/docs/Commands/dashboard.md
rename to site/content/en/docs/commands/dashboard.md
diff --git a/site/content/en/docs/Commands/delete.md b/site/content/en/docs/commands/delete.md
similarity index 100%
rename from site/content/en/docs/Commands/delete.md
rename to site/content/en/docs/commands/delete.md
diff --git a/site/content/en/docs/Commands/docker-env.md b/site/content/en/docs/commands/docker-env.md
similarity index 100%
rename from site/content/en/docs/Commands/docker-env.md
rename to site/content/en/docs/commands/docker-env.md
diff --git a/site/content/en/docs/Commands/ip.md b/site/content/en/docs/commands/ip.md
similarity index 100%
rename from site/content/en/docs/Commands/ip.md
rename to site/content/en/docs/commands/ip.md
diff --git a/site/content/en/docs/Commands/kubectl.md b/site/content/en/docs/commands/kubectl.md
similarity index 100%
rename from site/content/en/docs/Commands/kubectl.md
rename to site/content/en/docs/commands/kubectl.md
diff --git a/site/content/en/docs/Commands/logs.md b/site/content/en/docs/commands/logs.md
similarity index 100%
rename from site/content/en/docs/Commands/logs.md
rename to site/content/en/docs/commands/logs.md
diff --git a/site/content/en/docs/Commands/mount.md b/site/content/en/docs/commands/mount.md
similarity index 100%
rename from site/content/en/docs/Commands/mount.md
rename to site/content/en/docs/commands/mount.md
diff --git a/site/content/en/docs/Commands/pause.md b/site/content/en/docs/commands/pause.md
similarity index 100%
rename from site/content/en/docs/Commands/pause.md
rename to site/content/en/docs/commands/pause.md
diff --git a/site/content/en/docs/Commands/profile.md b/site/content/en/docs/commands/profile.md
similarity index 100%
rename from site/content/en/docs/Commands/profile.md
rename to site/content/en/docs/commands/profile.md
diff --git a/site/content/en/docs/Commands/service.md b/site/content/en/docs/commands/service.md
similarity index 100%
rename from site/content/en/docs/Commands/service.md
rename to site/content/en/docs/commands/service.md
diff --git a/site/content/en/docs/Commands/ssh-key.md b/site/content/en/docs/commands/ssh-key.md
similarity index 100%
rename from site/content/en/docs/Commands/ssh-key.md
rename to site/content/en/docs/commands/ssh-key.md
diff --git a/site/content/en/docs/Commands/ssh.md b/site/content/en/docs/commands/ssh.md
similarity index 100%
rename from site/content/en/docs/Commands/ssh.md
rename to site/content/en/docs/commands/ssh.md
diff --git a/site/content/en/docs/Commands/start.md b/site/content/en/docs/commands/start.md
similarity index 100%
rename from site/content/en/docs/Commands/start.md
rename to site/content/en/docs/commands/start.md
diff --git a/site/content/en/docs/Commands/status.md b/site/content/en/docs/commands/status.md
similarity index 100%
rename from site/content/en/docs/Commands/status.md
rename to site/content/en/docs/commands/status.md
diff --git a/site/content/en/docs/Commands/stop.md b/site/content/en/docs/commands/stop.md
similarity index 100%
rename from site/content/en/docs/Commands/stop.md
rename to site/content/en/docs/commands/stop.md
diff --git a/site/content/en/docs/Commands/tunnel.md b/site/content/en/docs/commands/tunnel.md
similarity index 100%
rename from site/content/en/docs/Commands/tunnel.md
rename to site/content/en/docs/commands/tunnel.md
diff --git a/site/content/en/docs/Commands/unpause.md b/site/content/en/docs/commands/unpause.md
similarity index 100%
rename from site/content/en/docs/Commands/unpause.md
rename to site/content/en/docs/commands/unpause.md
diff --git a/site/content/en/docs/Commands/update-check.md b/site/content/en/docs/commands/update-check.md
similarity index 100%
rename from site/content/en/docs/Commands/update-check.md
rename to site/content/en/docs/commands/update-check.md
diff --git a/site/content/en/docs/Commands/update-context.md b/site/content/en/docs/commands/update-context.md
similarity index 100%
rename from site/content/en/docs/Commands/update-context.md
rename to site/content/en/docs/commands/update-context.md
diff --git a/site/content/en/docs/Commands/version.md b/site/content/en/docs/commands/version.md
similarity index 100%
rename from site/content/en/docs/Commands/version.md
rename to site/content/en/docs/commands/version.md
diff --git a/site/content/en/docs/Contributing/_index.md b/site/content/en/docs/contrib/_index.md
similarity index 100%
rename from site/content/en/docs/Contributing/_index.md
rename to site/content/en/docs/contrib/_index.md
diff --git a/site/content/en/docs/Contributing/addons.en.md b/site/content/en/docs/contrib/addons.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/addons.en.md
rename to site/content/en/docs/contrib/addons.en.md
diff --git a/site/content/en/docs/Contributing/building/_index.md b/site/content/en/docs/contrib/building/_index.md
similarity index 100%
rename from site/content/en/docs/Contributing/building/_index.md
rename to site/content/en/docs/contrib/building/_index.md
diff --git a/site/content/en/docs/Contributing/building/binaries.md b/site/content/en/docs/contrib/building/binaries.md
similarity index 100%
rename from site/content/en/docs/Contributing/building/binaries.md
rename to site/content/en/docs/contrib/building/binaries.md
diff --git a/site/content/en/docs/Contributing/building/iso.md b/site/content/en/docs/contrib/building/iso.md
similarity index 100%
rename from site/content/en/docs/Contributing/building/iso.md
rename to site/content/en/docs/contrib/building/iso.md
diff --git a/site/content/en/docs/Contributing/documentation.en.md b/site/content/en/docs/contrib/documentation.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/documentation.en.md
rename to site/content/en/docs/contrib/documentation.en.md
diff --git a/site/content/en/docs/Contributing/drivers.en.md b/site/content/en/docs/contrib/drivers.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/drivers.en.md
rename to site/content/en/docs/contrib/drivers.en.md
diff --git a/site/content/en/docs/Contributing/guide.en.md b/site/content/en/docs/contrib/guide.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/guide.en.md
rename to site/content/en/docs/contrib/guide.en.md
diff --git a/site/content/en/docs/Contributing/principles.en.md b/site/content/en/docs/contrib/principles.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/principles.en.md
rename to site/content/en/docs/contrib/principles.en.md
diff --git a/site/content/en/docs/Contributing/releasing/_index.md b/site/content/en/docs/contrib/releasing/_index.md
similarity index 100%
rename from site/content/en/docs/Contributing/releasing/_index.md
rename to site/content/en/docs/contrib/releasing/_index.md
diff --git a/site/content/en/docs/Contributing/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md
similarity index 100%
rename from site/content/en/docs/Contributing/releasing/binaries.md
rename to site/content/en/docs/contrib/releasing/binaries.md
diff --git a/site/content/en/docs/Contributing/releasing/gvisor.md b/site/content/en/docs/contrib/releasing/gvisor.md
similarity index 100%
rename from site/content/en/docs/Contributing/releasing/gvisor.md
rename to site/content/en/docs/contrib/releasing/gvisor.md
diff --git a/site/content/en/docs/Contributing/releasing/iso.md b/site/content/en/docs/contrib/releasing/iso.md
similarity index 100%
rename from site/content/en/docs/Contributing/releasing/iso.md
rename to site/content/en/docs/contrib/releasing/iso.md
diff --git a/site/content/en/docs/Contributing/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/roadmap.en.md
rename to site/content/en/docs/contrib/roadmap.en.md
diff --git a/site/content/en/docs/Contributing/testing.en.md b/site/content/en/docs/contrib/testing.en.md
similarity index 100%
rename from site/content/en/docs/Contributing/testing.en.md
rename to site/content/en/docs/contrib/testing.en.md
diff --git a/site/content/en/docs/Contributing/translations.md b/site/content/en/docs/contrib/translations.md
similarity index 100%
rename from site/content/en/docs/Contributing/translations.md
rename to site/content/en/docs/contrib/translations.md
diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/contrib/triage.md
similarity index 100%
rename from site/content/en/docs/Contributing/triage.md
rename to site/content/en/docs/contrib/triage.md
diff --git a/site/content/en/docs/Drivers/_index.md b/site/content/en/docs/drivers/_index.md
similarity index 100%
rename from site/content/en/docs/Drivers/_index.md
rename to site/content/en/docs/drivers/_index.md
diff --git a/site/content/en/docs/Drivers/docker.md b/site/content/en/docs/drivers/docker.md
similarity index 100%
rename from site/content/en/docs/Drivers/docker.md
rename to site/content/en/docs/drivers/docker.md
diff --git a/site/content/en/docs/Drivers/hyperkit.md b/site/content/en/docs/drivers/hyperkit.md
similarity index 100%
rename from site/content/en/docs/Drivers/hyperkit.md
rename to site/content/en/docs/drivers/hyperkit.md
diff --git a/site/content/en/docs/Drivers/hyperv.md b/site/content/en/docs/drivers/hyperv.md
similarity index 100%
rename from site/content/en/docs/Drivers/hyperv.md
rename to site/content/en/docs/drivers/hyperv.md
diff --git a/site/content/en/docs/Drivers/includes/check_baremetal_linux.inc b/site/content/en/docs/drivers/includes/check_baremetal_linux.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/check_baremetal_linux.inc
rename to site/content/en/docs/drivers/includes/check_baremetal_linux.inc
diff --git a/site/content/en/docs/Drivers/includes/check_virtualization_linux.inc b/site/content/en/docs/drivers/includes/check_virtualization_linux.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/check_virtualization_linux.inc
rename to site/content/en/docs/drivers/includes/check_virtualization_linux.inc
diff --git a/site/content/en/docs/Drivers/includes/check_virtualization_windows.inc b/site/content/en/docs/drivers/includes/check_virtualization_windows.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/check_virtualization_windows.inc
rename to site/content/en/docs/drivers/includes/check_virtualization_windows.inc
diff --git a/site/content/en/docs/Drivers/includes/docker_usage.inc b/site/content/en/docs/drivers/includes/docker_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/docker_usage.inc
rename to site/content/en/docs/drivers/includes/docker_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/hyperkit_usage.inc b/site/content/en/docs/drivers/includes/hyperkit_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/hyperkit_usage.inc
rename to site/content/en/docs/drivers/includes/hyperkit_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/hyperv_usage.inc b/site/content/en/docs/drivers/includes/hyperv_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/hyperv_usage.inc
rename to site/content/en/docs/drivers/includes/hyperv_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/kvm2_usage.inc b/site/content/en/docs/drivers/includes/kvm2_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/kvm2_usage.inc
rename to site/content/en/docs/drivers/includes/kvm2_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/none_usage.inc b/site/content/en/docs/drivers/includes/none_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/none_usage.inc
rename to site/content/en/docs/drivers/includes/none_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/parallels_usage.inc b/site/content/en/docs/drivers/includes/parallels_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/parallels_usage.inc
rename to site/content/en/docs/drivers/includes/parallels_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/podman_usage.inc b/site/content/en/docs/drivers/includes/podman_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/podman_usage.inc
rename to site/content/en/docs/drivers/includes/podman_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/virtualbox_usage.inc b/site/content/en/docs/drivers/includes/virtualbox_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/virtualbox_usage.inc
rename to site/content/en/docs/drivers/includes/virtualbox_usage.inc
diff --git a/site/content/en/docs/Drivers/includes/vmware_macos_usage.inc b/site/content/en/docs/drivers/includes/vmware_macos_usage.inc
similarity index 100%
rename from site/content/en/docs/Drivers/includes/vmware_macos_usage.inc
rename to site/content/en/docs/drivers/includes/vmware_macos_usage.inc
diff --git a/site/content/en/docs/Drivers/kvm2.md b/site/content/en/docs/drivers/kvm2.md
similarity index 100%
rename from site/content/en/docs/Drivers/kvm2.md
rename to site/content/en/docs/drivers/kvm2.md
diff --git a/site/content/en/docs/Drivers/none.md b/site/content/en/docs/drivers/none.md
similarity index 100%
rename from site/content/en/docs/Drivers/none.md
rename to site/content/en/docs/drivers/none.md
diff --git a/site/content/en/docs/Drivers/parallels.md b/site/content/en/docs/drivers/parallels.md
similarity index 100%
rename from site/content/en/docs/Drivers/parallels.md
rename to site/content/en/docs/drivers/parallels.md
diff --git a/site/content/en/docs/Drivers/podman.md b/site/content/en/docs/drivers/podman.md
similarity index 100%
rename from site/content/en/docs/Drivers/podman.md
rename to site/content/en/docs/drivers/podman.md
diff --git a/site/content/en/docs/Drivers/virtualbox.md b/site/content/en/docs/drivers/virtualbox.md
similarity index 100%
rename from site/content/en/docs/Drivers/virtualbox.md
rename to site/content/en/docs/drivers/virtualbox.md
diff --git a/site/content/en/docs/Drivers/vmware.md b/site/content/en/docs/drivers/vmware.md
similarity index 100%
rename from site/content/en/docs/Drivers/vmware.md
rename to site/content/en/docs/drivers/vmware.md
diff --git a/site/content/en/docs/FAQ/_index.md b/site/content/en/docs/faq/_index.md
similarity index 100%
rename from site/content/en/docs/FAQ/_index.md
rename to site/content/en/docs/faq/_index.md
diff --git a/site/content/en/docs/Handbook/_index.md b/site/content/en/docs/handbook/_index.md
similarity index 100%
rename from site/content/en/docs/Handbook/_index.md
rename to site/content/en/docs/handbook/_index.md
diff --git a/site/content/en/docs/Handbook/accessing.md b/site/content/en/docs/handbook/accessing.md
similarity index 100%
rename from site/content/en/docs/Handbook/accessing.md
rename to site/content/en/docs/handbook/accessing.md
diff --git a/site/content/en/docs/Handbook/config.md b/site/content/en/docs/handbook/config.md
similarity index 100%
rename from site/content/en/docs/Handbook/config.md
rename to site/content/en/docs/handbook/config.md
diff --git a/site/content/en/docs/Handbook/controls.md b/site/content/en/docs/handbook/controls.md
similarity index 100%
rename from site/content/en/docs/Handbook/controls.md
rename to site/content/en/docs/handbook/controls.md
diff --git a/site/content/en/docs/Handbook/dashboard.md b/site/content/en/docs/handbook/dashboard.md
similarity index 100%
rename from site/content/en/docs/Handbook/dashboard.md
rename to site/content/en/docs/handbook/dashboard.md
diff --git a/site/content/en/docs/Handbook/deploying.md b/site/content/en/docs/handbook/deploying.md
similarity index 100%
rename from site/content/en/docs/Handbook/deploying.md
rename to site/content/en/docs/handbook/deploying.md
diff --git a/site/content/en/docs/Handbook/filesync.md b/site/content/en/docs/handbook/filesync.md
similarity index 100%
rename from site/content/en/docs/Handbook/filesync.md
rename to site/content/en/docs/handbook/filesync.md
diff --git a/site/content/en/docs/Handbook/host-access.md b/site/content/en/docs/handbook/host-access.md
similarity index 100%
rename from site/content/en/docs/Handbook/host-access.md
rename to site/content/en/docs/handbook/host-access.md
diff --git a/site/content/en/docs/Handbook/mount.md b/site/content/en/docs/handbook/mount.md
similarity index 100%
rename from site/content/en/docs/Handbook/mount.md
rename to site/content/en/docs/handbook/mount.md
diff --git a/site/content/en/docs/Handbook/offline.md b/site/content/en/docs/handbook/offline.md
similarity index 100%
rename from site/content/en/docs/Handbook/offline.md
rename to site/content/en/docs/handbook/offline.md
diff --git a/site/content/en/docs/Handbook/persistent_volumes.md b/site/content/en/docs/handbook/persistent_volumes.md
similarity index 100%
rename from site/content/en/docs/Handbook/persistent_volumes.md
rename to site/content/en/docs/handbook/persistent_volumes.md
diff --git a/site/content/en/docs/Handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
similarity index 100%
rename from site/content/en/docs/Handbook/pushing.md
rename to site/content/en/docs/handbook/pushing.md
diff --git a/site/content/en/docs/Handbook/registry.md b/site/content/en/docs/handbook/registry.md
similarity index 100%
rename from site/content/en/docs/Handbook/registry.md
rename to site/content/en/docs/handbook/registry.md
diff --git a/site/content/en/docs/Handbook/troubleshooting.md b/site/content/en/docs/handbook/troubleshooting.md
similarity index 100%
rename from site/content/en/docs/Handbook/troubleshooting.md
rename to site/content/en/docs/handbook/troubleshooting.md
diff --git a/site/content/en/docs/Handbook/uninstalling_minikube.md b/site/content/en/docs/handbook/uninstalling_minikube.md
similarity index 100%
rename from site/content/en/docs/Handbook/uninstalling_minikube.md
rename to site/content/en/docs/handbook/uninstalling_minikube.md
diff --git a/site/content/en/docs/Handbook/untrusted_certs.md b/site/content/en/docs/handbook/untrusted_certs.md
similarity index 100%
rename from site/content/en/docs/Handbook/untrusted_certs.md
rename to site/content/en/docs/handbook/untrusted_certs.md
diff --git a/site/content/en/docs/Handbook/vpn_and_proxy.md b/site/content/en/docs/handbook/vpn_and_proxy.md
similarity index 100%
rename from site/content/en/docs/Handbook/vpn_and_proxy.md
rename to site/content/en/docs/handbook/vpn_and_proxy.md
diff --git a/site/content/en/docs/Tutorials/_index.md b/site/content/en/docs/tutorials/_index.md
similarity index 100%
rename from site/content/en/docs/Tutorials/_index.md
rename to site/content/en/docs/tutorials/_index.md
diff --git a/site/content/en/docs/Tutorials/audit-policy.md b/site/content/en/docs/tutorials/audit-policy.md
similarity index 100%
rename from site/content/en/docs/Tutorials/audit-policy.md
rename to site/content/en/docs/tutorials/audit-policy.md
diff --git a/site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md b/site/content/en/docs/tutorials/configuring_creds_for_aws_ecr.md
similarity index 100%
rename from site/content/en/docs/Tutorials/configuring_creds_for_aws_ecr.md
rename to site/content/en/docs/tutorials/configuring_creds_for_aws_ecr.md
diff --git a/site/content/en/docs/Tutorials/continuous_integration.md b/site/content/en/docs/tutorials/continuous_integration.md
similarity index 100%
rename from site/content/en/docs/Tutorials/continuous_integration.md
rename to site/content/en/docs/tutorials/continuous_integration.md
diff --git a/site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md b/site/content/en/docs/tutorials/ebpf_tools_in_minikube.md
similarity index 100%
rename from site/content/en/docs/Tutorials/ebpf_tools_in_minikube.md
rename to site/content/en/docs/tutorials/ebpf_tools_in_minikube.md
diff --git a/site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md b/site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md
similarity index 100%
rename from site/content/en/docs/Tutorials/nginx_tcp_udp_ingress.md
rename to site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md
diff --git a/site/content/en/docs/Tutorials/nvidia_gpu.md b/site/content/en/docs/tutorials/nvidia_gpu.md
similarity index 100%
rename from site/content/en/docs/Tutorials/nvidia_gpu.md
rename to site/content/en/docs/tutorials/nvidia_gpu.md
diff --git a/site/content/en/docs/Tutorials/openid_connect_auth.md b/site/content/en/docs/tutorials/openid_connect_auth.md
similarity index 100%
rename from site/content/en/docs/Tutorials/openid_connect_auth.md
rename to site/content/en/docs/tutorials/openid_connect_auth.md
diff --git a/site/content/en/docs/Tutorials/using_psp.md b/site/content/en/docs/tutorials/using_psp.md
similarity index 100%
rename from site/content/en/docs/Tutorials/using_psp.md
rename to site/content/en/docs/tutorials/using_psp.md

From fe39b0ce52d37576d5de819dcf5ffa7338d158e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 5 Apr 2020 10:15:38 +0200
Subject: [PATCH 485/668] Update translations files by running extract

This should probably be part of the release
---
 translations/de.json | 1 -
 translations/es.json | 1 -
 translations/fr.json | 1 -
 translations/ja.json | 1 -
 translations/pl.json | 1 -
 5 files changed, 5 deletions(-)

diff --git a/translations/de.json b/translations/de.json
index 747def2375..4dafa749a1 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -43,7 +43,6 @@
 	"Basic Commands:": "",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
-	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
diff --git a/translations/es.json b/translations/es.json
index 4aecf8975d..76827505a8 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -44,7 +44,6 @@
 	"Basic Commands:": "",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
-	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
diff --git a/translations/fr.json b/translations/fr.json
index 872710c938..573981e1d2 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -43,7 +43,6 @@
 	"Basic Commands:": "",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
-	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
diff --git a/translations/ja.json b/translations/ja.json
index d32dafaa95..8e19ce4b8b 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -50,7 +50,6 @@
 	"Basic Commands:": "基本的なコマンド",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "アドレスをバインドします: {{.Address}}",
-	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "",
 	"Cannot use both --output and --format options": "",
diff --git a/translations/pl.json b/translations/pl.json
index f7ddd5fe7d..7bf259a38a 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -46,7 +46,6 @@
 	"Basic Commands:": "Podstawowe polecenia",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
 	"Bind Address: {{.Address}}": "",
-	"Block until the apiserver is servicing API requests": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.": "",
 	"Cannot find directory {{.path}} for mount": "Nie można odnoleść folderu {{.path}} do zamontowania",
 	"Cannot use both --output and --format options": "",

From d41865a5fbb4308e806deedac331069feb95bb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 5 Apr 2020 10:18:45 +0200
Subject: [PATCH 486/668] Add some basic documentation string for golint

"exported type ControlPlane should have comment or be unexported"
---
 pkg/minikube/mustload/mustload.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/minikube/mustload/mustload.go b/pkg/minikube/mustload/mustload.go
index fb96c9c182..0910ba35fc 100644
--- a/pkg/minikube/mustload/mustload.go
+++ b/pkg/minikube/mustload/mustload.go
@@ -43,6 +43,7 @@ type ClusterController struct {
 	CP     ControlPlane
 }
 
+// ControlPlane holds all the needed information for the k8s control plane
 type ControlPlane struct {
 	// Host is the libmachine host object
 	Host *host.Host

From 1fdc54434319f07a73876a3a60c28076278f1414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 5 Apr 2020 10:53:43 +0200
Subject: [PATCH 487/668] Upgrade falco-probe module to version 0.21.0

---
 deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash | 2 ++
 deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash b/deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash
index a8afdf53cc..2a1b798854 100644
--- a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash
+++ b/deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash
@@ -1,5 +1,7 @@
 # falco
 sha256 87c60273c35d544256e471b403497be33f24df662673338236ec92ba3fc1f8b7 0.19.0.tar.gz
 sha256 b873e3590e56ead740ed905108221f98da6100da3c5b7acf2355ea1cf628d931 0.20.0.tar.gz
+sha256 b1c9884855d58be94a97b2e348bcdc7db995800f0405b0f4e9a7176ee2f094a7 0.21.0.tar.gz
 # sysdig
 sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz
+sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94.tar.gz
diff --git a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk b/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk
index 0e5986f1fc..888a16535a 100644
--- a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk
+++ b/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk
@@ -4,7 +4,7 @@
 #
 ########################################################################
 
-FALCO_PROBE_VERSION = 0.20.0
+FALCO_PROBE_VERSION = 0.21.0
 FALCO_PROBE_SITE = https://github.com/falcosecurity/falco/archive
 FALCO_PROBE_SOURCE = $(FALCO_PROBE_VERSION).tar.gz
 FALCO_PROBE_DEPENDENCIES += ncurses libyaml
@@ -12,7 +12,7 @@ FALCO_PROBE_LICENSE = Apache-2.0
 FALCO_PROBE_LICENSE_FILES = COPYING
 
 # see cmake/modules/sysdig-repo/CMakeLists.txt
-FALCO_PROBE_SYSDIG_VERSION = 146a431edf95829ac11bfd9c85ba3ef08789bffe
+FALCO_PROBE_SYSDIG_VERSION = be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94
 FALCO_PROBE_EXTRA_DOWNLOADS = https://github.com/draios/sysdig/archive/${FALCO_PROBE_SYSDIG_VERSION}.tar.gz
 
 define FALCO_PROBE_SYSDIG_SRC

From 242547423c1a237e661789ff06d247408ccddb9a Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Mon, 6 Apr 2020 00:48:35 +0900
Subject: [PATCH 488/668] Update Japanese translations

---
 translations/ja.json | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/translations/ja.json b/translations/ja.json
index 8e19ce4b8b..c2346cd739 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -623,36 +623,36 @@
 	"failed to open browser: {{.error}}": "",
 	"if true, will embed the certs in kubeconfig.": "",
 	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
-	"initialization failed, will try again: {{.error}}": "",
-	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "",
+	"initialization failed, will try again: {{.error}}": "初期化が失敗しました。再施行します。 {{.error}}",
+	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "kubeadm が他のプロセス（おそらくローカルでの他の Kubernetes をインストールするプロセス）との TCP ポートでの衝突を検知しました。 lsof -p\u003cport\u003e を実行して、そのプロセスを Kill してください",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl と minikube の構成は {{.home_folder}} に保存されます",
-	"kubectl proxy": "",
-	"libmachine failed": "",
-	"logdir set failed": "",
-	"max time to wait per Kubernetes core services to be healthy.": "",
-	"minikube addons list --output OUTPUT. json, list": "",
-	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
-	"minikube is not yet compatible with ChromeOS": "",
-	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
-	"minikube profile was successfully set to {{.profile_name}}": "",
-	"minikube status --output OUTPUT. json, text": "",
-	"minikube {{.version}} is available! Download it: {{.url}}": "",
-	"mkcmp is used to compare performance of two minikube binaries": "",
-	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
-	"mount failed": "",
-	"namespaces to pause": "",
-	"namespaces to unpause": "",
-	"none driver does not support multi-node clusters": "",
-	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
-	"pause containers": "",
-	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
-	"reload cached images.": "",
+	"kubectl proxy": "kubectl proxy",
+	"libmachine failed": "libmachine が失敗しました",
+	"logdir set failed": "logdir の値を設定するのに失敗しました",
+	"max time to wait per Kubernetes core services to be healthy.": "Kubernetes の core サービスが正常に稼働するまで待つ最大時間",
+	"minikube addons list --output OUTPUT. json, list": "minikube addons list --output OUTPUT. json, list",
+	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "minikube がエラーで終了しました。もし上のメッセージが不十分であれば、Issue を作成してください",
+	"minikube is not yet compatible with ChromeOS": "minikube はまだ ChromeOS と互換性がありません",
+	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "minikube が Google Container Registry に接続できません。 HTTP プロキシを使用するように設定する必要があるかもしれません",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "minikube が VM に接続できませんでした。 {{.error}}\n\n\t考えられる理由は以下の二つです。\n\n\t- VPN 、あるいはファイアウォールによる干渉\n\t- {{.hypervisor}} のネットワークの設定での問題\n\n\t迂回策には以下があります。\n\n\t- ローカルの VPN 、あるいはファイアウォールを無効にする\n\t- {{.ip}} へのアクセスを許可するようにローカルの VPN 、あるいはファイアウォールを設定する\n\t- {{.hypervisor}} を再起動、あるいは再インストールする\n\t- 別の VM ドライバーを使用する\n\t- --force を使用してこの接続チェックを上書きする",
+	"minikube profile was successfully set to {{.profile_name}}": "{{.profile_name}} の値が minikube のプロフィールに正常に設定されました",
+	"minikube status --output OUTPUT. json, text": "minikube status --output OUTPUT. json, text",
+	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} が利用可能です! 以下のURLでダウンロードできます。 {{.url}}",
+	"mkcmp is used to compare performance of two minikube binaries": "mkcmp で二つの minikube のバイナリのパフォーマンスを比較することができます",
+	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "mount への引数 \"{{.value}}\" は以下のフォーマットである必要があります。\u003cソースディレクトリ\u003e:\u003cターゲットディレクトリ\u003e",
+	"mount failed": "マウントが失敗しました",
+	"namespaces to pause": "停止する名前空間",
+	"namespaces to unpause": "停止を解除する名前空間",
+	"none driver does not support multi-node clusters": "マルチクラスターをサポートしているドライバーがありません",
+	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "引数（{{.ArgCount}}）が少なすぎます。\\n使用方法: minikube config set PROPERTY_NAME PROPERTY_VALUE",
+	"pause containers": "コンテナを停止させます",
+	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "profile で現在の minikube のプロフィールの値を設定することができます。profil に引数を渡さなければ、現在のプロフィールを見ることができます。このコマンドは複数の minikube インスタンスを管理するのに使用されます。「 minikube profile default 」で minikube のデフォルトのプロフィールを見ることができます",
+	"reload cached images.": "キャッシュしていたイメージから再読み込みをします",
 	"reloads images previously added using the 'cache add' subcommand": "",
 	"retrieving node": "ノードを取得しています",
 	"saving node": "ノードを保存しています",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort を持っていません",
-	"startup failed": "",
+	"startup failed": "起動に失敗しました",
 	"stat failed": "stat が失敗しました",
 	"status json failure": "ステータスは JSON エラーです",
 	"status text failure": "ステータスはテキストエラーです",
@@ -676,10 +676,10 @@
 	"usage: minikube config unset PROPERTY_NAME": "使用方法: minikube config unset PROPERTY_NAME",
 	"usage: minikube delete": "使用方法: minikube delete",
 	"usage: minikube profile [MINIKUBE_PROFILE_NAME]": "使用方法: minikube profile [MINIKUBE_PROFILE_NAME]",
-	"version json failure": "",
-	"version yaml failure": "",
+	"version json failure": "JSON でバージョンを表示するのに失敗しました",
+	"version yaml failure": "YAML でバージョンを表示するのに失敗しました",
 	"zsh completion failed": "zsh の補完が失敗しました",
-	"{{ .name }}: {{ .rejection }}": "",
+	"{{ .name }}: {{ .rejection }}": "{{ .name }}: {{ .rejection }}",
 	"{{.cluster}} IP has been updated to point at {{.ip}}": "{{.cluster}} の IP アドレスは {{.ip}} へと更新されました",
 	"{{.cluster}} IP was already correctly configured for {{.ip}}": "{{.cluster}} の IP アドレスは {{.ip}} としてすでに正常に設定されています",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} 「 {{.cluster}} 」 {{.machine_type}} がありません。再生成します。",

From f05002e8aa456b3975f1d9254b33bcd5b5b6ce00 Mon Sep 17 00:00:00 2001
From: Vikky Omkar <vikkyomkar@gmail.com>
Date: Mon, 6 Apr 2020 00:56:54 +0530
Subject: [PATCH 489/668] doc on how to enable feature gates

---
 site/content/en/docs/Reference/Configuration/kubernetes.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/site/content/en/docs/Reference/Configuration/kubernetes.md b/site/content/en/docs/Reference/Configuration/kubernetes.md
index 8781b3f710..63f33700a0 100644
--- a/site/content/en/docs/Reference/Configuration/kubernetes.md
+++ b/site/content/en/docs/Reference/Configuration/kubernetes.md
@@ -55,3 +55,9 @@ For instance, to allow Kubernetes to launch on an unsupported Docker release:
 ```shell
 minikube start --extra-config=kubeadm.ignore-preflight-errors=SystemVerification
 ```
+
+Kubernetes alpha/experimental features can be enabled or disabled by the `--feature-gates` flag on the `minikube start` command. It takes a string of the form `key=value` where key is the `component` name and value is the `status` of it.
+
+```shell
+minikube start --feature-gates=EphemeralContainers=true
+```

From 06ac3fcae695d34b9d10be1cc8bcb68d16495406 Mon Sep 17 00:00:00 2001
From: Vikky Omkar <vikkyomkar@gmail.com>
Date: Mon, 6 Apr 2020 14:19:02 +0530
Subject: [PATCH 490/668] added a heading for feature gate

---
 site/content/en/docs/Reference/Configuration/kubernetes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/content/en/docs/Reference/Configuration/kubernetes.md b/site/content/en/docs/Reference/Configuration/kubernetes.md
index 63f33700a0..7a271d49c0 100644
--- a/site/content/en/docs/Reference/Configuration/kubernetes.md
+++ b/site/content/en/docs/Reference/Configuration/kubernetes.md
@@ -56,6 +56,8 @@ For instance, to allow Kubernetes to launch on an unsupported Docker release:
 minikube start --extra-config=kubeadm.ignore-preflight-errors=SystemVerification
 ```
 
+## Enable feature gates
+
 Kubernetes alpha/experimental features can be enabled or disabled by the `--feature-gates` flag on the `minikube start` command. It takes a string of the form `key=value` where key is the `component` name and value is the `status` of it.
 
 ```shell

From fb2c3ed4b7539297d8dbe395d2c5cb15c7eef2af Mon Sep 17 00:00:00 2001
From: loftkun <loftkun@gmail.com>
Date: Mon, 6 Apr 2020 23:45:54 +0900
Subject: [PATCH 491/668] fix validateDriver() to exit when detects an error

---
 cmd/minikube/cmd/start.go | 4 ++++
 translations/de.json      | 1 +
 translations/es.json      | 1 +
 translations/fr.json      | 1 +
 translations/ja.json      | 1 +
 translations/ko.json      | 1 +
 translations/pl.json      | 1 +
 translations/zh-CN.json   | 1 +
 8 files changed, 11 insertions(+)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0a42f5e979..6ca754d823 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -679,6 +679,10 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 			}
 			exit.WithCodeT(exit.Unavailable, "{{.driver}} does not appear to be installed", out.V{"driver": name})
 		}
+
+		if !viper.GetBool(force) {
+			exit.WithCodeT(exit.Unavailable, "Failed to validate '{{.driver}}' driver", out.V{"driver": name})
+		}
 	}
 }
 
diff --git a/translations/de.json b/translations/de.json
index 4dafa749a1..721744768f 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -184,6 +184,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
diff --git a/translations/es.json b/translations/es.json
index 76827505a8..9a94511d4d 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -185,6 +185,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
diff --git a/translations/fr.json b/translations/fr.json
index 573981e1d2..3f1f53d0e5 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -182,6 +182,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
diff --git a/translations/ja.json b/translations/ja.json
index c2346cd739..84f91a6f24 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -193,6 +193,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "",
 	"Failed to update config": "",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
diff --git a/translations/ko.json b/translations/ko.json
index 8c20c92de6..f246b3b6d9 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -197,6 +197,7 @@
 	"Failed to stop node {{.name}}": "노드 {{.name}} 중지에 실패하였습니다",
 	"Failed to update cluster": "클러스터를 수정하는 데 실패하였습니다",
 	"Failed to update config": "컨피그를 수정하는 데 실패하였습니다",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "마운트 해제에 실패하였습니다: {{.error}}",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
diff --git a/translations/pl.json b/translations/pl.json
index 7bf259a38a..4a2543df8a 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -190,6 +190,7 @@
 	"Failed to setup kubeconfig": "Konfiguracja kubeconfig nie powiodła się",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "Aktualizacja klastra nie powiodła się",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed to update config": "Aktualizacja konfiguracji nie powiodła się",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 1174030a21..31a90e3542 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -240,6 +240,7 @@
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "更新 cluster 失败",
 	"Failed to update config": "更新 config 失败",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "unmount 失败：{{.error}}",
 	"File permissions used for the mount": "用于 mount 的文件权限",
 	"Filter to use only VM Drivers": "",

From ff654225626d28fa22dc26785851fae0193ee69b Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 6 Apr 2020 10:26:16 -0700
Subject: [PATCH 492/668] Code review comments

---
 pkg/generate/docs.go                          |  6 ++--
 pkg/generate/docs_templates.go                |  3 --
 pkg/generate/rewrite.go                       | 36 ++++++-------------
 .../en/docs/Reference/Commands/addons.md      |  3 --
 .../en/docs/Reference/Commands/cache.md       |  3 --
 .../en/docs/Reference/Commands/completion.md  |  3 --
 .../en/docs/Reference/Commands/config.md      |  3 --
 .../en/docs/Reference/Commands/dashboard.md   |  3 --
 .../en/docs/Reference/Commands/delete.md      |  3 --
 .../en/docs/Reference/Commands/docker-env.md  |  3 --
 .../en/docs/Reference/Commands/help.md        |  3 --
 site/content/en/docs/Reference/Commands/ip.md |  3 --
 .../en/docs/Reference/Commands/kubectl.md     |  3 --
 .../en/docs/Reference/Commands/logs.md        |  3 --
 .../en/docs/Reference/Commands/mount.md       |  3 --
 .../en/docs/Reference/Commands/node.md        |  3 --
 .../en/docs/Reference/Commands/options.md     |  3 --
 .../en/docs/Reference/Commands/pause.md       |  3 --
 .../en/docs/Reference/Commands/podman-env.md  |  3 --
 .../en/docs/Reference/Commands/profile.md     |  3 --
 .../en/docs/Reference/Commands/service.md     |  3 --
 .../en/docs/Reference/Commands/ssh-key.md     |  3 --
 .../content/en/docs/Reference/Commands/ssh.md |  3 --
 .../en/docs/Reference/Commands/start.md       |  9 ++---
 .../en/docs/Reference/Commands/status.md      |  3 --
 .../en/docs/Reference/Commands/stop.md        |  3 --
 .../en/docs/Reference/Commands/tunnel.md      |  3 --
 .../en/docs/Reference/Commands/unpause.md     |  3 --
 .../docs/Reference/Commands/update-check.md   |  3 --
 .../docs/Reference/Commands/update-context.md |  3 --
 .../en/docs/Reference/Commands/version.md     |  3 --
 31 files changed, 17 insertions(+), 118 deletions(-)

diff --git a/pkg/generate/docs.go b/pkg/generate/docs.go
index 064fab1df6..895362214b 100644
--- a/pkg/generate/docs.go
+++ b/pkg/generate/docs.go
@@ -59,11 +59,13 @@ func DocForCommand(command *cobra.Command) (string, error) {
 	if err := generateTitle(command, buf); err != nil {
 		return "", errors.Wrap(err, "generating title")
 	}
+	if err := rewriteFlags(command); err != nil {
+		return "", errors.Wrap(err, "rewriting flags")
+	}
 	if err := writeSubcommands(command, buf); err != nil {
 		return "", errors.Wrap(err, "writing subcommands")
 	}
-	edited := removeHelpText(buf)
-	return rewriteFlags(command, edited), nil
+	return removeHelpText(buf), nil
 }
 
 // after every command, cobra automatically appends
diff --git a/pkg/generate/docs_templates.go b/pkg/generate/docs_templates.go
index 7e6bc94d34..f7f5048370 100644
--- a/pkg/generate/docs_templates.go
+++ b/pkg/generate/docs_templates.go
@@ -18,9 +18,6 @@ package generate
 
 var title = `---
 title: "{{.Command}}"
-linkTitle: "{{.Command}}"
-weight: 1
-date: {{.Date}}
 description: >
   {{.Description}}
 ---
diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go
index b289699903..e32825beb5 100644
--- a/pkg/generate/rewrite.go
+++ b/pkg/generate/rewrite.go
@@ -17,7 +17,7 @@ limitations under the License.
 package generate
 
 import (
-	"strings"
+	"fmt"
 
 	"github.com/spf13/cobra"
 )
@@ -30,42 +30,26 @@ type rewrite struct {
 // rewriteFlags rewrites flags that are dependent on operating system
 // for example, for `minikube start`, the description of --driver
 // outputs possible drivers for the operating system
-func rewriteFlags(command *cobra.Command, contents string) string {
+func rewriteFlags(command *cobra.Command) error {
 	rewrites := map[string][]rewrite{
 		"start": []rewrite{{
-			flag:        "--driver",
+			flag:        "driver",
 			description: "Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.",
 		}, {
-			flag:        "--mount-string",
+			flag:        "mount-string",
 			description: "The argument to pass the minikube mount command on start.",
 		}},
 	}
 	rws, ok := rewrites[command.Name()]
 	if !ok {
-		return contents
+		return nil
 	}
 	for _, r := range rws {
-		contents = rewriteFlag(contents, r.flag, r.description)
-	}
-	return contents
-}
-
-func rewriteFlag(contents, flag, description string) string {
-	lines := strings.Split(contents, "\n")
-	for i, l := range lines {
-		if strings.Contains(l, flag) {
-			// docs start with a prefix of 6 spaces
-			replacement := "      "
-			replacement += flag
-			// there are 36 spaces between the start of the flag name
-			// and the description
-			spacesBetween := 36 - len(flag)
-			for i := 0; i < spacesBetween; i++ {
-				replacement += " "
-			}
-			replacement += description
-			lines[i] = replacement
+		flag := command.Flag(r.flag)
+		if flag == nil {
+			return fmt.Errorf("--%s is not a valid flag for %s", r.flag, command.Name())
 		}
+		flag.Usage = r.description
 	}
-	return strings.Join(lines, "\n")
+	return nil
 }
diff --git a/site/content/en/docs/Reference/Commands/addons.md b/site/content/en/docs/Reference/Commands/addons.md
index 53cb511426..ce54b0967e 100644
--- a/site/content/en/docs/Reference/Commands/addons.md
+++ b/site/content/en/docs/Reference/Commands/addons.md
@@ -1,8 +1,5 @@
 ---
 title: "addons"
-linkTitle: "addons"
-weight: 1
-date: 2020-04-02
 description: >
   Modify minikube's kubernetes addons
 ---
diff --git a/site/content/en/docs/Reference/Commands/cache.md b/site/content/en/docs/Reference/Commands/cache.md
index 4a0ced0fbc..d3e3cd1b9f 100644
--- a/site/content/en/docs/Reference/Commands/cache.md
+++ b/site/content/en/docs/Reference/Commands/cache.md
@@ -1,8 +1,5 @@
 ---
 title: "cache"
-linkTitle: "cache"
-weight: 1
-date: 2020-04-02
 description: >
   Add or delete an image from the local cache.
 ---
diff --git a/site/content/en/docs/Reference/Commands/completion.md b/site/content/en/docs/Reference/Commands/completion.md
index 872dc8fca4..38bec17318 100644
--- a/site/content/en/docs/Reference/Commands/completion.md
+++ b/site/content/en/docs/Reference/Commands/completion.md
@@ -1,8 +1,5 @@
 ---
 title: "completion"
-linkTitle: "completion"
-weight: 1
-date: 2020-04-02
 description: >
   Outputs minikube shell completion for the given shell (bash or zsh)
 ---
diff --git a/site/content/en/docs/Reference/Commands/config.md b/site/content/en/docs/Reference/Commands/config.md
index 81eb395045..2775a6e4ae 100644
--- a/site/content/en/docs/Reference/Commands/config.md
+++ b/site/content/en/docs/Reference/Commands/config.md
@@ -1,8 +1,5 @@
 ---
 title: "config"
-linkTitle: "config"
-weight: 1
-date: 2020-04-02
 description: >
   Modify minikube config
 ---
diff --git a/site/content/en/docs/Reference/Commands/dashboard.md b/site/content/en/docs/Reference/Commands/dashboard.md
index 23e3c39a95..e2aafc4e08 100644
--- a/site/content/en/docs/Reference/Commands/dashboard.md
+++ b/site/content/en/docs/Reference/Commands/dashboard.md
@@ -1,8 +1,5 @@
 ---
 title: "dashboard"
-linkTitle: "dashboard"
-weight: 1
-date: 2020-04-02
 description: >
   Access the kubernetes dashboard running within the minikube cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/delete.md b/site/content/en/docs/Reference/Commands/delete.md
index c025e6c244..f343bf524f 100644
--- a/site/content/en/docs/Reference/Commands/delete.md
+++ b/site/content/en/docs/Reference/Commands/delete.md
@@ -1,8 +1,5 @@
 ---
 title: "delete"
-linkTitle: "delete"
-weight: 1
-date: 2020-04-02
 description: >
   Deletes a local kubernetes cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/docker-env.md b/site/content/en/docs/Reference/Commands/docker-env.md
index e9e215e239..188051a6e1 100644
--- a/site/content/en/docs/Reference/Commands/docker-env.md
+++ b/site/content/en/docs/Reference/Commands/docker-env.md
@@ -1,8 +1,5 @@
 ---
 title: "docker-env"
-linkTitle: "docker-env"
-weight: 1
-date: 2020-04-02
 description: >
   Sets up docker env variables; similar to '$(docker-machine env)'
 ---
diff --git a/site/content/en/docs/Reference/Commands/help.md b/site/content/en/docs/Reference/Commands/help.md
index 7c4cc4b92a..717ec0445e 100644
--- a/site/content/en/docs/Reference/Commands/help.md
+++ b/site/content/en/docs/Reference/Commands/help.md
@@ -1,8 +1,5 @@
 ---
 title: "help"
-linkTitle: "help"
-weight: 1
-date: 2020-04-02
 description: >
   Help about any command
 ---
diff --git a/site/content/en/docs/Reference/Commands/ip.md b/site/content/en/docs/Reference/Commands/ip.md
index 1f6b4318e7..188312dad3 100644
--- a/site/content/en/docs/Reference/Commands/ip.md
+++ b/site/content/en/docs/Reference/Commands/ip.md
@@ -1,8 +1,5 @@
 ---
 title: "ip"
-linkTitle: "ip"
-weight: 1
-date: 2020-04-02
 description: >
   Retrieves the IP address of the running cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/kubectl.md b/site/content/en/docs/Reference/Commands/kubectl.md
index 3cc66801b3..6699f257a4 100644
--- a/site/content/en/docs/Reference/Commands/kubectl.md
+++ b/site/content/en/docs/Reference/Commands/kubectl.md
@@ -1,8 +1,5 @@
 ---
 title: "kubectl"
-linkTitle: "kubectl"
-weight: 1
-date: 2020-04-02
 description: >
   Run kubectl
 ---
diff --git a/site/content/en/docs/Reference/Commands/logs.md b/site/content/en/docs/Reference/Commands/logs.md
index 99ca38664a..097a87b3c4 100644
--- a/site/content/en/docs/Reference/Commands/logs.md
+++ b/site/content/en/docs/Reference/Commands/logs.md
@@ -1,8 +1,5 @@
 ---
 title: "logs"
-linkTitle: "logs"
-weight: 1
-date: 2020-04-02
 description: >
   Gets the logs of the running instance, used for debugging minikube, not user code.
 ---
diff --git a/site/content/en/docs/Reference/Commands/mount.md b/site/content/en/docs/Reference/Commands/mount.md
index f891009b77..afc671e778 100644
--- a/site/content/en/docs/Reference/Commands/mount.md
+++ b/site/content/en/docs/Reference/Commands/mount.md
@@ -1,8 +1,5 @@
 ---
 title: "mount"
-linkTitle: "mount"
-weight: 1
-date: 2020-04-02
 description: >
   Mounts the specified directory into minikube
 ---
diff --git a/site/content/en/docs/Reference/Commands/node.md b/site/content/en/docs/Reference/Commands/node.md
index 5ff4646afa..9aec995f71 100644
--- a/site/content/en/docs/Reference/Commands/node.md
+++ b/site/content/en/docs/Reference/Commands/node.md
@@ -1,8 +1,5 @@
 ---
 title: "node"
-linkTitle: "node"
-weight: 1
-date: 2020-04-02
 description: >
   Node operations
 ---
diff --git a/site/content/en/docs/Reference/Commands/options.md b/site/content/en/docs/Reference/Commands/options.md
index aea27a58b6..9536ffb349 100644
--- a/site/content/en/docs/Reference/Commands/options.md
+++ b/site/content/en/docs/Reference/Commands/options.md
@@ -1,8 +1,5 @@
 ---
 title: "options"
-linkTitle: "options"
-weight: 1
-date: 2020-04-02
 description: >
   Show a list of global command-line options (applies to all commands).
 ---
diff --git a/site/content/en/docs/Reference/Commands/pause.md b/site/content/en/docs/Reference/Commands/pause.md
index ee6598b95d..7a6bc5cbcb 100644
--- a/site/content/en/docs/Reference/Commands/pause.md
+++ b/site/content/en/docs/Reference/Commands/pause.md
@@ -1,8 +1,5 @@
 ---
 title: "pause"
-linkTitle: "pause"
-weight: 1
-date: 2020-04-02
 description: >
   pause containers
 ---
diff --git a/site/content/en/docs/Reference/Commands/podman-env.md b/site/content/en/docs/Reference/Commands/podman-env.md
index 72bda64e09..ab5e7769a8 100644
--- a/site/content/en/docs/Reference/Commands/podman-env.md
+++ b/site/content/en/docs/Reference/Commands/podman-env.md
@@ -1,8 +1,5 @@
 ---
 title: "podman-env"
-linkTitle: "podman-env"
-weight: 1
-date: 2020-04-02
 description: >
   Sets up podman env variables; similar to '$(podman-machine env)'
 ---
diff --git a/site/content/en/docs/Reference/Commands/profile.md b/site/content/en/docs/Reference/Commands/profile.md
index 79527f5c7f..8dc67629c6 100644
--- a/site/content/en/docs/Reference/Commands/profile.md
+++ b/site/content/en/docs/Reference/Commands/profile.md
@@ -1,8 +1,5 @@
 ---
 title: "profile"
-linkTitle: "profile"
-weight: 1
-date: 2020-04-02
 description: >
   Profile gets or sets the current minikube profile
 ---
diff --git a/site/content/en/docs/Reference/Commands/service.md b/site/content/en/docs/Reference/Commands/service.md
index 71ad7c1195..7b95e7b85e 100644
--- a/site/content/en/docs/Reference/Commands/service.md
+++ b/site/content/en/docs/Reference/Commands/service.md
@@ -1,8 +1,5 @@
 ---
 title: "service"
-linkTitle: "service"
-weight: 1
-date: 2020-04-02
 description: >
   Gets the kubernetes URL(s) for the specified service in your local cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/ssh-key.md b/site/content/en/docs/Reference/Commands/ssh-key.md
index 3b45143bd3..dba64aadbf 100644
--- a/site/content/en/docs/Reference/Commands/ssh-key.md
+++ b/site/content/en/docs/Reference/Commands/ssh-key.md
@@ -1,8 +1,5 @@
 ---
 title: "ssh-key"
-linkTitle: "ssh-key"
-weight: 1
-date: 2020-04-02
 description: >
   Retrieve the ssh identity key path of the specified cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/ssh.md b/site/content/en/docs/Reference/Commands/ssh.md
index 2a1ddc0f9f..d1d99ebe69 100644
--- a/site/content/en/docs/Reference/Commands/ssh.md
+++ b/site/content/en/docs/Reference/Commands/ssh.md
@@ -1,8 +1,5 @@
 ---
 title: "ssh"
-linkTitle: "ssh"
-weight: 1
-date: 2020-04-02
 description: >
   Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'
 ---
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 536e837b39..3e304014a1 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -1,8 +1,5 @@
 ---
 title: "start"
-linkTitle: "start"
-weight: 1
-date: 2020-04-02
 description: >
   Starts a local kubernetes cluster
 ---
@@ -30,7 +27,7 @@ minikube start [flags]
       --apiserver-names stringArray       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
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --driver                            Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.
+      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --container-runtime string          The container runtime to be used (docker, crio, containerd). (default "docker")
       --cpus int                          Number of CPUs allocated to Kubernetes. (default 2)
       --cri-socket string                 The cri socket path to be used.
@@ -42,7 +39,7 @@ minikube start [flags]
       --docker-env stringArray            Environment variables to pass to the Docker daemon. (format: key=value)
       --docker-opt stringArray            Specify arbitrary flags to pass to the Docker daemon. (format: key=value)
       --download-only                     If true, only download and cache files for later use - don't install or start anything.
-      --driver                            Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.
+      --driver string                     Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.
       --dry-run                           dry-run mode. Validates configuration, but does not mutate system state
       --embed-certs                       if true, will embed the certs in kubeconfig.
       --enable-default-cni                Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with "--network-plugin=cni".
@@ -75,7 +72,7 @@ minikube start [flags]
       --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
       --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
       --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string                      The argument to pass the minikube mount command on start.
+      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
       --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
       --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
       --network-plugin string             The name of the network plugin.
diff --git a/site/content/en/docs/Reference/Commands/status.md b/site/content/en/docs/Reference/Commands/status.md
index 67da3ca3f4..fd1462f33d 100644
--- a/site/content/en/docs/Reference/Commands/status.md
+++ b/site/content/en/docs/Reference/Commands/status.md
@@ -1,8 +1,5 @@
 ---
 title: "status"
-linkTitle: "status"
-weight: 1
-date: 2020-04-02
 description: >
   Gets the status of a local kubernetes cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/stop.md b/site/content/en/docs/Reference/Commands/stop.md
index 21b7717fdb..08e190832b 100644
--- a/site/content/en/docs/Reference/Commands/stop.md
+++ b/site/content/en/docs/Reference/Commands/stop.md
@@ -1,8 +1,5 @@
 ---
 title: "stop"
-linkTitle: "stop"
-weight: 1
-date: 2020-04-02
 description: >
   Stops a running local kubernetes cluster
 ---
diff --git a/site/content/en/docs/Reference/Commands/tunnel.md b/site/content/en/docs/Reference/Commands/tunnel.md
index 4b2f73b544..72b73a316b 100644
--- a/site/content/en/docs/Reference/Commands/tunnel.md
+++ b/site/content/en/docs/Reference/Commands/tunnel.md
@@ -1,8 +1,5 @@
 ---
 title: "tunnel"
-linkTitle: "tunnel"
-weight: 1
-date: 2020-04-02
 description: >
   tunnel makes services of type LoadBalancer accessible on localhost
 ---
diff --git a/site/content/en/docs/Reference/Commands/unpause.md b/site/content/en/docs/Reference/Commands/unpause.md
index fc14d29c1a..3ae61076af 100644
--- a/site/content/en/docs/Reference/Commands/unpause.md
+++ b/site/content/en/docs/Reference/Commands/unpause.md
@@ -1,8 +1,5 @@
 ---
 title: "unpause"
-linkTitle: "unpause"
-weight: 1
-date: 2020-04-02
 description: >
   unpause Kubernetes
 ---
diff --git a/site/content/en/docs/Reference/Commands/update-check.md b/site/content/en/docs/Reference/Commands/update-check.md
index 0ac28ac4dc..c472068813 100644
--- a/site/content/en/docs/Reference/Commands/update-check.md
+++ b/site/content/en/docs/Reference/Commands/update-check.md
@@ -1,8 +1,5 @@
 ---
 title: "update-check"
-linkTitle: "update-check"
-weight: 1
-date: 2020-04-02
 description: >
   Print current and latest version number
 ---
diff --git a/site/content/en/docs/Reference/Commands/update-context.md b/site/content/en/docs/Reference/Commands/update-context.md
index cb3d1b1634..4e200a747b 100644
--- a/site/content/en/docs/Reference/Commands/update-context.md
+++ b/site/content/en/docs/Reference/Commands/update-context.md
@@ -1,8 +1,5 @@
 ---
 title: "update-context"
-linkTitle: "update-context"
-weight: 1
-date: 2020-04-02
 description: >
   Verify the IP address of the running cluster in kubeconfig.
 ---
diff --git a/site/content/en/docs/Reference/Commands/version.md b/site/content/en/docs/Reference/Commands/version.md
index ae8ffc28b3..4aeddee307 100644
--- a/site/content/en/docs/Reference/Commands/version.md
+++ b/site/content/en/docs/Reference/Commands/version.md
@@ -1,8 +1,5 @@
 ---
 title: "version"
-linkTitle: "version"
-weight: 1
-date: 2020-04-02
 description: >
   Print the version of minikube
 ---

From d6fb0931c24b634bd3d0867aa02e064e8313a261 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 6 Apr 2020 10:27:06 -0700
Subject: [PATCH 493/668] update docs

---
 site/content/en/docs/Reference/Commands/start.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 3e304014a1..92cda2ac9a 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -23,7 +23,7 @@ minikube start [flags]
 ```
       --addons minikube addons list       Enable addons. see minikube addons list for a list of valid addon names.
       --apiserver-ips ipSlice             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 (default [])
-      --apiserver-name string             The apiserver name which is used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
+      --apiserver-name string             The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine (default "minikubeCA")
       --apiserver-names stringArray       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
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
@@ -86,7 +86,7 @@ minikube start [flags]
       --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
       --vm                                Filter to use only VM Drivers
       --vm-driver driver                  DEPRECATED, use driver instead.
-      --wait                              Block until the apiserver is servicing API requests (default true)
+      --wait strings                      comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to "apiserver,system_pods", available options: "apiserver,system_pods,default_sa" . other acceptable values are 'all' or 'none', 'true' and 'false' (default [apiserver,system_pods])
       --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
 ```
 

From 3c7c47e1c7c995390480c6705d67daf88154cb53 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 6 Apr 2020 10:58:54 -0700
Subject: [PATCH 494/668] Rewrite default values that are OS dependent

---
 pkg/generate/rewrite.go                        | 18 ++++++++++--------
 .../en/docs/Reference/Commands/start.md        |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go
index e32825beb5..fa7ca9d425 100644
--- a/pkg/generate/rewrite.go
+++ b/pkg/generate/rewrite.go
@@ -23,21 +23,22 @@ import (
 )
 
 type rewrite struct {
-	flag        string
-	description string
+	flag       string
+	usage      string
+	defaultVal string
 }
 
 // rewriteFlags rewrites flags that are dependent on operating system
-// for example, for `minikube start`, the description of --driver
+// for example, for `minikube start`, the usage of --driver
 // outputs possible drivers for the operating system
 func rewriteFlags(command *cobra.Command) error {
 	rewrites := map[string][]rewrite{
 		"start": []rewrite{{
-			flag:        "driver",
-			description: "Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.",
+			flag:  "driver",
+			usage: "Used to specify the driver to run kubernetes in. The list of available drivers depends on operating system.",
 		}, {
-			flag:        "mount-string",
-			description: "The argument to pass the minikube mount command on start.",
+			flag:  "mount-string",
+			usage: "The argument to pass the minikube mount command on start.",
 		}},
 	}
 	rws, ok := rewrites[command.Name()]
@@ -49,7 +50,8 @@ func rewriteFlags(command *cobra.Command) error {
 		if flag == nil {
 			return fmt.Errorf("--%s is not a valid flag for %s", r.flag, command.Name())
 		}
-		flag.Usage = r.description
+		flag.Usage = r.usage
+		flag.DefValue = r.defaultVal
 	}
 	return nil
 }
diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md
index 92cda2ac9a..ce1fa0af1e 100644
--- a/site/content/en/docs/Reference/Commands/start.md
+++ b/site/content/en/docs/Reference/Commands/start.md
@@ -72,7 +72,7 @@ minikube start [flags]
       --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
       --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).
       --mount                             This will start the mount daemon and automatically mount files into minikube.
-      --mount-string string               The argument to pass the minikube mount command on start. (default "/Users:/minikube-host")
+      --mount-string string               The argument to pass the minikube mount command on start.
       --nat-nic-type string               NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio")
       --native-ssh                        Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true)
       --network-plugin string             The name of the network plugin.

From 78595b13dc6fe1d762eb8426c22613834aa67394 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 6 Apr 2020 11:45:42 -0700
Subject: [PATCH 495/668] split out node provisioning and starting kubernetes

---
 cmd/minikube/cmd/node_start.go |  6 +++---
 cmd/minikube/cmd/start.go      | 16 ++++++++--------
 pkg/minikube/node/node.go      |  6 +++---
 pkg/minikube/node/start.go     | 34 +++++++++++++++++-----------------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index 0b4a918ce1..81f9ac6b80 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -49,7 +49,7 @@ var nodeStartCmd = &cobra.Command{
 			exit.WithError("retrieving node", err)
 		}
 
-		r, p, m, h, err := node.Provision(*cc, *n, false)
+		r, p, m, h, err := node.Provision(cc, n, false)
 		if err != nil {
 			exit.WithError("provisioning host for node", err)
 		}
@@ -59,8 +59,8 @@ var nodeStartCmd = &cobra.Command{
 			PreExists:      p,
 			MachineAPI:     m,
 			Host:           h,
-			Cfg:            *cc,
-			Node:           *n,
+			Cfg:            cc,
+			Node:           n,
 			ExistingAddons: nil,
 		}
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 60d5788378..7ea3b9a938 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -399,7 +399,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 		}
 	}
 
-	mRunner, preExists, mAPI, host, err := node.Provision(cc, n, true)
+	mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true)
 	if err != nil {
 		return node.Starter{}, err
 	}
@@ -410,8 +410,8 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 		MachineAPI:     mAPI,
 		Host:           host,
 		ExistingAddons: existingAddons,
-		Cfg:            cc,
-		Node:           n,
+		Cfg:            &cc,
+		Node:           &n,
 	}, nil
 }
 
@@ -419,7 +419,7 @@ func startWithDriver(starter node.Starter, existing *config.ClusterConfig) (*kub
 
 	kubeconfig, err := node.Start(starter, true)
 	if err != nil {
-		kubeconfig, err = maybeDeleteAndRetry(starter.Cfg, starter.Node, starter.ExistingAddons, err)
+		kubeconfig, err = maybeDeleteAndRetry(*starter.Cfg, *starter.Node, starter.ExistingAddons, err)
 		if err != nil {
 			return nil, err
 		}
@@ -442,7 +442,7 @@ func startWithDriver(starter node.Starter, existing *config.ClusterConfig) (*kub
 					KubernetesVersion: starter.Cfg.KubernetesConfig.KubernetesVersion,
 				}
 				out.Ln("") // extra newline for clarity on the command line
-				err := node.Add(&starter.Cfg, n)
+				err := node.Add(starter.Cfg, n)
 				if err != nil {
 					return nil, errors.Wrap(err, "adding node")
 				}
@@ -541,14 +541,14 @@ func maybeDeleteAndRetry(cc config.ClusterConfig, n config.Node, existingAddons
 
 		var kubeconfig *kubeconfig.Settings
 		for _, n := range cc.Nodes {
-			r, p, m, h, err := node.Provision(cc, n, n.ControlPlane)
+			r, p, m, h, err := node.Provision(&cc, &n, n.ControlPlane)
 			s := node.Starter{
 				Runner:         r,
 				PreExists:      p,
 				MachineAPI:     m,
 				Host:           h,
-				Cfg:            cc,
-				Node:           n,
+				Cfg:            &cc,
+				Node:           &n,
 				ExistingAddons: existingAddons,
 			}
 			if err != nil {
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 6f6e383844..dcc4f4d7d5 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -39,7 +39,7 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		return errors.Wrap(err, "save node")
 	}
 
-	r, p, m, h, err := Provision(*cc, n, false)
+	r, p, m, h, err := Provision(cc, &n, false)
 	if err != nil {
 		return err
 	}
@@ -48,8 +48,8 @@ func Add(cc *config.ClusterConfig, n config.Node) error {
 		PreExists:      p,
 		MachineAPI:     m,
 		Host:           h,
-		Cfg:            *cc,
-		Node:           n,
+		Cfg:            cc,
+		Node:           &n,
 		ExistingAddons: nil,
 	}
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index d890fef494..3e2584481a 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -75,8 +75,8 @@ type Starter struct {
 	PreExists      bool
 	MachineAPI     libmachine.API
 	Host           *host.Host
-	Cfg            config.ClusterConfig
-	Node           config.Node
+	Cfg            *config.ClusterConfig
+	Node           *config.Node
 	ExistingAddons map[string]bool
 }
 
@@ -98,16 +98,16 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 	var kcs *kubeconfig.Settings
 	if apiServer {
 		// Must be written before bootstrap, otherwise health checks may flake due to stale IP
-		kcs = setupKubeconfig(starter.Host, &starter.Cfg, &starter.Node, starter.Cfg.Name)
+		kcs = setupKubeconfig(starter.Host, starter.Cfg, starter.Node, starter.Cfg.Name)
 		if err != nil {
 			return nil, errors.Wrap(err, "Failed to setup kubeconfig")
 		}
 
 		// setup kubeadm (must come after setupKubeconfig)
-		bs = setupKubeAdm(starter.MachineAPI, starter.Cfg, starter.Node)
-		err = bs.StartCluster(starter.Cfg)
+		bs = setupKubeAdm(starter.MachineAPI, *starter.Cfg, *starter.Node)
+		err = bs.StartCluster(*starter.Cfg)
 		if err != nil {
-			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, starter.Cfg, starter.Runner))
+			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, *starter.Cfg, starter.Runner))
 			return nil, err
 		}
 
@@ -116,12 +116,12 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 			return nil, errors.Wrap(err, "Failed to update kubeconfig file.")
 		}
 	} else {
-		bs, err = cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), starter.Cfg, starter.Node)
+		bs, err = cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), *starter.Cfg, *starter.Node)
 		if err != nil {
 			return nil, errors.Wrap(err, "Failed to get bootstrapper")
 		}
 
-		if err = bs.SetupCerts(starter.Cfg.KubernetesConfig, starter.Node); err != nil {
+		if err = bs.SetupCerts(starter.Cfg.KubernetesConfig, *starter.Node); err != nil {
 			return nil, errors.Wrap(err, "setting up certs")
 		}
 	}
@@ -146,30 +146,30 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 
 		// Skip pre-existing, because we already waited for health
 		if kverify.ShouldWait(starter.Cfg.VerifyComponents) && !starter.PreExists {
-			if err := bs.WaitForNode(starter.Cfg, starter.Node, viper.GetDuration(waitTimeout)); err != nil {
+			if err := bs.WaitForNode(*starter.Cfg, *starter.Node, viper.GetDuration(waitTimeout)); err != nil {
 				return nil, errors.Wrap(err, "Wait failed")
 			}
 		}
 	} else {
-		if err := bs.UpdateNode(starter.Cfg, starter.Node, cr); err != nil {
+		if err := bs.UpdateNode(*starter.Cfg, *starter.Node, cr); err != nil {
 			return nil, errors.Wrap(err, "Updating node")
 		}
 
-		cp, err := config.PrimaryControlPlane(&starter.Cfg)
+		cp, err := config.PrimaryControlPlane(starter.Cfg)
 		if err != nil {
 			return nil, errors.Wrap(err, "Getting primary control plane")
 		}
-		cpBs, err := cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), starter.Cfg, cp)
+		cpBs, err := cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), *starter.Cfg, cp)
 		if err != nil {
 			return nil, errors.Wrap(err, "Getting bootstrapper")
 		}
 
-		joinCmd, err := cpBs.GenerateToken(starter.Cfg)
+		joinCmd, err := cpBs.GenerateToken(*starter.Cfg)
 		if err != nil {
 			return nil, errors.Wrap(err, "generating join token")
 		}
 
-		if err = bs.JoinCluster(starter.Cfg, starter.Node, joinCmd); err != nil {
+		if err = bs.JoinCluster(*starter.Cfg, *starter.Node, joinCmd); err != nil {
 			return nil, errors.Wrap(err, "joining cluster")
 		}
 	}
@@ -178,7 +178,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 }
 
 // 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) {
+func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool) (command.Runner, bool, libmachine.API, *host.Host, error) {
 	if apiServer {
 		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
 	} else {
@@ -195,14 +195,14 @@ func Provision(cc config.ClusterConfig, n config.Node, apiServer bool) (command.
 
 	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
 	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
-	if err := config.SaveProfile(viper.GetString(config.ProfileName), &cc); err != nil {
+	if err := config.SaveProfile(viper.GetString(config.ProfileName), cc); err != nil {
 		return nil, false, nil, nil, errors.Wrap(err, "Failed to save config")
 	}
 
 	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion)
 	waitDownloadKicArtifacts(&kicGroup)
 
-	return startMachine(&cc, &n)
+	return startMachine(cc, n)
 
 }
 

From eb42d160873716a8bdfce0fb6169bdb73326f4b3 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 6 Apr 2020 13:51:30 -0700
Subject: [PATCH 496/668] actually error out when driver is specified

---
 cmd/minikube/cmd/start.go | 60 +++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 7ea3b9a938..8f8e564337 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -307,33 +307,38 @@ func runStart(cmd *cobra.Command, args []string) {
 	validateSpecifiedDriver(existing)
 	ds, alts, specified := selectDriver(existing)
 	starter, err := provisionWithDriver(cmd, ds, existing)
-	if err != nil && !specified {
-		success := false
-		// Walk down the rest of the options
-		for _, alt := range alts {
-			out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}: {{.error}}", out.V{"old_driver": ds.Name, "new_driver": alt.Name, "error": err})
-			ds = alt
-			// Delete the existing cluster and try again with the next driver on the list
-			profile, err := config.LoadProfile(ClusterFlagValue())
-			if err != nil {
-				glog.Warningf("%s profile does not exist, trying anyways.", ClusterFlagValue())
-			}
-
-			err = deleteProfile(profile)
-			if err != nil {
-				out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": ClusterFlagValue()})
-			}
-			starter, err = provisionWithDriver(cmd, ds, existing)
-			if err != nil {
-				continue
-			} else {
-				// Success!
-				success = true
-				break
-			}
-		}
-		if !success {
+	if err != nil {
+		if specified {
+			// If the user specified a driver, don't fallback to anything else
 			exit.WithError("error provisioning host", err)
+		} else {
+			success := false
+			// Walk down the rest of the options
+			for _, alt := range alts {
+				out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}: {{.error}}", out.V{"old_driver": ds.Name, "new_driver": alt.Name, "error": err})
+				ds = alt
+				// Delete the existing cluster and try again with the next driver on the list
+				profile, err := config.LoadProfile(ClusterFlagValue())
+				if err != nil {
+					glog.Warningf("%s profile does not exist, trying anyways.", ClusterFlagValue())
+				}
+
+				err = deleteProfile(profile)
+				if err != nil {
+					out.WarningT("Failed to delete cluster {{.name}}, proceeding with retry anyway.", out.V{"name": ClusterFlagValue()})
+				}
+				starter, err = provisionWithDriver(cmd, ds, existing)
+				if err != nil {
+					continue
+				} else {
+					// Success!
+					success = true
+					break
+				}
+			}
+			if !success {
+				exit.WithError("error provisioning host", err)
+			}
 		}
 	}
 
@@ -374,7 +379,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 	// This is about as far as we can go without overwriting config files
 	if viper.GetBool(dryRun) {
 		out.T(out.DryRun, `dry-run validation complete!`)
-		return node.Starter{}, nil
+		os.Exit(0)
 	}
 
 	if driver.IsVM(driverName) {
@@ -416,7 +421,6 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 }
 
 func startWithDriver(starter node.Starter, existing *config.ClusterConfig) (*kubeconfig.Settings, error) {
-
 	kubeconfig, err := node.Start(starter, true)
 	if err != nil {
 		kubeconfig, err = maybeDeleteAndRetry(*starter.Cfg, *starter.Node, starter.ExistingAddons, err)

From 0bb1c411d4432b70b439fecd2e2ed8f07cbffdb5 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 14:57:33 -0700
Subject: [PATCH 497/668] add new wait component apps_running

---
 .../bootstrapper/bsutil/kverify/kverify.go    | 122 ++----------------
 .../bsutil/kverify/system_pods.go             |  88 +++++++++++++
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |   2 +-
 3 files changed, 102 insertions(+), 110 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 15b89c6cdc..2028cefffa 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -18,22 +18,7 @@ limitations under the License.
 package kverify
 
 import (
-	"fmt"
-	"os/exec"
-	"strings"
 	"time"
-
-	"github.com/docker/machine/libmachine/state"
-	"github.com/golang/glog"
-	core "k8s.io/api/core/v1"
-	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	"k8s.io/minikube/pkg/minikube/bootstrapper"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/logs"
 )
 
 // minLogCheckTime how long to wait before spamming error logs to console
@@ -46,6 +31,8 @@ const (
 	SystemPodsWaitKey = "system_pods"
 	// DefaultSAWaitKey is the name used in the flags for default service account
 	DefaultSAWaitKey = "default_sa"
+	// K8SApps is the name used in the flags for waiting for k8s-apps to be running
+	AppsRunning = "apps_running"
 )
 
 //  vars related to the --wait flag
@@ -53,13 +40,22 @@ var (
 	// DefaultComponents is map of the the default components to wait for
 	DefaultComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true}
 	// NoWaitComponents is map of componets to wait for if specified 'none' or 'false'
-	NoComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false}
+	NoComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false, AppsRunning: false}
 	// AllComponents is map for waiting for all components.
 	AllComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true}
 	// DefaultWaitList is list of all default components to wait for. only names to be used for start flags.
 	DefaultWaitList = []string{APIServerWaitKey, SystemPodsWaitKey}
 	// AllComponentsList list of all valid components keys to wait for. only names to be used used for start flags.
-	AllComponentsList = []string{APIServerWaitKey, SystemPodsWaitKey, DefaultSAWaitKey}
+	AllComponentsList = []string{APIServerWaitKey, SystemPodsWaitKey, DefaultSAWaitKey, AppsRunning}
+	// AppsRunningList running list are valid k8s-app components to wait for them to be running
+	AppsRunningList = []string{
+		"kube-dns", // coredns
+		"etcd",
+		"kube-apiserver",
+		"kube-controller-manager",
+		"kube-proxy",
+		"kube-scheduler",
+	}
 )
 
 // ShouldWait will return true if the config says need to wait
@@ -71,95 +67,3 @@ func ShouldWait(wcs map[string]bool) bool {
 	}
 	return false
 }
-
-// ExpectedComponentsRunning returns whether or not all expected components are running
-func ExpectedComponentsRunning(cs *kubernetes.Clientset) error {
-	expected := []string{
-		"kube-dns", // coredns
-		"etcd",
-		"kube-apiserver",
-		"kube-controller-manager",
-		"kube-proxy",
-		"kube-scheduler",
-	}
-
-	found := map[string]bool{}
-
-	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
-	if err != nil {
-		return err
-	}
-
-	for _, pod := range pods.Items {
-		glog.Infof("found pod: %s", podStatusMsg(pod))
-		if pod.Status.Phase != core.PodRunning {
-			continue
-		}
-		for k, v := range pod.ObjectMeta.Labels {
-			if k == "component" || k == "k8s-app" {
-				found[v] = true
-			}
-		}
-	}
-
-	missing := []string{}
-	for _, e := range expected {
-		if !found[e] {
-			missing = append(missing, e)
-		}
-	}
-	if len(missing) > 0 {
-		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
-	}
-	return nil
-}
-
-// podStatusMsg returns a human-readable pod status, for generating debug status
-func podStatusMsg(pod core.Pod) string {
-	var sb strings.Builder
-	sb.WriteString(fmt.Sprintf("%q [%s] %s", pod.ObjectMeta.GetName(), pod.ObjectMeta.GetUID(), pod.Status.Phase))
-	for i, c := range pod.Status.Conditions {
-		if c.Reason != "" {
-			if i == 0 {
-				sb.WriteString(": ")
-			} else {
-				sb.WriteString(" / ")
-			}
-			sb.WriteString(fmt.Sprintf("%s:%s", c.Type, c.Reason))
-		}
-		if c.Message != "" {
-			sb.WriteString(fmt.Sprintf(" (%s)", c.Message))
-		}
-	}
-	return sb.String()
-}
-
-// announceProblems checks for problems, and slows polling down if any are found
-func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner) {
-	problems := logs.FindProblems(r, bs, cfg, cr)
-	if len(problems) > 0 {
-		logs.OutputProblems(problems, 5)
-		time.Sleep(kconst.APICallRetryInterval * 15)
-	}
-}
-
-// KubeletStatus checks the kubelet status
-func KubeletStatus(cr command.Runner) (state.State, error) {
-	glog.Infof("Checking kubelet status ...")
-	rr, err := cr.RunCmd(exec.Command("sudo", "systemctl", "is-active", "kubelet"))
-	if err != nil {
-		// Do not return now, as we still have parsing to do!
-		glog.Warningf("%s returned error: %v", rr.Command(), err)
-	}
-	s := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("kubelet is-active: %s", s)
-	switch s {
-	case "active":
-		return state.Running, nil
-	case "inactive":
-		return state.Stopped, nil
-	case "activating":
-		return state.Starting, nil
-	}
-	return state.Error, nil
-}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 9993044ae7..7bcd1c8206 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -19,9 +19,13 @@ package kverify
 
 import (
 	"fmt"
+	"os/exec"
+	"strings"
 	"time"
 
+	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -30,6 +34,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/logs"
 )
 
 // WaitForSystemPods verifies essential pods for running kurnetes is running
@@ -68,3 +73,86 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 	glog.Infof("duration metric: took %s to wait for pod list to return data ...", time.Since(pStart))
 	return nil
 }
+
+// WaitForAppsRunning returns whether or not all expected k8s-apps are running
+func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string) error {
+	found := map[string]bool{}
+
+	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
+	if err != nil {
+		return err
+	}
+
+	for _, pod := range pods.Items {
+		glog.Infof("found pod: %s", podStatusMsg(pod))
+		if pod.Status.Phase != core.PodRunning {
+			continue
+		}
+		for k, v := range pod.ObjectMeta.Labels {
+			if k == "component" || k == "k8s-app" {
+				found[v] = true
+			}
+		}
+	}
+
+	missing := []string{}
+	for _, e := range expected {
+		if !found[e] {
+			missing = append(missing, e)
+		}
+	}
+	if len(missing) > 0 {
+		return fmt.Errorf("missing components: %v", strings.Join(missing, ", "))
+	}
+	return nil
+}
+
+// podStatusMsg returns a human-readable pod status, for generating debug status
+func podStatusMsg(pod core.Pod) string {
+	var sb strings.Builder
+	sb.WriteString(fmt.Sprintf("%q [%s] %s", pod.ObjectMeta.GetName(), pod.ObjectMeta.GetUID(), pod.Status.Phase))
+	for i, c := range pod.Status.Conditions {
+		if c.Reason != "" {
+			if i == 0 {
+				sb.WriteString(": ")
+			} else {
+				sb.WriteString(" / ")
+			}
+			sb.WriteString(fmt.Sprintf("%s:%s", c.Type, c.Reason))
+		}
+		if c.Message != "" {
+			sb.WriteString(fmt.Sprintf(" (%s)", c.Message))
+		}
+	}
+	return sb.String()
+}
+
+// announceProblems checks for problems, and slows polling down if any are found
+func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.ClusterConfig, cr command.Runner) {
+	problems := logs.FindProblems(r, bs, cfg, cr)
+	if len(problems) > 0 {
+		logs.OutputProblems(problems, 5)
+		time.Sleep(kconst.APICallRetryInterval * 15)
+	}
+}
+
+// KubeletStatus checks the kubelet status
+func KubeletStatus(cr command.Runner) (state.State, error) {
+	glog.Infof("Checking kubelet status ...")
+	rr, err := cr.RunCmd(exec.Command("sudo", "systemctl", "is-active", "kubelet"))
+	if err != nil {
+		// Do not return now, as we still have parsing to do!
+		glog.Warningf("%s returned error: %v", rr.Command(), err)
+	}
+	s := strings.TrimSpace(rr.Stdout.String())
+	glog.Infof("kubelet is-active: %s", s)
+	switch s {
+	case "active":
+		return state.Running, nil
+	case "inactive":
+		return state.Stopped, nil
+	case "activating":
+		return state.Starting, nil
+	}
+	return state.Error, nil
+}
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index e8d76def91..ea109eaa34 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -416,7 +416,7 @@ func (k *Bootstrapper) needsReset(conf string, hostname string, port int, client
 		return true
 	}
 
-	if err := kverify.ExpectedComponentsRunning(client); err != nil {
+	if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList); err != nil {
 		glog.Infof("needs reset: %v", err)
 		return true
 	}

From 2da72fac54dbcd5073f47a83576457b7c81ee866 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 15:14:16 -0700
Subject: [PATCH 498/668] add wait for k8s-app running

---
 .../bootstrapper/bsutil/kverify/system_pods.go  | 17 +++++++++++++++--
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go    | 13 ++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 7bcd1c8206..7c1723d931 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -35,6 +36,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 // WaitForSystemPods verifies essential pods for running kurnetes is running
@@ -74,8 +76,8 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 	return nil
 }
 
-// WaitForAppsRunning returns whether or not all expected k8s-apps are running
-func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string) error {
+// ExpectAppsRunning returns whether or not all expected k8s-apps are running. (without waiting for them)
+func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error {
 	found := map[string]bool{}
 
 	pods, err := cs.CoreV1().Pods("kube-system").List(meta.ListOptions{})
@@ -107,6 +109,17 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string) error {
 	return nil
 }
 
+// WaitForAppsRunning waits for expected Apps To be running
+func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout time.Duration) error {
+	start := time.Now()
+	checkRunning := func() error { return ExpectAppsRunning(cs, expected) }
+	if err := retry.Expo(checkRunning, 500*time.Millisecond, timeout); err != nil {
+		return errors.Wrap(err, "waitings for k8s app running")
+	}
+	glog.Infof("duration metric: took %s to wait for k8s-apps to be running ...", time.Since(start))
+	return nil
+}
+
 // podStatusMsg returns a human-readable pod status, for generating debug status
 func podStatusMsg(pod core.Pod) string {
 	var sb strings.Builder
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ea109eaa34..8afd7734dc 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -394,6 +394,17 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 			return errors.Wrap(err, "waiting for default service account")
 		}
 	}
+
+	if cfg.VerifyComponents[kverify.AppsRunning] {
+		client, err := k.client(hostname, port)
+		if err != nil {
+			return errors.Wrap(err, "get k8s client")
+		}
+		if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList); err != nil {
+			return errors.Wrap(err, "waiting for apps_running")
+		}
+	}
+
 	glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.VerifyComponents)
 	return nil
 }
@@ -416,7 +427,7 @@ func (k *Bootstrapper) needsReset(conf string, hostname string, port int, client
 		return true
 	}
 
-	if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList); err != nil {
+	if err := kverify.ExpectAppsRunning(client, kverify.AppsRunningList); err != nil {
 		glog.Infof("needs reset: %v", err)
 		return true
 	}

From 20c27081ca4e8876a047984223d8ef104b85544f Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 15:16:41 -0700
Subject: [PATCH 499/668] add timeout for WaitForAppsRunning

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 8afd7734dc..9a65e7df8c 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -400,7 +400,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
 		if err != nil {
 			return errors.Wrap(err, "get k8s client")
 		}
-		if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList); err != nil {
+		if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList, timeout); err != nil {
 			return errors.Wrap(err, "waiting for apps_running")
 		}
 	}

From c9eb446eb3f1a2b8349cd8ce351de9c0d398490e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 15:17:35 -0700
Subject: [PATCH 500/668] fix comment

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index 2028cefffa..d67f51bd0c 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -31,7 +31,7 @@ const (
 	SystemPodsWaitKey = "system_pods"
 	// DefaultSAWaitKey is the name used in the flags for default service account
 	DefaultSAWaitKey = "default_sa"
-	// K8SApps is the name used in the flags for waiting for k8s-apps to be running
+	// AppsRunning is the name used in the flags for waiting for k8s-apps to be running
 	AppsRunning = "apps_running"
 )
 

From b880469cd7227fab141ffd652f975f11da335b8b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 15:23:06 -0700
Subject: [PATCH 501/668] add logs for waiting

---
 pkg/minikube/bootstrapper/bsutil/kverify/kverify.go     | 2 +-
 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
index d67f51bd0c..f4486196c3 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
@@ -42,7 +42,7 @@ var (
 	// NoWaitComponents is map of componets to wait for if specified 'none' or 'false'
 	NoComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false, AppsRunning: false}
 	// AllComponents is map for waiting for all components.
-	AllComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true}
+	AllComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true, DefaultSAWaitKey: true, AppsRunning: true}
 	// DefaultWaitList is list of all default components to wait for. only names to be used for start flags.
 	DefaultWaitList = []string{APIServerWaitKey, SystemPodsWaitKey}
 	// AllComponentsList list of all valid components keys to wait for. only names to be used used for start flags.
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 7c1723d931..f6e9a5f98f 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -111,6 +111,7 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error {
 
 // WaitForAppsRunning waits for expected Apps To be running
 func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout time.Duration) error {
+	glog.Info("waiting for k8s-apps to be running ...")
 	start := time.Now()
 	checkRunning := func() error { return ExpectAppsRunning(cs, expected) }
 	if err := retry.Expo(checkRunning, 500*time.Millisecond, timeout); err != nil {

From 9b4d4dd661d2b63550d886c36ec9cb53c49349bc Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Mon, 6 Apr 2020 16:17:00 -0700
Subject: [PATCH 502/668] Update screenshot and frontpage based on review
 feedback

---
 site/content/en/docs/_index.md    |   4 ++--
 site/static/images/screenshot.png | Bin 130043 -> 118874 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md
index 8d9db894e7..59b02066e7 100755
--- a/site/content/en/docs/_index.md
+++ b/site/content/en/docs/_index.md
@@ -7,7 +7,7 @@ aliases:
   - /docs/overview
 ---
 
-minikube implements a local Kubernetes cluster on macOS, Linux, and Windows.
+minikube quickly sets up a local Kubernetes cluster on macOS, Linux, and Windows. We proudly focus on helping application developers and new Kubernetes users.
 
 ![Screenshot](/images/screenshot.png)
 
@@ -23,4 +23,4 @@ minikube implements a local Kubernetes cluster on macOS, Linux, and Windows.
 
 ## Survey
 
-Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A) so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
+We have a [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A) to learn how & why you are using minikube, and what improvements we should make. We would love to hear from you! 🙏
diff --git a/site/static/images/screenshot.png b/site/static/images/screenshot.png
index b6f14a111aefbe82d1e5891679eb2b1391a51868..4eefa2e796c65e632c6ecb0b5f9c4dd48a84a365 100644
GIT binary patch
literal 118874
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
GLSTY^d^|b;

literal 130043
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
B2O$6e


From cf9883628fb735ded05f9e20566ed65d4f28bc66 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sat, 4 Apr 2020 23:16:34 -0700
Subject: [PATCH 503/668] remove kic overlay network

---
 pkg/drivers/kic/types.go                      |   4 -
 .../bootstrapper/kubeadm/default_cni.go       | 118 ------------------
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  27 ----
 3 files changed, 149 deletions(-)

diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index d31aac0b85..e5acc79cb0 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -33,10 +33,6 @@ const (
 	Version = "v0.0.8"
 	// SHA of the kic base image
 	baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81"
-
-	// OverlayImage is the cni plugin used for overlay image, created by kind.
-	// CNI plugin image used for kic drivers created by kind.
-	OverlayImage = "kindest/kindnetd:0.5.3"
 )
 
 var (
diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
index fb5b0c55f5..da896eee8d 100644
--- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go
+++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
@@ -16,8 +16,6 @@ limitations under the License.
 
 package kubeadm
 
-import "html/template"
-
 // defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni
 // has been passed to `minikube start`.
 //
@@ -44,119 +42,3 @@ const defaultCNIConfig = `
   }
 }
 `
-
-// kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go
-var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: kindnet
-rules:
-  - apiGroups:
-    - policy
-    resources:
-    - podsecuritypolicies
-    verbs:
-    - use
-    resourceNames: 
-    - kindnet
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - list
-      - watch
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: kindnet
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kindnet
-subjects:
-- kind: ServiceAccount
-  name: kindnet
-  namespace: kube-system
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kindnet
-  namespace: kube-system
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kindnet
-  namespace: kube-system
-  labels:
-    tier: node
-    app: kindnet
-    k8s-app: kindnet
-spec:
-  selector:
-    matchLabels:
-      app: kindnet
-  template:
-    metadata:
-      labels:
-        tier: node
-        app: kindnet
-        k8s-app: kindnet
-    spec:
-      hostNetwork: true
-      tolerations:
-      - operator: Exists
-        effect: NoSchedule
-      serviceAccountName: kindnet
-      containers:
-      - name: kindnet-cni
-        image: {{.ImageName}}
-        env:
-        - name: HOST_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.hostIP
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        - name: POD_SUBNET
-          value: 10.244.0.0/16
-        volumeMounts:
-        - name: cni-cfg
-          mountPath: /etc/cni/net.d
-        - name: xtables-lock
-          mountPath: /run/xtables.lock
-          readOnly: false
-        - name: lib-modules
-          mountPath: /lib/modules
-          readOnly: true
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "50Mi"
-          limits:
-            cpu: "100m"
-            memory: "50Mi"
-        securityContext:
-          privileged: false
-          capabilities:
-            add: ["NET_RAW", "NET_ADMIN"]
-      volumes:
-      - name: cni-cfg
-        hostPath:
-          path: /etc/cni/net.d
-      - name: xtables-lock
-        hostPath:
-          path: /run/xtables.lock
-          type: FileOrCreate
-      - name: lib-modules
-        hostPath:
-          path: /lib/modules
-
----
-`))
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 9a65e7df8c..b52a543fb6 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -17,7 +17,6 @@ limitations under the License.
 package kubeadm
 
 import (
-	"bytes"
 	"context"
 	"os/exec"
 	"path"
@@ -38,7 +37,6 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
@@ -231,12 +229,6 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
-	if cfg.Driver == driver.Docker {
-		if err := k.applyKicOverlay(cfg); err != nil {
-			return errors.Wrap(err, "apply kic overlay")
-		}
-	}
-
 	if err := k.applyNodeLabels(cfg); err != nil {
 		glog.Warningf("unable to apply node labels: %v", err)
 	}
@@ -738,25 +730,6 @@ func reloadKubelet(runner command.Runner) error {
 	return nil
 }
 
-// applyKicOverlay applies the CNI plugin needed to make kic work
-func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
-	// Allow no more than 5 seconds for apply kic overlay
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	cmd := exec.CommandContext(ctx, "sudo",
-		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
-		"-f", "-")
-	b := bytes.Buffer{}
-	if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil {
-		return err
-	}
-	cmd.Stdin = bytes.NewReader(b.Bytes())
-	if rr, err := k.c.RunCmd(cmd); err != nil {
-		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
-	}
-	return nil
-}
-
 // applyNodeLabels applies minikube labels to all the nodes
 func (k *Bootstrapper) applyNodeLabels(cfg config.ClusterConfig) error {
 	// time cluster was created. time format is based on ISO 8601 (RFC 3339)

From f72132b5eceace00bd5f53eded83ae6b0dea7e77 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sat, 4 Apr 2020 23:32:03 -0700
Subject: [PATCH 504/668] lint

---
 hack/preload-images/generate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go
index a3160bc5a1..ebb50a8bf0 100644
--- a/hack/preload-images/generate.go
+++ b/hack/preload-images/generate.go
@@ -68,7 +68,7 @@ func generateTarball(kubernetesVersion, tarballFilename string) error {
 		return errors.Wrap(err, "kubeadm images")
 	}
 
-	for _, img := range append(imgs, kic.OverlayImage) {
+	for _, img := range imgs {
 		cmd := exec.Command("docker", "exec", profile, "docker", "pull", img)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr

From 2aacdde555e254d38679a0d4d2790aa28c5f2612 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 5 Apr 2020 01:03:39 -0700
Subject: [PATCH 505/668] only remove kic overaly for docker driver

---
 pkg/drivers/kic/types.go                      |   4 +
 .../bootstrapper/kubeadm/default_cni.go       | 117 ++++++++++++++++++
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  28 +++++
 3 files changed, 149 insertions(+)

diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index e5acc79cb0..d31aac0b85 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -33,6 +33,10 @@ const (
 	Version = "v0.0.8"
 	// SHA of the kic base image
 	baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81"
+
+	// OverlayImage is the cni plugin used for overlay image, created by kind.
+	// CNI plugin image used for kic drivers created by kind.
+	OverlayImage = "kindest/kindnetd:0.5.3"
 )
 
 var (
diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
index da896eee8d..96e6627498 100644
--- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go
+++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 package kubeadm
 
+import "html/template"
+
 // defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni
 // has been passed to `minikube start`.
 //
@@ -42,3 +44,118 @@ const defaultCNIConfig = `
   }
 }
 `
+
+// kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go
+var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---	
+kind: ClusterRole	
+apiVersion: rbac.authorization.k8s.io/v1	
+metadata:	
+  name: kindnet	
+rules:	
+  - apiGroups:	
+    - policy	
+    resources:	
+    - podsecuritypolicies	
+    verbs:	
+    - use	
+    resourceNames: 	
+    - kindnet	
+  - apiGroups:	
+      - ""	
+    resources:	
+      - nodes	
+    verbs:	
+      - list	
+      - watch	
+---	
+kind: ClusterRoleBinding	
+apiVersion: rbac.authorization.k8s.io/v1	
+metadata:	
+  name: kindnet	
+roleRef:	
+  apiGroup: rbac.authorization.k8s.io	
+  kind: ClusterRole	
+  name: kindnet	
+subjects:	
+- kind: ServiceAccount	
+  name: kindnet	
+  namespace: kube-system	
+---	
+apiVersion: v1	
+kind: ServiceAccount	
+metadata:	
+  name: kindnet	
+  namespace: kube-system	
+---	
+apiVersion: apps/v1	
+kind: DaemonSet	
+metadata:	
+  name: kindnet	
+  namespace: kube-system	
+  labels:	
+    tier: node	
+    app: kindnet	
+    k8s-app: kindnet	
+spec:	
+  selector:	
+    matchLabels:	
+      app: kindnet	
+  template:	
+    metadata:	
+      labels:	
+        tier: node	
+        app: kindnet	
+        k8s-app: kindnet	
+    spec:	
+      hostNetwork: true	
+      tolerations:	
+      - operator: Exists	
+        effect: NoSchedule	
+      serviceAccountName: kindnet	
+      containers:	
+      - name: kindnet-cni	
+        image: {{.ImageName}}	
+        env:	
+        - name: HOST_IP	
+          valueFrom:	
+            fieldRef:	
+              fieldPath: status.hostIP	
+        - name: POD_IP	
+          valueFrom:	
+            fieldRef:	
+              fieldPath: status.podIP	
+        - name: POD_SUBNET	
+          value: 10.244.0.0/16	
+        volumeMounts:	
+        - name: cni-cfg	
+          mountPath: /etc/cni/net.d	
+        - name: xtables-lock	
+          mountPath: /run/xtables.lock	
+          readOnly: false	
+        - name: lib-modules	
+          mountPath: /lib/modules	
+          readOnly: true	
+        resources:	
+          requests:	
+            cpu: "100m"	
+            memory: "50Mi"	
+          limits:	
+            cpu: "100m"	
+            memory: "50Mi"	
+        securityContext:	
+          privileged: false	
+          capabilities:	
+            add: ["NET_RAW", "NET_ADMIN"]	
+      volumes:	
+      - name: cni-cfg	
+        hostPath:	
+          path: /etc/cni/net.d	
+      - name: xtables-lock	
+        hostPath:	
+          path: /run/xtables.lock	
+          type: FileOrCreate	
+      - name: lib-modules	
+        hostPath:	
+          path: /lib/modules	
+---	
+`))
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index b52a543fb6..e0228819b7 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -17,6 +17,7 @@ limitations under the License.
 package kubeadm
 
 import (
+	"bytes"
 	"context"
 	"os/exec"
 	"path"
@@ -37,6 +38,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/client-go/kubernetes"
 	kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
+	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
@@ -229,6 +231,13 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
+	// this is only required for containerd and cri-o runtime to avoid
+	if cfg.Driver == driver.Docker && cfg.KubernetesConfig.ContainerRuntime != "docker" {
+		if err := k.applyKicOverlay(cfg); err != nil {
+			return errors.Wrap(err, "apply kic overlay")
+		}
+	}
+
 	if err := k.applyNodeLabels(cfg); err != nil {
 		glog.Warningf("unable to apply node labels: %v", err)
 	}
@@ -730,6 +739,25 @@ func reloadKubelet(runner command.Runner) error {
 	return nil
 }
 
+// applyKicOverlay applies the CNI plugin needed to make kic work
+func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
+	// Allow no more than 5 seconds for apply kic overlay
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	cmd := exec.CommandContext(ctx, "sudo",
+		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
+		"-f", "-")
+	b := bytes.Buffer{}
+	if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil {
+		return err
+	}
+	cmd.Stdin = bytes.NewReader(b.Bytes())
+	if rr, err := k.c.RunCmd(cmd); err != nil {
+		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
+	}
+	return nil
+}
+
 // applyNodeLabels applies minikube labels to all the nodes
 func (k *Bootstrapper) applyNodeLabels(cfg config.ClusterConfig) error {
 	// time cluster was created. time format is based on ISO 8601 (RFC 3339)

From e1650ac78dd25e41b288da891df3f218506b6275 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 5 Apr 2020 01:05:03 -0700
Subject: [PATCH 506/668] revert default cni

---
 .../bootstrapper/kubeadm/default_cni.go       | 225 +++++++++---------
 1 file changed, 113 insertions(+), 112 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
index 96e6627498..fb5b0c55f5 100644
--- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go
+++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go
@@ -46,116 +46,117 @@ const defaultCNIConfig = `
 `
 
 // kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go
-var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---	
-kind: ClusterRole	
-apiVersion: rbac.authorization.k8s.io/v1	
-metadata:	
-  name: kindnet	
-rules:	
-  - apiGroups:	
-    - policy	
-    resources:	
-    - podsecuritypolicies	
-    verbs:	
-    - use	
-    resourceNames: 	
-    - kindnet	
-  - apiGroups:	
-      - ""	
-    resources:	
-      - nodes	
-    verbs:	
-      - list	
-      - watch	
----	
-kind: ClusterRoleBinding	
-apiVersion: rbac.authorization.k8s.io/v1	
-metadata:	
-  name: kindnet	
-roleRef:	
-  apiGroup: rbac.authorization.k8s.io	
-  kind: ClusterRole	
-  name: kindnet	
-subjects:	
-- kind: ServiceAccount	
-  name: kindnet	
-  namespace: kube-system	
----	
-apiVersion: v1	
-kind: ServiceAccount	
-metadata:	
-  name: kindnet	
-  namespace: kube-system	
----	
-apiVersion: apps/v1	
-kind: DaemonSet	
-metadata:	
-  name: kindnet	
-  namespace: kube-system	
-  labels:	
-    tier: node	
-    app: kindnet	
-    k8s-app: kindnet	
-spec:	
-  selector:	
-    matchLabels:	
-      app: kindnet	
-  template:	
-    metadata:	
-      labels:	
-        tier: node	
-        app: kindnet	
-        k8s-app: kindnet	
-    spec:	
-      hostNetwork: true	
-      tolerations:	
-      - operator: Exists	
-        effect: NoSchedule	
-      serviceAccountName: kindnet	
-      containers:	
-      - name: kindnet-cni	
-        image: {{.ImageName}}	
-        env:	
-        - name: HOST_IP	
-          valueFrom:	
-            fieldRef:	
-              fieldPath: status.hostIP	
-        - name: POD_IP	
-          valueFrom:	
-            fieldRef:	
-              fieldPath: status.podIP	
-        - name: POD_SUBNET	
-          value: 10.244.0.0/16	
-        volumeMounts:	
-        - name: cni-cfg	
-          mountPath: /etc/cni/net.d	
-        - name: xtables-lock	
-          mountPath: /run/xtables.lock	
-          readOnly: false	
-        - name: lib-modules	
-          mountPath: /lib/modules	
-          readOnly: true	
-        resources:	
-          requests:	
-            cpu: "100m"	
-            memory: "50Mi"	
-          limits:	
-            cpu: "100m"	
-            memory: "50Mi"	
-        securityContext:	
-          privileged: false	
-          capabilities:	
-            add: ["NET_RAW", "NET_ADMIN"]	
-      volumes:	
-      - name: cni-cfg	
-        hostPath:	
-          path: /etc/cni/net.d	
-      - name: xtables-lock	
-        hostPath:	
-          path: /run/xtables.lock	
-          type: FileOrCreate	
-      - name: lib-modules	
-        hostPath:	
-          path: /lib/modules	
----	
+var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+rules:
+  - apiGroups:
+    - policy
+    resources:
+    - podsecuritypolicies
+    verbs:
+    - use
+    resourceNames: 
+    - kindnet
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - list
+      - watch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kindnet
+subjects:
+- kind: ServiceAccount
+  name: kindnet
+  namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kindnet
+  namespace: kube-system
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kindnet
+  namespace: kube-system
+  labels:
+    tier: node
+    app: kindnet
+    k8s-app: kindnet
+spec:
+  selector:
+    matchLabels:
+      app: kindnet
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: kindnet
+        k8s-app: kindnet
+    spec:
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: kindnet
+      containers:
+      - name: kindnet-cni
+        image: {{.ImageName}}
+        env:
+        - name: HOST_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: POD_SUBNET
+          value: 10.244.0.0/16
+        volumeMounts:
+        - name: cni-cfg
+          mountPath: /etc/cni/net.d
+        - name: xtables-lock
+          mountPath: /run/xtables.lock
+          readOnly: false
+        - name: lib-modules
+          mountPath: /lib/modules
+          readOnly: true
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+            add: ["NET_RAW", "NET_ADMIN"]
+      volumes:
+      - name: cni-cfg
+        hostPath:
+          path: /etc/cni/net.d
+      - name: xtables-lock
+        hostPath:
+          path: /run/xtables.lock
+          type: FileOrCreate
+      - name: lib-modules
+        hostPath:
+          path: /lib/modules
+
+---
 `))

From deb16d67518923cd4789110a984dfda19db31fe8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 5 Apr 2020 01:23:11 -0700
Subject: [PATCH 507/668] copy kic overlay image only for docker run time
 tarball

---
 hack/preload-images/generate.go              | 7 ++++++-
 hack/preload-images/preload_images.go        | 2 +-
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go
index ebb50a8bf0..f178a6592b 100644
--- a/hack/preload-images/generate.go
+++ b/hack/preload-images/generate.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
 
-func generateTarball(kubernetesVersion, tarballFilename string) error {
+func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string) error {
 	defer func() {
 		if err := deleteMinikube(); err != nil {
 			fmt.Println(err)
@@ -68,6 +68,10 @@ func generateTarball(kubernetesVersion, tarballFilename string) error {
 		return errors.Wrap(err, "kubeadm images")
 	}
 
+	if containerRuntime != "docker" { // kic overlay image is only needed by containerd and cri-o https://github.com/kubernetes/minikube/issues/7428
+		imgs = append(imgs, kic.OverlayImage)
+	}
+
 	for _, img := range imgs {
 		cmd := exec.Command("docker", "exec", profile, "docker", "pull", img)
 		cmd.Stdout = os.Stdout
@@ -93,6 +97,7 @@ func generateTarball(kubernetesVersion, tarballFilename string) error {
 }
 
 func createImageTarball(tarballFilename string) error {
+	// directories to save into tarball
 	dirs := []string{
 		fmt.Sprintf("./lib/docker/%s", dockerStorageDriver),
 		"./lib/docker/image",
diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go
index fcf06180d7..37bbd678e7 100644
--- a/hack/preload-images/preload_images.go
+++ b/hack/preload-images/preload_images.go
@@ -69,7 +69,7 @@ func main() {
 				continue
 			}
 			fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kv)
-			if err := generateTarball(kv, tf); err != nil {
+			if err := generateTarball(kv, cr, tf); err != nil {
 				exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kv, cr), err)
 			}
 			if err := uploadTarball(tf); err != nil {
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index e0228819b7..f421af2448 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -232,7 +232,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 	}
 
 	// this is only required for containerd and cri-o runtime to avoid
-	if cfg.Driver == driver.Docker && cfg.KubernetesConfig.ContainerRuntime != "docker" {
+	if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
 		if err := k.applyKicOverlay(cfg); err != nil {
 			return errors.Wrap(err, "apply kic overlay")
 		}

From 6676bbc697495dbb9e1dd6fc38de2f6004a2138d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 5 Apr 2020 01:26:29 -0700
Subject: [PATCH 508/668] add issue

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index f421af2448..3df6e80368 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -231,7 +231,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
-	// this is only required for containerd and cri-o runtime to avoid
+	// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
 	if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
 		if err := k.applyKicOverlay(cfg); err != nil {
 			return errors.Wrap(err, "apply kic overlay")

From a3480c0e14a6163e6642ad6b786ada6a190e766a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 18:55:55 -0700
Subject: [PATCH 509/668] bump preload image version

---
 pkg/minikube/download/preload.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index 59a0c4b7e0..e3f859a23b 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -41,7 +41,7 @@ const (
 	// PreloadVersion is the current version of the preloaded tarball
 	//
 	// NOTE: You may need to bump this version up when upgrading auxiliary docker images
-	PreloadVersion = "v2"
+	PreloadVersion = "v3"
 	// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )

From 792ca63179b50e3f04688de323685d9c1496ac6b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 5 Apr 2020 22:39:00 -0700
Subject: [PATCH 510/668] respect the user existing config

---
 cmd/minikube/cmd/start.go | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0a42f5e979..b5b018c428 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -322,8 +322,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		updateDriver(driverName)
 	}
 
-	k8sVersion := getKubernetesVersion(existing)
-	cc, n, err := generateCfgFromFlags(cmd, k8sVersion, driverName)
+	cc, n, err := generateCfgFromFlags(cmd,*existing)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -932,10 +931,15 @@ func validateRegistryMirror() {
 }
 
 // generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
-	r, err := cruntime.New(cruntime.Config{Type: viper.GetString(containerRuntime)})
+func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+	
+	if cmd.Flags().Changed(containerRuntime) {
+		existing.KubernetesConfig.ContainerRuntime= viper.GetString(containerRuntime)
+	}
+	
+	r, err := cruntime.New(cruntime.Config{Type:existing.KubernetesConfig.ContainerRuntime})
 	if err != nil {
-		return config.ClusterConfig{}, config.Node{}, err
+		return existing, config.Node{}, errors.Wrap(err,"new runtime manager")
 	}
 
 	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
@@ -952,11 +956,16 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 	if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
 		setDockerProxy()
 	}
-
-	repository := viper.GetString(imageRepository)
+	
+	
+	if cmd.Flags().Changed(imageRepository) {
+		existing.KubernetesConfig.ImageRepository=viper.GetString(imageRepository)
+	}
+	
 	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
-	if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
-		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
+
+	if strings.ToLower(existing.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
+		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&existing), version.VersionPrefix)))
 		if err != nil {
 			exit.WithError("Failed to check main repository and mirrors for images for images", err)
 		}
@@ -969,20 +978,20 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 			}
 		}
 
-		repository = autoSelectedRepository
+		existing.KubernetesConfig.ImageRepository = autoSelectedRepository
 	}
 
 	if cmd.Flags().Changed(imageRepository) {
-		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": repository})
+		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": existing.KubernetesConfig.ImageRepository})
 	}
 
 	var kubeNodeName string
-	if drvName != driver.None {
+	if driver.BareMetal(existing.Driver){
 		kubeNodeName = "m01"
 	}
 
-	return createNode(cmd, k8sVersion, kubeNodeName, drvName,
-		repository, selectedEnableDefaultCNI, selectedNetworkPlugin)
+	return createNode(cmd, getKubernetesVersion(&existing), kubeNodeName, existing.Driver,
+	existing.KubernetesConfig.ImageRepository, selectedEnableDefaultCNI, selectedNetworkPlugin)
 }
 
 func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repository string,
@@ -1018,6 +1027,7 @@ func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repositor
 		exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
 	}
 
+
 	cfg := config.ClusterConfig{
 		Name:                    ClusterFlagValue(),
 		KeepContext:             viper.GetBool(keepContext),

From a35006507beaf79bc9ddff6bb18ceedcc180ec6b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 00:30:06 -0700
Subject: [PATCH 511/668] add new func updateExistingConfigFromFlags

---
 cmd/minikube/cmd/flags.go       |  27 --
 cmd/minikube/cmd/start.go       | 295 +--------------------
 cmd/minikube/cmd/start_flags.go | 442 ++++++++++++++++++++++++++++++++
 3 files changed, 447 insertions(+), 317 deletions(-)
 delete mode 100644 cmd/minikube/cmd/flags.go
 create mode 100644 cmd/minikube/cmd/start_flags.go

diff --git a/cmd/minikube/cmd/flags.go b/cmd/minikube/cmd/flags.go
deleted file mode 100644
index 4c8c0efa0f..0000000000
--- a/cmd/minikube/cmd/flags.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cmd
-
-import (
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
-)
-
-// ClusterFlagValue returns the current cluster name based on flags
-func ClusterFlagValue() string {
-	return viper.GetString(config.ProfileName)
-}
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index b5b018c428..4acea1cb3a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -27,7 +27,6 @@ import (
 	"os/user"
 	"runtime"
 	"strings"
-	"time"
 
 	"github.com/blang/semver"
 	"github.com/docker/machine/libmachine/ssh"
@@ -44,11 +43,9 @@ import (
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -145,104 +142,6 @@ func init() {
 	}
 }
 
-// initMinikubeFlags includes commandline flags for minikube.
-func initMinikubeFlags() {
-	viper.SetEnvPrefix(minikubeEnvPrefix)
-	// Replaces '-' in flags with '_' in env variables
-	// e.g. iso-url => $ENVPREFIX_ISO_URL
-	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
-	viper.AutomaticEnv()
-
-	startCmd.Flags().Bool(force, false, "Force minikube to perform possibly dangerous operations")
-	startCmd.Flags().Bool(interactive, true, "Allow user prompts for more information")
-	startCmd.Flags().Bool(dryRun, false, "dry-run mode. Validates configuration, but does not mutate system state")
-
-	startCmd.Flags().Int(cpus, 2, "Number of CPUs allocated to Kubernetes.")
-	startCmd.Flags().String(memory, "", "Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).")
-	startCmd.Flags().String(humanReadableDiskSize, defaultDiskSize, "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g).")
-	startCmd.Flags().Bool(downloadOnly, false, "If true, only download and cache files for later use - don't install or start anything.")
-	startCmd.Flags().Bool(cacheImages, true, "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.")
-	startCmd.Flags().StringSlice(isoURL, download.DefaultISOURLs(), "Locations to fetch the minikube ISO from.")
-	startCmd.Flags().Bool(keepContext, false, "This will keep the existing kubectl context and will create a minikube context.")
-	startCmd.Flags().Bool(embedCerts, false, "if true, will embed the certs in kubeconfig.")
-	startCmd.Flags().String(containerRuntime, "docker", "The container runtime to be used (docker, crio, containerd).")
-	startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.")
-	startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.")
-	startCmd.Flags().StringArrayVar(&config.AddonList, "addons", nil, "Enable addons. see `minikube addons list` for a list of valid addon names.")
-	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
-	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
-	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
-	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllComponentsList, ",")))
-	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
-	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
-	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
-	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
-	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
-	startCmd.Flags().Bool(preload, true, "If set, download tarball of preloaded images if available to improve start time. Defaults to true.")
-	startCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")
-}
-
-// initKubernetesFlags inits the commandline flags for kubernetes related options
-func initKubernetesFlags() {
-	startCmd.Flags().String(kubernetesVersion, "", fmt.Sprintf("The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for %s, 'latest' for %s). Defaults to 'stable'.", constants.DefaultKubernetesVersion, constants.NewestKubernetesVersion))
-	startCmd.Flags().Var(&config.ExtraOptions, "extra-config",
-		`A set of key=value pairs that describe configuration that may be passed to different components.
-		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
-		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
-		Valid kubeadm parameters: `+fmt.Sprintf("%s, %s", strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmCmdParam], ", "), strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmConfigParam], ",")))
-	startCmd.Flags().String(featureGates, "", "A set of key=value pairs that describe feature gates for alpha/experimental features.")
-	startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster")
-	startCmd.Flags().Int(apiServerPort, constants.APIServerPort, "The apiserver listening port")
-	startCmd.Flags().String(apiServerName, constants.APIServerName, "The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine")
-	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")
-}
-
-// initDriverFlags inits the commandline flags for vm drivers
-func initDriverFlags() {
-	startCmd.Flags().String("driver", "", fmt.Sprintf("Driver is one of: %v (defaults to auto-detect)", driver.DisplaySupportedDrivers()))
-	startCmd.Flags().String("vm-driver", "", "DEPRECATED, use `driver` instead.")
-	startCmd.Flags().Bool(disableDriverMounts, false, "Disables the filesystem mounts provided by the hypervisors")
-	startCmd.Flags().Bool("vm", false, "Filter to use only VM Drivers")
-
-	// kvm2
-	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (kvm2 driver only)")
-	startCmd.Flags().String(kvmQemuURI, "qemu:///system", "The KVM QEMU connection URI. (kvm2 driver only)")
-	startCmd.Flags().Bool(kvmGPU, false, "Enable experimental NVIDIA GPU support in minikube")
-	startCmd.Flags().Bool(kvmHidden, false, "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)")
-
-	// virtualbox
-	startCmd.Flags().String(hostOnlyCIDR, "192.168.99.1/24", "The CIDR to be used for the minikube VM (virtualbox driver only)")
-	startCmd.Flags().Bool(dnsProxy, false, "Enable proxy for NAT DNS requests (virtualbox driver only)")
-	startCmd.Flags().Bool(hostDNSResolver, true, "Enable host resolver for NAT DNS requests (virtualbox driver only)")
-	startCmd.Flags().Bool(noVTXCheck, false, "Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)")
-	startCmd.Flags().String(hostOnlyNicType, "virtio", "NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)")
-	startCmd.Flags().String(natNicType, "virtio", "NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)")
-
-	// hyperkit
-	startCmd.Flags().StringSlice(vsockPorts, []string{}, "List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)")
-	startCmd.Flags().String(uuid, "", "Provide VM UUID to restore MAC address (hyperkit driver only)")
-	startCmd.Flags().String(vpnkitSock, "", "Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)")
-	startCmd.Flags().StringSlice(nfsShare, []string{}, "Local folders to share with Guest via NFS mounts (hyperkit driver only)")
-	startCmd.Flags().String(nfsSharesRoot, "/nfsshares", "Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)")
-
-	// hyperv
-	startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (hyperv driver only)")
-	startCmd.Flags().Bool(hypervUseExternalSwitch, false, "Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)")
-	startCmd.Flags().String(hypervExternalAdapter, "", "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)")
-}
-
-// initNetworkingFlags inits the commandline flags for connectivity related flags for start
-func initNetworkingFlags() {
-	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(imageRepository, "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers")
-	startCmd.Flags().String(imageMirrorCountry, "", "Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.")
-	startCmd.Flags().String(serviceCIDR, constants.DefaultServiceCIDR, "The CIDR to be used for service cluster IPs.")
-	startCmd.Flags().StringArrayVar(&config.DockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
-	startCmd.Flags().StringArrayVar(&config.DockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
-}
-
 // startCmd represents the start command
 var startCmd = &cobra.Command{
 	Use:   "start",
@@ -322,7 +221,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		updateDriver(driverName)
 	}
 
-	cc, n, err := generateCfgFromFlags(cmd,*existing)
+	cc, n, err := generateCfgFromFlags(cmd, *existing)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -930,156 +829,17 @@ func validateRegistryMirror() {
 	}
 }
 
-// generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
-	
-	if cmd.Flags().Changed(containerRuntime) {
-		existing.KubernetesConfig.ContainerRuntime= viper.GetString(containerRuntime)
-	}
-	
-	r, err := cruntime.New(cruntime.Config{Type:existing.KubernetesConfig.ContainerRuntime})
-	if err != nil {
-		return existing, config.Node{}, errors.Wrap(err,"new runtime manager")
-	}
-
-	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
-	selectedEnableDefaultCNI := viper.GetBool(enableDefaultCNI)
-	selectedNetworkPlugin := viper.GetString(networkPlugin)
-	if r.DefaultCNI() && !cmd.Flags().Changed(networkPlugin) {
-		selectedNetworkPlugin = "cni"
-		if !cmd.Flags().Changed(enableDefaultCNI) {
-			selectedEnableDefaultCNI = true
-		}
-	}
-
-	// Feed Docker our host proxy environment by default, so that it can pull images
-	if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
-		setDockerProxy()
-	}
-	
-	
-	if cmd.Flags().Changed(imageRepository) {
-		existing.KubernetesConfig.ImageRepository=viper.GetString(imageRepository)
-	}
-	
-	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
-
-	if strings.ToLower(existing.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
-		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&existing), version.VersionPrefix)))
-		if err != nil {
-			exit.WithError("Failed to check main repository and mirrors for images for images", err)
-		}
-
-		if !found {
-			if autoSelectedRepository == "" {
-				exit.WithCodeT(exit.Failure, "None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag")
-			} else {
-				out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
-			}
-		}
-
-		existing.KubernetesConfig.ImageRepository = autoSelectedRepository
-	}
-
-	if cmd.Flags().Changed(imageRepository) {
-		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": existing.KubernetesConfig.ImageRepository})
-	}
-
-	var kubeNodeName string
-	if driver.BareMetal(existing.Driver){
-		kubeNodeName = "m01"
-	}
-
-	return createNode(cmd, getKubernetesVersion(&existing), kubeNodeName, existing.Driver,
-	existing.KubernetesConfig.ImageRepository, selectedEnableDefaultCNI, selectedNetworkPlugin)
-}
-
-func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repository string,
-	selectedEnableDefaultCNI bool, selectedNetworkPlugin string) (config.ClusterConfig, config.Node, error) {
-
-	sysLimit, containerLimit, err := memoryLimits(drvName)
-	if err != nil {
-		glog.Warningf("Unable to query memory limits: %v", err)
-	}
-
-	mem := suggestMemoryAllocation(sysLimit, containerLimit)
-	if cmd.Flags().Changed(memory) {
-		mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
-		if err != nil {
-			exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
-		}
-
-	} else {
-		glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
-	}
-
+func createNode(cmd *cobra.Command, existing config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
 	cp := config.Node{
 		Port:              viper.GetInt(apiServerPort),
-		KubernetesVersion: k8sVersion,
+		KubernetesVersion: getKubernetesVersion(&existing),
 		Name:              kubeNodeName,
 		ControlPlane:      true,
 		Worker:            true,
 	}
-
-	diskSize, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
-	if err != nil {
-		exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
-	}
-
-
-	cfg := config.ClusterConfig{
-		Name:                    ClusterFlagValue(),
-		KeepContext:             viper.GetBool(keepContext),
-		EmbedCerts:              viper.GetBool(embedCerts),
-		MinikubeISO:             viper.GetString(isoURL),
-		Memory:                  mem,
-		CPUs:                    viper.GetInt(cpus),
-		DiskSize:                diskSize,
-		Driver:                  drvName,
-		HyperkitVpnKitSock:      viper.GetString(vpnkitSock),
-		HyperkitVSockPorts:      viper.GetStringSlice(vsockPorts),
-		NFSShare:                viper.GetStringSlice(nfsShare),
-		NFSSharesRoot:           viper.GetString(nfsSharesRoot),
-		DockerEnv:               config.DockerEnv,
-		DockerOpt:               config.DockerOpt,
-		InsecureRegistry:        insecureRegistry,
-		RegistryMirror:          registryMirror,
-		HostOnlyCIDR:            viper.GetString(hostOnlyCIDR),
-		HypervVirtualSwitch:     viper.GetString(hypervVirtualSwitch),
-		HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch),
-		HypervExternalAdapter:   viper.GetString(hypervExternalAdapter),
-		KVMNetwork:              viper.GetString(kvmNetwork),
-		KVMQemuURI:              viper.GetString(kvmQemuURI),
-		KVMGPU:                  viper.GetBool(kvmGPU),
-		KVMHidden:               viper.GetBool(kvmHidden),
-		DisableDriverMounts:     viper.GetBool(disableDriverMounts),
-		UUID:                    viper.GetString(uuid),
-		NoVTXCheck:              viper.GetBool(noVTXCheck),
-		DNSProxy:                viper.GetBool(dnsProxy),
-		HostDNSResolver:         viper.GetBool(hostDNSResolver),
-		HostOnlyNicType:         viper.GetString(hostOnlyNicType),
-		NatNicType:              viper.GetString(natNicType),
-		KubernetesConfig: config.KubernetesConfig{
-			KubernetesVersion:      k8sVersion,
-			ClusterName:            ClusterFlagValue(),
-			APIServerName:          viper.GetString(apiServerName),
-			APIServerNames:         apiServerNames,
-			APIServerIPs:           apiServerIPs,
-			DNSDomain:              viper.GetString(dnsDomain),
-			FeatureGates:           viper.GetString(featureGates),
-			ContainerRuntime:       viper.GetString(containerRuntime),
-			CRISocket:              viper.GetString(criSocket),
-			NetworkPlugin:          selectedNetworkPlugin,
-			ServiceCIDR:            viper.GetString(serviceCIDR),
-			ImageRepository:        repository,
-			ExtraOptions:           config.ExtraOptions,
-			ShouldLoadCachedImages: viper.GetBool(cacheImages),
-			EnableDefaultCNI:       selectedEnableDefaultCNI,
-		},
-		Nodes: []config.Node{cp},
-	}
-	cfg.VerifyComponents = interpretWaitFlag(*cmd)
+	cfg := existing
+	cfg.Nodes = []config.Node{cp}
 	return cfg, cp, nil
 }
 
@@ -1212,48 +972,3 @@ func getKubernetesVersion(old *config.ClusterConfig) string {
 	}
 	return nv
 }
-
-// interpretWaitFlag interprets the wait flag and respects the legacy minikube users
-// returns map of components to wait for
-func interpretWaitFlag(cmd cobra.Command) map[string]bool {
-	if !cmd.Flags().Changed(waitComponents) {
-		glog.Infof("Wait components to verify : %+v", kverify.DefaultComponents)
-		return kverify.DefaultComponents
-	}
-
-	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
-	if err != nil {
-		glog.Warningf("Failed to read --wait from flags: %v.\n Moving on will use the default wait components: %+v", err, kverify.DefaultComponents)
-		return kverify.DefaultComponents
-	}
-
-	if len(waitFlags) == 1 {
-		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
-		if waitFlags[0] == "false" || waitFlags[0] == "none" {
-			glog.Infof("Waiting for no components: %+v", kverify.NoComponents)
-			return kverify.NoComponents
-		}
-		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
-		if waitFlags[0] == "true" || waitFlags[0] == "all" {
-			glog.Infof("Waiting for all components: %+v", kverify.AllComponents)
-			return kverify.AllComponents
-		}
-	}
-
-	waitComponents := kverify.NoComponents
-	for _, wc := range waitFlags {
-		seen := false
-		for _, valid := range kverify.AllComponentsList {
-			if wc == valid {
-				waitComponents[wc] = true
-				seen = true
-				continue
-			}
-		}
-		if !seen {
-			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllComponentsList, ","))
-		}
-	}
-	glog.Infof("Waiting for components: %+v", waitComponents)
-	return waitComponents
-}
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
new file mode 100644
index 0000000000..d277cff711
--- /dev/null
+++ b/cmd/minikube/cmd/start_flags.go
@@ -0,0 +1,442 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/blang/semver"
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/download"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/out"
+	pkgutil "k8s.io/minikube/pkg/util"
+	"k8s.io/minikube/pkg/version"
+)
+
+// initMinikubeFlags includes commandline flags for minikube.
+func initMinikubeFlags() {
+	viper.SetEnvPrefix(minikubeEnvPrefix)
+	// Replaces '-' in flags with '_' in env variables
+	// e.g. iso-url => $ENVPREFIX_ISO_URL
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+	viper.AutomaticEnv()
+
+	startCmd.Flags().Bool(force, false, "Force minikube to perform possibly dangerous operations")
+	startCmd.Flags().Bool(interactive, true, "Allow user prompts for more information")
+	startCmd.Flags().Bool(dryRun, false, "dry-run mode. Validates configuration, but does not mutate system state")
+
+	startCmd.Flags().Int(cpus, 2, "Number of CPUs allocated to Kubernetes.")
+	startCmd.Flags().String(memory, "", "Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).")
+	startCmd.Flags().String(humanReadableDiskSize, defaultDiskSize, "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g).")
+	startCmd.Flags().Bool(downloadOnly, false, "If true, only download and cache files for later use - don't install or start anything.")
+	startCmd.Flags().Bool(cacheImages, true, "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.")
+	startCmd.Flags().StringSlice(isoURL, download.DefaultISOURLs(), "Locations to fetch the minikube ISO from.")
+	startCmd.Flags().Bool(keepContext, false, "This will keep the existing kubectl context and will create a minikube context.")
+	startCmd.Flags().Bool(embedCerts, false, "if true, will embed the certs in kubeconfig.")
+	startCmd.Flags().String(containerRuntime, "docker", "The container runtime to be used (docker, crio, containerd).")
+	startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.")
+	startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.")
+	startCmd.Flags().StringArrayVar(&config.AddonList, "addons", nil, "Enable addons. see `minikube addons list` for a list of valid addon names.")
+	startCmd.Flags().String(criSocket, "", "The cri socket path to be used.")
+	startCmd.Flags().String(networkPlugin, "", "The name of the network plugin.")
+	startCmd.Flags().Bool(enableDefaultCNI, false, "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \"--network-plugin=cni\".")
+	startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllComponentsList, ",")))
+	startCmd.Flags().Duration(waitTimeout, 6*time.Minute, "max time to wait per Kubernetes core services to be healthy.")
+	startCmd.Flags().Bool(nativeSSH, true, "Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.")
+	startCmd.Flags().Bool(autoUpdate, true, "If set, automatically updates drivers to the latest version. Defaults to true.")
+	startCmd.Flags().Bool(installAddons, true, "If set, install addons. Defaults to true.")
+	startCmd.Flags().IntP(nodes, "n", 1, "The number of nodes to spin up. Defaults to 1.")
+	startCmd.Flags().Bool(preload, true, "If set, download tarball of preloaded images if available to improve start time. Defaults to true.")
+	startCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.")
+}
+
+// initKubernetesFlags inits the commandline flags for kubernetes related options
+func initKubernetesFlags() {
+	startCmd.Flags().String(kubernetesVersion, "", fmt.Sprintf("The kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for %s, 'latest' for %s). Defaults to 'stable'.", constants.DefaultKubernetesVersion, constants.NewestKubernetesVersion))
+	startCmd.Flags().Var(&config.ExtraOptions, "extra-config",
+		`A set of key=value pairs that describe configuration that may be passed to different components.
+		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
+		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
+		Valid kubeadm parameters: `+fmt.Sprintf("%s, %s", strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmCmdParam], ", "), strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmConfigParam], ",")))
+	startCmd.Flags().String(featureGates, "", "A set of key=value pairs that describe feature gates for alpha/experimental features.")
+	startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster")
+	startCmd.Flags().Int(apiServerPort, constants.APIServerPort, "The apiserver listening port")
+	startCmd.Flags().String(apiServerName, constants.APIServerName, "The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine")
+	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")
+}
+
+// initDriverFlags inits the commandline flags for vm drivers
+func initDriverFlags() {
+	startCmd.Flags().String("driver", "", fmt.Sprintf("Driver is one of: %v (defaults to auto-detect)", driver.DisplaySupportedDrivers()))
+	startCmd.Flags().String("vm-driver", "", "DEPRECATED, use `driver` instead.")
+	startCmd.Flags().Bool(disableDriverMounts, false, "Disables the filesystem mounts provided by the hypervisors")
+	startCmd.Flags().Bool("vm", false, "Filter to use only VM Drivers")
+
+	// kvm2
+	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (kvm2 driver only)")
+	startCmd.Flags().String(kvmQemuURI, "qemu:///system", "The KVM QEMU connection URI. (kvm2 driver only)")
+	startCmd.Flags().Bool(kvmGPU, false, "Enable experimental NVIDIA GPU support in minikube")
+	startCmd.Flags().Bool(kvmHidden, false, "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)")
+
+	// virtualbox
+	startCmd.Flags().String(hostOnlyCIDR, "192.168.99.1/24", "The CIDR to be used for the minikube VM (virtualbox driver only)")
+	startCmd.Flags().Bool(dnsProxy, false, "Enable proxy for NAT DNS requests (virtualbox driver only)")
+	startCmd.Flags().Bool(hostDNSResolver, true, "Enable host resolver for NAT DNS requests (virtualbox driver only)")
+	startCmd.Flags().Bool(noVTXCheck, false, "Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)")
+	startCmd.Flags().String(hostOnlyNicType, "virtio", "NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)")
+	startCmd.Flags().String(natNicType, "virtio", "NIC Type used for host only network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only)")
+
+	// hyperkit
+	startCmd.Flags().StringSlice(vsockPorts, []string{}, "List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)")
+	startCmd.Flags().String(uuid, "", "Provide VM UUID to restore MAC address (hyperkit driver only)")
+	startCmd.Flags().String(vpnkitSock, "", "Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)")
+	startCmd.Flags().StringSlice(nfsShare, []string{}, "Local folders to share with Guest via NFS mounts (hyperkit driver only)")
+	startCmd.Flags().String(nfsSharesRoot, "/nfsshares", "Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)")
+
+	// hyperv
+	startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (hyperv driver only)")
+	startCmd.Flags().Bool(hypervUseExternalSwitch, false, "Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)")
+	startCmd.Flags().String(hypervExternalAdapter, "", "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)")
+}
+
+// initNetworkingFlags inits the commandline flags for connectivity related flags for start
+func initNetworkingFlags() {
+	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(imageRepository, "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers")
+	startCmd.Flags().String(imageMirrorCountry, "", "Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.")
+	startCmd.Flags().String(serviceCIDR, constants.DefaultServiceCIDR, "The CIDR to be used for service cluster IPs.")
+	startCmd.Flags().StringArrayVar(&config.DockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
+	startCmd.Flags().StringArrayVar(&config.DockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
+}
+
+// ClusterFlagValue returns the current cluster name based on flags
+func ClusterFlagValue() string {
+	return viper.GetString(config.ProfileName)
+}
+
+// generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
+func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+
+	existing = updateExistingConfigFromFlags(cmd, existing)
+	r, err := cruntime.New(cruntime.Config{Type: existing.KubernetesConfig.ContainerRuntime})
+	if err != nil {
+		return existing, config.Node{}, errors.Wrap(err, "new runtime manager")
+	}
+
+	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
+	if r.DefaultCNI() && !cmd.Flags().Changed(networkPlugin) {
+		existing.KubernetesConfig.NetworkPlugin = "cni"
+		if !cmd.Flags().Changed(enableDefaultCNI) {
+			existing.KubernetesConfig.EnableDefaultCNI = true
+		}
+	}
+
+	// Feed Docker our host proxy environment by default, so that it can pull images
+	if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
+		setDockerProxy()
+	}
+
+	if cmd.Flags().Changed(imageRepository) {
+		existing.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
+	}
+
+	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
+
+	if strings.ToLower(existing.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
+		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&existing), version.VersionPrefix)))
+		if err != nil {
+			exit.WithError("Failed to check main repository and mirrors for images for images", err)
+		}
+
+		if !found {
+			if autoSelectedRepository == "" {
+				exit.WithCodeT(exit.Failure, "None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag")
+			} else {
+				out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
+			}
+		}
+		existing.KubernetesConfig.ImageRepository = autoSelectedRepository
+	}
+
+	if cmd.Flags().Changed(imageRepository) {
+		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": existing.KubernetesConfig.ImageRepository})
+	}
+
+	var kubeNodeName string
+	if driver.BareMetal(existing.Driver) {
+		kubeNodeName = "m01"
+	}
+	return createNode(cmd, existing, kubeNodeName)
+}
+
+// updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
+func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterConfig) config.ClusterConfig {
+	if cmd.Flags().Changed(containerRuntime) {
+		existing.KubernetesConfig.ContainerRuntime = viper.GetString(containerRuntime)
+	}
+
+	if cmd.Flags().Changed(keepContext) {
+		existing.KeepContext = viper.GetBool(keepContext)
+	}
+
+	if cmd.Flags().Changed(embedCerts) {
+		existing.EmbedCerts = viper.GetBool(embedCerts)
+	}
+
+	if cmd.Flags().Changed(isoURL) {
+		existing.MinikubeISO = viper.GetString(isoURL)
+	}
+
+	sysLimit, containerLimit, err := memoryLimits(existing.Driver)
+	if err != nil {
+		glog.Warningf("Unable to query memory limits: %v", err)
+	}
+	mem := suggestMemoryAllocation(sysLimit, containerLimit)
+	if cmd.Flags().Changed(memory) {
+		mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
+		if err != nil {
+			exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
+		}
+	} else {
+		glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
+	}
+
+	if cmd.Flags().Changed(cpus) {
+		existing.CPUs = viper.GetInt(cpus)
+	}
+
+	if cmd.Flags().Changed(humanReadableDiskSize) {
+		d, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
+		if err != nil {
+			exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
+		}
+		existing.DiskSize = d
+	}
+	if cmd.Flags().Changed("vm-driver") {
+		existing.Driver = viper.GetString("vm-driver")
+	}
+
+	if cmd.Flags().Changed("driver") {
+		existing.Driver = viper.GetString("driver")
+	}
+
+	if cmd.Flags().Changed(vpnkitSock) {
+		existing.HyperkitVpnKitSock = viper.GetString(vpnkitSock)
+	}
+
+	if cmd.Flags().Changed(vsockPorts) {
+		existing.HyperkitVSockPorts = viper.GetString(vsockPorts)
+	}
+
+	if cmd.Flags().Changed(nfsShare) {
+		existing.NFSShare = viper.GetStringSlice(nfsShare)
+	}
+
+	if cmd.Flags().Changed(nfsSharesRoot) {
+		existing.NFSSharesRoot = viper.GetString(nfsSharesRoot)
+	}
+
+	// skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror
+
+	if cmd.Flags().Changed(vpnkitSock) {
+		existing.NFSSharesRoot = viper.GetStringSlice(nfsSharesRoot)
+	}
+
+	if cmd.Flags().Changed(hostOnlyCIDR) {
+		existing.HostOnlyCIDR = viper.GetString(hostOnlyCIDR)
+	}
+
+	if cmd.Flags().Changed(hypervVirtualSwitch) {
+		existing.HypervVirtualSwitch = viper.GetString(hypervVirtualSwitch)
+	}
+
+	if cmd.Flags().Changed(hypervUseExternalSwitch) {
+		existing.HypervUseExternalSwitch = viper.GetString(hypervUseExternalSwitch)
+	}
+
+	if cmd.Flags().Changed(hypervExternalAdapter) {
+		existing.HypervExternalAdapter = viper.GetString(hypervExternalAdapter)
+	}
+
+	if cmd.Flags().Changed(kvmNetwork) {
+		existing.KVMNetwork = viper.GetString(kvmNetwork)
+	}
+
+	if cmd.Flags().Changed(kvmQemuURI) {
+		existing.KVMQemuURI = viper.GetString(kvmQemuURI)
+	}
+
+	if cmd.Flags().Changed(kvmGPU) {
+		existing.KVMGPU = viper.GetString(kvmGPU)
+	}
+
+	if cmd.Flags().Changed(kvmHidden) {
+		existing.KVMHidden = viper.GetString(kvmHidden)
+	}
+
+	if cmd.Flags().Changed(disableDriverMounts) {
+		existing.DisableDriverMounts = viper.GetBool(disableDriverMounts)
+	}
+
+	if cmd.Flags().Changed(uuid) {
+		existing.UUID = viper.GetString(uuid)
+	}
+
+	if cmd.Flags().Changed(noVTXCheck) {
+		existing.NoVTXCheck = viper.GetBool(noVTXCheck)
+	}
+
+	if cmd.Flags().Changed(dnsProxy) {
+		existing.DNSProxy = viper.GetBool(dnsProxy)
+	}
+
+	if cmd.Flags().Changed(hostDNSResolver) {
+		existing.HostDNSResolver = viper.GetBool(hostDNSResolver)
+	}
+
+	if cmd.Flags().Changed(hostOnlyNicType) {
+		existing.HostOnlyNicType = viper.GetString(hostOnlyNicType)
+	}
+
+	if cmd.Flags().Changed(natNicType) {
+		existing.NatNicType = viper.GetString(natNicType)
+	}
+
+	if cmd.Flags().Changed(kubernetesVersion) {
+		existing.KubernetesConfig.KubernetesVersion = viper.GetString(kubernetesVersion)
+	}
+
+	if cmd.Flags().Changed(apiServerName) {
+		existing.KubernetesConfig.APIServerName = viper.GetString(apiServerName)
+	}
+
+	if cmd.Flags().Changed("apiserver-names") {
+		existing.KubernetesConfig.APIServerNames = viper.GetString("apiserver-names")
+	}
+
+	if cmd.Flags().Changed("apiserver-ips") {
+		existing.KubernetesConfig.APIServerIPs = viper.GetString("apiserver-ips")
+	}
+
+	if cmd.Flags().Changed(dnsDomain) {
+		existing.KubernetesConfig.DNSDomain = viper.GetString(dnsDomain)
+	}
+
+	if cmd.Flags().Changed(featureGates) {
+		existing.KubernetesConfig.FeatureGates = viper.GetString(featureGates)
+	}
+
+	if cmd.Flags().Changed(containerRuntime) {
+		existing.KubernetesConfig.ContainerRuntime = viper.GetString(containerRuntime)
+	}
+
+	if cmd.Flags().Changed(criSocket) {
+		existing.KubernetesConfig.CRISocket = viper.GetString(criSocket)
+	}
+
+	if cmd.Flags().Changed(criSocket) {
+		existing.KubernetesConfig.NetworkPlugin = viper.GetString(criSocket)
+	}
+
+	if cmd.Flags().Changed(networkPlugin) {
+		existing.KubernetesConfig.NetworkPlugin = viper.GetString(networkPlugin)
+	}
+
+	if cmd.Flags().Changed(serviceCIDR) {
+		existing.KubernetesConfig.ServiceCIDR = viper.GetString(serviceCIDR)
+	}
+
+	if cmd.Flags().Changed(cacheImages) {
+		existing.KubernetesConfig.ShouldLoadCachedImages = viper.GetBool(cacheImages)
+	}
+
+	if cmd.Flags().Changed("extra-config") {
+		existing.KubernetesConfig.ExtraOptions = viper.GetVar("extra-config")
+	}
+
+	if cmd.Flags().Changed(imageRepository) {
+		existing.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
+	}
+
+	if cmd.Flags().Changed(enableDefaultCNI) {
+		existing.KubernetesConfig.EnableDefaultCNI = viper.GetBool(enableDefaultCNI)
+	}
+	
+	existing.VerifyComponents = interpretWaitFlag(*cmd)
+
+	return existing
+}
+
+// interpretWaitFlag interprets the wait flag and respects the legacy minikube users
+// returns map of components to wait for
+func interpretWaitFlag(cmd cobra.Command) map[string]bool {
+	if !cmd.Flags().Changed(waitComponents) {
+		glog.Infof("Wait components to verify : %+v", kverify.DefaultComponents)
+		return kverify.DefaultComponents
+	}
+
+	waitFlags, err := cmd.Flags().GetStringSlice(waitComponents)
+	if err != nil {
+		glog.Warningf("Failed to read --wait from flags: %v.\n Moving on will use the default wait components: %+v", err, kverify.DefaultComponents)
+		return kverify.DefaultComponents
+	}
+
+	if len(waitFlags) == 1 {
+		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
+		if waitFlags[0] == "false" || waitFlags[0] == "none" {
+			glog.Infof("Waiting for no components: %+v", kverify.NoComponents)
+			return kverify.NoComponents
+		}
+		// respecting legacy flag before minikube 1.9.0, wait flag was boolean
+		if waitFlags[0] == "true" || waitFlags[0] == "all" {
+			glog.Infof("Waiting for all components: %+v", kverify.AllComponents)
+			return kverify.AllComponents
+		}
+	}
+
+	waitComponents := kverify.NoComponents
+	for _, wc := range waitFlags {
+		seen := false
+		for _, valid := range kverify.AllComponentsList {
+			if wc == valid {
+				waitComponents[wc] = true
+				seen = true
+				continue
+			}
+		}
+		if !seen {
+			glog.Warningf("The value %q is invalid for --wait flag. valid options are %q", wc, strings.Join(kverify.AllComponentsList, ","))
+		}
+	}
+	glog.Infof("Waiting for components: %+v", waitComponents)
+	return waitComponents
+}
+

From bee681559b9e9fd2a587db62ec1b5042f32f02a8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 01:15:15 -0700
Subject: [PATCH 512/668] save profile

---
 cmd/minikube/cmd/start.go       |  4 +-
 cmd/minikube/cmd/start_flags.go | 67 +++++++++++++++------------------
 pkg/minikube/config/config.go   |  1 +
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 4acea1cb3a..0b08595a2a 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -221,7 +221,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		updateDriver(driverName)
 	}
 
-	cc, n, err := generateCfgFromFlags(cmd, *existing)
+	cc, n, err := generateCfgFromFlags(cmd, existing)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -284,7 +284,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	if err := showKubectlInfo(kubeconfig, k8sVersion, cc.Name); err != nil {
+	if err := showKubectlInfo(kubeconfig, cc.KubernetesConfig.KubernetesVersion, cc.Name); err != nil {
 		glog.Errorf("kubectl info: %v", err)
 	}
 }
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index d277cff711..df1dcdda12 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -143,19 +143,27 @@ func ClusterFlagValue() string {
 }
 
 // generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+	cc := config.ClusterConfig{}
 
-	existing = updateExistingConfigFromFlags(cmd, existing)
-	r, err := cruntime.New(cruntime.Config{Type: existing.KubernetesConfig.ContainerRuntime})
+	if existing == nil { // create profile config first time
+		if err := config.CreateEmptyProfile(ClusterFlagValue()); err != nil {
+			return cc, config.Node{}, errors.Wrap(err, "create empty profile config")
+		}
+	} else {
+		cc = updateExistingConfigFromFlags(cmd, existing)
+	}
+
+	r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime})
 	if err != nil {
-		return existing, config.Node{}, errors.Wrap(err, "new runtime manager")
+		return cc, config.Node{}, errors.Wrap(err, "new runtime manager")
 	}
 
 	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
 	if r.DefaultCNI() && !cmd.Flags().Changed(networkPlugin) {
-		existing.KubernetesConfig.NetworkPlugin = "cni"
+		cc.KubernetesConfig.NetworkPlugin = "cni"
 		if !cmd.Flags().Changed(enableDefaultCNI) {
-			existing.KubernetesConfig.EnableDefaultCNI = true
+			cc.KubernetesConfig.EnableDefaultCNI = true
 		}
 	}
 
@@ -165,13 +173,13 @@ func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (co
 	}
 
 	if cmd.Flags().Changed(imageRepository) {
-		existing.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
+		cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
 	}
 
 	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
 
-	if strings.ToLower(existing.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
-		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&existing), version.VersionPrefix)))
+	if strings.ToLower(cc.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
+		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&cc), version.VersionPrefix)))
 		if err != nil {
 			exit.WithError("Failed to check main repository and mirrors for images for images", err)
 		}
@@ -183,22 +191,23 @@ func generateCfgFromFlags(cmd *cobra.Command, existing config.ClusterConfig) (co
 				out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
 			}
 		}
-		existing.KubernetesConfig.ImageRepository = autoSelectedRepository
+		cc.KubernetesConfig.ImageRepository = autoSelectedRepository
 	}
 
 	if cmd.Flags().Changed(imageRepository) {
-		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": existing.KubernetesConfig.ImageRepository})
+		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": cc.KubernetesConfig.ImageRepository})
 	}
 
 	var kubeNodeName string
-	if driver.BareMetal(existing.Driver) {
+	if driver.BareMetal(cc.Driver) {
 		kubeNodeName = "m01"
 	}
-	return createNode(cmd, existing, kubeNodeName)
+	return createNode(cmd, cc, kubeNodeName)
 }
 
 // updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
-func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterConfig) config.ClusterConfig {
+// skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
+func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig {
 	if cmd.Flags().Changed(containerRuntime) {
 		existing.KubernetesConfig.ContainerRuntime = viper.GetString(containerRuntime)
 	}
@@ -240,6 +249,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 		}
 		existing.DiskSize = d
 	}
+
 	if cmd.Flags().Changed("vm-driver") {
 		existing.Driver = viper.GetString("vm-driver")
 	}
@@ -253,7 +263,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 	}
 
 	if cmd.Flags().Changed(vsockPorts) {
-		existing.HyperkitVSockPorts = viper.GetString(vsockPorts)
+		existing.HyperkitVSockPorts = viper.GetStringSlice(vsockPorts)
 	}
 
 	if cmd.Flags().Changed(nfsShare) {
@@ -264,12 +274,6 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 		existing.NFSSharesRoot = viper.GetString(nfsSharesRoot)
 	}
 
-	// skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror
-
-	if cmd.Flags().Changed(vpnkitSock) {
-		existing.NFSSharesRoot = viper.GetStringSlice(nfsSharesRoot)
-	}
-
 	if cmd.Flags().Changed(hostOnlyCIDR) {
 		existing.HostOnlyCIDR = viper.GetString(hostOnlyCIDR)
 	}
@@ -279,7 +283,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 	}
 
 	if cmd.Flags().Changed(hypervUseExternalSwitch) {
-		existing.HypervUseExternalSwitch = viper.GetString(hypervUseExternalSwitch)
+		existing.HypervUseExternalSwitch = viper.GetBool(hypervUseExternalSwitch)
 	}
 
 	if cmd.Flags().Changed(hypervExternalAdapter) {
@@ -295,11 +299,11 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 	}
 
 	if cmd.Flags().Changed(kvmGPU) {
-		existing.KVMGPU = viper.GetString(kvmGPU)
+		existing.KVMGPU = viper.GetBool(kvmGPU)
 	}
 
 	if cmd.Flags().Changed(kvmHidden) {
-		existing.KVMHidden = viper.GetString(kvmHidden)
+		existing.KVMHidden = viper.GetBool(kvmHidden)
 	}
 
 	if cmd.Flags().Changed(disableDriverMounts) {
@@ -339,11 +343,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 	}
 
 	if cmd.Flags().Changed("apiserver-names") {
-		existing.KubernetesConfig.APIServerNames = viper.GetString("apiserver-names")
-	}
-
-	if cmd.Flags().Changed("apiserver-ips") {
-		existing.KubernetesConfig.APIServerIPs = viper.GetString("apiserver-ips")
+		existing.KubernetesConfig.APIServerNames = viper.GetStringSlice("apiserver-names")
 	}
 
 	if cmd.Flags().Changed(dnsDomain) {
@@ -378,10 +378,6 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 		existing.KubernetesConfig.ShouldLoadCachedImages = viper.GetBool(cacheImages)
 	}
 
-	if cmd.Flags().Changed("extra-config") {
-		existing.KubernetesConfig.ExtraOptions = viper.GetVar("extra-config")
-	}
-
 	if cmd.Flags().Changed(imageRepository) {
 		existing.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
 	}
@@ -389,10 +385,10 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing config.ClusterCo
 	if cmd.Flags().Changed(enableDefaultCNI) {
 		existing.KubernetesConfig.EnableDefaultCNI = viper.GetBool(enableDefaultCNI)
 	}
-	
+
 	existing.VerifyComponents = interpretWaitFlag(*cmd)
 
-	return existing
+	return *existing
 }
 
 // interpretWaitFlag interprets the wait flag and respects the legacy minikube users
@@ -439,4 +435,3 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	glog.Infof("Waiting for components: %+v", waitComponents)
 	return waitComponents
 }
-
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index f11816070c..0abf76e4aa 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -194,6 +194,7 @@ func (c *simpleConfigLoader) LoadConfigFromFile(profileName string, miniHome ...
 
 func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *ClusterConfig, miniHome ...string) error {
 	// Move to profile package
+	fmt.Println("inside WriteConfigToFile")
 	path := profileFilePath(profileName, miniHome...)
 	contents, err := json.MarshalIndent(cc, "", "	")
 	if err != nil {

From b777d97d76648a1613684db2335529818bfc1fca Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 02:38:40 -0700
Subject: [PATCH 513/668] refactor more

---
 cmd/minikube/cmd/start.go       |   3 +-
 cmd/minikube/cmd/start_flags.go | 171 ++++++++++++++++++++++++--------
 2 files changed, 132 insertions(+), 42 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0b08595a2a..67fb95e4bb 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -221,7 +221,8 @@ func runStart(cmd *cobra.Command, args []string) {
 		updateDriver(driverName)
 	}
 
-	cc, n, err := generateCfgFromFlags(cmd, existing)
+	k8sVersion := getKubernetesVersion(existing)
+	cc, n, err := generateCfgFromFlags(cmd, existing, k8sVersion, driverName)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index df1dcdda12..bfe0effb20 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -143,15 +143,137 @@ func ClusterFlagValue() string {
 }
 
 // generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
 	cc := config.ClusterConfig{}
-
-	if existing == nil { // create profile config first time
-		if err := config.CreateEmptyProfile(ClusterFlagValue()); err != nil {
-			return cc, config.Node{}, errors.Wrap(err, "create empty profile config")
-		}
-	} else {
+	if existing != nil { // create profile config first time
+		fmt.Println("(medya dbg) updating the existing cluster config with the provided flags")
 		cc = updateExistingConfigFromFlags(cmd, existing)
+	} else {
+		fmt.Println("Existing config is nil will use only from flags ")
+
+		sysLimit, containerLimit, err := memoryLimits(drvName)
+		if err != nil {
+			glog.Warningf("Unable to query memory limits: %v", err)
+		}
+
+		mem := suggestMemoryAllocation(sysLimit, containerLimit)
+		if cmd.Flags().Changed(memory) {
+			mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
+			if err != nil {
+				exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
+			}
+
+		} else {
+			glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
+		}
+
+		diskSize, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
+		if err != nil {
+			exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
+		}
+
+		r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime})
+		if err != nil {
+			return cc, config.Node{}, errors.Wrap(err, "new runtime manager")
+		}
+
+		if cmd.Flags().Changed(imageRepository) {
+			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
+		}
+
+		// Feed Docker our host proxy environment by default, so that it can pull images
+		if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
+			setDockerProxy()
+		}
+
+		if cmd.Flags().Changed(imageRepository) {
+			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
+		}
+
+		// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
+		selectedEnableDefaultCNI := viper.GetBool(enableDefaultCNI)
+		selectedNetworkPlugin := viper.GetString(networkPlugin)
+		if r.DefaultCNI() && !cmd.Flags().Changed(networkPlugin) {
+			selectedNetworkPlugin = "cni"
+			if !cmd.Flags().Changed(enableDefaultCNI) {
+				selectedEnableDefaultCNI = true
+			}
+		}
+
+		repository := viper.GetString(imageRepository)
+		mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
+		if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
+			found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
+			if err != nil {
+				exit.WithError("Failed to check main repository and mirrors for images for images", err)
+			}
+
+			if !found {
+				if autoSelectedRepository == "" {
+					exit.WithCodeT(exit.Failure, "None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag")
+				} else {
+					out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
+				}
+			}
+
+			repository = autoSelectedRepository
+		}
+
+		if cmd.Flags().Changed(imageRepository) {
+			out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": repository})
+		}
+
+		cc = config.ClusterConfig{
+			Name:                    ClusterFlagValue(),
+			KeepContext:             viper.GetBool(keepContext),
+			EmbedCerts:              viper.GetBool(embedCerts),
+			MinikubeISO:             viper.GetString(isoURL),
+			Memory:                  mem,
+			CPUs:                    viper.GetInt(cpus),
+			DiskSize:                diskSize,
+			Driver:                  drvName,
+			HyperkitVpnKitSock:      viper.GetString(vpnkitSock),
+			HyperkitVSockPorts:      viper.GetStringSlice(vsockPorts),
+			NFSShare:                viper.GetStringSlice(nfsShare),
+			NFSSharesRoot:           viper.GetString(nfsSharesRoot),
+			DockerEnv:               config.DockerEnv,
+			DockerOpt:               config.DockerOpt,
+			InsecureRegistry:        insecureRegistry,
+			RegistryMirror:          registryMirror,
+			HostOnlyCIDR:            viper.GetString(hostOnlyCIDR),
+			HypervVirtualSwitch:     viper.GetString(hypervVirtualSwitch),
+			HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch),
+			HypervExternalAdapter:   viper.GetString(hypervExternalAdapter),
+			KVMNetwork:              viper.GetString(kvmNetwork),
+			KVMQemuURI:              viper.GetString(kvmQemuURI),
+			KVMGPU:                  viper.GetBool(kvmGPU),
+			KVMHidden:               viper.GetBool(kvmHidden),
+			DisableDriverMounts:     viper.GetBool(disableDriverMounts),
+			UUID:                    viper.GetString(uuid),
+			NoVTXCheck:              viper.GetBool(noVTXCheck),
+			DNSProxy:                viper.GetBool(dnsProxy),
+			HostDNSResolver:         viper.GetBool(hostDNSResolver),
+			HostOnlyNicType:         viper.GetString(hostOnlyNicType),
+			NatNicType:              viper.GetString(natNicType),
+			KubernetesConfig: config.KubernetesConfig{
+				KubernetesVersion:      k8sVersion,
+				ClusterName:            ClusterFlagValue(),
+				APIServerName:          viper.GetString(apiServerName),
+				APIServerNames:         apiServerNames,
+				APIServerIPs:           apiServerIPs,
+				DNSDomain:              viper.GetString(dnsDomain),
+				FeatureGates:           viper.GetString(featureGates),
+				ContainerRuntime:       viper.GetString(containerRuntime),
+				CRISocket:              viper.GetString(criSocket),
+				NetworkPlugin:          selectedNetworkPlugin,
+				ServiceCIDR:            viper.GetString(serviceCIDR),
+				ImageRepository:        repository,
+				ExtraOptions:           config.ExtraOptions,
+				ShouldLoadCachedImages: viper.GetBool(cacheImages),
+				EnableDefaultCNI:       selectedEnableDefaultCNI,
+			},
+		}
+		cc.VerifyComponents = interpretWaitFlag(*cmd)
 	}
 
 	r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime})
@@ -159,45 +281,12 @@ func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) (c
 		return cc, config.Node{}, errors.Wrap(err, "new runtime manager")
 	}
 
-	// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
-	if r.DefaultCNI() && !cmd.Flags().Changed(networkPlugin) {
-		cc.KubernetesConfig.NetworkPlugin = "cni"
-		if !cmd.Flags().Changed(enableDefaultCNI) {
-			cc.KubernetesConfig.EnableDefaultCNI = true
-		}
-	}
-
 	// Feed Docker our host proxy environment by default, so that it can pull images
+	// redoing setDockerProxy in case proxy changed since last start.
 	if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
 		setDockerProxy()
 	}
 
-	if cmd.Flags().Changed(imageRepository) {
-		cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
-	}
-
-	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
-
-	if strings.ToLower(cc.KubernetesConfig.ImageRepository) == "auto" || mirrorCountry != "" {
-		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(getKubernetesVersion(&cc), version.VersionPrefix)))
-		if err != nil {
-			exit.WithError("Failed to check main repository and mirrors for images for images", err)
-		}
-
-		if !found {
-			if autoSelectedRepository == "" {
-				exit.WithCodeT(exit.Failure, "None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag")
-			} else {
-				out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
-			}
-		}
-		cc.KubernetesConfig.ImageRepository = autoSelectedRepository
-	}
-
-	if cmd.Flags().Changed(imageRepository) {
-		out.T(out.SuccessType, "Using image repository {{.name}}", out.V{"name": cc.KubernetesConfig.ImageRepository})
-	}
-
 	var kubeNodeName string
 	if driver.BareMetal(cc.Driver) {
 		kubeNodeName = "m01"

From 1d892a2e0b7712520e3993231d43800432d04f9d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 03:24:08 -0700
Subject: [PATCH 514/668] fix it

---
 cmd/minikube/cmd/start.go       |  9 ++++-----
 cmd/minikube/cmd/start_flags.go |  3 +--
 pkg/minikube/node/start.go      | 19 +++++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 67fb95e4bb..1fd714abd5 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -830,18 +830,17 @@ func validateRegistryMirror() {
 	}
 }
 
-func createNode(cmd *cobra.Command, existing config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
+func createNode(cmd *cobra.Command, cc config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
 	cp := config.Node{
 		Port:              viper.GetInt(apiServerPort),
-		KubernetesVersion: getKubernetesVersion(&existing),
+		KubernetesVersion: getKubernetesVersion(&cc),
 		Name:              kubeNodeName,
 		ControlPlane:      true,
 		Worker:            true,
 	}
-	cfg := existing
-	cfg.Nodes = []config.Node{cp}
-	return cfg, cp, nil
+	cc.Nodes = []config.Node{cp}
+	return cc, cp, nil
 }
 
 // setDockerProxy sets the proxy environment variables in the docker environment.
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index bfe0effb20..8bca75ae8c 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -146,7 +146,6 @@ func ClusterFlagValue() string {
 func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
 	cc := config.ClusterConfig{}
 	if existing != nil { // create profile config first time
-		fmt.Println("(medya dbg) updating the existing cluster config with the provided flags")
 		cc = updateExistingConfigFromFlags(cmd, existing)
 	} else {
 		fmt.Println("Existing config is nil will use only from flags ")
@@ -326,6 +325,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	} else {
 		glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
 	}
+	existing.Memory = mem
 
 	if cmd.Flags().Changed(cpus) {
 		existing.CPUs = viper.GetInt(cpus)
@@ -476,7 +476,6 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	}
 
 	existing.VerifyComponents = interpretWaitFlag(*cmd)
-
 	return *existing
 }
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 9f4dbbd0bf..07226804b5 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -21,6 +21,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -103,7 +104,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 
 	// configure the runtime (docker, containerd, crio)
-	cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
+	cr := configureRuntimes(mRunner, cc, sv)
 	showVersionInfo(n.KubernetesVersion, cr)
 
 	var bs bootstrapper.Bootstrapper
@@ -189,10 +190,11 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 }
 
 // ConfigureRuntimes does what needs to happen to get a runtime going.
-func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig, kv semver.Version) cruntime.Manager {
+func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, kv semver.Version) cruntime.Manager {
 	co := cruntime.Config{
-		Type:   viper.GetString(containerRuntime),
-		Runner: runner, ImageRepository: k8s.ImageRepository,
+		Type:              cc.KubernetesConfig.ContainerRuntime,
+		Runner:            runner,
+		ImageRepository:   cc.KubernetesConfig.ImageRepository,
 		KubernetesVersion: kv,
 	}
 	cr, err := cruntime.New(co)
@@ -201,13 +203,13 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 	}
 
 	disableOthers := true
-	if driver.BareMetal(drvName) {
+	if driver.BareMetal(cc.Driver) {
 		disableOthers = false
 	}
 
 	// Preload is overly invasive for bare metal, and caching is not meaningful. KIC handled elsewhere.
-	if driver.IsVM(drvName) {
-		if err := cr.Preload(k8s); err != nil {
+	if driver.IsVM(cc.Driver) {
+		if err := cr.Preload(cc.KubernetesConfig); err != nil {
 			switch err.(type) {
 			case *cruntime.ErrISOFeature:
 				out.ErrT(out.Tip, "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'", out.V{"error": err})
@@ -215,7 +217,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 				glog.Warningf("%s preload failed: %v, falling back to caching images", cr.Name(), err)
 			}
 
-			if err := machine.CacheImagesForBootstrapper(k8s.ImageRepository, k8s.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
+			if err := machine.CacheImagesForBootstrapper(cc.KubernetesConfig.ImageRepository, cc.KubernetesConfig.KubernetesVersion, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
 				exit.WithError("Failed to cache images", err)
 			}
 		}
@@ -223,6 +225,7 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
 
 	err = cr.Enable(disableOthers)
 	if err != nil {
+		debug.PrintStack()
 		exit.WithError("Failed to enable container runtime", err)
 	}
 

From 2c037b42f23772374183fc77ab7c6bece487e388 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 03:40:26 -0700
Subject: [PATCH 515/668] fix unit test

---
 cmd/minikube/cmd/start.go       |  4 ++--
 cmd/minikube/cmd/start_flags.go | 11 +++++------
 cmd/minikube/cmd/start_test.go  |  4 ++--
 pkg/minikube/node/start.go      |  9 ++++-----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 1fd714abd5..552e658394 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -222,7 +222,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	k8sVersion := getKubernetesVersion(existing)
-	cc, n, err := generateCfgFromFlags(cmd, existing, k8sVersion, driverName)
+	cc, n, err := generateClusterConfig(cmd, existing, k8sVersion, driverName)
 	if err != nil {
 		exit.WithError("Failed to generate config", err)
 	}
@@ -830,7 +830,7 @@ func validateRegistryMirror() {
 	}
 }
 
-func createNode(cmd *cobra.Command, cc config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
+func createNode(cc config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
 	cp := config.Node{
 		Port:              viper.GetInt(apiServerPort),
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 8bca75ae8c..5eec6bde7b 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -142,14 +142,13 @@ func ClusterFlagValue() string {
 	return viper.GetString(config.ProfileName)
 }
 
-// generateCfgFromFlags generates config.ClusterConfig based on flags and supplied arguments
-func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
+// generateClusterConfig generate a config.ClusterConfig based on flags or existing cluster config
+func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
 	cc := config.ClusterConfig{}
 	if existing != nil { // create profile config first time
 		cc = updateExistingConfigFromFlags(cmd, existing)
 	} else {
-		fmt.Println("Existing config is nil will use only from flags ")
-
+		glog.Info("no existing cluster config was found, will generate one from the flags ")
 		sysLimit, containerLimit, err := memoryLimits(drvName)
 		if err != nil {
 			glog.Warningf("Unable to query memory limits: %v", err)
@@ -290,12 +289,12 @@ func generateCfgFromFlags(cmd *cobra.Command, existing *config.ClusterConfig, k8
 	if driver.BareMetal(cc.Driver) {
 		kubeNodeName = "m01"
 	}
-	return createNode(cmd, cc, kubeNodeName)
+	return createNode(cc, kubeNodeName)
 }
 
 // updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
 // skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
-func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig {
+func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig { //nolint to supress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
 	if cmd.Flags().Changed(containerRuntime) {
 		existing.KubernetesConfig.ContainerRuntime = viper.GetString(containerRuntime)
 	}
diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go
index 0a443aa507..9c6dfa93a1 100644
--- a/cmd/minikube/cmd/start_test.go
+++ b/cmd/minikube/cmd/start_test.go
@@ -114,7 +114,7 @@ func TestMirrorCountry(t *testing.T) {
 			cmd := &cobra.Command{}
 			viper.SetDefault(imageRepository, test.imageRepository)
 			viper.SetDefault(imageMirrorCountry, test.mirrorCountry)
-			config, _, err := generateCfgFromFlags(cmd, k8sVersion, "none")
+			config, _, err := generateClusterConfig(cmd, nil, k8sVersion, "none")
 			if err != nil {
 				t.Fatalf("Got unexpected error %v during config generation", err)
 			}
@@ -166,7 +166,7 @@ func TestGenerateCfgFromFlagsHTTPProxyHandling(t *testing.T) {
 			if err := os.Setenv("HTTP_PROXY", test.proxy); err != nil {
 				t.Fatalf("Unexpected error setting HTTP_PROXY: %v", err)
 			}
-			config, _, err := generateCfgFromFlags(cmd, k8sVersion, "none")
+			config, _, err := generateClusterConfig(cmd, nil, k8sVersion, "none")
 			if err != nil {
 				t.Fatalf("Got unexpected error %v during config generation", err)
 			}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 07226804b5..9ece4534fb 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -58,11 +58,10 @@ import (
 )
 
 const (
-	waitTimeout      = "wait-timeout"
-	embedCerts       = "embed-certs"
-	keepContext      = "keep-context"
-	imageRepository  = "image-repository"
-	containerRuntime = "container-runtime"
+	waitTimeout     = "wait-timeout"
+	embedCerts      = "embed-certs"
+	keepContext     = "keep-context"
+	imageRepository = "image-repository"
 )
 
 // Start spins up a guest and starts the kubernetes node.

From 9c0e5df1acccf974738ba3adb7216f637602fb5a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 03:59:06 -0700
Subject: [PATCH 516/668] remove most of the viper calls from node start

---
 pkg/minikube/node/start.go | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 9ece4534fb..28cac0476c 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -57,12 +57,7 @@ import (
 	"k8s.io/minikube/pkg/util/retry"
 )
 
-const (
-	waitTimeout     = "wait-timeout"
-	embedCerts      = "embed-certs"
-	keepContext     = "keep-context"
-	imageRepository = "image-repository"
-)
+const waitTimeout = "wait-timeout"
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) (*kubeconfig.Settings, error) {
@@ -277,8 +272,8 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
 		ClientCertificate:    localpath.ClientCert(cc.Name),
 		ClientKey:            localpath.ClientKey(cc.Name),
 		CertificateAuthority: localpath.CACert(),
-		KeepContext:          viper.GetBool(keepContext),
-		EmbedCerts:           viper.GetBool(embedCerts),
+		KeepContext:          cc.KeepContext,
+		EmbedCerts:           cc.EmbedCerts,
 	}
 
 	kcs.SetPath(kubeconfig.PathFromEnv())
@@ -305,7 +300,7 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 		exit.WithError("Failed to get command runner", err)
 	}
 
-	ip := validateNetwork(host, runner)
+	ip := validateNetwork(host, runner, cfg.KubernetesConfig.ImageRepository)
 
 	// Bypass proxy for minikube's vm host ip
 	err = proxy.ExcludeIP(ip)
@@ -354,7 +349,7 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 }
 
 // validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner) string {
+func validateNetwork(h *host.Host, r command.Runner, imageRepository string) string {
 	ip, err := h.Driver.GetIP()
 	if err != nil {
 		exit.WithError("Unable to get VM IP address", err)
@@ -383,7 +378,7 @@ func validateNetwork(h *host.Host, r command.Runner) string {
 	}
 
 	// Non-blocking
-	go tryRegistry(r, h.Driver.DriverName())
+	go tryRegistry(r, h.Driver.DriverName(), imageRepository)
 	return ip
 }
 
@@ -425,7 +420,7 @@ func trySSH(h *host.Host, ip string) {
 }
 
 // tryRegistry tries to connect to the image repository
-func tryRegistry(r command.Runner, driverName string) {
+func tryRegistry(r command.Runner, driverName string, imageRepository string) {
 	// 2 second timeout. For best results, call tryRegistry in a non-blocking manner.
 	opts := []string{"-sS", "-m", "2"}
 
@@ -434,15 +429,14 @@ func tryRegistry(r command.Runner, driverName string) {
 		opts = append([]string{"-x", proxy}, opts...)
 	}
 
-	repo := viper.GetString(imageRepository)
-	if repo == "" {
-		repo = images.DefaultKubernetesRepo
+	if imageRepository == "" {
+		imageRepository = images.DefaultKubernetesRepo
 	}
 
-	opts = append(opts, fmt.Sprintf("https://%s/", repo))
+	opts = append(opts, fmt.Sprintf("https://%s/", imageRepository))
 	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
 		glog.Warningf("%s failed: %v", rr.Args, err)
-		out.WarningT("This {{.type}} is having trouble accessing https://{{.repository}}", out.V{"repository": repo, "type": driver.MachineType(driverName)})
+		out.WarningT("This {{.type}} is having trouble accessing https://{{.repository}}", out.V{"repository": imageRepository, "type": driver.MachineType(driverName)})
 		out.ErrT(out.Tip, "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/")
 	}
 }

From 5517e2b03b02a6485a7f888a4ef0d588fe49782e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 04:01:29 -0700
Subject: [PATCH 517/668] remove debugging statement

---
 pkg/minikube/config/config.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index 0abf76e4aa..4db4af8dc5 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -193,8 +193,6 @@ func (c *simpleConfigLoader) LoadConfigFromFile(profileName string, miniHome ...
 }
 
 func (c *simpleConfigLoader) WriteConfigToFile(profileName string, cc *ClusterConfig, miniHome ...string) error {
-	// Move to profile package
-	fmt.Println("inside WriteConfigToFile")
 	path := profileFilePath(profileName, miniHome...)
 	contents, err := json.MarshalIndent(cc, "", "	")
 	if err != nil {

From ee1f8fffb3d7a755fc8bf6c356d5d50fc8a72e57 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 04:06:43 -0700
Subject: [PATCH 518/668] remove duplicate setDockerProxy

---
 cmd/minikube/cmd/start_flags.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 5eec6bde7b..4fe9fe2a37 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -179,11 +179,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
 		}
 
-		// Feed Docker our host proxy environment by default, so that it can pull images
-		if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
-			setDockerProxy()
-		}
-
 		if cmd.Flags().Changed(imageRepository) {
 			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
 		}
@@ -280,7 +275,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 	}
 
 	// Feed Docker our host proxy environment by default, so that it can pull images
-	// redoing setDockerProxy in case proxy changed since last start.
+	// doing this for both new config and existing, in case proxy changed since previous start
 	if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
 		setDockerProxy()
 	}

From 84693eaf0aa7c5d8f0e6fbcc7fd40f6d3ec3db8a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 04:11:06 -0700
Subject: [PATCH 519/668] add wait flag to updateExistingConfigFromFlags

---
 cmd/minikube/cmd/start_flags.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 4fe9fe2a37..d11fde51a2 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -469,7 +469,10 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		existing.KubernetesConfig.EnableDefaultCNI = viper.GetBool(enableDefaultCNI)
 	}
 
-	existing.VerifyComponents = interpretWaitFlag(*cmd)
+	if cmd.Flags().Changed(waitComponents) {
+		existing.VerifyComponents = interpretWaitFlag(*cmd)
+	}
+
 	return *existing
 }
 

From 75bc44212b0d419a5475252176f741cb6867f530 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 20:10:11 -0700
Subject: [PATCH 520/668] dont bumpt preload version in this PR yet

---
 pkg/minikube/download/preload.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index e3f859a23b..59a0c4b7e0 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -41,7 +41,7 @@ const (
 	// PreloadVersion is the current version of the preloaded tarball
 	//
 	// NOTE: You may need to bump this version up when upgrading auxiliary docker images
-	PreloadVersion = "v3"
+	PreloadVersion = "v2"
 	// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )

From 52fee5056d89920d9bb76277d4a1a50d7cbb56a7 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 20:14:20 -0700
Subject: [PATCH 521/668] add soft start test

---
 test/integration/start_stop_delete_test.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 30698b1da9..43b40f49a4 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -98,6 +98,16 @@ func TestStartStop(t *testing.T) {
 					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Command(), err)
 				}
 
+
+				// Soft Start this should not take longer than 10 seconds
+				softStartArgs := []string{"start", "-p", profile, "--alsologtostderr", "-v=3"}
+				rr, err = Run(t, exec.CommandContext(ctx, Target(), softStartArgs...))
+				if err != nil {
+					t.Fatalf("failed to soft start minikube. args %q: %v", rr.Command(), err)
+				}
+
+				
+				
 				if !strings.Contains(tc.name, "cni") {
 					testPodScheduling(ctx, t, profile)
 				}

From 67f1276c9c56b15fc1be159c2d8868af83c13a3d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 21:03:12 -0700
Subject: [PATCH 522/668] add soft start integeration test

---
 test/integration/functional_test.go        | 36 ++++++++++++++++++++--
 test/integration/start_stop_delete_test.go |  3 --
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 7ddbe72fb5..b56277673d 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -38,6 +38,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/localpath"
 
 	"github.com/elazarl/goproxy"
@@ -46,6 +47,7 @@ import (
 	"github.com/phayes/freeport"
 	"github.com/pkg/errors"
 	"golang.org/x/build/kubernetes/api"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
@@ -80,6 +82,7 @@ func TestFunctional(t *testing.T) {
 		}{
 			{"CopySyncFile", setupFileSync},                 // Set file for the file sync test case
 			{"StartWithProxy", validateStartWithProxy},      // Set everything else up for success
+			{"SoftStart", validateSoftStart},                // Set everything else up for success
 			{"KubeContext", validateKubeContext},            // Racy: must come immediately after "minikube start"
 			{"KubectlGetPods", validateKubectlGetPods},      // Make sure apiserver is up
 			{"CacheCmd", validateCacheCmd},                  // Caches images needed for subsequent tests because of proxy
@@ -88,7 +91,12 @@ func TestFunctional(t *testing.T) {
 		for _, tc := range tests {
 			tc := tc
 			t.Run(tc.name, func(t *testing.T) {
-				tc.validator(ctx, t, profile)
+				if strings.Contains(tc.name, "StartWithProxy") || strings.Contains(tc.name, "SoftStart") {
+					tc.validator(ctx, t, profile, 8441)
+				} else {
+					tc.validator(ctx, t, profile)
+				}
+
 			})
 		}
 	})
@@ -177,14 +185,15 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 
 }
 
-func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
+func validateStartWithProxy(ctx context.Context, t *testing.T, profile string, apiServerPort int) {
 	srv, err := startHTTPProxy(t)
 	if err != nil {
 		t.Fatalf("failed to set up the test proxy: %s", err)
 	}
 
 	// Use more memory so that we may reliably fit MySQL and nginx
-	startArgs := append([]string{"start", "-p", profile, "--wait=true"}, StartArgs()...)
+	// changing api server so later in soft start we verify it didn't change
+	startArgs := append([]string{"start", "-p", profile, fmt.Sprintf("--apiserver-port=%d", apiServerPort), "--wait=true"}, StartArgs()...)
 	c := exec.CommandContext(ctx, Target(), startArgs...)
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("HTTP_PROXY=%s", srv.Addr))
@@ -206,6 +215,27 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 	}
 }
 
+// validateSoftStart validates that after minikube already started, a "minikube start" should not change the configs.
+func validateSoftStart(ctx context.Context, t *testing.T, profile string, apiPortBefore int) {
+	// the test before this had been start with api-server
+	// before soft start the cluster was started with --apiserver-port=8441
+	beforeCfg := config.LoadProfile(profile)
+	if beforeCfg.Config.NodePort != apiPortBefore {
+		t.Errorf("expected cluster config node port before soft start to be %d but got %s", apiPortBefore, beforeCfg.Config.NodePort)
+	}
+
+	softStartArgs := append([]string{"start", "-p", profile})
+	c := exec.CommandContext(ctx, Target(), softStartArgs...)
+	if err != nil {
+		t.Errorf("failed to soft start minikube. args %q: %v", rr.Command(), err)
+	}
+
+	afterCfg := config.LoadProfile(profile)
+	if afterCfg.Config.NodePort != apiPortBefore {
+		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortBefore, afterCfg.Config.NodePort)
+	}
+}
+
 // validateKubeContext asserts that kubectl is properly configured (race-condition prone!)
 func validateKubeContext(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "config", "current-context"))
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 43b40f49a4..2eddc92455 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -98,7 +98,6 @@ func TestStartStop(t *testing.T) {
 					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Command(), err)
 				}
 
-
 				// Soft Start this should not take longer than 10 seconds
 				softStartArgs := []string{"start", "-p", profile, "--alsologtostderr", "-v=3"}
 				rr, err = Run(t, exec.CommandContext(ctx, Target(), softStartArgs...))
@@ -106,8 +105,6 @@ func TestStartStop(t *testing.T) {
 					t.Fatalf("failed to soft start minikube. args %q: %v", rr.Command(), err)
 				}
 
-				
-				
 				if !strings.Contains(tc.name, "cni") {
 					testPodScheduling(ctx, t, profile)
 				}

From 2a66c8cdc532b7c0305520465d167ce96d9bbb0d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 21:06:27 -0700
Subject: [PATCH 523/668] add log for how long soft start took

---
 test/integration/functional_test.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index b56277673d..825632d027 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -82,7 +82,7 @@ func TestFunctional(t *testing.T) {
 		}{
 			{"CopySyncFile", setupFileSync},                 // Set file for the file sync test case
 			{"StartWithProxy", validateStartWithProxy},      // Set everything else up for success
-			{"SoftStart", validateSoftStart},                // Set everything else up for success
+			{"SoftStart", validateSoftStart},                // do a soft start. ensure config didnt change.
 			{"KubeContext", validateKubeContext},            // Racy: must come immediately after "minikube start"
 			{"KubectlGetPods", validateKubectlGetPods},      // Make sure apiserver is up
 			{"CacheCmd", validateCacheCmd},                  // Caches images needed for subsequent tests because of proxy
@@ -217,6 +217,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string, a
 
 // validateSoftStart validates that after minikube already started, a "minikube start" should not change the configs.
 func validateSoftStart(ctx context.Context, t *testing.T, profile string, apiPortBefore int) {
+	start := time.Now()
 	// the test before this had been start with api-server
 	// before soft start the cluster was started with --apiserver-port=8441
 	beforeCfg := config.LoadProfile(profile)
@@ -229,11 +230,13 @@ func validateSoftStart(ctx context.Context, t *testing.T, profile string, apiPor
 	if err != nil {
 		t.Errorf("failed to soft start minikube. args %q: %v", rr.Command(), err)
 	}
+	t.Logf("soft start took %s for %q cluster.", time.Since(start), profile)
 
 	afterCfg := config.LoadProfile(profile)
 	if afterCfg.Config.NodePort != apiPortBefore {
 		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortBefore, afterCfg.Config.NodePort)
 	}
+
 }
 
 // validateKubeContext asserts that kubectl is properly configured (race-condition prone!)

From d9fa543951526882aaed58d28746332857c6bfb2 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 21:08:09 -0700
Subject: [PATCH 524/668] fix comment

---
 test/integration/functional_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 825632d027..71026abae5 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -218,8 +218,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string, a
 // validateSoftStart validates that after minikube already started, a "minikube start" should not change the configs.
 func validateSoftStart(ctx context.Context, t *testing.T, profile string, apiPortBefore int) {
 	start := time.Now()
-	// the test before this had been start with api-server
-	// before soft start the cluster was started with --apiserver-port=8441
+	// the test before this had been start with --apiserver-port=8441
 	beforeCfg := config.LoadProfile(profile)
 	if beforeCfg.Config.NodePort != apiPortBefore {
 		t.Errorf("expected cluster config node port before soft start to be %d but got %s", apiPortBefore, beforeCfg.Config.NodePort)

From e4abe73a25efc589d84954ae4edfc9b69e4f0d93 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 21:26:45 -0700
Subject: [PATCH 525/668] lint

---
 test/integration/functional_test.go        | 38 ++++++++++++----------
 test/integration/start_stop_delete_test.go |  7 ----
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 71026abae5..ee047c222d 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -40,6 +40,7 @@ import (
 
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/util/retry"
 
 	"github.com/elazarl/goproxy"
 	"github.com/hashicorp/go-retryablehttp"
@@ -47,8 +48,6 @@ import (
 	"github.com/phayes/freeport"
 	"github.com/pkg/errors"
 	"golang.org/x/build/kubernetes/api"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // validateFunc are for subtests that share a single setup
@@ -91,12 +90,7 @@ func TestFunctional(t *testing.T) {
 		for _, tc := range tests {
 			tc := tc
 			t.Run(tc.name, func(t *testing.T) {
-				if strings.Contains(tc.name, "StartWithProxy") || strings.Contains(tc.name, "SoftStart") {
-					tc.validator(ctx, t, profile, 8441)
-				} else {
-					tc.validator(ctx, t, profile)
-				}
-
+				tc.validator(ctx, t, profile)
 			})
 		}
 	})
@@ -185,7 +179,8 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 
 }
 
-func validateStartWithProxy(ctx context.Context, t *testing.T, profile string, apiServerPort int) {
+func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
+	apiServerPort := 8441
 	srv, err := startHTTPProxy(t)
 	if err != nil {
 		t.Fatalf("failed to set up the test proxy: %s", err)
@@ -216,24 +211,33 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string, a
 }
 
 // validateSoftStart validates that after minikube already started, a "minikube start" should not change the configs.
-func validateSoftStart(ctx context.Context, t *testing.T, profile string, apiPortBefore int) {
+func validateSoftStart(ctx context.Context, t *testing.T, profile string) {
+	apiPortBefore := 8441
 	start := time.Now()
 	// the test before this had been start with --apiserver-port=8441
-	beforeCfg := config.LoadProfile(profile)
-	if beforeCfg.Config.NodePort != apiPortBefore {
-		t.Errorf("expected cluster config node port before soft start to be %d but got %s", apiPortBefore, beforeCfg.Config.NodePort)
+	beforeCfg, err := config.LoadProfile(profile)
+	if err != nil {
+		t.Errorf("error reading cluster config before soft start: %v", err)
+	}
+	if beforeCfg.Config.KubernetesConfig.NodePort != apiPortBefore {
+		t.Errorf("expected cluster config node port before soft start to be %d but got %d", apiPortBefore, beforeCfg.Config.KubernetesConfig.NodePort)
 	}
 
-	softStartArgs := append([]string{"start", "-p", profile})
+	softStartArgs := []string{"start", "-p", profile}
 	c := exec.CommandContext(ctx, Target(), softStartArgs...)
+	rr, err := Run(t, c)
 	if err != nil {
 		t.Errorf("failed to soft start minikube. args %q: %v", rr.Command(), err)
 	}
 	t.Logf("soft start took %s for %q cluster.", time.Since(start), profile)
 
-	afterCfg := config.LoadProfile(profile)
-	if afterCfg.Config.NodePort != apiPortBefore {
-		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortBefore, afterCfg.Config.NodePort)
+	afterCfg, err := config.LoadProfile(profile)
+	if err != nil {
+		t.Errorf("error reading cluster config after soft start: %v", err)
+	}
+
+	if afterCfg.Config.KubernetesConfig.NodePort != apiPortBefore {
+		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortBefore, afterCfg.Config.KubernetesConfig.NodePort)
 	}
 
 }
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 2eddc92455..30698b1da9 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -98,13 +98,6 @@ func TestStartStop(t *testing.T) {
 					t.Fatalf("failed starting minikube -first start-. args %q: %v", rr.Command(), err)
 				}
 
-				// Soft Start this should not take longer than 10 seconds
-				softStartArgs := []string{"start", "-p", profile, "--alsologtostderr", "-v=3"}
-				rr, err = Run(t, exec.CommandContext(ctx, Target(), softStartArgs...))
-				if err != nil {
-					t.Fatalf("failed to soft start minikube. args %q: %v", rr.Command(), err)
-				}
-
 				if !strings.Contains(tc.name, "cni") {
 					testPodScheduling(ctx, t, profile)
 				}

From 217813466d7d1f09c1924e94ccbc6e02d0376ec6 Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Mon, 6 Apr 2020 21:30:06 -0700
Subject: [PATCH 526/668] update first page with link to docker-env

---
 site/content/en/docs/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md
index 59b02066e7..1a552191eb 100755
--- a/site/content/en/docs/_index.md
+++ b/site/content/en/docs/_index.md
@@ -17,7 +17,7 @@ minikube quickly sets up a local Kubernetes cluster on macOS, Linux, and Windows
 * Cross-platform (Linux, macOS, Windows)
 * Deploy as a VM, a container, or on bare-metal
 * Multiple container runtimes (CRI-O, containerd, docker)
-* Docker API endpoint for blazing fast image pushes
+* Docker API endpoint for blazing fast [image pushes](https://minikube.sigs.k8s.io/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)
 * Advanced features such as [LoadBalancer](https://minikube.sigs.k8s.io/Handbook/loadbalancer/), filesystem mounts, and FeatureGates
 * [Addons](https://minikube.sigs.k8s.io/Handbook/addons/) for easily installed Kubernetes applications
 

From c433ee128b084cda920ee5ed1784c5c9973aa5a0 Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Mon, 6 Apr 2020 21:35:21 -0700
Subject: [PATCH 527/668] update push to docker docs

---
 site/content/en/docs/handbook/pushing.md | 26 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 64f385e7f5..a8ac2d93a5 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -10,7 +10,7 @@ aliases:
  - /docs/tasks/docker_daemon
 ---
 
-## Cached Images
+# Cached Images
 
 From the host, you can push a Docker image directly to minikube. It will also be cached for future cluster starts.
 
@@ -39,26 +39,34 @@ For more information, see:
 
 You must be using minikube with the container runtime set to Docker. This is the default setting.
 
-## Pushing directly to the in-cluster Docker daemon
+# Pushing directly to the in-cluster Docker daemon
+When user a container or VM driver, it's really handy to reuse the Docker daemon inside minikube; 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 docker daemon as minikube which speeds up local experiments.
 
-When using a single VM of Kubernetes it's really handy to reuse the Docker daemon 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 docker daemon as minikube which speeds up local experiments.
-
-To be able to work with the docker daemon on your mac/linux host use the docker-env command in your shell:
+To point your terminal to use the docker daemon inside minikube run this:
 
 ```shell
 eval $(minikube docker-env)
 ```
 
-You should now be able to use docker on the command line on your host mac/linux machine talking to the docker daemon inside the minikube VM:
+now any command you run in this current terminal will run against the docker inside minikube VM or Container.
+Try it:
 
 ```shell
 docker ps
 ```
 
+now you can use same docker build command against the docker inside minikube. which is instantly accessible to kubernetes cluster.
+
+'''
+docker build -t myimage .
+'''
+
+
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
+more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 
-## Pushing directly to in-cluster CRIO
+# Pushing directly to in-cluster CRIO
 
 To push directly to CRIO, configure podman client on your mac/linux host using the podman-env command in your shell:
 
@@ -74,7 +82,7 @@ podman-remote help
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-## Pushing to an in-cluster Registry
+# Pushing to an in-cluster Registry
 
 For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
 
@@ -100,7 +108,7 @@ Push docker image to minikube registry:
 docker push $(minikube ip):5000/test-img
 ```
 
-## Building images inside of minikube
+# Building images inside of minikube
 
 Use `minikube ssh` to connect to the virtual machine, and run the `docker build` there:
 

From c4f5f4ddedcbe206b1f90d9911dec76ead679202 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 Apr 2020 22:53:44 -0700
Subject: [PATCH 528/668] fix

---
 cmd/minikube/cmd/start.go       | 2 +-
 cmd/minikube/cmd/start_flags.go | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 552e658394..44b7831adc 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -833,7 +833,7 @@ func validateRegistryMirror() {
 func createNode(cc config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
 	cp := config.Node{
-		Port:              viper.GetInt(apiServerPort),
+		Port:              cc.KubernetesConfig.NodePort,
 		KubernetesVersion: getKubernetesVersion(&cc),
 		Name:              kubeNodeName,
 		ControlPlane:      true,
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index d11fde51a2..d9cc94e1f7 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -179,10 +179,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
 		}
 
-		if cmd.Flags().Changed(imageRepository) {
-			cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
-		}
-
 		// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
 		selectedEnableDefaultCNI := viper.GetBool(enableDefaultCNI)
 		selectedNetworkPlugin := viper.GetString(networkPlugin)
@@ -264,6 +260,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 				ExtraOptions:           config.ExtraOptions,
 				ShouldLoadCachedImages: viper.GetBool(cacheImages),
 				EnableDefaultCNI:       selectedEnableDefaultCNI,
+				NodePort:               viper.GetInt(apiServerPort),
 			},
 		}
 		cc.VerifyComponents = interpretWaitFlag(*cmd)
@@ -429,6 +426,10 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		existing.KubernetesConfig.APIServerNames = viper.GetStringSlice("apiserver-names")
 	}
 
+	if cmd.Flags().Changed(apiServerPort) {
+		existing.KubernetesConfig.NodePort = viper.GetInt(apiServerPort)
+	}
+
 	if cmd.Flags().Changed(dnsDomain) {
 		existing.KubernetesConfig.DNSDomain = viper.GetString(dnsDomain)
 	}

From 26c999a811b64ccac497daa73791b27de3b2c4bb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 01:29:50 -0700
Subject: [PATCH 529/668] fix select default cni

---
 cmd/minikube/cmd/start_flags.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index d9cc94e1f7..d9004d73f8 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -170,7 +170,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 			exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
 		}
 
-		r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime})
+		r, err := cruntime.New(cruntime.Config{Type: viper.GetString(containerRuntime)})
 		if err != nil {
 			return cc, config.Node{}, errors.Wrap(err, "new runtime manager")
 		}

From e683dd315bea8a0141f6d11003d3c012936e6227 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 01:53:50 -0700
Subject: [PATCH 530/668] warn if changed memory cpu of an exiting cluster

---
 cmd/minikube/cmd/start_flags.go | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index d9004d73f8..092ecc5a3f 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -303,31 +303,16 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		existing.MinikubeISO = viper.GetString(isoURL)
 	}
 
-	sysLimit, containerLimit, err := memoryLimits(existing.Driver)
-	if err != nil {
-		glog.Warningf("Unable to query memory limits: %v", err)
-	}
-	mem := suggestMemoryAllocation(sysLimit, containerLimit)
 	if cmd.Flags().Changed(memory) {
-		mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
-		if err != nil {
-			exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
-		}
-	} else {
-		glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
+		glog.Warning("can not change memory for an exiting minikube cluster. you can delete and re-create instead.")
 	}
-	existing.Memory = mem
 
 	if cmd.Flags().Changed(cpus) {
-		existing.CPUs = viper.GetInt(cpus)
+		glog.Warning("can not change cpu for an exiting minikube cluster. you can delete and re-create instead.")
 	}
 
 	if cmd.Flags().Changed(humanReadableDiskSize) {
-		d, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
-		if err != nil {
-			exit.WithCodeT(exit.Config, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
-		}
-		existing.DiskSize = d
+		glog.Warning("can not change cpu for an exiting minikube cluster. you can delete and re-create instead.")
 	}
 
 	if cmd.Flags().Changed("vm-driver") {

From dfd9f7a9d1fafa9fabae625d8deda4883a3a32fa Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 03:06:44 -0700
Subject: [PATCH 531/668] handle Port 0 in configs

---
 cmd/minikube/cmd/start_flags.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 092ecc5a3f..9262cb43b4 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -415,6 +415,14 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		existing.KubernetesConfig.NodePort = viper.GetInt(apiServerPort)
 	}
 
+	// pre minikube 1.9.2 cc.KubernetesConfig.NodePort was not populated.
+	// in minikube config there were two fields for api server port.
+	// one in cc.KubernetesConfig.NodePort and one in cc.Nodes.Port
+	// this makes sure api server port not be set as 0!
+	if existing.KubernetesConfig.NodePort == 0 {
+		existing.KubernetesConfig.NodePort = viper.GetInt(apiServerPort)
+	}
+
 	if cmd.Flags().Changed(dnsDomain) {
 		existing.KubernetesConfig.DNSDomain = viper.GetString(dnsDomain)
 	}

From 30f68e09ef6edd5cc46c8049764cc9bca2d87f33 Mon Sep 17 00:00:00 2001
From: Kenta Iso <type.mafty@gmail.com>
Date: Tue, 7 Apr 2020 22:55:11 +0900
Subject: [PATCH 532/668] fix node name of `minikube status` to match worker
 node name

---
 cmd/minikube/cmd/status.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index bd1a72524c..95d21e3079 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -153,9 +153,10 @@ func exitCode(st *Status) int {
 func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status, error) {
 
 	controlPlane := n.ControlPlane
+	name := driver.MachineName(cc, n)
 
 	st := &Status{
-		Name:       n.Name,
+		Name:       name,
 		Host:       Nonexistent,
 		APIServer:  Nonexistent,
 		Kubelet:    Nonexistent,
@@ -163,7 +164,6 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status
 		Worker:     !controlPlane,
 	}
 
-	name := driver.MachineName(cc, n)
 	hs, err := machine.Status(api, name)
 	glog.Infof("%s host status = %q (err=%v)", name, hs, err)
 	if err != nil {

From d7e70cea5a90eda0cdf7b3a84a9cfd6ce028e1d6 Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Tue, 7 Apr 2020 23:14:50 +0900
Subject: [PATCH 533/668] Update Japanese translations

---
 translations/ja.json | 64 ++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/translations/ja.json b/translations/ja.json
index c2346cd739..189cc10be9 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -591,38 +591,38 @@
 	"You can delete them using the following command(s):": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザから「{{.name}}」VM を手動で削除することが必要な可能性があります",
-	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
-	"You must specify a service name": "",
-	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
-	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
-	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
-	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "",
-	"Your minikube vm is not running, try minikube start.": "",
-	"[{{.id}}] {{.msg}} {{.error}}": "",
-	"adding node": "",
-	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
-	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
-	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
-	"bash completion failed": "",
-	"call with cleanup=true to remove old tunnels": "",
-	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "",
-	"config view failed": "",
-	"dashboard service is not running: {{.error}}": "",
-	"deleting node": "",
-	"disable failed": "",
-	"dry-run mode. Validates configuration, but does not mutate system state": "",
-	"dry-run validation complete!": "",
-	"enable failed": "",
-	"error creating clientset": "",
-	"error getting primary control plane": "",
-	"error getting ssh port": "",
-	"error parsing the input ip address for mount": "",
-	"error starting tunnel": "",
-	"error stopping tunnel": "",
-	"error: --output must be 'yaml' or 'json'": "",
-	"failed to open browser: {{.error}}": "",
-	"if true, will embed the certs in kubeconfig.": "",
-	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "",
+	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "Hyper-V マネージャを停止して、「 minikube delete 」を再実行する必要があるかもしれません　",
+	"You must specify a service name": "サービスの名前を明示する必要があります",
+	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストマシーンは KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認してください。「 virt-host-validate 」を実行して、デバッグしてください",
+	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "ホストマシーンは仮想化をサポートしていません。もし VM 内で minikube を動かすのであれば、「 --driver=docker 」を試してください。そうでなければ、 BIOS で仮想化を有効にしてください",
+	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "ホストマシーンが minikube の VM にパケットをルーティングすることができていません。もし VPN を有効しているのであれば、VPN を無効にする、あるいは VM の IP アドレスに再ルーティングしないように設定してください。もし VPN を使用していないのであれば、 VM 環境のルーティング周りのオプションを確認してください",
+	"Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "今の minikube の設定はサポートされていないドライバーを参照しています。 ~/.minikube を削除して、もう一度試してください",
+	"Your minikube vm is not running, try minikube start.": "minikube の VM が動いていません。以下のコマンドを試してみてください。 minikube start",
+	"[{{.id}}] {{.msg}} {{.error}}": "[{{.id}}] {{.msg}} {{.error}}",
+	"adding node": "ノードを追加しています",
+	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "「 {{.name}} 」アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してくだいさい。 \nminikube addons enable {{.name}}",
+	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "「 {{.name}} 」アドオンは minikube では有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list",
+	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons では以下のようにサブコマンドを使用することで、 minikube のアドオンのファイルを編集することができます。 \"minikube addons enable dashboard\"",
+	"bash completion failed": "bash の補完が失敗しました",
+	"call with cleanup=true to remove old tunnels": "cleanup=true で呼び出すことで、古い tunnel を削除することができます",
+	"config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\\n\\n": "config では以下のようにサブコマンドを使用して、minikube の設定ファイルを編集することができます。 \"minikube config set driver kvm\"\n設定可能なフィールドは以下です。\\n\\n",
+	"config view failed": "設定を表示するのに失敗しました",
+	"dashboard service is not running: {{.error}}": "ダッシュボードのサービスが動いていません。 {{.error}}",
+	"deleting node": "ノードを削除しています",
+	"disable failed": "無効にするのに失敗しました",
+	"dry-run mode. Validates configuration, but does not mutate system state": "dry-run モードです。設定は検証しますが、実際にシステムの状態を変更することはしません",
+	"dry-run validation complete!": "dry-run の検証が終了しました",
+	"enable failed": "有効にするのに失敗しました",
+	"error creating clientset": "Clientset を作成する際にエラーが発生しました",
+	"error getting primary control plane": "コントロールプレーンを取得する際にエラーが発生しました",
+	"error getting ssh port": "SSH のポートを取得する際にエラーが発生しました",
+	"error parsing the input ip address for mount": "マウント用の入力された IP アドレスをパースする際にエラーが発生しました",
+	"error starting tunnel": "tunnel を開始する際にエラーが発生しました",
+	"error stopping tunnel": "tunnel を停止する際にエラーが発生しました",
+	"error: --output must be 'yaml' or 'json'": "エラーです。 --output は「 yaml 」、あるいは「 json 」である必要があります",
+	"failed to open browser: {{.error}}": "ブラウザを起動するのに失敗しました。 {{.error}}",
+	"if true, will embed the certs in kubeconfig.": "有効であれば、Kubernetes の設定ファイルに証明書を埋め込みます",
+	"if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "minikube のプロフィールを作成する場合は、以下のコマンドで作成できます。 minikube start -p {{.profile_name}}",
 	"initialization failed, will try again: {{.error}}": "初期化が失敗しました。再施行します。 {{.error}}",
 	"kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "kubeadm が他のプロセス（おそらくローカルでの他の Kubernetes をインストールするプロセス）との TCP ポートでの衝突を検知しました。 lsof -p\u003cport\u003e を実行して、そのプロセスを Kill してください",
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl と minikube の構成は {{.home_folder}} に保存されます",

From cf14cab4e49d31550be45aabc6f454edb4d1bfc4 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 7 Apr 2020 08:16:22 -0700
Subject: [PATCH 534/668] docs: Improve Drivers & Docker driver doc

---
 site/content/en/docs/drivers/_index.md | 29 +++++++++++++++++++++++++-
 site/content/en/docs/drivers/docker.md | 23 +++++++++++++-------
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/site/content/en/docs/drivers/_index.md b/site/content/en/docs/drivers/_index.md
index 7efc0914c9..698b172a0f 100644
--- a/site/content/en/docs/drivers/_index.md
+++ b/site/content/en/docs/drivers/_index.md
@@ -2,7 +2,34 @@
 title: "Drivers"
 linkTitle: "Drivers"
 weight: 8
+no_list: true
 description: >
   Configuring various minikube drivers
+aliases:
+  - /docs/reference/drivers
 ---
-minikube uses the Docker Machine library to provide a consistent way to interact with hypervisors. While most drivers are linked directly into the minikube program, some may require an additional binary to be downloaded due to technical or legal restrictions.
+minikube can be deployed as a VM, a container, or bare-metal.
+
+To do so, we use the [Docker Machine](https://github.com/docker/machine) library to provide a consistent way to interact with different environments. Here is what's supported:
+
+## Linux
+
+* [Docker]({{<ref "docker.md">}}) - container-based (preferred)
+* [KVM2]({{<ref "kvm2.md">}}) - VM-based (preferred)
+* [VirtualBox]({{<ref "virtualbox.md">}}) - VM
+* [None]({{<ref "none.md">}}) -  bare-metal
+* [Podman]({{<ref "podman.md">}}) - container (experimental)
+
+## macOS
+
+* [Hyperkit]({{<ref "hyperkit.md">}}) - VM (preferred)
+* [Docker]({{<ref "docker.md">}}) - VM + Container
+* [VirtualBox]({{<ref "virtualbox.md">}}) - FVM
+* [VMware]({{<ref "parallels.md">}}) - VM
+* [VMware]({{<ref "vmware.md">}}) - VM
+
+## Windows
+
+* [Hyper-V]({{<ref "hyperv.md">}}) - VM (preferred)
+* [Docker]({{<ref "docker.md">}}) - VM + Container (preferred)
+* [VirtualBox]({{<ref "virtualbox.md">}}) - VM
diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md
index 4c82cf36f5..bf47ed840b 100644
--- a/site/content/en/docs/drivers/docker.md
+++ b/site/content/en/docs/drivers/docker.md
@@ -7,18 +7,27 @@ aliases:
 
 ## Overview
 
-The Docker driver is the newest minikube driver. which runs kubernetes in container VM-free ! with full feature parity with minikube in VM.
+The Docker driver allows you to install Kubernetes into an existing Docker install. On Linux, this does not require virtualization to be enabled.
 
 {{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
 
 ## Special features
 
-- Cross platform (linux, macos, windows)
-- No hypervisor required when run on Linux.
+- Cross platform (linux, macOS, Windows)
+- No hypervisor required when run on Linux
+- Experimental support for [WSL2](https://docs.microsoft.com/en-us/windows/wsl/wsl2-install) on Windows 10
 
-## Known Issues.
+## Known Issues
 
-- The 'ingress' and 'ingress-dns' addons are only supported on Linux.
-these addons are not supported for Docker Driver on MacOS and Windows yet. to get updates on the work in progress please check [issue page](https://github.com/kubernetes/minikube/issues/7332)
+- On macOS, containers might get hung and require a restart of Docker for Desktop. See [docker/for-mac#1835](https://github.com/docker/for-mac/issues/1835)
 
-- a known [docker issue for macOS](https://github.com/docker/for-mac/issues/1835), a containers on Docker on MacOS might hang and get stuck while other containers can get created. The current workaround is restarting docker.
+- The `ingress` and `ingress-dns` addons are currently only supported on Linux. See [#7332](https://github.com/kubernetes/minikube/issues/7332)
+
+- On WSL2 (experimental - see [#5392](https://github.com/kubernetes/minikube/issues/5392)), you may need to run:
+
+   `sudo mkdir /sys/fs/cgroup/systemd && sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd`.
+
+## Troubleshooting
+
+- On macOS or Windows, you may need to restart Docker for Desktop if a command gets hung
+- Run `--alsologtostderr -v=1` for extra debugging information

From b6d66f16b469c973baf566c5ea9076e784197c53 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 7 Apr 2020 09:38:33 -0700
Subject: [PATCH 535/668] Disable update check for (--interactive|--dry-run),
 make non-blocking

---
 cmd/minikube/cmd/start.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 0a42f5e979..ad2df94888 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -286,6 +286,13 @@ func platform() string {
 // runStart handles the executes the flow of "minikube start"
 func runStart(cmd *cobra.Command, args []string) {
 	displayVersion(version.GetVersion())
+
+	// No need to do the update check if no one is going to see it
+	if !viper.GetBool(interactive) || !viper.GetBool(dryRun) {
+		// Avoid blocking execution on optional HTTP fetches
+		go notify.MaybePrintUpdateTextFromGithub()
+	}
+
 	displayEnviron(os.Environ())
 
 	// if --registry-mirror specified when run minikube start,
@@ -406,12 +413,7 @@ func displayVersion(version string) {
 		prefix = fmt.Sprintf("[%s] ", ClusterFlagValue())
 	}
 
-	versionState := out.Happy
-	if notify.MaybePrintUpdateTextFromGithub() {
-		versionState = out.Meh
-	}
-
-	out.T(versionState, "{{.prefix}}minikube {{.version}} on {{.platform}}", out.V{"prefix": prefix, "version": version, "platform": platform()})
+	out.T(out.Happy, "{{.prefix}}minikube {{.version}} on {{.platform}}", out.V{"prefix": prefix, "version": version, "platform": platform()})
 }
 
 // displayEnviron makes the user aware of environment variables that will affect how minikube operates

From 4464b8482068a383c9c3560482534fca1e2e4257 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 10:43:05 -0700
Subject: [PATCH 536/668] make post mortem logs easier on the eye

---
 test/integration/helpers.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 89eef10dc2..66ccb24338 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -201,34 +201,39 @@ func clusterLogs(t *testing.T, profile string) {
 		return
 	}
 
+	t.Logf("--------------------------post-mortem--------------------------------")
 	t.Logf("<<< %s FAILED: start of post-mortem logs <<<", t.Name())
+	t.Logf("----------------------post-mortem minikube logs----------------------")
 	rr, err := Run(t, exec.Command(Target(), "-p", profile, "logs", "--problems"))
 	if err != nil {
 		t.Logf("failed logs error: %v", err)
 		return
 	}
-	t.Logf("%s logs: %s", t.Name(), rr.Stdout)
+	t.Logf("%s logs: %s", t.Name(), rr.Output())
 
+	t.Logf("----------------------post-mortem api server status-------------------")
 	st = Status(context.Background(), t, Target(), profile, "APIServer")
 	if st != state.Running.String() {
 		t.Logf("%q apiserver is not running, skipping kubectl commands (state=%q)", profile, st)
 		return
 	}
-
+	t.Logf("---------------------post-mortem get pods------------------------------")
 	rr, rerr := Run(t, exec.Command("kubectl", "--context", profile, "get", "po", "-A", "--show-labels"))
 	if rerr != nil {
 		t.Logf("%s: %v", rr.Command(), rerr)
 		return
 	}
-	t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Stdout)
-
+	t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
+	t.Logf("---------------------post-mortem describe node-------------------------")
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "node"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
 	} else {
-		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Stdout)
+		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 	}
+	t.Logf("------------------------------------------------------------------")
 	t.Logf("<<< %s FAILED: end of post-mortem logs <<<", t.Name())
+	t.Logf("----------------   /post-mortem   ---------------------------")
 }
 
 // podStatusMsg returns a human-readable pod status, for generating debug status

From 0a63afb60cc3967650701b8b3e37833c2e0952b6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Tue, 7 Apr 2020 10:45:47 -0700
Subject: [PATCH 537/668] Add compatability alias

---
 site/content/en/docs/contrib/_index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/content/en/docs/contrib/_index.md b/site/content/en/docs/contrib/_index.md
index 7aef294ff1..46ef7101d3 100644
--- a/site/content/en/docs/contrib/_index.md
+++ b/site/content/en/docs/contrib/_index.md
@@ -4,4 +4,6 @@ linkTitle: "Contributing"
 weight: 10
 description: >
   How to contribute to minikube
+aliases:
+ - /docs/contributing
 ---

From e120758639eb427a73aa20d69b1fe9b04fe2a724 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 10:49:06 -0700
Subject: [PATCH 538/668] same tabs

---
 test/integration/helpers.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 66ccb24338..9b6242c602 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -201,9 +201,9 @@ func clusterLogs(t *testing.T, profile string) {
 		return
 	}
 
-	t.Logf("--------------------------post-mortem--------------------------------")
+	t.Logf("-----------------------post-mortem--------------------------------")
 	t.Logf("<<< %s FAILED: start of post-mortem logs <<<", t.Name())
-	t.Logf("----------------------post-mortem minikube logs----------------------")
+	t.Logf("-------------------post-mortem minikube logs----------------------")
 	rr, err := Run(t, exec.Command(Target(), "-p", profile, "logs", "--problems"))
 	if err != nil {
 		t.Logf("failed logs error: %v", err)
@@ -211,20 +211,20 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("%s logs: %s", t.Name(), rr.Output())
 
-	t.Logf("----------------------post-mortem api server status-------------------")
+	t.Logf("------------------post-mortem api server status-------------------")
 	st = Status(context.Background(), t, Target(), profile, "APIServer")
 	if st != state.Running.String() {
 		t.Logf("%q apiserver is not running, skipping kubectl commands (state=%q)", profile, st)
 		return
 	}
-	t.Logf("---------------------post-mortem get pods------------------------------")
+	t.Logf("--------------------post-mortem get pods--------------------------")
 	rr, rerr := Run(t, exec.Command("kubectl", "--context", profile, "get", "po", "-A", "--show-labels"))
 	if rerr != nil {
 		t.Logf("%s: %v", rr.Command(), rerr)
 		return
 	}
 	t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
-	t.Logf("---------------------post-mortem describe node-------------------------")
+	t.Logf("-------------------post-mortem describe node----------------------")
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "node"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
@@ -233,7 +233,7 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("------------------------------------------------------------------")
 	t.Logf("<<< %s FAILED: end of post-mortem logs <<<", t.Name())
-	t.Logf("----------------   /post-mortem   ---------------------------")
+	t.Logf("---------------------/post-mortem---------------------------------")
 }
 
 // podStatusMsg returns a human-readable pod status, for generating debug status

From b748766c24e89a73b998abb7742eefe7264ba570 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 11:06:12 -0700
Subject: [PATCH 539/668] wait cni

---
 test/integration/start_stop_delete_test.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 30698b1da9..3a46594237 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -89,7 +89,12 @@ func TestStartStop(t *testing.T) {
 				ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
 				defer CleanupWithLogs(t, profile, cancel)
 
-				startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}, tc.args...)
+				waitFlag := "--wait=true"
+				if !strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354
+					waitFlag = "--wait=apiserver,system_pods,default_sa"
+				}
+
+				startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", waitFlag}, tc.args...)
 				startArgs = append(startArgs, StartArgs()...)
 				startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", tc.version))
 

From 23ab8d59060ac3850bc3d0eff2b54c55a9a81cef Mon Sep 17 00:00:00 2001
From: gorbondiga <gbravo002@ikasle.ehu.es>
Date: Tue, 7 Apr 2020 19:04:23 +0200
Subject: [PATCH 540/668] Fix broken community links

Signed-off-by: Gorka B <gbravo002@ikasle.ehu.es>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c9f85e00a8..0dce7cc77c 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,6 @@ minikube is a Kubernetes [#sig-cluster-lifecycle](https://github.com/kubernetes/
 * [minikube-dev mailing list](https://groups.google.com/forum/#!forum/minikube-dev)
 * [Bi-weekly office hours, Mondays @ 11am PST](https://tinyurl.com/minikube-oh)
 
-* [Contributing](https://minikube.sigs.k8s.io/docs/contributing/)
-* [Development Roadmap](https://minikube.sigs.k8s.io/docs/contributing/roadmap/)
+* [Contributing](https://minikube.sigs.k8s.io/docs/contrib/)
+* [Development Roadmap](https://minikube.sigs.k8s.io/docs/contrib/roadmap/)
 

From d0a77b53ad7020d9d1072cbd2d876a037d095bdc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 11:29:30 -0700
Subject: [PATCH 541/668] rename podman test to experimental

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca58baa169..d70dbd0fa0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -413,7 +413,7 @@ jobs:
         numPass=$(echo $STAT | jq '.NumberOfPass')
         echo "*** $numPass Passed ***"
         if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
-  podman_ubuntu_18_04:
+  podman_ubuntu_18_04_experimental:
       needs: [build_minikube]
       env:
         TIME_ELAPSED: time
@@ -498,7 +498,7 @@ jobs:
   # collect all the reports and upload
   upload_all_reports:
     if: always()
-    needs: [docker_ubuntu_16_04,docker_ubuntu_18_04,none_ubuntu16_04,none_ubuntu18_04,podman_ubuntu_18_04]
+    needs: [docker_ubuntu_16_04,docker_ubuntu_18_04,none_ubuntu16_04,none_ubuntu18_04,podman_ubuntu_18_04_experimental]
     runs-on: ubuntu-18.04
     steps:
     - name: Download Results docker_ubuntu_16_04

From 2d6b8c531c2c0e7e75214a441f30ea099d00d15e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 12:04:26 -0700
Subject: [PATCH 542/668] fix negated if

---
 test/integration/start_stop_delete_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 3a46594237..fc3462261f 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -90,7 +90,7 @@ func TestStartStop(t *testing.T) {
 				defer CleanupWithLogs(t, profile, cancel)
 
 				waitFlag := "--wait=true"
-				if !strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354
+				if strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354
 					waitFlag = "--wait=apiserver,system_pods,default_sa"
 				}
 

From c11e642b2ac20eb3259098f9a223d81dabb65b7e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 13:14:30 -0700
Subject: [PATCH 543/668] put apiPort in a variable

---
 test/integration/functional_test.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index ee047c222d..9dd63bbc29 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -53,6 +53,9 @@ import (
 // validateFunc are for subtests that share a single setup
 type validateFunc func(context.Context, *testing.T, string)
 
+// used in validateStartWithProxy and validateSoftStart
+var apiPortTest = 8441
+
 // TestFunctional are functionality tests which can safely share a profile in parallel
 func TestFunctional(t *testing.T) {
 
@@ -180,7 +183,6 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 }
 
 func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
-	apiServerPort := 8441
 	srv, err := startHTTPProxy(t)
 	if err != nil {
 		t.Fatalf("failed to set up the test proxy: %s", err)
@@ -188,7 +190,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 
 	// Use more memory so that we may reliably fit MySQL and nginx
 	// changing api server so later in soft start we verify it didn't change
-	startArgs := append([]string{"start", "-p", profile, fmt.Sprintf("--apiserver-port=%d", apiServerPort), "--wait=true"}, StartArgs()...)
+	startArgs := append([]string{"start", "-p", profile, fmt.Sprintf("--apiserver-port=%d", apiPortTest), "--wait=true"}, StartArgs()...)
 	c := exec.CommandContext(ctx, Target(), startArgs...)
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("HTTP_PROXY=%s", srv.Addr))
@@ -212,15 +214,14 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) {
 
 // validateSoftStart validates that after minikube already started, a "minikube start" should not change the configs.
 func validateSoftStart(ctx context.Context, t *testing.T, profile string) {
-	apiPortBefore := 8441
 	start := time.Now()
 	// the test before this had been start with --apiserver-port=8441
 	beforeCfg, err := config.LoadProfile(profile)
 	if err != nil {
 		t.Errorf("error reading cluster config before soft start: %v", err)
 	}
-	if beforeCfg.Config.KubernetesConfig.NodePort != apiPortBefore {
-		t.Errorf("expected cluster config node port before soft start to be %d but got %d", apiPortBefore, beforeCfg.Config.KubernetesConfig.NodePort)
+	if beforeCfg.Config.KubernetesConfig.NodePort != apiPortTest {
+		t.Errorf("expected cluster config node port before soft start to be %d but got %d", apiPortTest, beforeCfg.Config.KubernetesConfig.NodePort)
 	}
 
 	softStartArgs := []string{"start", "-p", profile}
@@ -236,8 +237,8 @@ func validateSoftStart(ctx context.Context, t *testing.T, profile string) {
 		t.Errorf("error reading cluster config after soft start: %v", err)
 	}
 
-	if afterCfg.Config.KubernetesConfig.NodePort != apiPortBefore {
-		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortBefore, afterCfg.Config.KubernetesConfig.NodePort)
+	if afterCfg.Config.KubernetesConfig.NodePort != apiPortTest {
+		t.Errorf("expected node port in the config not change after soft start. exepceted node port to be %d but got %d.", apiPortTest, afterCfg.Config.KubernetesConfig.NodePort)
 	}
 
 }

From 65e1ff3be4c8596d805f6d7d1edb1cdaab33a20b Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 13:55:21 -0700
Subject: [PATCH 544/668] remove duplicate checking existing driver flag

---
 cmd/minikube/cmd/start.go       | 61 ----------------------
 cmd/minikube/cmd/start_flags.go | 91 +++++++++++++++++++++++++++++----
 2 files changed, 81 insertions(+), 71 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 44b7831adc..72e7351bed 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -64,67 +64,6 @@ import (
 	"k8s.io/minikube/pkg/version"
 )
 
-const (
-	isoURL                  = "iso-url"
-	memory                  = "memory"
-	cpus                    = "cpus"
-	humanReadableDiskSize   = "disk-size"
-	nfsSharesRoot           = "nfs-shares-root"
-	nfsShare                = "nfs-share"
-	kubernetesVersion       = "kubernetes-version"
-	hostOnlyCIDR            = "host-only-cidr"
-	containerRuntime        = "container-runtime"
-	criSocket               = "cri-socket"
-	networkPlugin           = "network-plugin"
-	enableDefaultCNI        = "enable-default-cni"
-	hypervVirtualSwitch     = "hyperv-virtual-switch"
-	hypervUseExternalSwitch = "hyperv-use-external-switch"
-	hypervExternalAdapter   = "hyperv-external-adapter"
-	kvmNetwork              = "kvm-network"
-	kvmQemuURI              = "kvm-qemu-uri"
-	kvmGPU                  = "kvm-gpu"
-	kvmHidden               = "kvm-hidden"
-	minikubeEnvPrefix       = "MINIKUBE"
-	installAddons           = "install-addons"
-	defaultDiskSize         = "20000mb"
-	keepContext             = "keep-context"
-	createMount             = "mount"
-	featureGates            = "feature-gates"
-	apiServerName           = "apiserver-name"
-	apiServerPort           = "apiserver-port"
-	dnsDomain               = "dns-domain"
-	serviceCIDR             = "service-cluster-ip-range"
-	imageRepository         = "image-repository"
-	imageMirrorCountry      = "image-mirror-country"
-	mountString             = "mount-string"
-	disableDriverMounts     = "disable-driver-mounts"
-	cacheImages             = "cache-images"
-	uuid                    = "uuid"
-	vpnkitSock              = "hyperkit-vpnkit-sock"
-	vsockPorts              = "hyperkit-vsock-ports"
-	embedCerts              = "embed-certs"
-	noVTXCheck              = "no-vtx-check"
-	downloadOnly            = "download-only"
-	dnsProxy                = "dns-proxy"
-	hostDNSResolver         = "host-dns-resolver"
-	waitComponents          = "wait"
-	force                   = "force"
-	dryRun                  = "dry-run"
-	interactive             = "interactive"
-	waitTimeout             = "wait-timeout"
-	nativeSSH               = "native-ssh"
-	minUsableMem            = 1024 // Kubernetes will not start with less than 1GB
-	minRecommendedMem       = 2000 // Warn at no lower than existing configurations
-	minimumCPUS             = 2
-	minimumDiskSize         = 2000
-	autoUpdate              = "auto-update-drivers"
-	hostOnlyNicType         = "host-only-nic-type"
-	natNicType              = "nat-nic-type"
-	nodes                   = "nodes"
-	preload                 = "preload"
-	deleteOnFailure         = "delete-on-failure"
-)
-
 var (
 	registryMirror   []string
 	insecureRegistry []string
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 9262cb43b4..b0556c79a2 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -39,6 +39,67 @@ import (
 	"k8s.io/minikube/pkg/version"
 )
 
+const (
+	isoURL                  = "iso-url"
+	memory                  = "memory"
+	cpus                    = "cpus"
+	humanReadableDiskSize   = "disk-size"
+	nfsSharesRoot           = "nfs-shares-root"
+	nfsShare                = "nfs-share"
+	kubernetesVersion       = "kubernetes-version"
+	hostOnlyCIDR            = "host-only-cidr"
+	containerRuntime        = "container-runtime"
+	criSocket               = "cri-socket"
+	networkPlugin           = "network-plugin"
+	enableDefaultCNI        = "enable-default-cni"
+	hypervVirtualSwitch     = "hyperv-virtual-switch"
+	hypervUseExternalSwitch = "hyperv-use-external-switch"
+	hypervExternalAdapter   = "hyperv-external-adapter"
+	kvmNetwork              = "kvm-network"
+	kvmQemuURI              = "kvm-qemu-uri"
+	kvmGPU                  = "kvm-gpu"
+	kvmHidden               = "kvm-hidden"
+	minikubeEnvPrefix       = "MINIKUBE"
+	installAddons           = "install-addons"
+	defaultDiskSize         = "20000mb"
+	keepContext             = "keep-context"
+	createMount             = "mount"
+	featureGates            = "feature-gates"
+	apiServerName           = "apiserver-name"
+	apiServerPort           = "apiserver-port"
+	dnsDomain               = "dns-domain"
+	serviceCIDR             = "service-cluster-ip-range"
+	imageRepository         = "image-repository"
+	imageMirrorCountry      = "image-mirror-country"
+	mountString             = "mount-string"
+	disableDriverMounts     = "disable-driver-mounts"
+	cacheImages             = "cache-images"
+	uuid                    = "uuid"
+	vpnkitSock              = "hyperkit-vpnkit-sock"
+	vsockPorts              = "hyperkit-vsock-ports"
+	embedCerts              = "embed-certs"
+	noVTXCheck              = "no-vtx-check"
+	downloadOnly            = "download-only"
+	dnsProxy                = "dns-proxy"
+	hostDNSResolver         = "host-dns-resolver"
+	waitComponents          = "wait"
+	force                   = "force"
+	dryRun                  = "dry-run"
+	interactive             = "interactive"
+	waitTimeout             = "wait-timeout"
+	nativeSSH               = "native-ssh"
+	minUsableMem            = 1024 // Kubernetes will not start with less than 1GB
+	minRecommendedMem       = 2000 // Warn at no lower than existing configurations
+	minimumCPUS             = 2
+	minimumDiskSize         = 2000
+	autoUpdate              = "auto-update-drivers"
+	hostOnlyNicType         = "host-only-nic-type"
+	natNicType              = "nat-nic-type"
+	nodes                   = "nodes"
+	preload                 = "preload"
+	deleteOnFailure         = "delete-on-failure"
+)
+
 // initMinikubeFlags includes commandline flags for minikube.
 func initMinikubeFlags() {
 	viper.SetEnvPrefix(minikubeEnvPrefix)
@@ -287,6 +348,8 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 // updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
 // skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
 func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig { //nolint to supress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
+	validateFlags(cmd, existing.Driver)
+
 	if cmd.Flags().Changed(containerRuntime) {
 		existing.KubernetesConfig.ContainerRuntime = viper.GetString(containerRuntime)
 	}
@@ -304,23 +367,31 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	}
 
 	if cmd.Flags().Changed(memory) {
-		glog.Warning("can not change memory for an exiting minikube cluster. you can delete and re-create instead.")
+		memInMB, err := pkgutil.CalculateSizeInMB(viper.GetString(memory))
+		if err != nil {
+			glog.Warningf("error calculate memory size in mb : %v", err)
+		}
+		if memInMB != existing.Memory {
+			out.WarningT("You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.")
+		}
+
 	}
 
 	if cmd.Flags().Changed(cpus) {
-		glog.Warning("can not change cpu for an exiting minikube cluster. you can delete and re-create instead.")
+		if viper.GetInt(cpus) != existing.CPUs {
+			out.WarningT("You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.")
+		}
 	}
 
 	if cmd.Flags().Changed(humanReadableDiskSize) {
-		glog.Warning("can not change cpu for an exiting minikube cluster. you can delete and re-create instead.")
-	}
+		memInMB, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
+		if err != nil {
+			glog.Warningf("error calculate disk size in mb : %v", err)
+		}
 
-	if cmd.Flags().Changed("vm-driver") {
-		existing.Driver = viper.GetString("vm-driver")
-	}
-
-	if cmd.Flags().Changed("driver") {
-		existing.Driver = viper.GetString("driver")
+		if memInMB != existing.DiskSize {
+			out.WarningT("You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.")
+		}
 	}
 
 	if cmd.Flags().Changed(vpnkitSock) {

From 017285ea1711dc7c236b2fe1794284f6c114ee87 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Tue, 7 Apr 2020 14:02:29 -0700
Subject: [PATCH 545/668] Fix link to minikube examples

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c9f85e00a8..6b4aa7c126 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,9 @@ See the [Getting Started Guide](https://minikube.sigs.k8s.io/docs/start/)
 
 See https://minikube.sigs.k8s.io/docs/
 
-## More Examples
+## Minikube in action
 
-See our [examples page](https://minikube.sigs.k8s.io/docs/examples/)
+See minikube in action [here](https://minikube.sigs.k8s.io/docs/handbook/controls/)
 
 ## Community
 

From b509d69182fc227c50fa6905feb96e08046a9673 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 7 Apr 2020 14:19:20 -0700
Subject: [PATCH 546/668] Extract preloaded tarball as soon as minikube volume
 is created

Extracting preload currently takes 6 seconds. This PR begins preload extraction as soon as the minikube volume is created, and runs it in parallell with creating the container node and setting up SSH.

This shaves 2-3 secnods off of `node.StartHost`
---
 pkg/drivers/kic/kic.go     | 37 ++++++++++++++++++++++++-------------
 pkg/drivers/kic/oci/oci.go | 16 ++++++++++++----
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 692bcdf485..081850a124 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -22,6 +22,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -112,6 +113,28 @@ func (d *Driver) Create() error {
 		}
 	}
 
+	if err := oci.SetupContainerNode(params); err != nil {
+		return errors.Wrap(err, "setting up container node")
+	}
+
+	var waitForPreload sync.WaitGroup
+	waitForPreload.Add(1)
+	go func() {
+		defer waitForPreload.Done()
+		// If preload doesn't exist, don't bother extracting tarball to volume
+		if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) {
+			return
+		}
+		t := time.Now()
+		glog.Infof("Starting extracting preloaded images to volume")
+		// Extract preloaded images to container
+		if err := oci.ExtractTarballToVolume(download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil {
+			glog.Infof("Unable to extract preloaded tarball to volume: %v", err)
+		} else {
+			glog.Infof("Took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
+		}
+	}()
+
 	if err := oci.CreateContainerNode(params); err != nil {
 		return errors.Wrap(err, "create kic node")
 	}
@@ -120,19 +143,7 @@ func (d *Driver) Create() error {
 		return errors.Wrap(err, "prepare kic ssh")
 	}
 
-	// If preload doesn't exist, don't bother extracting tarball to volume
-	if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) {
-		return nil
-	}
-	t := time.Now()
-	glog.Infof("Starting extracting preloaded images to volume")
-	// Extract preloaded images to container
-	if err := oci.ExtractTarballToVolume(download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil {
-		glog.Infof("Unable to extract preloaded tarball to volume: %v", err)
-	} else {
-		glog.Infof("Took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
-	}
-
+	waitForPreload.Wait()
 	return nil
 }
 
diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 29b6ddbd9b..6605c3e332 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -84,6 +84,18 @@ func DeleteContainer(ociBin string, name string) error {
 	return nil
 }
 
+// SetupContainerNode sets up the container node
+func SetupContainerNode(p CreateParams) error {
+	if p.OCIBinary != Docker {
+		return nil
+	}
+	if err := createDockerVolume(p.Name, p.Name); err != nil {
+		return errors.Wrapf(err, "creating volume for %s container", p.Name)
+	}
+	glog.Infof("Successfully created a docker volume %s", p.Name)
+	return nil
+}
+
 // CreateContainerNode creates a new container node
 func CreateContainerNode(p CreateParams) error {
 	runArgs := []string{
@@ -122,10 +134,6 @@ func CreateContainerNode(p CreateParams) error {
 		runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", hostVarVolPath))
 	}
 	if p.OCIBinary == Docker {
-		if err := createDockerVolume(p.Name, p.Name); err != nil {
-			return errors.Wrapf(err, "creating volume for %s container", p.Name)
-		}
-		glog.Infof("Successfully created a docker volume %s", p.Name)
 		runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var", p.Name))
 		// setting resource limit in privileged mode is only supported by docker
 		// podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode"

From 4238d5d92909fe14a7513b39e9fd3bbdc3800428 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Tue, 7 Apr 2020 14:32:33 -0700
Subject: [PATCH 547/668] Add /docs/examples/ alias for compatibility

---
 README.md                                 | 2 +-
 site/content/en/docs/handbook/controls.md | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b4aa7c126..fd93818a50 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ See the [Getting Started Guide](https://minikube.sigs.k8s.io/docs/start/)
 
 See https://minikube.sigs.k8s.io/docs/
 
-## Minikube in action
+## More Examples
 
 See minikube in action [here](https://minikube.sigs.k8s.io/docs/handbook/controls/)
 
diff --git a/site/content/en/docs/handbook/controls.md b/site/content/en/docs/handbook/controls.md
index 537f2478c6..18866c8500 100755
--- a/site/content/en/docs/handbook/controls.md
+++ b/site/content/en/docs/handbook/controls.md
@@ -4,6 +4,8 @@ title: "Basic controls"
 weight: 2
 description: >
   See minikube in action!
+aliases:
+  - /docs/examples/
 ---
 
 Start a cluster by running:

From accba6aa7fa673ae3c4276f77f9f0f44df85f4e0 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 7 Apr 2020 15:00:28 -0700
Subject: [PATCH 548/668] code review comments

---
 pkg/drivers/kic/kic.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 081850a124..a1468b53e5 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -131,7 +131,7 @@ func (d *Driver) Create() error {
 		if err := oci.ExtractTarballToVolume(download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil {
 			glog.Infof("Unable to extract preloaded tarball to volume: %v", err)
 		} else {
-			glog.Infof("Took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
+			glog.Infof("duration metric: took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
 		}
 	}()
 

From 09dd0acb9bb5e36f6e19c76d5b9b8a50e0ea7988 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 7 Apr 2020 15:15:08 -0700
Subject: [PATCH 549/668] Update docs contents

---
 Makefile                               | 2 +-
 cmd/minikube/cmd/generate-docs_test.go | 2 +-
 site/content/en/docs/commands/start.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5c357db7f1..1665b17c58 100755
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,7 @@ test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go ## Tr
 
 .PHONY: generate-docs
 generate-docs: out/minikube ## Automatically generate commands documentation.
-	out/minikube generate-docs --path ./site/content/en/docs/Reference/Commands/
+	out/minikube generate-docs --path ./site/content/en/docs/commands/
 
 .PHONY: extract
 extract: ## Compile extract tool
diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index 190bf3455d..3a4e8b6ba6 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestGenerateDocs(t *testing.T) {
-	dir := "../../../site/content/en/docs/Reference/Commands/"
+	dir := "../../../site/content/en/docs/commands/"
 
 	for _, sc := range RootCmd.Commands() {
 		t.Run(sc.Name(), func(t *testing.T) {
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index ce1fa0af1e..839be1e167 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -86,7 +86,7 @@ minikube start [flags]
       --uuid string                       Provide VM UUID to restore MAC address (hyperkit driver only)
       --vm                                Filter to use only VM Drivers
       --vm-driver driver                  DEPRECATED, use driver instead.
-      --wait strings                      comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to "apiserver,system_pods", available options: "apiserver,system_pods,default_sa" . other acceptable values are 'all' or 'none', 'true' and 'false' (default [apiserver,system_pods])
+      --wait strings                      comma separated list of kubernetes components to verify and wait for after starting a cluster. defaults to "apiserver,system_pods", available options: "apiserver,system_pods,default_sa,apps_running" . other acceptable values are 'all' or 'none', 'true' and 'false' (default [apiserver,system_pods])
       --wait-timeout duration             max time to wait per Kubernetes core services to be healthy. (default 6m0s)
 ```
 

From 0119d725c6bc6f4b60ded96a363d5cc43f08bfdb Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 7 Apr 2020 15:51:29 -0700
Subject: [PATCH 550/668] Use SSH runner once SSH is set up in kic

This change shaves off 1.5 seconds on setupKubeadm, and shaves off ~4 seconds in total.
---
 pkg/minikube/machine/client.go |  5 +++++
 pkg/minikube/node/start.go     | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go
index 06c422b2a8..49f0a901be 100644
--- a/pkg/minikube/machine/client.go
+++ b/pkg/minikube/machine/client.go
@@ -157,6 +157,11 @@ func CommandRunner(h *host.Host) (command.Runner, error) {
 	if driver.IsKIC(h.Driver.DriverName()) {
 		return command.NewKICRunner(h.Name, h.Driver.DriverName()), nil
 	}
+	return SSHRunner(h)
+}
+
+// SSHRunner returns an SSH runner for the host
+func SSHRunner(h *host.Host) (command.Runner, error) {
 	client, err := sshutil.NewSSHClient(h.Driver)
 	if err != nil {
 		return nil, errors.Wrap(err, "getting ssh client for bootstrapper")
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 9f4dbbd0bf..7fcb0e5351 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -106,6 +106,17 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv)
 	showVersionInfo(n.KubernetesVersion, cr)
 
+	// ssh should be set up by now
+	// switch to using ssh runner since it is faster
+	if driver.IsKIC(cc.Driver) {
+		sshRunner, err := machine.SSHRunner(host)
+		if err != nil {
+			glog.Infof("error getting ssh runner, will use slower command runner: %v", err)
+		} else {
+			mRunner = sshRunner
+		}
+	}
+
 	var bs bootstrapper.Bootstrapper
 	var kcs *kubeconfig.Settings
 	if apiServer {

From 5df9ead41cd157783024f999797a26f0759500e5 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 7 Apr 2020 16:29:40 -0700
Subject: [PATCH 551/668] never exit during provisioning

---
 cmd/minikube/cmd/start.go  |  2 +-
 pkg/minikube/node/cache.go |  1 -
 pkg/minikube/node/start.go | 45 ++++++++++++++++++++++++--------------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 8f8e564337..9b20bff2d2 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1038,7 +1038,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 	if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
 		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
 		if err != nil {
-			exit.WithError("Failed to check main repository and mirrors for images for images", err)
+			exit.WithError("Failed to check main repository and mirrors for images", err)
 		}
 
 		if !found {
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index ebeb04fdc0..46a51ba8c9 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -80,7 +80,6 @@ func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string)
 	}
 	out.T(out.Check, "Download complete!")
 	os.Exit(0)
-
 }
 
 // CacheKubectlBinary caches the kubectl binary
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 3e2584481a..334c9a62fd 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -313,15 +313,21 @@ func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string,
 func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host, err error) {
 	m, err := machine.NewAPIClient()
 	if err != nil {
-		return nil, false, nil, nil, errors.Wrap(err, "Failed to get machine client")
+		return runner, preExists, m, host, errors.Wrap(err, "Failed to get machine client")
+	}
+	host, preExists, err = startHost(m, *cfg, *node)
+	if err != nil {
+		return runner, preExists, m, host, errors.Wrap(err, "Failed to start host")
 	}
-	host, preExists = startHost(m, *cfg, *node)
 	runner, err = machine.CommandRunner(host)
 	if err != nil {
 		return runner, preExists, m, host, errors.Wrap(err, "Failed to get command runner")
 	}
 
-	ip := validateNetwork(host, runner)
+	ip, err := validateNetwork(host, runner)
+	if err != nil {
+		return runner, preExists, m, host, errors.Wrap(err, "Failed to validate network")
+	}
 
 	// Bypass proxy for minikube's vm host ip
 	err = proxy.ExcludeIP(ip)
@@ -333,17 +339,17 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
 	node.IP = ip
 	err = config.SaveNode(cfg, node)
 	if err != nil {
-		return nil, false, nil, nil, errors.Wrap(err, "saving node")
+		return runner, preExists, m, host, errors.Wrap(err, "saving node")
 	}
 
 	return runner, preExists, m, host, err
 }
 
 // startHost starts a new minikube host using a VM or None
-func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, bool) {
+func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*host.Host, bool, error) {
 	host, exists, err := machine.StartHost(api, cc, n)
 	if err == nil {
-		return host, exists
+		return host, exists, nil
 	}
 	out.ErrT(out.Embarrassed, "StartHost failed, but will try again: {{.error}}", out.V{"error": err})
 
@@ -360,20 +366,20 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
 
 	host, exists, err = machine.StartHost(api, cc, n)
 	if err == nil {
-		return host, exists
+		return host, exists, nil
 	}
 
 	// Don't use host.Driver to avoid nil pointer deref
 	drv := cc.Driver
-	exit.WithError(fmt.Sprintf(`Failed to start %s %s. "%s" may fix it.`, drv, driver.MachineType(drv), mustload.ExampleCmd(cc.Name, "start")), err)
-	return host, exists
+	out.ErrT(out.Sad, `Failed to start {{.driver}} {{.driver_type}}. "{{.cmd}}" may fix it: {{.error}}`, out.V{"driver": drv, "driver_type": driver.MachineType(drv), "cmd": mustload.ExampleCmd(cc.Name, "start"), "error": err})
+	return host, exists, err
 }
 
 // validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner) string {
+func validateNetwork(h *host.Host, r command.Runner) (string, error) {
 	ip, err := h.Driver.GetIP()
 	if err != nil {
-		exit.WithError("Unable to get VM IP address", err)
+		return ip, err
 	}
 
 	optSeen := false
@@ -395,17 +401,19 @@ func validateNetwork(h *host.Host, r command.Runner) string {
 	}
 
 	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
-		trySSH(h, ip)
+		if err := trySSH(h, ip); err != nil {
+			return ip, err
+		}
 	}
 
 	// Non-blocking
 	go tryRegistry(r, h.Driver.DriverName())
-	return ip
+	return ip, nil
 }
 
-func trySSH(h *host.Host, ip string) {
+func trySSH(h *host.Host, ip string) error {
 	if viper.GetBool("force") {
-		return
+		return nil
 	}
 
 	sshAddr := net.JoinHostPort(ip, "22")
@@ -421,8 +429,9 @@ func trySSH(h *host.Host, ip string) {
 		return nil
 	}
 
-	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
-		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
+	err := retry.Expo(dial, time.Second, 13*time.Second)
+	if err != nil {
+		out.ErrT(out.FailureType, `minikube is unable to connect to the VM: {{.error}}
 
 	This is likely due to one of two reasons:
 
@@ -438,6 +447,8 @@ func trySSH(h *host.Host, ip string) {
 	- Use --force to override this connectivity check
 	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
 	}
+
+	return err
 }
 
 // tryRegistry tries to connect to the image repository

From 4f42dc3a5ba87c3068dc53a0f647611044232a10 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Tue, 7 Apr 2020 16:46:41 -0700
Subject: [PATCH 552/668] logs

---
 pkg/minikube/node/start.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 7fcb0e5351..427c717900 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -111,8 +111,9 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	if driver.IsKIC(cc.Driver) {
 		sshRunner, err := machine.SSHRunner(host)
 		if err != nil {
-			glog.Infof("error getting ssh runner, will use slower command runner: %v", err)
+			glog.Infof("error getting ssh runner: %v", err)
 		} else {
+			glog.Infof("Using ssh runner for kic...")
 			mRunner = sshRunner
 		}
 	}

From f82c2f2dd34dc3510630c9870f461395262be8a8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 17:08:34 -0700
Subject: [PATCH 553/668] add copy to clipboard to test results

---
 .github/workflows/main.yml | 10 +++++-----
 hack/jenkins/common.sh     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d70dbd0fa0..ba15fc9b65 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -110,7 +110,7 @@ jobs:
     - name: Install gopogh
       shell: bash
       run: |
-        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64
+        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64
         sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
     - name: Download Binaries
       uses: actions/download-artifact@v1
@@ -199,7 +199,7 @@ jobs:
     - name: Install gopogh
       shell: bash
       run: |
-        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64
+        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64
         sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
     - name: Download Binaries
       uses: actions/download-artifact@v1
@@ -280,7 +280,7 @@ jobs:
     - name: Install gopogh
       shell: bash
       run: |
-        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64
+        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64
         sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
     - name: Download Binaries
       uses: actions/download-artifact@v1
@@ -361,7 +361,7 @@ jobs:
     - name: Install gopogh
       shell: bash
       run: |
-        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64
+        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64
         sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
     - name: Download Binaries
       uses: actions/download-artifact@v1
@@ -442,7 +442,7 @@ jobs:
       - name: Install gopogh
         shell: bash
         run: |
-          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64
+          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64
           sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
       - name: Download binaries
         uses: actions/download-artifact@v1
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 8b908d3d73..3035caae53 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -338,9 +338,9 @@ fi
 
 echo ">> Installing gopogh"
 if [ "$(uname)" != "Darwin" ]; then
-  curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-linux-amd64 && sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
+  curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-linux-amd64 && sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
 else
-  curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.16/gopogh-darwin-amd64 && sudo install gopogh-darwin-amd64 /usr/local/bin/gopogh
+  curl -LO https://github.com/medyagh/gopogh/releases/download/v0.1.18/gopogh-darwin-amd64 && sudo install gopogh-darwin-amd64 /usr/local/bin/gopogh
 fi
 
 echo ">> Running gopogh"

From 176ee7cf15a6880e54c8e6a5af5df35f88b97b7c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sat, 4 Apr 2020 23:10:33 -0700
Subject: [PATCH 554/668] do kubeadm post init in paralle

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 32 ++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 3df6e80368..10bac2d726 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"os/exec"
 	"path"
+	"sync"
 
 	"fmt"
 	"net"
@@ -238,17 +239,30 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		}
 	}
 
-	if err := k.applyNodeLabels(cfg); err != nil {
-		glog.Warningf("unable to apply node labels: %v", err)
-	}
+	var wg sync.WaitGroup
+	wg.Add(3)
 
-	if err := bsutil.AdjustResourceLimits(k.c); err != nil {
-		glog.Warningf("unable to adjust resource limits: %v", err)
-	}
+	go func() {
+		if err := k.applyNodeLabels(cfg); err != nil {
+			glog.Warningf("unable to apply node labels: %v", err)
+		}
+		wg.Done()
+	}()
 
-	if err := k.elevateKubeSystemPrivileges(cfg); err != nil {
-		glog.Warningf("unable to create cluster role binding, some addons might not work: %v", err)
-	}
+	go func() {
+		if err := bsutil.AdjustResourceLimits(k.c); err != nil {
+			glog.Warningf("unable to adjust resource limits: %v", err)
+		}
+		wg.Done()
+	}()
+
+	go func() {
+		if err := k.elevateKubeSystemPrivileges(cfg); err != nil {
+			glog.Warningf("unable to create cluster role binding, some addons might not work: %v", err)
+		}
+		wg.Done()
+	}()
+	wg.Wait()
 	return nil
 }
 

From df5da4d45332821a6f3481df7d4f404a5967fb5e Mon Sep 17 00:00:00 2001
From: nestoralonso <nestoralonso@users.noreply.github.com>
Date: Tue, 7 Apr 2020 22:01:38 -0500
Subject: [PATCH 555/668] Update start.go

It's necessary to add the start argument in this scenario because the suggested command doesn't work as printed:
'sudo minikube --driver=none'->'sudo minikube start --driver=none'
---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 7e3dba8f7f..9e296e195d 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -584,7 +584,7 @@ func validateUser(drvName string) {
 	useForce := viper.GetBool(force)
 
 	if driver.NeedsRoot(drvName) && u.Uid != "0" && !useForce {
-		exit.WithCodeT(exit.Permissions, `The "{{.driver_name}}" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.`, out.V{"driver_name": drvName})
+		exit.WithCodeT(exit.Permissions, `The "{{.driver_name}}" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.`, out.V{"driver_name": drvName})
 	}
 
 	if driver.NeedsRoot(drvName) || u.Uid != "0" {

From dc49de8549d41bb882ff1eea2f5a560f1ea61f74 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 7 Apr 2020 20:22:39 -0700
Subject: [PATCH 556/668] add experimental multi-node walkthrough to docs

---
 hack/demo/hello-deployment.yaml              |  33 +
 hack/demo/hello-svc.yaml                     |  14 +
 hack/demo/kube-flannel.yaml                  | 602 +++++++++++++++++++
 site/content/en/docs/tutorials/multi_node.md | 115 ++++
 4 files changed, 764 insertions(+)
 create mode 100644 hack/demo/hello-deployment.yaml
 create mode 100644 hack/demo/hello-svc.yaml
 create mode 100644 hack/demo/kube-flannel.yaml
 create mode 100644 site/content/en/docs/tutorials/multi_node.md

diff --git a/hack/demo/hello-deployment.yaml b/hack/demo/hello-deployment.yaml
new file mode 100644
index 0000000000..f266444e9f
--- /dev/null
+++ b/hack/demo/hello-deployment.yaml
@@ -0,0 +1,33 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hello
+spec:
+  replicas: 2
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 100%
+  selector:
+    matchLabels:
+      app: hello
+  template:
+    metadata:
+      labels:
+        app: hello
+    spec:
+      affinity:
+        # ⬇⬇⬇ This ensures pods will land on separate hosts
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions: [{ key: app, operator: In, values: [hello-from] }]
+            topologyKey: "kubernetes.io/hostname"
+      containers:
+      - name: hello-from
+        image: pbitty/hello-from:latest
+        ports:
+          - name: http
+            containerPort: 80
+      terminationGracePeriodSeconds: 1
diff --git a/hack/demo/hello-svc.yaml b/hack/demo/hello-svc.yaml
new file mode 100644
index 0000000000..6db3dd8647
--- /dev/null
+++ b/hack/demo/hello-svc.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: hello
+spec:
+  type: NodePort
+  selector:
+    app: hello
+  ports:
+    - protocol: TCP
+      nodePort: 31000
+      port: 80
+      targetPort: http 
diff --git a/hack/demo/kube-flannel.yaml b/hack/demo/kube-flannel.yaml
new file mode 100644
index 0000000000..bfed51be44
--- /dev/null
+++ b/hack/demo/kube-flannel.yaml
@@ -0,0 +1,602 @@
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: psp.flannel.unprivileged
+  annotations:
+    seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default
+    seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default
+    apparmor.security.beta.kubernetes.io/allowedProfileNames: runtime/default
+    apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
+spec:
+  privileged: false
+  volumes:
+    - configMap
+    - secret
+    - emptyDir
+    - hostPath
+  allowedHostPaths:
+    - pathPrefix: "/etc/cni/net.d"
+    - pathPrefix: "/etc/kube-flannel"
+    - pathPrefix: "/run/flannel"
+  readOnlyRootFilesystem: false
+  # Users and groups
+  runAsUser:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  fsGroup:
+    rule: RunAsAny
+  # Privilege Escalation
+  allowPrivilegeEscalation: false
+  defaultAllowPrivilegeEscalation: false
+  # Capabilities
+  allowedCapabilities: ['NET_ADMIN']
+  defaultAddCapabilities: []
+  requiredDropCapabilities: []
+  # Host namespaces
+  hostPID: false
+  hostIPC: false
+  hostNetwork: true
+  hostPorts:
+  - min: 0
+    max: 65535
+  # SELinux
+  seLinux:
+    # SELinux is unused in CaaSP
+    rule: 'RunAsAny'
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: flannel
+rules:
+  - apiGroups: ['extensions']
+    resources: ['podsecuritypolicies']
+    verbs: ['use']
+    resourceNames: ['psp.flannel.unprivileged']
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes/status
+    verbs:
+      - patch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: flannel
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: flannel
+subjects:
+- kind: ServiceAccount
+  name: flannel
+  namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: flannel
+  namespace: kube-system
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: kube-flannel-cfg
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+data:
+  cni-conf.json: |
+    {
+      "name": "cbr0",
+      "cniVersion": "0.3.1",
+      "plugins": [
+        {
+          "type": "flannel",
+          "delegate": {
+            "hairpinMode": true,
+            "isDefaultGateway": true
+          }
+        },
+        {
+          "type": "portmap",
+          "capabilities": {
+            "portMappings": true
+          }
+        }
+      ]
+    }
+  net-conf.json: |
+    {
+      "Network": "10.244.0.0/16",
+      "Backend": {
+        "Type": "vxlan"
+      }
+    }
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-flannel-ds-amd64
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+spec:
+  selector:
+    matchLabels:
+      app: flannel
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: beta.kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+                  - key: beta.kubernetes.io/arch
+                    operator: In
+                    values:
+                      - amd64
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: flannel
+      initContainers:
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.11.0-amd64
+        command:
+        - cp
+        args:
+        - -f
+        - /etc/kube-flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.11.0-amd64
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+            add: ["NET_ADMIN"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: run
+          mountPath: /run/flannel
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run/flannel
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-flannel-ds-arm64
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+spec:
+  selector:
+    matchLabels:
+      app: flannel
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: beta.kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+                  - key: beta.kubernetes.io/arch
+                    operator: In
+                    values:
+                      - arm64
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: flannel
+      initContainers:
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.11.0-arm64
+        command:
+        - cp
+        args:
+        - -f
+        - /etc/kube-flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.11.0-arm64
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+             add: ["NET_ADMIN"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: run
+          mountPath: /run/flannel
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run/flannel
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-flannel-ds-arm
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+spec:
+  selector:
+    matchLabels:
+      app: flannel
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: beta.kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+                  - key: beta.kubernetes.io/arch
+                    operator: In
+                    values:
+                      - arm
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: flannel
+      initContainers:
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.11.0-arm
+        command:
+        - cp
+        args:
+        - -f
+        - /etc/kube-flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.11.0-arm
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+             add: ["NET_ADMIN"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: run
+          mountPath: /run/flannel
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run/flannel
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-flannel-ds-ppc64le
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+spec:
+  selector:
+    matchLabels:
+      app: flannel
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: beta.kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+                  - key: beta.kubernetes.io/arch
+                    operator: In
+                    values:
+                      - ppc64le
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: flannel
+      initContainers:
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.11.0-ppc64le
+        command:
+        - cp
+        args:
+        - -f
+        - /etc/kube-flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.11.0-ppc64le
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+             add: ["NET_ADMIN"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: run
+          mountPath: /run/flannel
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run/flannel
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-flannel-ds-s390x
+  namespace: kube-system
+  labels:
+    tier: node
+    app: flannel
+spec:
+  selector:
+    matchLabels:
+      app: flannel
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: beta.kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
+                  - key: beta.kubernetes.io/arch
+                    operator: In
+                    values:
+                      - s390x
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: flannel
+      initContainers:
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.11.0-s390x
+        command:
+        - cp
+        args:
+        - -f
+        - /etc/kube-flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.11.0-s390x
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+             add: ["NET_ADMIN"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: run
+          mountPath: /run/flannel
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run/flannel
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
new file mode 100644
index 0000000000..cde1cd74ea
--- /dev/null
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -0,0 +1,115 @@
+---
+title: "Using Multi-Node Clusters"
+linkTitle: "Using Minikube with more than one cluster."
+weight: 1
+date: 2019-11-24
+description: >
+  Using Multi-Node Clusters
+---
+
+## Overview
+
+- This tutorial will show you how to start a multi-node clusters on minikube and deploy a service to it.
+
+## Prerequisites
+
+- Minikube 1.9.0 (experimental) or higher
+- kubectl
+
+## Tutorial
+
+- Start a cluster with 2 nodes in the driver of your choice (the extra parameters are to make our chosen CNI, flannel, work while we're still experimental):
+```
+minikube start --nodes 2 -p multinode-demo --network-plugin=cni --extra-config=kubeadm.pod-network-cidr=10.244.0.0/16
+😄  [multinode-demo] minikube v1.9.2 on Darwin 10.14.6
+✨  Automatically selected the hyperkit driver
+👍  Starting control plane node m01 in cluster multinode-demo
+🔥  Creating hyperkit VM (CPUs=2, Memory=4000MB, Disk=20000MB) ...
+🐳  Preparing Kubernetes v1.18.0 on Docker 19.03.8 ...
+🌟  Enabling addons: default-storageclass, storage-provisioner
+
+👍  Starting node m02 in cluster multinode-demo
+🔥  Creating hyperkit VM (CPUs=2, Memory=4000MB, Disk=20000MB) ...
+🌐  Found network options:
+    ▪ NO_PROXY=192.168.64.213
+🐳  Preparing Kubernetes v1.18.0 on Docker 19.03.8 ...
+🏄  Done! kubectl is now configured to use "multinode-demo"
+```
+
+- Get the list of your nodes:
+```
+kubectl get nodes
+NAME                 STATUS   ROLES    AGE     VERSION
+multinode-demo       Ready    master   9m58s   v1.18.0
+multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
+multinode-demo-m03   Ready    <none>   7m9s    v1.18.0
+```
+
+- Install a CNI (e.g. flannel):
+NOTE: This currently needs to be done manually after the apiserver is running, the multi-node feature is still experimental as of 1.9.2.
+An example yaml for flannel is at [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/kube_flannel.yaml).
+```
+kubectl apply -f kube-flannel.yaml
+podsecuritypolicy.policy/psp.flannel.unprivileged created
+clusterrole.rbac.authorization.k8s.io/flannel created
+clusterrolebinding.rbac.authorization.k8s.io/flannel created
+serviceaccount/flannel created
+configmap/kube-flannel-cfg created
+daemonset.apps/kube-flannel-ds-amd64 created
+daemonset.apps/kube-flannel-ds-arm64 created
+daemonset.apps/kube-flannel-ds-arm created
+daemonset.apps/kube-flannel-ds-ppc64le created
+daemonset.apps/kube-flannel-ds-s390x created
+```
+
+- Deploy our hello world deployment, available [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/hello-deployment.yaml).
+```
+kubectl apply -f hello-deployment.yaml
+deployment.apps/hello created
+
+kubectl rollout status deployment/hello
+deployment "hello" successfully rolled out
+```
+
+- Deploy our hello world service, which just spits back the IP address the request was served from, available [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/hello-deployment.yaml)
+```
+kubectl apply -f hello-svc.yml
+service/hello created
+```
+
+- Check out the IP addresses of our pods, to note for future reference
+```
+kubectl get pods -o wide
+NAME                    READY   STATUS    RESTARTS   AGE   IP           NODE             NOMINATED NODE   READINESS GATES
+hello-c7b8df44f-qbhxh   1/1     Running   0          31s   10.244.0.3   multinode-demo   <none>           <none>
+hello-c7b8df44f-xv4v6   1/1     Running   0          31s   10.244.0.2   multinode-demo   <none>           <none>
+```
+
+- Look at our service, to know what URL to hit
+```
+minikube service list
+|-------------|------------|--------------|-----------------------------|
+|  NAMESPACE  |    NAME    | TARGET PORT  |             URL             |
+|-------------|------------|--------------|-----------------------------|
+| default     | hello      |           80 | http://192.168.64.226:31000 |
+| default     | kubernetes | No node port |				|
+| kube-system | kube-dns   | No node port |				|
+|-------------|------------|--------------|-----------------------------|
+```
+
+- Let's hit the URL a few times and see what comes back
+```
+curl  http://192.168.64.226:31000
+Hello from hello-c7b8df44f-qbhxh (10.244.0.3)
+
+curl  http://192.168.64.226:31000
+Hello from hello-c7b8df44f-qbhxh (10.244.0.3)
+
+curl  http://192.168.64.226:31000
+Hello from hello-c7b8df44f-xv4v6 (10.244.0.2)
+
+curl  http://192.168.64.226:31000
+Hello from hello-c7b8df44f-xv4v6 (10.244.0.2)
+```
+
+- Multiple nodes!

From cba420bbf30072f39301abe213d70fa79ad4734d Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 7 Apr 2020 20:25:05 -0700
Subject: [PATCH 557/668] formatting

---
 site/content/en/docs/tutorials/multi_node.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index cde1cd74ea..754310a893 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -42,7 +42,6 @@ kubectl get nodes
 NAME                 STATUS   ROLES    AGE     VERSION
 multinode-demo       Ready    master   9m58s   v1.18.0
 multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
-multinode-demo-m03   Ready    <none>   7m9s    v1.18.0
 ```
 
 - Install a CNI (e.g. flannel):

From 52044e9ffa37df7a8a55f47c95fec9dff3b11b4f Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 7 Apr 2020 20:26:03 -0700
Subject: [PATCH 558/668] formatting again

---
 site/content/en/docs/tutorials/multi_node.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index 754310a893..a0d60fe5f5 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -91,8 +91,8 @@ minikube service list
 |  NAMESPACE  |    NAME    | TARGET PORT  |             URL             |
 |-------------|------------|--------------|-----------------------------|
 | default     | hello      |           80 | http://192.168.64.226:31000 |
-| default     | kubernetes | No node port |				|
-| kube-system | kube-dns   | No node port |				|
+| default     | kubernetes | No node port |                             |
+| kube-system | kube-dns   | No node port |                             |
 |-------------|------------|--------------|-----------------------------|
 ```
 

From dd16e499040c1774379c158b1c64de725870fcab Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 8 Apr 2020 00:25:52 -0700
Subject: [PATCH 559/668] Fix label for parallels link

---
 site/content/en/docs/drivers/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/drivers/_index.md b/site/content/en/docs/drivers/_index.md
index 698b172a0f..21ef03d4b4 100644
--- a/site/content/en/docs/drivers/_index.md
+++ b/site/content/en/docs/drivers/_index.md
@@ -25,7 +25,7 @@ To do so, we use the [Docker Machine](https://github.com/docker/machine) library
 * [Hyperkit]({{<ref "hyperkit.md">}}) - VM (preferred)
 * [Docker]({{<ref "docker.md">}}) - VM + Container
 * [VirtualBox]({{<ref "virtualbox.md">}}) - FVM
-* [VMware]({{<ref "parallels.md">}}) - VM
+* [Parallels]({{<ref "parallels.md">}}) - VM
 * [VMware]({{<ref "vmware.md">}}) - VM
 
 ## Windows

From 9116393aa3e4eb6ac6a41011e3de33aefff929f8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 00:36:52 -0700
Subject: [PATCH 560/668] fix wait retry logic

---
 cmd/minikube/cmd/start.go                         |  2 +-
 go.sum                                            |  1 +
 .../bootstrapper/bsutil/kverify/system_pods.go    | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 7e3dba8f7f..5307298c4d 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -806,7 +806,7 @@ func setDockerProxy() {
 func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 	err = nil
 	hints := driver.FlagDefaults(drvName)
-	if !cmd.Flags().Changed("extra-config") && len(hints.ExtraOptions) > 0 {
+	if len(hints.ExtraOptions) > 0 {
 		for _, eo := range hints.ExtraOptions {
 			glog.Infof("auto setting extra-config to %q.", eo)
 			err = config.ExtraOptions.Set(eo)
diff --git a/go.sum b/go.sum
index c997562aea..36812fb2d3 100644
--- a/go.sum
+++ b/go.sum
@@ -1082,6 +1082,7 @@ k8s.io/kubelet v0.17.3 h1:e6oo26NusXf6i7Pp6i5tWXT+Z/oQW0XzxiWxa5pBgw0=
 k8s.io/kubelet v0.17.3/go.mod h1:Nh8owUHZcUXtnDAtmGnip36Nw+X6c4rbmDQlVyIhwMQ=
 k8s.io/kubernetes v1.17.3 h1:zWCppkLfHM+hoLqfbsrQ0cJnYw+4vAvedI92oQnjo/Q=
 k8s.io/kubernetes v1.17.3/go.mod h1:gt28rfzaskIzJ8d82TSJmGrJ0XZD0BBy8TcQvTuCI3w=
+k8s.io/kubernetes v1.18.0 h1:rVe+edi5GwutPQJ4KIZq1Nk506nmnfyz/KOZVCLv7Yo=
 k8s.io/legacy-cloud-providers v0.17.3/go.mod h1:ujZML5v8efVQxiXXTG+nck7SjP8KhMRjUYNIsoSkYI0=
 k8s.io/metrics v0.17.3 h1:IqXkNK+5E3vnobFD923Mn1QJEt3fb6+sK0wIjtBzOvw=
 k8s.io/metrics v0.17.3/go.mod h1:HEJGy1fhHOjHggW9rMDBJBD3YuGroH3Y1pnIRw9FFaI=
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index f6e9a5f98f..c2a27c6b6b 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -36,7 +35,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/logs"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // WaitForSystemPods verifies essential pods for running kurnetes is running
@@ -113,9 +111,16 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error {
 func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout time.Duration) error {
 	glog.Info("waiting for k8s-apps to be running ...")
 	start := time.Now()
-	checkRunning := func() error { return ExpectAppsRunning(cs, expected) }
-	if err := retry.Expo(checkRunning, 500*time.Millisecond, timeout); err != nil {
-		return errors.Wrap(err, "waitings for k8s app running")
+
+	checkRunning := func() (bool, error) {
+		if err := ExpectAppsRunning(cs, expected); err != nil {
+			return false, err
+		}
+		return true, nil
+	}
+
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, timeout, checkRunning); err != nil {
+		return fmt.Errorf("apiserver never returned a pod list")
 	}
 	glog.Infof("duration metric: took %s to wait for k8s-apps to be running ...", time.Since(start))
 	return nil

From 590c229e498599b9bf1e9b4013d24ab22cff8f09 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 00:39:17 -0700
Subject: [PATCH 561/668] go mod tidy

---
 go.sum | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go.sum b/go.sum
index 36812fb2d3..c997562aea 100644
--- a/go.sum
+++ b/go.sum
@@ -1082,7 +1082,6 @@ k8s.io/kubelet v0.17.3 h1:e6oo26NusXf6i7Pp6i5tWXT+Z/oQW0XzxiWxa5pBgw0=
 k8s.io/kubelet v0.17.3/go.mod h1:Nh8owUHZcUXtnDAtmGnip36Nw+X6c4rbmDQlVyIhwMQ=
 k8s.io/kubernetes v1.17.3 h1:zWCppkLfHM+hoLqfbsrQ0cJnYw+4vAvedI92oQnjo/Q=
 k8s.io/kubernetes v1.17.3/go.mod h1:gt28rfzaskIzJ8d82TSJmGrJ0XZD0BBy8TcQvTuCI3w=
-k8s.io/kubernetes v1.18.0 h1:rVe+edi5GwutPQJ4KIZq1Nk506nmnfyz/KOZVCLv7Yo=
 k8s.io/legacy-cloud-providers v0.17.3/go.mod h1:ujZML5v8efVQxiXXTG+nck7SjP8KhMRjUYNIsoSkYI0=
 k8s.io/metrics v0.17.3 h1:IqXkNK+5E3vnobFD923Mn1QJEt3fb6+sK0wIjtBzOvw=
 k8s.io/metrics v0.17.3/go.mod h1:HEJGy1fhHOjHggW9rMDBJBD3YuGroH3Y1pnIRw9FFaI=

From e9c375d266d72105a42b1910c71981e99ee7d9b6 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 01:05:22 -0700
Subject: [PATCH 562/668] reduce log noise

---
 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index c2a27c6b6b..2e21717fb4 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -67,7 +67,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con
 		}
 		return true, nil
 	}
-	if err := wait.PollImmediate(kconst.APICallRetryInterval, kconst.DefaultControlPlaneTimeout, podList); err != nil {
+	if err := wait.PollImmediate(kconst.APICallRetryInterval, timeout, podList); err != nil {
 		return fmt.Errorf("apiserver never returned a pod list")
 	}
 	glog.Infof("duration metric: took %s to wait for pod list to return data ...", time.Since(pStart))
@@ -84,7 +84,6 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error {
 	}
 
 	for _, pod := range pods.Items {
-		glog.Infof("found pod: %s", podStatusMsg(pod))
 		if pod.Status.Phase != core.PodRunning {
 			continue
 		}
@@ -114,7 +113,11 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout tim
 
 	checkRunning := func() (bool, error) {
 		if err := ExpectAppsRunning(cs, expected); err != nil {
-			return false, err
+			if time.Since(start) > minLogCheckTime {
+				glog.Info("error waiting for apps to be running: %v", err)
+				time.Sleep(kconst.APICallRetryInterval * 5)
+			}
+			return false, nil
 		}
 		return true, nil
 	}

From 1f4bf22d4e68b149a1ab64fdc8256732d6da69dc Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 01:14:09 -0700
Subject: [PATCH 563/668] lint

---
 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 2e21717fb4..a36e9a90cb 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -114,7 +114,7 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout tim
 	checkRunning := func() (bool, error) {
 		if err := ExpectAppsRunning(cs, expected); err != nil {
 			if time.Since(start) > minLogCheckTime {
-				glog.Info("error waiting for apps to be running: %v", err)
+				glog.Infof("error waiting for apps to be running: %v", err)
 				time.Sleep(kconst.APICallRetryInterval * 5)
 			}
 			return false, nil

From 4e1eed86023f0be17fcb7c0707c792bcc211f2e1 Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Wed, 8 Apr 2020 22:38:39 +0900
Subject: [PATCH 564/668] Run make extract

---
 translations/de.json    | 3 +++
 translations/es.json    | 3 +++
 translations/fr.json    | 3 +++
 translations/ja.json    | 3 +++
 translations/ko.json    | 3 +++
 translations/pl.json    | 3 +++
 translations/zh-CN.json | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/translations/de.json b/translations/de.json
index 4dafa749a1..6de2a7ec27 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -582,6 +582,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Möglicherweise müssen Sie die VM \"{{.name}}\" manuell von Ihrem Hypervisor entfernen",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/es.json b/translations/es.json
index 76827505a8..12de1548fe 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -583,6 +583,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Puede que tengas que retirar manualmente la VM \"{{.name}}\" de tu hipervisor",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/fr.json b/translations/fr.json
index 573981e1d2..145efc368b 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -582,6 +582,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Vous devrez peut-être supprimer la VM \"{{.name}}\" manuellement de votre hyperviseur.",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/ja.json b/translations/ja.json
index 189cc10be9..39cc78d543 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -593,6 +593,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザから「{{.name}}」VM を手動で削除することが必要な可能性があります",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "Hyper-V マネージャを停止して、「 minikube delete 」を再実行する必要があるかもしれません　",
 	"You must specify a service name": "サービスの名前を明示する必要があります",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストマシーンは KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認してください。「 virt-host-validate 」を実行して、デバッグしてください",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "ホストマシーンは仮想化をサポートしていません。もし VM 内で minikube を動かすのであれば、「 --driver=docker 」を試してください。そうでなければ、 BIOS で仮想化を有効にしてください",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "ホストマシーンが minikube の VM にパケットをルーティングすることができていません。もし VPN を有効しているのであれば、VPN を無効にする、あるいは VM の IP アドレスに再ルーティングしないように設定してください。もし VPN を使用していないのであれば、 VM 環境のルーティング周りのオプションを確認してください",
diff --git a/translations/ko.json b/translations/ko.json
index 8c20c92de6..3b53b6c04e 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -573,6 +573,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "service 이름을 명시해야 합니다",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "호스트가 KVM 가상화를 지원하지 않습니다. qemu-kvm 이 설치되었는지 확인 후, 문제 디버그를 위해 'virt-host-validate' 를 실행하세요",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "호스트가 가상화를 지원하지 않습니다. 가상 머신 안에서 minikube 를 실행 중인 경우, '--driver=none' 로 시도하세요. 그렇지 않다면, BIOS 에서 가상화를 활성화하세요",
diff --git a/translations/pl.json b/translations/pl.json
index 7bf259a38a..c969fd333c 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -581,6 +581,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "Musisz podać nazwę serwisu",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Twoje środowisko nie wspiera virtualizacji KVM. Upewnij się że qemu-kvm jest zainstalowane i uruchom 'virt-host-validate' aby rozwiązać problem.",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 1174030a21..47178a5694 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -661,6 +661,9 @@
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "您可能需要从管理程序中手动移除“{{.name}}”虚拟机",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
+	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
+	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",

From ec10017443d02754ec76ac2e813c531dddb6df27 Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Wed, 8 Apr 2020 22:43:47 +0900
Subject: [PATCH 565/668] Fix typo

---
 cmd/minikube/cmd/start_flags.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index b0556c79a2..5b768a5267 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -372,14 +372,14 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 			glog.Warningf("error calculate memory size in mb : %v", err)
 		}
 		if memInMB != existing.Memory {
-			out.WarningT("You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.")
 		}
 
 	}
 
 	if cmd.Flags().Changed(cpus) {
 		if viper.GetInt(cpus) != existing.CPUs {
-			out.WarningT("You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.")
 		}
 	}
 
@@ -390,7 +390,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		}
 
 		if memInMB != existing.DiskSize {
-			out.WarningT("You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.")
 		}
 	}
 

From 544f15cd2da528321a8af830865c660fa9af1679 Mon Sep 17 00:00:00 2001
From: tomocy <tomocy.dev@gmail.com>
Date: Wed, 8 Apr 2020 23:09:08 +0900
Subject: [PATCH 566/668] Update Japanese translations

---
 translations/ja.json | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/translations/ja.json b/translations/ja.json
index 39cc78d543..ed54c35154 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -562,33 +562,33 @@
 	"Use -A to specify all namespaces": "",
 	"Use VirtualBox to remove the conflicting VM and/or network interfaces": "",
 	"Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'.": "",
-	"User ID:      {{.userID}}": "",
-	"Userspace file server is shutdown": "",
-	"Userspace file server:": "",
+	"User ID:      {{.userID}}": "ユーザー ID:      {{.userID}}",
+	"Userspace file server is shutdown": "ユーザー側のファイルサーバーが停止しました",
+	"Userspace file server:": "ユーザー側のファイルサーバー",
 	"Using image repository {{.name}}": "イメージ リポジトリ {{.name}} を使用しています",
-	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the {{.driver}} driver based on existing profile": "",
-	"Using the {{.driver}} driver based on user configuration": "",
+	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "「 none 」ドライバで「 {{.runtime}} 」ランタイムを使用することは、テストされていない設定です！",
+	"Using the {{.driver}} driver based on existing profile": "プロフィールを元に、 {{.driver}} ドライバを使用します",
+	"Using the {{.driver}} driver based on user configuration": "設定を元に、 {{.driver}} ドライバを使用します",
 	"VM driver is one of: %v": "VM ドライバは次のいずれかです。%v",
-	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
-	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
-	"Verify the IP address of the running cluster in kubeconfig.": "",
-	"Verifying dashboard health ...": "",
-	"Verifying proxy health ...": "",
-	"Version:      {{.version}}": "",
-	"VirtualBox and Hyper-V are having a conflict. Use '--driver=hyperv' or disable Hyper-V using: 'bcdedit /set hypervisorlaunchtype off'": "",
-	"VirtualBox cannot create a network, probably because it conflicts with an existing network that minikube no longer knows about. Try running 'minikube delete'": "",
-	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "",
-	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "",
-	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "",
-	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "",
-	"Wait failed: {{.error}}": "",
+	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "検証中に、ディスクのサイズ（ {{.diskSize}} ）をパースできませんでした。{{.error}}",
+	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "HTTP_PROXY と HTTPS_PROXY 環境変数が正常に設定されているかを確認します",
+	"Verify the IP address of the running cluster in kubeconfig.": "Kubernetes の設定ファイルのクラスタの IP アドレスを確認します",
+	"Verifying dashboard health ...": "ダッシュボードの状態を確認しています...",
+	"Verifying proxy health ...": "プロキシの状態を確認しています...",
+	"Version:      {{.version}}": "バージョン:      {{.version}}",
+	"VirtualBox and Hyper-V are having a conflict. Use '--driver=hyperv' or disable Hyper-V using: 'bcdedit /set hypervisorlaunchtype off'": "VirtualBox と Hyper-V が衝突しています。「 --driver=hyperv 」を使用するか、以下のコマンドで Hyper-V を無効にしてください。 bcdedit /set hypervisorlaunchtype off",
+	"VirtualBox cannot create a network, probably because it conflicts with an existing network that minikube no longer knows about. Try running 'minikube delete'": "VirtualBox がネットワークを作成できません。おそらく minikube が把握していないネットワークと衝突しています。「 minikube delete 」を実行してみてください",
+	"VirtualBox is broken. Disable real-time anti-virus software, reboot, and reinstall VirtualBox if the problem continues.": "VirtualBox が故障しています。アンチウィルスソフトを無効にして、リブートしてください。もし問題が続くようであれば、 VirtualBox を再インストールしてください",
+	"VirtualBox is broken. Reinstall VirtualBox, reboot, and run 'minikube delete'.": "VirtualBox が故障しています。 VirtualBox を再インストールして、リブートした後に、「 minikube delete 」を実行してください",
+	"VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "VirtualBox はネットワークインターフェイスを見つけることができません。最新のリリースへとアップデートして、リブートしてみてください",
+	"Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "このコンピュータでは仮想化のサポートが無効化されています。もし VM で minikube を動かすのであれば、「 --driver=docker 」を試してみてください。そうでなければ、仮想化を有効にする方法を BIOS の説明書を調べてください",
+	"Wait failed: {{.error}}": "待機するのに失敗しました。{{.error}}",
 	"Wait until Kubernetes core services are healthy before exiting": "Kubernetes コアサービスが正常になるまで待機してから終了してください",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "NFS 共有のルートに指定する場所。デフォルトは /nfsshares（hyperkit ドライバのみ）",
-	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
+	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "仮想スイッチが明示的に設定されていない場合、デフォルトのではなく外部のスイッチを使用します。（Hyper-V ドライバのみ）",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "プロキシを使用しようとしていますが、現在の NO_PROXY 環境に minikube IP（{{.ip_address}}）は含まれていません。詳細については、{{.documentation_url}} をご覧ください",
-	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
-	"You can delete them using the following command(s):": "",
+	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "「 minikube kubectl -- get pods 」で、一致するバージョンを表示することができます",
+	"You can delete them using the following command(s):": "以下のコマンドで削除することができます",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザから「{{.name}}」VM を手動で削除することが必要な可能性があります",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "Hyper-V マネージャを停止して、「 minikube delete 」を再実行する必要があるかもしれません　",

From 5110da968d365cf5ec9e61c4e4d398707592c848 Mon Sep 17 00:00:00 2001
From: Kenta Iso <type.mafty@gmail.com>
Date: Thu, 9 Apr 2020 00:25:21 +0900
Subject: [PATCH 567/668] Fix `minikube start` output node name to match worker
 node name

---
 pkg/minikube/node/start.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 34b8822c07..b2129662cd 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -61,10 +61,11 @@ const waitTimeout = "wait-timeout"
 
 // Start spins up a guest and starts the kubernetes node.
 func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]bool, apiServer bool) (*kubeconfig.Settings, error) {
+	name := driver.MachineName(cc, n)
 	if apiServer {
-		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
+		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name})
 	} else {
-		out.T(out.ThumbsUp, "Starting node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
+		out.T(out.ThumbsUp, "Starting node {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name})
 	}
 
 	var kicGroup errgroup.Group

From 3a9bdd5328ba262949ef32f0bc4c207a32880fcb Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 11:35:36 -0700
Subject: [PATCH 568/668] Add df and desc po to post-mortem out

---
 test/integration/helpers.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 89eef10dc2..2007d0b6e3 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -209,6 +209,13 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("%s logs: %s", t.Name(), rr.Stdout)
 
+	rr, err := Run(t, exec.Command(Target(), "-p", profile, "ssh", "df -h /var/lib/docker/overlay2 /var /; du -hs /var/lib/docker/overlay2"))
+	if err != nil {
+		t.Logf("failed logs error: %v", err)
+		return
+	}
+	t.Logf("%s logs: %s", t.Name(), rr.Stdout)
+
 	st = Status(context.Background(), t, Target(), profile, "APIServer")
 	if st != state.Running.String() {
 		t.Logf("%q apiserver is not running, skipping kubectl commands (state=%q)", profile, st)
@@ -228,6 +235,14 @@ func clusterLogs(t *testing.T, profile string) {
 	} else {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Stdout)
 	}
+
+	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A"))
+	if err != nil {
+		t.Logf("%s: %v", rr.Command(), err)
+	} else {
+		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Stdout)
+	}
+
 	t.Logf("<<< %s FAILED: end of post-mortem logs <<<", t.Name())
 }
 

From 5ce7b4b147fdaa5f144276e26df39656507b9ad5 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 12:29:23 -0700
Subject: [PATCH 569/668] Parallelize post-cluster steps

---
 pkg/addons/addons.go        | 22 ++++++++++++++++------
 pkg/minikube/node/config.go |  8 +++++++-
 pkg/minikube/node/start.go  | 18 +++++++++++++-----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 63ae1507df..991347e3d3 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -23,6 +23,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/golang/glog"
@@ -287,7 +288,12 @@ func enableOrDisableStorageClasses(cc *config.ClusterConfig, name string, val st
 }
 
 // Start enables the default addons for a profile, plus any additional
-func Start(profile string, toEnable map[string]bool, additional []string) {
+func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, additional []string) {
+	wg.Add(1)
+	defer func() {
+		wg.Done()
+	}()
+
 	start := time.Now()
 	glog.Infof("enableAddons start: toEnable=%v, additional=%s", toEnable, additional)
 	defer func() {
@@ -323,10 +329,14 @@ func Start(profile string, toEnable map[string]bool, additional []string) {
 
 	out.T(out.AddonEnable, "Enabling addons: {{.addons}}", out.V{"addons": strings.Join(toEnableList, ", ")})
 	for _, a := range toEnableList {
-		err := Set(a, "true", profile)
-		if err != nil {
-			// Intentionally non-fatal
-			out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": a, "error": err})
-		}
+		go func() {
+			wg.Add(1)
+			err := Set(a, "true", profile)
+			if err != nil {
+				// Intentionally non-fatal
+				out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": a, "error": err})
+			}
+			wg.Done()
+		}()
 	}
 }
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index ef0f66dc12..61b5c6f600 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -22,6 +22,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"sync"
 
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
@@ -46,7 +47,12 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 }
 
 // configureMounts configures any requested filesystem mounts
-func configureMounts() {
+func configureMounts(wg sync.WaitGroup) {
+	wg.Add(1)
+	defer func() {
+		wg.Done()
+	}()
+
 	if !viper.GetBool(createMount) {
 		return
 	}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 9f4dbbd0bf..0f33ed3ae1 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -137,15 +137,21 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 	}
 
-	configureMounts()
+	var wg sync.WaitGroup
 
-	if err := CacheAndLoadImagesInConfig(); err != nil {
-		out.FailureT("Unable to load cached images from config file.")
-	}
+	go configureMounts(wg)
+
+	go func() {
+		wg.Add(1)
+		if err := CacheAndLoadImagesInConfig(); err != nil {
+			out.FailureT("Unable to load cached images from config file: {{error}}", out.V{"error": err})
+		}
+		wg.Done()
+	}()
 
 	// enable addons, both old and new!
 	if existingAddons != nil {
-		addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList)
+		go addons.Start(wg, viper.GetString(config.ProfileName), existingAddons, config.AddonList)
 	}
 
 	if apiServer {
@@ -185,6 +191,8 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 		}
 	}
 
+	wg.Wait()
+
 	return kcs, nil
 }
 

From 70329bf51d859f98977c4e6b847cf8b9b61b993a Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 8 Apr 2020 13:44:04 -0700
Subject: [PATCH 570/668] Code review comments

---
 pkg/drivers/kic/kic.go     | 2 +-
 pkg/drivers/kic/oci/oci.go | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index a1468b53e5..f8607c0c4d 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -113,7 +113,7 @@ func (d *Driver) Create() error {
 		}
 	}
 
-	if err := oci.SetupContainerNode(params); err != nil {
+	if err := oci.PrepareContainerNode(params); err != nil {
 		return errors.Wrap(err, "setting up container node")
 	}
 
diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 6605c3e332..372dad8620 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -84,8 +84,9 @@ func DeleteContainer(ociBin string, name string) error {
 	return nil
 }
 
-// SetupContainerNode sets up the container node
-func SetupContainerNode(p CreateParams) error {
+// PrepareContainerNode sets up the container node befpre CreateContainerNode is caleld
+// for the docker runtime, it creates a docker volume which will be mounted into kic
+func PrepareContainerNode(p CreateParams) error {
 	if p.OCIBinary != Docker {
 		return nil
 	}

From 2f84aa642ffb694a15c5c65096252fbf64d90a52 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 13:54:20 -0700
Subject: [PATCH 571/668] address code review comment

---
 pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index a36e9a90cb..70d808b326 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -113,10 +113,8 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout tim
 
 	checkRunning := func() (bool, error) {
 		if err := ExpectAppsRunning(cs, expected); err != nil {
-			if time.Since(start) > minLogCheckTime {
-				glog.Infof("error waiting for apps to be running: %v", err)
-				time.Sleep(kconst.APICallRetryInterval * 5)
-			}
+			glog.Infof("error waiting for apps to be running: %v", err)
+			time.Sleep(kconst.APICallRetryInterval * 5)
 			return false, nil
 		}
 		return true, nil

From 1497b941450085041282a663aa8f92c75b8d76a2 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 8 Apr 2020 14:06:35 -0700
Subject: [PATCH 572/668] start does not auto-upgrade k8s version

`minikube start` does not auto-upgrade k8s version since #5798
---
 site/content/en/docs/handbook/config.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/site/content/en/docs/handbook/config.md b/site/content/en/docs/handbook/config.md
index 34b83cb5b7..783d03489d 100644
--- a/site/content/en/docs/handbook/config.md
+++ b/site/content/en/docs/handbook/config.md
@@ -41,10 +41,6 @@ By default, minikube installs the latest stable version of Kubernetes that was a
 
 `minikube start --kubernetes-version=v1.11.10`
   
-If you omit this flag, minikube will upgrade your cluster to the default version. If you would like to pin to a specific Kubernetes version across clusters, restarts, and upgrades to minikube, use:
-
-`minikube config set kubernetes-version v1.11.0`
-
 minikube follows the [Kubernetes Version and Version Skew Support Policy](https://kubernetes.io/docs/setup/version-skew-policy/), so we guarantee support for the latest build for the last 3 minor Kubernetes releases. When practical, minikube aims for the last 6 minor releases so that users can emulate legacy environments.
 
 As of September 2019, this means that minikube supports and actively tests against the latest builds of:

From ad85883d8d705ec665cbcb1b825ef8cd8ab35443 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 14:15:15 -0700
Subject: [PATCH 573/668] site npm audit fix

---
 site/package-lock.json | 281 ++++++++++++++++++++++++-----------------
 1 file changed, 166 insertions(+), 115 deletions(-)

diff --git a/site/package-lock.json b/site/package-lock.json
index 0cb1933f78..bbcb3785d0 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -259,6 +259,16 @@
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -356,9 +366,9 @@
       }
     },
     "chokidar": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
@@ -480,12 +490,14 @@
       }
     },
     "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
       }
@@ -574,6 +586,15 @@
       "integrity": "sha512-/QI4hMpAh48a1Sea6PALGv+kuVne9A2EWGd8HrWHMdYhIzGtbhVVHh6heL5fAzGaDnZuPyrlWJRl8WPm4RyiQQ==",
       "dev": true
     },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -596,13 +617,13 @@
       "dev": true
     },
     "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
         "is-stream": "^1.1.0",
         "npm-run-path": "^2.0.0",
         "p-finally": "^1.0.0",
@@ -745,6 +766,13 @@
         "micromatch": "^3.1.10"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -810,14 +838,15 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
+      "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
       "dev": true,
       "optional": true,
       "requires": {
+        "bindings": "^1.5.0",
         "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
+        "node-pre-gyp": "*"
       },
       "dependencies": {
         "abbrev": {
@@ -865,7 +894,7 @@
           }
         },
         "chownr": {
-          "version": "1.1.1",
+          "version": "1.1.4",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -895,7 +924,7 @@
           "optional": true
         },
         "debug": {
-          "version": "4.1.1",
+          "version": "3.2.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -922,12 +951,12 @@
           "optional": true
         },
         "fs-minipass": {
-          "version": "1.2.5",
+          "version": "1.2.7",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.6.0"
           }
         },
         "fs.realpath": {
@@ -953,7 +982,7 @@
           }
         },
         "glob": {
-          "version": "7.1.3",
+          "version": "7.1.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -982,7 +1011,7 @@
           }
         },
         "ignore-walk": {
-          "version": "3.0.1",
+          "version": "3.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1001,7 +1030,7 @@
           }
         },
         "inherits": {
-          "version": "2.0.3",
+          "version": "2.0.4",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1037,13 +1066,13 @@
           }
         },
         "minimist": {
-          "version": "0.0.8",
+          "version": "1.2.5",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "minipass": {
-          "version": "2.3.5",
+          "version": "2.9.0",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1053,42 +1082,42 @@
           }
         },
         "minizlib": {
-          "version": "1.2.1",
+          "version": "1.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.9.0"
           }
         },
         "mkdirp": {
-          "version": "0.5.1",
+          "version": "0.5.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minimist": "0.0.8"
+            "minimist": "^1.2.5"
           }
         },
         "ms": {
-          "version": "2.1.1",
+          "version": "2.1.2",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.3.0",
+          "version": "2.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^4.1.0",
+            "debug": "^3.2.6",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.12.0",
+          "version": "0.14.0",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1102,11 +1131,11 @@
             "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
-            "tar": "^4"
+            "tar": "^4.4.2"
           }
         },
         "nopt": {
-          "version": "4.0.1",
+          "version": "4.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1116,19 +1145,29 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.6",
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.4.1",
+          "version": "1.4.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "npm-bundled": "^1.0.1",
+            "npm-normalize-package-bin": "^1.0.1"
           }
         },
         "npmlog": {
@@ -1193,7 +1232,7 @@
           "optional": true
         },
         "process-nextick-args": {
-          "version": "2.0.0",
+          "version": "2.0.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1208,18 +1247,10 @@
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
           }
         },
         "readable-stream": {
-          "version": "2.3.6",
+          "version": "2.3.7",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1234,7 +1265,7 @@
           }
         },
         "rimraf": {
-          "version": "2.6.3",
+          "version": "2.7.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1261,7 +1292,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.7.0",
+          "version": "5.7.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1314,18 +1345,18 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.8",
+          "version": "4.4.13",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
             "mkdirp": "^0.5.0",
             "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "yallist": "^3.0.3"
           }
         },
         "util-deprecate": {
@@ -1350,7 +1381,7 @@
           "optional": true
         },
         "yallist": {
-          "version": "3.0.3",
+          "version": "3.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1370,10 +1401,13 @@
       "dev": true
     },
     "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
     },
     "get-value": {
       "version": "2.0.6",
@@ -1504,9 +1538,9 @@
       "dev": true
     },
     "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
     "is-accessor-descriptor": {
@@ -1701,18 +1735,18 @@
       }
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "^2.0.0"
       }
     },
     "locate-path": {
@@ -1740,14 +1774,13 @@
         "chalk": "^2.0.1"
       }
     },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "p-defer": "^1.0.0"
       }
     },
     "map-cache": {
@@ -1766,12 +1799,14 @@
       }
     },
     "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
       }
     },
     "merge2": {
@@ -1802,9 +1837,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
     "minimatch": {
@@ -1817,9 +1852,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "mixin-deep": {
@@ -1875,6 +1910,12 @@
         "to-regex": "^3.0.1"
       }
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
     "node-releases": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz",
@@ -1988,22 +2029,34 @@
       "dev": true
     },
     "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
       }
     },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -2189,11 +2242,15 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
     },
     "read-cache": {
       "version": "1.0.0",
@@ -2213,9 +2270,9 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
@@ -2362,9 +2419,9 @@
       "dev": true
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
     "slash": {
@@ -2685,9 +2742,9 @@
       }
     },
     "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
     "urix": {
@@ -2782,23 +2839,17 @@
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
       "dev": true
     },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
     "yargs": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-      "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
       "dev": true,
       "requires": {
         "cliui": "^4.0.0",
         "decamelize": "^1.1.1",
         "find-up": "^2.1.0",
         "get-caller-file": "^1.0.1",
-        "os-locale": "^2.0.0",
+        "os-locale": "^3.1.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",

From b5028746ccd54449b2b44ddbf36fedb7e2b5f4fe Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 8 Apr 2020 14:30:45 -0700
Subject: [PATCH 574/668] Update note on supported k8s versions

---
 site/content/en/docs/handbook/config.md | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/site/content/en/docs/handbook/config.md b/site/content/en/docs/handbook/config.md
index 783d03489d..c14dfc85f8 100644
--- a/site/content/en/docs/handbook/config.md
+++ b/site/content/en/docs/handbook/config.md
@@ -41,18 +41,9 @@ By default, minikube installs the latest stable version of Kubernetes that was a
 
 `minikube start --kubernetes-version=v1.11.10`
   
-minikube follows the [Kubernetes Version and Version Skew Support Policy](https://kubernetes.io/docs/setup/version-skew-policy/), so we guarantee support for the latest build for the last 3 minor Kubernetes releases. When practical, minikube aims for the last 6 minor releases so that users can emulate legacy environments.
+minikube follows the [Kubernetes Version and Version Skew Support Policy](https://kubernetes.io/docs/setup/version-skew-policy/), so we guarantee support for the latest build for the last 3 minor Kubernetes releases. When practical, minikube aims to support older releases as well so that users can emulate legacy environments.
 
-As of September 2019, this means that minikube supports and actively tests against the latest builds of:
-
-* v1.16 (default)
-* v1.15
-* v1.14
-* v1.13
-* v1.12
-* v1.11 (best effort)
-
-For more up to date information, see `OldestKubernetesVersion` and `NewestKubernetesVersion` in [constants.go](https://github.com/kubernetes/minikube/blob/master/pkg/minikube/constants/constants.go)
+For up to date information on supported versions, see `OldestKubernetesVersion` and `NewestKubernetesVersion` in [constants.go](https://github.com/kubernetes/minikube/blob/master/pkg/minikube/constants/constants.go)
 
 ### Enabling feature gates
 

From e0271c53d8e0ad49fc0d73f21020bf0510b22729 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 14:39:47 -0700
Subject: [PATCH 575/668] update docsy theme

---
 site/themes/docsy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/themes/docsy b/site/themes/docsy
index e13afeb5c0..dd303fd19c 160000
--- a/site/themes/docsy
+++ b/site/themes/docsy
@@ -1 +1 @@
-Subproject commit e13afeb5c0ffa5a2dff237fffa77bea80319f578
+Subproject commit dd303fd19cc13ffc01bcbe86ff54f21e423d04de

From ae74bb0bce0bf26075f744a1938a9cb8971b2f87 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 14:41:41 -0700
Subject: [PATCH 576/668] make site search wider

---
 site/assets/scss/_variables_project.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index 01a924faa8..5d5d9059c4 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -163,3 +163,8 @@ div.td-content {
         font-size: 1.3rem !important;
     }
 }
+
+// make search bar wider https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
+.popover.offline-search-result {
+    max-width: 460px;
+}
\ No newline at end of file

From 6af9002d9c3b2bbbb120054fc78cfe475cd074fb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 14:45:17 -0700
Subject: [PATCH 577/668] change bg color

---
 site/assets/scss/_variables_project.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index 5d5d9059c4..857958fb5d 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -166,5 +166,6 @@ div.td-content {
 
 // make search bar wider https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
 .popover.offline-search-result {
+    background-color: $mk-dark !important;
     max-width: 460px;
 }
\ No newline at end of file

From e03f079eb385f6a53f49a58e28a4182eac65f615 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 14:53:52 -0700
Subject: [PATCH 578/668] change bg color

---
 site/assets/scss/_variables_project.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index 857958fb5d..f9c97d406a 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -166,6 +166,6 @@ div.td-content {
 
 // make search bar wider https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
 .popover.offline-search-result {
-    background-color: $mk-dark !important;
+    background-color: $gray-200 !important;
     max-width: 460px;
 }
\ No newline at end of file

From 546c8daa13e316f1990b93d1f5448adef26f61bf Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:04:12 -0700
Subject: [PATCH 579/668] cert sync: ignore 0-byte certs, test for them
 explicitly

---
 pkg/minikube/bootstrapper/certs.go  | 68 ++++++++++++++++++-----------
 test/integration/functional_test.go | 37 ++++++++++++++--
 2 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index 28ea6e5295..35833705e0 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -323,20 +323,33 @@ func collectCACerts() (map[string]string, error) {
 		if err != nil {
 			return err
 		}
+		if info == nil {
+			return nil
+		}
+		if info.IsDir() {
+			return nil
+		}
 
-		if info != nil && !info.IsDir() {
-			ext := strings.ToLower(filepath.Ext(hostpath))
-			if ext == ".crt" || ext == ".pem" {
-				glog.Infof("found cert: %s (%d bytes)", info.Name(), info.Size())
-				validPem, err := isValidPEMCertificate(hostpath)
-				if err != nil {
-					return err
-				}
-				if validPem {
-					filename := filepath.Base(hostpath)
-					dst := fmt.Sprintf("%s.%s", strings.TrimSuffix(filename, ext), "pem")
-					certFiles[hostpath] = path.Join(vmpath.GuestCertAuthDir, dst)
-				}
+		fullPath := filepath.Join(certsDir, hostpath)
+		ext := strings.ToLower(filepath.Ext(hostpath))
+
+		if ext == ".crt" || ext == ".pem" {
+			if info.Size() < 32 {
+				glog.Warningf("ignoring %s, impossibly tiny %d bytes", fullPath, info.Size())
+				return nil
+			}
+
+			glog.Infof("found cert: %s (%d bytes)", fullPath, info.Size())
+
+			validPem, err := isValidPEMCertificate(hostpath)
+			if err != nil {
+				return err
+			}
+
+			if validPem {
+				filename := filepath.Base(hostpath)
+				dst := fmt.Sprintf("%s.%s", strings.TrimSuffix(filename, ext), "pem")
+				certFiles[hostpath] = path.Join(vmpath.GuestCertAuthDir, dst)
 			}
 		}
 		return nil
@@ -394,23 +407,26 @@ func installCertSymlinks(cr command.Runner, caCerts map[string]string) error {
 	for _, caCertFile := range caCerts {
 		dstFilename := path.Base(caCertFile)
 		certStorePath := path.Join(vmpath.GuestCertStoreDir, dstFilename)
-		// If the cert really exists, add a named symlink
-		cmd := fmt.Sprintf("test -f %s && ln -fs %s %s", caCertFile, caCertFile, certStorePath)
+
+		cmd := fmt.Sprintf("test -s %s && ln -fs %s %s", caCertFile, caCertFile, certStorePath)
 		if _, err := cr.RunCmd(exec.Command("sudo", "/bin/bash", "-c", cmd)); err != nil {
 			return errors.Wrapf(err, "create symlink for %s", caCertFile)
 		}
-		if hasSSLBinary {
-			subjectHash, err := getSubjectHash(cr, caCertFile)
-			if err != nil {
-				return errors.Wrapf(err, "calculate hash for cacert %s", caCertFile)
-			}
-			subjectHashLink := path.Join(vmpath.GuestCertStoreDir, fmt.Sprintf("%s.0", subjectHash))
 
-			// NOTE: This symlink may exist, but point to a missing file
-			cmd := fmt.Sprintf("test -L %s || ln -fs %s %s", subjectHashLink, certStorePath, subjectHashLink)
-			if _, err := cr.RunCmd(exec.Command("sudo", "/bin/bash", "-c", cmd)); err != nil {
-				return errors.Wrapf(err, "create symlink for %s", caCertFile)
-			}
+		if !hasSSLBinary {
+			continue
+		}
+
+		subjectHash, err := getSubjectHash(cr, caCertFile)
+		if err != nil {
+			return errors.Wrapf(err, "calculate hash for cacert %s", caCertFile)
+		}
+		subjectHashLink := path.Join(vmpath.GuestCertStoreDir, fmt.Sprintf("%s.0", subjectHash))
+
+		// NOTE: This symlink may exist, but point to a missing file
+		cmd = fmt.Sprintf("test -L %s || ln -fs %s %s", subjectHashLink, certStorePath, subjectHashLink)
+		if _, err := cr.RunCmd(exec.Command("sudo", "/bin/bash", "-c", cmd)); err != nil {
+			return errors.Wrapf(err, "create symlink for %s", caCertFile)
 		}
 	}
 	return nil
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 9dd63bbc29..8545e811a7 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -73,6 +73,11 @@ func TestFunctional(t *testing.T) {
 		if err := os.Remove(p); err != nil {
 			t.Logf("unable to remove %q: %v", p, err)
 		}
+		p = localEmptyCertPath()
+		if err := os.Remove(p); err != nil {
+			t.Logf("unable to remove %q: %v", p, err)
+		}
+
 		CleanupWithLogs(t, profile, cancel)
 	}()
 
@@ -793,18 +798,44 @@ func localTestCertPath() string {
 	return filepath.Join(localpath.MiniPath(), "/certs", testCert())
 }
 
+// localEmptyCertPath is where the test file will be synced into the VM
+func localEmptyCertPath() string {
+	return filepath.Join(localpath.MiniPath(), "/certs", fmt.Sprintf("%d_empty.pem", os.Getpid()))
+}
+
 // Copy extra file into minikube home folder for file sync test
 func setupFileSync(ctx context.Context, t *testing.T, profile string) {
 	p := localSyncTestPath()
 	t.Logf("local sync path: %s", p)
 	err := copy.Copy("./testdata/sync.test", p)
 	if err != nil {
-		t.Fatalf("failed to copy ./testdata/sync.test : %v", err)
+		t.Fatalf("failed to copy ./testdata/sync.test: %v", err)
 	}
 
-	err = copy.Copy("./testdata/minikube_test.pem", localTestCertPath())
+	testPem := "./testdata/minikube_test.pem"
+
+	err = copy.Copy(testPem, localTestCertPath())
 	if err != nil {
-		t.Fatalf("failed to copy ./testdata/minikube_test.pem : %v", err)
+		t.Fatalf("failed to copy %s: %v", testPem, err)
+	}
+
+	want, err := os.Stat(testPem)
+	if err != nil {
+		t.Fatalf("stat failed: %v", err)
+	}
+
+	got, err := os.Stat(localTestCertPath())
+	if err != nil {
+		t.Fatalf("stat failed: %v", err)
+	}
+
+	if want.Size() != got.Size() {
+		t.Errorf("%s size=%d, want %d", localTestCertPath(), got.Size(), want.Size())
+	}
+
+	// Create an empty file just to mess with people
+	if _, err := os.Create(localEmptyCertPath()); err != nil {
+		t.Fatalf("create failed: %v", err)
 	}
 }
 

From a585340bd6f0824f971bea15b27ea1ba0de17517 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 15:15:23 -0700
Subject: [PATCH 580/668] address review comments

---
 go.mod                                        |  10 +-
 go.sum                                        | 249 ++++++++++++++++++
 .../bsutil/kverify/system_pods.go             |   5 +-
 3 files changed, 257 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 2a00c74992..859e0038ca 100644
--- a/go.mod
+++ b/go.mod
@@ -22,10 +22,12 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/go-ole/go-ole v1.2.4 // indirect
+	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
+	github.com/gohugoio/hugo v0.68.3 // indirect
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/go-cmp v0.3.1
+	github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93
 	github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/googleapis/gnostic v0.3.0 // indirect
@@ -47,10 +49,10 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/libvirt/libvirt-go v3.4.0+incompatible
 	github.com/machine-drivers/docker-machine-driver-vmware v0.1.1
-	github.com/mattn/go-isatty v0.0.9
+	github.com/mattn/go-isatty v0.0.11
 	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
 	github.com/moby/hyperkit v0.0.0-20171020124204-a12cd7250bcd
-	github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5
+	github.com/olekukonko/tablewriter v0.0.4
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
@@ -67,7 +69,7 @@ require (
 	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.3.2
+	github.com/spf13/viper v1.6.1
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f
diff --git a/go.sum b/go.sum
index c997562aea..c7ab22f29a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,17 +1,37 @@
 bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
+contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
+contrib.go.opencensus.io/exporter/stackdriver v0.11.0/go.mod h1:hA7rlmtavV03FGxzWXAPBUnZeZBhWN/QYQAuMtxc9Bk=
+contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
+contrib.go.opencensus.io/resource v0.0.0-20190131005048-21591786a5e0/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA=
+github.com/Azure/azure-amqp-common-go v1.1.3/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8=
+github.com/Azure/azure-amqp-common-go v1.1.4/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8=
+github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg=
+github.com/Azure/azure-pipeline-go v0.1.9 h1:u7JFb9fFTE6Y/j8ae2VK33ePrRqJqoCM/IWkQdAZ+rg=
+github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg=
+github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v27.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-service-bus-go v0.4.1/go.mod h1:d9ho9e/06euiTwGpKxmlbpPhFUsfCsq6a4tZ68r51qI=
+github.com/Azure/azure-storage-blob-go v0.6.0 h1:SEATKb3LIHcaSIX+E6/K4kJpwfuozFEsmt5rS56N6CE=
+github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest v11.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest v11.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
@@ -26,10 +46,16 @@ github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocm
 github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
 github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU=
+github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
+github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190418212003-6ac0b49e7197/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo=
 github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
@@ -43,6 +69,7 @@ github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tT
 github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d h1:u64+IetywsPQ0gJ/4cXBJ/KiXV9xTKRMoaCOzW9PI3g=
 github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OpenPeeDeeP/depguard v1.0.0/go.mod h1:7/4sitnI9YlQgTLLk734QlzXT8DuHVnAyztLplQjk+o=
 github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM=
 github.com/Parallels/docker-machine-parallels v1.3.0 h1:RG1fyf3v1GwXMCeHRiZkB4tL9phFZEv6ixcvRZ1raN8=
@@ -55,6 +82,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
@@ -63,22 +92,41 @@ github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmx
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c h1:18gEt7qzn7CW7qMkfPTFyyotlPbvPQo9o4IDV8jZqP4=
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
+github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
+github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
+github.com/alecthomas/chroma v0.7.1 h1:G1i02OhUbRi2nJxcNkwJaY/J1gHXj9tt72qN6ZouLFQ=
+github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc=
+github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
+github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
+github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
+github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
+github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E=
+github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
+github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.16.26 h1:GWkl3rkRO/JGRTWoLLIqwf7AWC4/W/1hMOUZqmX0js4=
 github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.18.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.19.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.1 h1:MXnqY6SlWySaZAqNnXThOvjRFdiiOuKtC6i7baFdNdU=
 github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/bazelbuild/bazel-gazelle v0.18.2/go.mod h1:D0ehMSbS+vesFsLGiD6JXu3mVEzOlfUl8wNnq+x/9p0=
@@ -92,6 +140,13 @@ github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
+github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
+github.com/bep/gitmap v1.1.1 h1:Nf8ySnC3I7/xPjuWeCwzukUFv185iTUQ6nOvLy9gCJA=
+github.com/bep/gitmap v1.1.1/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY=
+github.com/bep/golibsass v0.5.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
+github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
+github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -107,13 +162,16 @@ github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b h1:T4nWG1TXIxeor8mAu5bFguPJgSIGhZqv/f0z55KCrJM=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
 github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
 github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/cheggaaa/pb/v3 v3.0.1 h1:m0BngUk2LuSRYdx4fujDKNRXNDpbNCfptPfVT2m6OJY=
@@ -125,6 +183,7 @@ github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuij
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
 github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
 github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa h1:GnRy2maqb8vcJhYRN5L+5WyYNKfUG4otiz2zxE182ng=
@@ -139,6 +198,7 @@ github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kw
 github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=
 github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 github.com/coredns/corefile-migration v1.0.4/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
@@ -150,18 +210,30 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
+github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
+github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc=
+github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
+github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
+github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 h1:2HQmlpI3yI9deH18Q6xiSOIjXD4sLI55Y/gfpa8/558=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
@@ -185,7 +257,11 @@ github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34/go.mod h
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs=
 github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
@@ -209,6 +285,12 @@ github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
+github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ=
+github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk=
+github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -220,6 +302,7 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0
 github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
 github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
+github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -277,6 +360,7 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
 github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ=
@@ -291,22 +375,32 @@ github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoM
 github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc=
 github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8=
 github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU=
+github.com/gobuffalo/envy v1.9.0 h1:eZR0DuEgVLfeIb1zIKt3bT4YovIMf9O9LXQeCZLXpqE=
+github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f h1:zlOR3rOlPAVvtfuxGKoghCmop5B0TRyu/ZieziZuGiM=
 github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gohugoio/hugo v0.68.3 h1:dLzfE2XLP3K4zD0muTGAhbhHaI/+pvXR+ZVCc8oKWvs=
+github.com/gohugoio/hugo v0.68.3/go.mod h1:jj7XAfCteXVxl6peDyGGiH60XPfWIvDy05qHFzNRQbo=
+github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95 h1:sgew0XCnZwnzpWxTt3V8LLiCO7OQi3C6dycaE67wfkU=
+github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8=
 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.0.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
@@ -319,6 +413,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
 github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0=
@@ -348,6 +444,8 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93 h1:VvBteXw2zOXEgm0o3PgONTWf+bhUGsCaiNn3pbkU9LA=
+github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2 h1:/z0FoA29APs30PljxT6GoZQekF5c1cYhow2osFsj1XU=
 github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2/go.mod h1:Wtl/v6YdQxv397EREtzwgd9+Ud7Q5D8XMbi3Zazgkrs=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
@@ -359,6 +457,7 @@ github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -366,6 +465,10 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/wire v0.2.2 h1:fSIRzE/K12IaNgV6X0173X/oLrTwHKRiMcFZhiDrN3s=
+github.com/google/wire v0.2.2/go.mod h1:7FHVg6mFpFQrjeUZrm+BaD50N5jnDKm50uVPTpyYOmU=
+github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww=
+github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -377,18 +480,27 @@ github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
+github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -427,7 +539,10 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 h1:XboatR7lasl05yel5hNXF7kQBw2oFUGdMztcgisfhNU=
 github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6/go.mod h1:RmeVYf9XrPRbRc3XIx0gLYA8qOFvNoPOfaEZduRlEp4=
+github.com/jdkato/prose v1.1.1 h1:r6CwY09U97IZNgNQEHoeCh2nvg2e8WCOGjPH/b7lowI=
+github.com/jdkato/prose v1.1.1/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -436,6 +551,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -481,12 +598,17 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
+github.com/kyokomi/emoji v2.1.0+incompatible h1:+DYU2RgpI6OHG4oQkM5KlqD3Wd3UPEsX8jamTo1Mp6o=
+github.com/kyokomi/emoji v2.1.0+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
 github.com/libvirt/libvirt-go v3.4.0+incompatible h1:Cpyalgj1x8JIeTlL6SDYZBo7j8nY3+5XHqmi8DaunCk=
 github.com/libvirt/libvirt-go v3.4.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE=
@@ -504,6 +626,7 @@ github.com/machine-drivers/docker-machine-driver-vmware v0.1.1 h1:+E1IKKk+6kaQrC
 github.com/machine-drivers/docker-machine-driver-vmware v0.1.1/go.mod h1:ej014C83EmSnxJeJ8PtVb8OLJ91PJKO1Q8Y7sM5CK0o=
 github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8 h1:CIddS19fAKG4rUkZAotX0WPQtx/v/SdLhhDU3MVhLy0=
 github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8/go.mod h1:79Uwa2hGd5S39LDJt58s8JZcIhGEK6pkq9bsuTbFWbk=
+github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.7.6/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -516,7 +639,10 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/markbates/inflect v1.0.0 h1:gTffXSQCc+WaIvBcI/IItJQMOemietXr5EIKLXDYqI4=
+github.com/markbates/inflect v1.0.0/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
+github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -526,9 +652,13 @@ github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc=
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
@@ -541,6 +671,8 @@ github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPx
 github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
 github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/mmark v1.3.6 h1:t47x5vThdwgLJzofNsbsAl7gmIiJ7kbDQN5BxwBmwvY=
+github.com/miekg/mmark v1.3.6/go.mod h1:w7r9mkTvpS55jlfyn22qJ618itLryxXBhA7Jp3FIlkw=
 github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
 github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -552,6 +684,8 @@ github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdI
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y=
+github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
 github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -572,6 +706,8 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
 github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 h1:7InQ7/zrOh6SlFjaXFubv0xX0HsuC9qJsdqm7bNQpYM=
 github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
+github.com/muesli/smartcrop v0.3.0 h1:JTlSkmxWg/oQ1TcLDoypuirdE8Y/jzNirQeLkxpA6Oc=
+github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
@@ -582,10 +718,20 @@ github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h
 github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q=
+github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
+github.com/niklasfasching/go-org v1.0.0 h1:lDh8zKtmbaQupKQhLyVp1clG+JojkVoVBH9bT7c9O70=
+github.com/niklasfasching/go-org v1.0.0/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU=
+github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5 h1:58+kh9C6jJVXYjt8IE48G2eWl6BjwU5Gj0gqY84fy78=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
@@ -611,6 +757,8 @@ github.com/opencontainers/runtime-spec v1.0.0 h1:O6L965K88AilqnxeYPks/75HLpp4IG+
 github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52 h1:B8hYj3NxHmjsC3T+tnlZ1UhInqUgnyF1zlGPmzNg2Qk=
 github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
+github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc=
 github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95 h1:+OLn68pqasWca0z5ryit9KGfp3sUsW4Lqg32iRMJyzs=
@@ -622,10 +770,13 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
 github.com/pelletier/go-toml v1.1.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4=
+github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/browser v0.0.0-20160118053552-9302be274faa h1:od00Tr1U7+cLVtc+RNFmR53spHUF98Ziu33S8UIQnt0=
 github.com/pkg/browser v0.0.0-20160118053552-9302be274faa/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -641,45 +792,65 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.5.1 h1:asQ0uD7BN9RU5Im41SEEZTwCi/zAXdMOLS3npYaos2g=
+github.com/rogpeppe/go-internal v1.5.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
 github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns=
+github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
+github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sanity-io/litter v1.2.0 h1:DGJO0bxH/+C2EukzOSBmAlxmkhVMGqzvcx/rvySYw9M=
+github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97 h1:DWY4yZN6w+FSKMeqBBXaalT8zmCn4DVwBGopShnlwFE=
 github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/seccomp/libseccomp-golang v0.9.1 h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM=
@@ -696,8 +867,10 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.0/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -706,10 +879,14 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
 github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/fsync v0.9.0 h1:f9CEt3DOB2mnHxZaftmEOFWjABEvKM/xpf3cUwJrGOY=
+github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0=
 github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
@@ -724,25 +901,41 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.0.2/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
 github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
+github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/tdewolff/minify/v2 v2.6.1 h1:UJLhbs2Q/iDrqA79EEyKE48uYHeAMPVdiUzdtKsatJ8=
+github.com/tdewolff/minify/v2 v2.6.1/go.mod h1:l9hbQnH096st77OkscoRUvKdd23oUM6pDZpYx381sPo=
+github.com/tdewolff/parse/v2 v2.3.14 h1:Tzam5YoUXx7gybFEfR/zcuR74PXADnrfUqYUXL+K5oA=
+github.com/tdewolff/parse/v2 v2.3.14/go.mod h1:+V2lSZ93xpH2Csfs/vtNY1Fjr8kcFMsZKjyLoSkZbM0=
+github.com/tdewolff/test v1.0.4/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
+github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
+github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
+github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
 github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
@@ -753,6 +946,7 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/quicktemplate v1.1.1/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vdemeester/k8s-pkg-credentialprovider v0.0.0-20200107171650-7c61ffa44238/go.mod h1:JwQJCMWpUDqjZrB5jpw0f5VbN7U95zxFy1ZDpoEarGo=
@@ -762,6 +956,8 @@ github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJ
 github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 h1:J9gO8RJCAFlln1jsvRba/CWVUnMHwObklfxxjErl1uk=
 github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -771,25 +967,39 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.25 h1:isv+Q6HQAmmL2Ofcmg8QauBmDPlUUnSoNhEcC940Rds=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f h1:5295skDVJn90SXIYI22jOMeR9XbnuN76y/V1m9N8ITQ=
+github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f/go.mod h1:9yW2CHuRSORvHgw7YfybB09PqUZTbzERyW3QFvd8+0Q=
 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 h1:Ucx5I1l1+TWXvqFmBigYu4Ub4MLvUuUU/whjoUvV95I=
 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097/go.mod h1:lFZSWRIpCfE/pt91hHBBpV6+x87YlCjsp+aIR2qCPPU=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.mongodb.org/mongo-driver v1.0.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+gocloud.dev v0.15.0 h1:Tl8dkOHWVZiYBYPxG2ouhpfmluoQGt3mY323DaAHaC8=
+gocloud.dev v0.15.0/go.mod h1:ShXCyJaGrJu9y/7a6+DSCyBb9MFGZ1P5wwPa0Wu6w34=
 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f h1:hXVePvSFG7tPGX4Pwk1d10ePFfoTCc0QmISfpKOHsS8=
 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f/go.mod h1:fYw7AShPAhGMdXqA9gRadk/CcMsvLlClpE5oBwnS3dM=
 golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -797,6 +1007,7 @@ golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -814,6 +1025,8 @@ golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 h1:2fktqPPvDiVEEVT/vSTeoUPXfmRxRaGy6GU8jypvEn0=
+golang.org/x/image v0.0.0-20191214001246-9130b4cfad52/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -831,6 +1044,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -839,12 +1053,16 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190322120337-addf6b3196f6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
@@ -854,12 +1072,15 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
@@ -876,8 +1097,11 @@ golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -903,12 +1127,15 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200107144601-ef85f5a75ddf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -919,6 +1146,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -936,6 +1164,7 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -952,13 +1181,17 @@ golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200115165105-de0b1760071a h1:bEJ3JL2YUH3tt9KX9dsy0WUF3WOrhjtNjK93o0svepY=
 golang.org/x/tools v0.0.0-20200115165105-de0b1760071a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -968,20 +1201,27 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 h1:wDju+RU97qa0FZT0QnZDg9Uc2dH0Ql513kFvHocz+WM=
 google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -997,8 +1237,10 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
@@ -1010,6 +1252,9 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNj
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
@@ -1025,6 +1270,7 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
@@ -1034,6 +1280,7 @@ gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpA
 gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1100,6 +1347,8 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY=
+pack.ag/amqp v0.8.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
+pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index 70d808b326..d13f3b3ea3 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -113,15 +114,13 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout tim
 
 	checkRunning := func() (bool, error) {
 		if err := ExpectAppsRunning(cs, expected); err != nil {
-			glog.Infof("error waiting for apps to be running: %v", err)
-			time.Sleep(kconst.APICallRetryInterval * 5)
 			return false, nil
 		}
 		return true, nil
 	}
 
 	if err := wait.PollImmediate(kconst.APICallRetryInterval, timeout, checkRunning); err != nil {
-		return fmt.Errorf("apiserver never returned a pod list")
+		return errors.Wrapf(err, "checking k8s-apps to be running")
 	}
 	glog.Infof("duration metric: took %s to wait for k8s-apps to be running ...", time.Since(start))
 	return nil

From 40f1d7d356651f8e4c7e36436388981719b5c0e3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 15:16:45 -0700
Subject: [PATCH 581/668] go mod tidy

---
 go.mod |   9 ++-
 go.sum | 205 ++-------------------------------------------------------
 2 files changed, 13 insertions(+), 201 deletions(-)

diff --git a/go.mod b/go.mod
index 859e0038ca..62c03dbf00 100644
--- a/go.mod
+++ b/go.mod
@@ -22,14 +22,13 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/gohugoio/hugo v0.68.3 // indirect
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93
 	github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2
 	github.com/google/go-github v17.0.0+incompatible
+	github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
 	github.com/googleapis/gnostic v0.3.0 // indirect
 	github.com/hashicorp/go-getter v1.4.0
 	github.com/hashicorp/go-retryablehttp v0.5.4
@@ -47,6 +46,7 @@ require (
 	github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect
 	github.com/juju/version v0.0.0-20180108022336-b64dbd566305 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
+	github.com/kr/pretty v0.2.0 // indirect
 	github.com/libvirt/libvirt-go v3.4.0+incompatible
 	github.com/machine-drivers/docker-machine-driver-vmware v0.1.1
 	github.com/mattn/go-isatty v0.0.11
@@ -58,6 +58,7 @@ require (
 	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/otiai10/copy v1.0.2
 	github.com/pborman/uuid v1.2.0
+	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pkg/browser v0.0.0-20160118053552-9302be274faa
 	github.com/pkg/errors v0.9.1
@@ -65,8 +66,10 @@ require (
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/prometheus/client_golang v1.1.0 // indirect
 	github.com/prometheus/procfs v0.0.5 // indirect
+	github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 // indirect
 	github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect
 	github.com/shirou/gopsutil v2.18.12+incompatible
+	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.6.1
@@ -83,6 +86,8 @@ require (
 	google.golang.org/api v0.9.0
 	google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
 	google.golang.org/grpc v1.26.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/ini.v1 v1.51.1 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	gotest.tools/v3 v3.0.2 // indirect
diff --git a/go.sum b/go.sum
index c7ab22f29a..d9235acee9 100644
--- a/go.sum
+++ b/go.sum
@@ -1,37 +1,17 @@
 bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
-contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
-contrib.go.opencensus.io/exporter/stackdriver v0.11.0/go.mod h1:hA7rlmtavV03FGxzWXAPBUnZeZBhWN/QYQAuMtxc9Bk=
-contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
-contrib.go.opencensus.io/resource v0.0.0-20190131005048-21591786a5e0/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA=
-github.com/Azure/azure-amqp-common-go v1.1.3/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8=
-github.com/Azure/azure-amqp-common-go v1.1.4/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8=
-github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg=
-github.com/Azure/azure-pipeline-go v0.1.9 h1:u7JFb9fFTE6Y/j8ae2VK33ePrRqJqoCM/IWkQdAZ+rg=
-github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg=
-github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v27.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-service-bus-go v0.4.1/go.mod h1:d9ho9e/06euiTwGpKxmlbpPhFUsfCsq6a4tZ68r51qI=
-github.com/Azure/azure-storage-blob-go v0.6.0 h1:SEATKb3LIHcaSIX+E6/K4kJpwfuozFEsmt5rS56N6CE=
-github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-autorest v11.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest v11.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
@@ -46,16 +26,10 @@ github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocm
 github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
 github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU=
-github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
-github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
-github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190418212003-6ac0b49e7197/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo=
 github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
@@ -82,8 +56,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
@@ -92,41 +64,22 @@ github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmx
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c h1:18gEt7qzn7CW7qMkfPTFyyotlPbvPQo9o4IDV8jZqP4=
 github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
-github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
-github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
-github.com/alecthomas/chroma v0.7.1 h1:G1i02OhUbRi2nJxcNkwJaY/J1gHXj9tt72qN6ZouLFQ=
-github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc=
-github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
-github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
-github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
-github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
-github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
-github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
-github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E=
-github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
-github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.16.26 h1:GWkl3rkRO/JGRTWoLLIqwf7AWC4/W/1hMOUZqmX0js4=
 github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.18.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.19.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.1 h1:MXnqY6SlWySaZAqNnXThOvjRFdiiOuKtC6i7baFdNdU=
 github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/bazelbuild/bazel-gazelle v0.18.2/go.mod h1:D0ehMSbS+vesFsLGiD6JXu3mVEzOlfUl8wNnq+x/9p0=
@@ -140,13 +93,6 @@ github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
-github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
-github.com/bep/gitmap v1.1.1 h1:Nf8ySnC3I7/xPjuWeCwzukUFv185iTUQ6nOvLy9gCJA=
-github.com/bep/gitmap v1.1.1/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY=
-github.com/bep/golibsass v0.5.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
-github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
-github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -162,7 +108,6 @@ github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -171,7 +116,6 @@ github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b h1:T4nWG1TXIxeor8mAu5bFguPJgSIGhZqv/f0z55KCrJM=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
 github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
 github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/cheggaaa/pb/v3 v3.0.1 h1:m0BngUk2LuSRYdx4fujDKNRXNDpbNCfptPfVT2m6OJY=
@@ -183,7 +127,6 @@ github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuij
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
 github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
 github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa h1:GnRy2maqb8vcJhYRN5L+5WyYNKfUG4otiz2zxE182ng=
@@ -216,11 +159,7 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
-github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
-github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -228,12 +167,6 @@ github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMph
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
-github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc=
-github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
-github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
-github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 h1:2HQmlpI3yI9deH18Q6xiSOIjXD4sLI55Y/gfpa8/558=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
@@ -259,9 +192,6 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs=
 github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
@@ -285,12 +215,6 @@ github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ=
-github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk=
-github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -302,7 +226,6 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0
 github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
 github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
-github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -360,7 +283,6 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
 github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ=
@@ -375,24 +297,17 @@ github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoM
 github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc=
 github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8=
 github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU=
-github.com/gobuffalo/envy v1.9.0 h1:eZR0DuEgVLfeIb1zIKt3bT4YovIMf9O9LXQeCZLXpqE=
-github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f h1:zlOR3rOlPAVvtfuxGKoghCmop5B0TRyu/ZieziZuGiM=
 github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/gohugoio/hugo v0.68.3 h1:dLzfE2XLP3K4zD0muTGAhbhHaI/+pvXR+ZVCc8oKWvs=
-github.com/gohugoio/hugo v0.68.3/go.mod h1:jj7XAfCteXVxl6peDyGGiH60XPfWIvDy05qHFzNRQbo=
-github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95 h1:sgew0XCnZwnzpWxTt3V8LLiCO7OQi3C6dycaE67wfkU=
-github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8=
 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
@@ -413,8 +328,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
 github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0=
@@ -442,8 +355,6 @@ github.com/google/cadvisor v0.35.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93 h1:VvBteXw2zOXEgm0o3PgONTWf+bhUGsCaiNn3pbkU9LA=
 github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2 h1:/z0FoA29APs30PljxT6GoZQekF5c1cYhow2osFsj1XU=
@@ -457,6 +368,7 @@ github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE=
 github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ=
@@ -465,10 +377,6 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/wire v0.2.2 h1:fSIRzE/K12IaNgV6X0173X/oLrTwHKRiMcFZhiDrN3s=
-github.com/google/wire v0.2.2/go.mod h1:7FHVg6mFpFQrjeUZrm+BaD50N5jnDKm50uVPTpyYOmU=
-github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww=
-github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -478,19 +386,14 @@ github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV
 github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0=
 github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
-github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
@@ -499,7 +402,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig=
@@ -539,10 +441,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 h1:XboatR7lasl05yel5hNXF7kQBw2oFUGdMztcgisfhNU=
 github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6/go.mod h1:RmeVYf9XrPRbRc3XIx0gLYA8qOFvNoPOfaEZduRlEp4=
-github.com/jdkato/prose v1.1.1 h1:r6CwY09U97IZNgNQEHoeCh2nvg2e8WCOGjPH/b7lowI=
-github.com/jdkato/prose v1.1.1/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -551,8 +450,6 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0=
 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -562,6 +459,7 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c h1:3UvYABOQRhJAApj9MdCN+Ydv841ETSoy6xLzdmmr/9A=
 github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c/go.mod h1:nD0vlnrUjcjJhqN5WuCWZyzfd5AHZAC9/ajvbSx69xA=
@@ -606,9 +504,6 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
-github.com/kyokomi/emoji v2.1.0+incompatible h1:+DYU2RgpI6OHG4oQkM5KlqD3Wd3UPEsX8jamTo1Mp6o=
-github.com/kyokomi/emoji v2.1.0+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
 github.com/libvirt/libvirt-go v3.4.0+incompatible h1:Cpyalgj1x8JIeTlL6SDYZBo7j8nY3+5XHqmi8DaunCk=
 github.com/libvirt/libvirt-go v3.4.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE=
@@ -626,7 +521,6 @@ github.com/machine-drivers/docker-machine-driver-vmware v0.1.1 h1:+E1IKKk+6kaQrC
 github.com/machine-drivers/docker-machine-driver-vmware v0.1.1/go.mod h1:ej014C83EmSnxJeJ8PtVb8OLJ91PJKO1Q8Y7sM5CK0o=
 github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8 h1:CIddS19fAKG4rUkZAotX0WPQtx/v/SdLhhDU3MVhLy0=
 github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8/go.mod h1:79Uwa2hGd5S39LDJt58s8JZcIhGEK6pkq9bsuTbFWbk=
-github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.7.6/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -639,10 +533,7 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/markbates/inflect v1.0.0 h1:gTffXSQCc+WaIvBcI/IItJQMOemietXr5EIKLXDYqI4=
-github.com/markbates/inflect v1.0.0/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
-github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -671,8 +562,6 @@ github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPx
 github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
 github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/mmark v1.3.6 h1:t47x5vThdwgLJzofNsbsAl7gmIiJ7kbDQN5BxwBmwvY=
-github.com/miekg/mmark v1.3.6/go.mod h1:w7r9mkTvpS55jlfyn22qJ618itLryxXBhA7Jp3FIlkw=
 github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
 github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -684,8 +573,6 @@ github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdI
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y=
-github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
 github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -706,8 +593,6 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
 github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 h1:7InQ7/zrOh6SlFjaXFubv0xX0HsuC9qJsdqm7bNQpYM=
 github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
-github.com/muesli/smartcrop v0.3.0 h1:JTlSkmxWg/oQ1TcLDoypuirdE8Y/jzNirQeLkxpA6Oc=
-github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
@@ -718,12 +603,6 @@ github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h
 github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q=
-github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
-github.com/niklasfasching/go-org v1.0.0 h1:lDh8zKtmbaQupKQhLyVp1clG+JojkVoVBH9bT7c9O70=
-github.com/niklasfasching/go-org v1.0.0/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU=
-github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5 h1:58+kh9C6jJVXYjt8IE48G2eWl6BjwU5Gj0gqY84fy78=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
@@ -731,7 +610,6 @@ github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
@@ -757,8 +635,6 @@ github.com/opencontainers/runtime-spec v1.0.0 h1:O6L965K88AilqnxeYPks/75HLpp4IG+
 github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52 h1:B8hYj3NxHmjsC3T+tnlZ1UhInqUgnyF1zlGPmzNg2Qk=
 github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc=
 github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95 h1:+OLn68pqasWca0z5ryit9KGfp3sUsW4Lqg32iRMJyzs=
@@ -776,7 +652,6 @@ github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+v
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/browser v0.0.0-20160118053552-9302be274faa h1:od00Tr1U7+cLVtc+RNFmR53spHUF98Ziu33S8UIQnt0=
 github.com/pkg/browser v0.0.0-20160118053552-9302be274faa/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -792,7 +667,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -800,20 +674,17 @@ github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -823,27 +694,19 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.5.1 h1:asQ0uD7BN9RU5Im41SEEZTwCi/zAXdMOLS3npYaos2g=
-github.com/rogpeppe/go-internal v1.5.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
 github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns=
 github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
-github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sanity-io/litter v1.2.0 h1:DGJO0bxH/+C2EukzOSBmAlxmkhVMGqzvcx/rvySYw9M=
-github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97 h1:DWY4yZN6w+FSKMeqBBXaalT8zmCn4DVwBGopShnlwFE=
 github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY=
@@ -865,8 +728,10 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE=
@@ -885,8 +750,6 @@ github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/fsync v0.9.0 h1:f9CEt3DOB2mnHxZaftmEOFWjABEvKM/xpf3cUwJrGOY=
-github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0=
 github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
@@ -909,7 +772,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
@@ -921,20 +783,11 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/tdewolff/minify/v2 v2.6.1 h1:UJLhbs2Q/iDrqA79EEyKE48uYHeAMPVdiUzdtKsatJ8=
-github.com/tdewolff/minify/v2 v2.6.1/go.mod h1:l9hbQnH096st77OkscoRUvKdd23oUM6pDZpYx381sPo=
-github.com/tdewolff/parse/v2 v2.3.14 h1:Tzam5YoUXx7gybFEfR/zcuR74PXADnrfUqYUXL+K5oA=
-github.com/tdewolff/parse/v2 v2.3.14/go.mod h1:+V2lSZ93xpH2Csfs/vtNY1Fjr8kcFMsZKjyLoSkZbM0=
-github.com/tdewolff/test v1.0.4/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
-github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
@@ -946,7 +799,6 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/quicktemplate v1.1.1/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vdemeester/k8s-pkg-credentialprovider v0.0.0-20200107171650-7c61ffa44238/go.mod h1:JwQJCMWpUDqjZrB5jpw0f5VbN7U95zxFy1ZDpoEarGo=
@@ -956,8 +808,6 @@ github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJ
 github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 h1:J9gO8RJCAFlln1jsvRba/CWVUnMHwObklfxxjErl1uk=
 github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -967,24 +817,15 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.25 h1:isv+Q6HQAmmL2Ofcmg8QauBmDPlUUnSoNhEcC940Rds=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f h1:5295skDVJn90SXIYI22jOMeR9XbnuN76y/V1m9N8ITQ=
-github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f/go.mod h1:9yW2CHuRSORvHgw7YfybB09PqUZTbzERyW3QFvd8+0Q=
 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 h1:Ucx5I1l1+TWXvqFmBigYu4Ub4MLvUuUU/whjoUvV95I=
 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097/go.mod h1:lFZSWRIpCfE/pt91hHBBpV6+x87YlCjsp+aIR2qCPPU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.mongodb.org/mongo-driver v1.0.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -993,13 +834,10 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-gocloud.dev v0.15.0 h1:Tl8dkOHWVZiYBYPxG2ouhpfmluoQGt3mY323DaAHaC8=
-gocloud.dev v0.15.0/go.mod h1:ShXCyJaGrJu9y/7a6+DSCyBb9MFGZ1P5wwPa0Wu6w34=
 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f h1:hXVePvSFG7tPGX4Pwk1d10ePFfoTCc0QmISfpKOHsS8=
 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f/go.mod h1:fYw7AShPAhGMdXqA9gRadk/CcMsvLlClpE5oBwnS3dM=
 golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1007,7 +845,6 @@ golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -1025,8 +862,6 @@ golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 h1:2fktqPPvDiVEEVT/vSTeoUPXfmRxRaGy6GU8jypvEn0=
-golang.org/x/image v0.0.0-20191214001246-9130b4cfad52/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1044,7 +879,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1053,12 +887,9 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190322120337-addf6b3196f6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -1072,15 +903,12 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
@@ -1097,11 +925,8 @@ golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1128,14 +953,12 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200107144601-ef85f5a75ddf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1146,7 +969,6 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1164,7 +986,6 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -1181,17 +1002,13 @@ golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200115165105-de0b1760071a h1:bEJ3JL2YUH3tt9KX9dsy0WUF3WOrhjtNjK93o0svepY=
 golang.org/x/tools v0.0.0-20200115165105-de0b1760071a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -1201,25 +1018,19 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 h1:wDju+RU97qa0FZT0QnZDg9Uc2dH0Ql513kFvHocz+WM=
 google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
@@ -1237,9 +1048,9 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
@@ -1270,7 +1081,6 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
@@ -1280,7 +1090,6 @@ gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpA
 gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1347,8 +1156,6 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY=
-pack.ag/amqp v0.8.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
-pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=

From 22882089af535a6dc845cbe45b3c86fe8c27df32 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:17:14 -0700
Subject: [PATCH 582/668] Address code review comments

---
 pkg/addons/addons.go        | 12 +++++-------
 pkg/minikube/node/config.go |  4 +---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 991347e3d3..9ba24da3d0 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -290,9 +290,7 @@ func enableOrDisableStorageClasses(cc *config.ClusterConfig, name string, val st
 // Start enables the default addons for a profile, plus any additional
 func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, additional []string) {
 	wg.Add(1)
-	defer func() {
-		wg.Done()
-	}()
+	defer wg.Done()
 
 	start := time.Now()
 	glog.Infof("enableAddons start: toEnable=%v, additional=%s", toEnable, additional)
@@ -329,12 +327,12 @@ func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, addition
 
 	out.T(out.AddonEnable, "Enabling addons: {{.addons}}", out.V{"addons": strings.Join(toEnableList, ", ")})
 	for _, a := range toEnableList {
-		go func() {
-			wg.Add(1)
-			err := Set(a, "true", profile)
+		wg.Add(1)
+		go func(name) {
+			err := Set(name, "true", profile)
 			if err != nil {
 				// Intentionally non-fatal
-				out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": a, "error": err})
+				out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": name, "error": err})
 			}
 			wg.Done()
 		}()
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index 61b5c6f600..8cb8a27296 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -49,9 +49,7 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 // configureMounts configures any requested filesystem mounts
 func configureMounts(wg sync.WaitGroup) {
 	wg.Add(1)
-	defer func() {
-		wg.Done()
-	}()
+	defer wg.Done()
 
 	if !viper.GetBool(createMount) {
 		return

From 93e6eee2e3fb3ddbca4c27de4c31887495a64358 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:20:30 -0700
Subject: [PATCH 583/668] Pass correct variable in

---
 pkg/addons/addons.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 9ba24da3d0..de0ec4dccb 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -328,13 +328,13 @@ func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, addition
 	out.T(out.AddonEnable, "Enabling addons: {{.addons}}", out.V{"addons": strings.Join(toEnableList, ", ")})
 	for _, a := range toEnableList {
 		wg.Add(1)
-		go func(name) {
+		go func(name string) {
 			err := Set(name, "true", profile)
 			if err != nil {
 				// Intentionally non-fatal
 				out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": name, "error": err})
 			}
 			wg.Done()
-		}()
+		}(a)
 	}
 }

From 1a0f86a7af568a759c8519c79e2efbe53f08dcb3 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:27:54 -0700
Subject: [PATCH 584/668] Update unit tests for new command line

---
 pkg/minikube/bootstrapper/certs_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/bootstrapper/certs_test.go b/pkg/minikube/bootstrapper/certs_test.go
index fd96b6a838..4f93aad180 100644
--- a/pkg/minikube/bootstrapper/certs_test.go
+++ b/pkg/minikube/bootstrapper/certs_test.go
@@ -51,8 +51,8 @@ func TestSetupCerts(t *testing.T) {
 	}
 
 	expected := map[string]string{
-		`sudo /bin/bash -c "test -f /usr/share/ca-certificates/mycert.pem && ln -fs /usr/share/ca-certificates/mycert.pem /etc/ssl/certs/mycert.pem"`:             "-",
-		`sudo /bin/bash -c "test -f /usr/share/ca-certificates/minikubeCA.pem && ln -fs /usr/share/ca-certificates/minikubeCA.pem /etc/ssl/certs/minikubeCA.pem"`: "-",
+		`sudo /bin/bash -c "test -s /usr/share/ca-certificates/mycert.pem && ln -fs /usr/share/ca-certificates/mycert.pem /etc/ssl/certs/mycert.pem"`:             "-",
+		`sudo /bin/bash -c "test -s /usr/share/ca-certificates/minikubeCA.pem && ln -fs /usr/share/ca-certificates/minikubeCA.pem /etc/ssl/certs/minikubeCA.pem"`: "-",
 	}
 	f := command.NewFakeCommandRunner()
 	f.SetCommandToOutput(expected)

From 194b8cd7d8261908ec22f925b009ef2c2fc2fbee Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:34:16 -0700
Subject: [PATCH 585/668] Modify post-mortem logs so I don't need to count
 dashes

---
 test/integration/helpers.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 8304e879ed..2ec166a4ac 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -201,9 +201,9 @@ func clusterLogs(t *testing.T, profile string) {
 		return
 	}
 
-	t.Logf("-----------------------post-mortem--------------------------------")
+	t.Logf("------------------------------------------------------------------")
 	t.Logf("<<< %s FAILED: start of post-mortem logs <<<", t.Name())
-	t.Logf("-------------------post-mortem minikube logs----------------------")
+	t.Logf("------++> post-mortem[%s]: minikube logs", t.Name())
 
 	rr, err := Run(t, exec.Command(Target(), "-p", profile, "logs", "--problems"))
 	if err != nil {
@@ -212,21 +212,20 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("%s logs: %s", t.Name(), rr.Output())
 
-	t.Logf("------------------post-mortem disk usage-------------------")
+	t.Logf("------++> post-mortem[%s]: disk usage", t.Name())
 	rr, err = Run(t, exec.Command(Target(), "-p", profile, "ssh", "df -h /var/lib/docker/overlay2 /var /; du -hs /var/lib/docker/overlay2"))
 	if err != nil {
 		t.Logf("failed df error: %v", err)
 	}
 	t.Logf("%s df: %s", t.Name(), rr.Stdout)
 
-	t.Logf("------------------post-mortem api server status-------------------")
 	st = Status(context.Background(), t, Target(), profile, "APIServer")
 	if st != state.Running.String() {
 		t.Logf("%q apiserver is not running, skipping kubectl commands (state=%q)", profile, st)
 		return
 	}
 
-	t.Logf("--------------------post-mortem get pods--------------------------")
+	t.Logf("------++> post-mortem[%s]: get pods", t.Name())
 	rr, rerr := Run(t, exec.Command("kubectl", "--context", profile, "get", "po", "-A", "--show-labels"))
 	if rerr != nil {
 		t.Logf("%s: %v", rr.Command(), rerr)
@@ -234,7 +233,7 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 
-	t.Logf("-------------------post-mortem describe node----------------------")
+	t.Logf("------++> post-mortem[%s]: describe node", t.Name())
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "node"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
@@ -242,7 +241,7 @@ func clusterLogs(t *testing.T, profile string) {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 	}
 
-	t.Logf("-------------------post-mortem describe pods----------------------")
+	t.Logf("------++> post-mortem[%s]: describe pods", t.Name())
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
@@ -250,7 +249,6 @@ func clusterLogs(t *testing.T, profile string) {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Stdout)
 	}
 
-	t.Logf("------------------------------------------------------------------")
 	t.Logf("<<< %s FAILED: end of post-mortem logs <<<", t.Name())
 	t.Logf("---------------------/post-mortem---------------------------------")
 }

From 93060d17d190574a1b99443f8893e376bce8ec24 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 15:35:09 -0700
Subject: [PATCH 586/668] keep header

---
 test/integration/helpers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 2ec166a4ac..7daac4aa6f 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -201,7 +201,7 @@ func clusterLogs(t *testing.T, profile string) {
 		return
 	}
 
-	t.Logf("------------------------------------------------------------------")
+	t.Logf("-----------------------post-mortem--------------------------------")
 	t.Logf("<<< %s FAILED: start of post-mortem logs <<<", t.Name())
 	t.Logf("------++> post-mortem[%s]: minikube logs", t.Name())
 

From 9f09a5b52793d8d551d539e60397236848750265 Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 8 Apr 2020 15:55:42 -0700
Subject: [PATCH 587/668] More updates to the configuration docs

---
 site/content/en/docs/handbook/config.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/site/content/en/docs/handbook/config.md b/site/content/en/docs/handbook/config.md
index c14dfc85f8..9479c3c691 100644
--- a/site/content/en/docs/handbook/config.md
+++ b/site/content/en/docs/handbook/config.md
@@ -17,18 +17,24 @@ minikube start --help
 
 minikube allows users to persistently store new default values to be used across all profiles, using the `minikube config` command. This is done providing a property name, and a property value.
 
-### Listing config properties
-
-```shell
-minikube config
-```
-
 For example, to persistently configure minikube to use hyperkit:
 
 ```shell
 minikube config set driver hyperkit
 ```
 
+You can get a complete list of configurable fields using:
+
+```shell
+minikube config --help
+```
+
+To get a list of the currently set config properties:
+
+```shell
+minikube config view
+```
+
 ## Kubernetes configuration
 
 minikube allows users to configure the Kubernetes components with arbitrary values. To use this feature, you can use the `--extra-config` flag on the `minikube start` command.

From 7a2f62dbe79b14d08deded612df7f0ba1e409328 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:18:43 -0700
Subject: [PATCH 588/668] create comparision table for methods to push img to
 minikube

---
 site/content/en/docs/handbook/pushing.md | 103 +++++++++++++++--------
 1 file changed, 68 insertions(+), 35 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index a8ac2d93a5..3ea44e0623 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -2,7 +2,7 @@
 title: "Pushing images"
 weight: 5
 description: >
-  There are many ways to push images into minikube.
+ comparing 3 ways to push your image into minikiube.
 aliases:
  - /docs/tasks/building
  - /docs/tasks/caching
@@ -10,9 +10,59 @@ aliases:
  - /docs/tasks/docker_daemon
 ---
 
-# Cached Images
+## What is best method to push image to minikiube ?
+the answer depends on the container-runtime driver you choose. 
+Here is a comparison table to help you choose:
 
-From the host, you can push a Docker image directly to minikube. It will also be cached for future cluster starts.
+
+
+| Method   	| Supported Runtimes   	|  Supported Drivers* 	|  Performance 	|
+|---	|---	|---	|---	|---	|
+|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  all	|  best 	|
+|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|   all  |  best 	|
+|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	| all   	|  good 	|
+|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   all but [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  good 	|
+|  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|   all |  best 	|
+
+
+* note1 : the default container-runtime on minikube is 'docker'.
+* note2 : 'none' driver (bare metal) does not need pushing image to the cluster, as any image on your system is already available to the kuberentes.
+
+
+# Pushing directly to the in-cluster Docker daemon
+When using a container or VM driver (all drivers except none), you can reuse the Docker daemon inside minikube cluster.
+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 docker daemon as minikube which speeds up local experiments.
+
+To point your terminal to use the docker daemon inside minikube run this:
+
+```shell
+eval $(minikube docker-env)
+```
+
+now any 'docker' command you run in this current terminal will run against the docker inside minikube VM or Container.
+Try it:
+
+```shell
+docker ps
+```
+
+now you 'build' against the docker inside minikube. which is instantly accessible to kubernetes cluster.
+
+'''
+docker build -t myimage .
+'''
+
+Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
+
+#### docker-env will be 
+Please remember by closing the terminal, you will go back to using your own system's docker daemon.
+to verify your terminal is using minikuber's docker-env you can check the value of the environment MINIKUBE_ACTIVE_DOCKERD
+
+more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
+
+# Push images using Cache Command.
+
+From the host, you can push a Docker image directly to minikube. It will also be cached for all minikube clusters .
 
 ```shell
 minikube cache add ubuntu:16.04
@@ -26,7 +76,13 @@ To display images you have added to the cache:
 minikube cache list
 ```
 
-This listing will not include the images which are built-in to minikube.
+This listing will not include the images minikube's built-in system images.
+
+to ensure your running cluster has cached the updated images use reload:
+
+```shell
+minikube cache reload
+```
 
 
 ```shell
@@ -37,34 +93,6 @@ For more information, see:
 
 * [Reference: cache command]({{< ref "/docs/commands/cache.md" >}})
 
-You must be using minikube with the container runtime set to Docker. This is the default setting.
-
-# Pushing directly to the in-cluster Docker daemon
-When user a container or VM driver, it's really handy to reuse the Docker daemon inside minikube; 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 docker daemon as minikube which speeds up local experiments.
-
-To point your terminal to use the docker daemon inside minikube run this:
-
-```shell
-eval $(minikube docker-env)
-```
-
-now any command you run in this current terminal will run against the docker inside minikube VM or Container.
-Try it:
-
-```shell
-docker ps
-```
-
-now you can use same docker build command against the docker inside minikube. which is instantly accessible to kubernetes cluster.
-
-'''
-docker build -t myimage .
-'''
-
-
-Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
-
-more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 
 # Pushing directly to in-cluster CRIO
 
@@ -82,7 +110,7 @@ podman-remote help
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-# Pushing to an in-cluster Registry
+# Pushing to an in-cluster using a Registry addon
 
 For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
 
@@ -108,9 +136,10 @@ Push docker image to minikube registry:
 docker push $(minikube ip):5000/test-img
 ```
 
-# Building images inside of minikube
+# Building images inside of minikube using SSH
 
-Use `minikube ssh` to connect to the virtual machine, and run the `docker build` there:
+Use `minikube ssh` to go inside a minikube node, and run the `docker build` directly there.
+any command you run there will run against the same daemon that kubernetes is using.
 
 ```shell
 docker build
@@ -126,3 +155,7 @@ sudo -E podman build
 
 For more information on the `podman build` command, read the [Podman documentation](https://github.com/containers/libpod/blob/master/docs/source/markdown/podman-build.1.md) (podman.io).
 
+to exit minikube ssh and come back to your terminal type:
+```shell
+exit
+```

From 6604dfb9a1126666684eb3df466affb4f9ce5d16 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:19:25 -0700
Subject: [PATCH 589/668] moving files around

---
 cmd/minikube/cmd/start_flags.go                      |  6 +++---
 site/content/en/docs/handbook/pushing.md             | 12 ++++++------
 .../docs/tutorials/includes}/hello-deployment.yaml   |  0
 .../en/docs/tutorials/includes}/hello-svc.yaml       |  0
 .../en/docs/tutorials/includes}/kube-flannel.yaml    |  0
 site/content/en/docs/tutorials/multi_node.md         | 12 ++++++------
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename {hack/demo => site/content/en/docs/tutorials/includes}/hello-deployment.yaml (100%)
 rename {hack/demo => site/content/en/docs/tutorials/includes}/hello-svc.yaml (100%)
 rename {hack/demo => site/content/en/docs/tutorials/includes}/kube-flannel.yaml (100%)

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index b0556c79a2..aeadae8a86 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -372,14 +372,14 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 			glog.Warningf("error calculate memory size in mb : %v", err)
 		}
 		if memInMB != existing.Memory {
-			out.WarningT("You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the memory size for an exiting minikube cluster. Pease first delete the cluster.")
 		}
 
 	}
 
 	if cmd.Flags().Changed(cpus) {
 		if viper.GetInt(cpus) != existing.CPUs {
-			out.WarningT("You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the CPUs for an exiting minikube cluster. Pease first delete the cluster.")
 		}
 	}
 
@@ -390,7 +390,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		}
 
 		if memInMB != existing.DiskSize {
-			out.WarningT("You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.")
+			out.WarningT("You cannot change the Disk size for an exiting minikube cluster. Pease first delete the cluster.")
 		}
 	}
 
diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index a8ac2d93a5..96a8f19b2e 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -40,7 +40,7 @@ For more information, see:
 You must be using minikube with the container runtime set to Docker. This is the default setting.
 
 # Pushing directly to the in-cluster Docker daemon
-When user a container or VM driver, it's really handy to reuse the Docker daemon inside minikube; 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 docker daemon as minikube which speeds up local experiments.
+When using a container or VM driver, it's really handy to reuse the Docker daemon inside minikube 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 docker daemon as minikube which speeds up local development.
 
 To point your terminal to use the docker daemon inside minikube run this:
 
@@ -48,23 +48,23 @@ To point your terminal to use the docker daemon inside minikube run this:
 eval $(minikube docker-env)
 ```
 
-now any command you run in this current terminal will run against the docker inside minikube VM or Container.
+Now any command you run in this current terminal will run against the docker inside minikube.
 Try it:
 
 ```shell
 docker ps
 ```
 
-now you can use same docker build command against the docker inside minikube. which is instantly accessible to kubernetes cluster.
+Now you can use the same docker build command against the docker inside minikube, which is instantly accessible to the Kubernetes cluster.
 
-'''
+```shell
 docker build -t myimage .
-'''
+```
 
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
+More information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 
 # Pushing directly to in-cluster CRIO
 
diff --git a/hack/demo/hello-deployment.yaml b/site/content/en/docs/tutorials/includes/hello-deployment.yaml
similarity index 100%
rename from hack/demo/hello-deployment.yaml
rename to site/content/en/docs/tutorials/includes/hello-deployment.yaml
diff --git a/hack/demo/hello-svc.yaml b/site/content/en/docs/tutorials/includes/hello-svc.yaml
similarity index 100%
rename from hack/demo/hello-svc.yaml
rename to site/content/en/docs/tutorials/includes/hello-svc.yaml
diff --git a/hack/demo/kube-flannel.yaml b/site/content/en/docs/tutorials/includes/kube-flannel.yaml
similarity index 100%
rename from hack/demo/kube-flannel.yaml
rename to site/content/en/docs/tutorials/includes/kube-flannel.yaml
diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index a0d60fe5f5..dfebc7d76e 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -1,10 +1,8 @@
 ---
 title: "Using Multi-Node Clusters"
-linkTitle: "Using Minikube with more than one cluster."
+linkTitle: "Using multi-node clusters"
 weight: 1
 date: 2019-11-24
-description: >
-  Using Multi-Node Clusters
 ---
 
 ## Overview
@@ -46,7 +44,7 @@ multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
 
 - Install a CNI (e.g. flannel):
 NOTE: This currently needs to be done manually after the apiserver is running, the multi-node feature is still experimental as of 1.9.2.
-An example yaml for flannel is at [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/kube_flannel.yaml).
+{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml %}}
 ```
 kubectl apply -f kube-flannel.yaml
 podsecuritypolicy.policy/psp.flannel.unprivileged created
@@ -61,7 +59,8 @@ daemonset.apps/kube-flannel-ds-ppc64le created
 daemonset.apps/kube-flannel-ds-s390x created
 ```
 
-- Deploy our hello world deployment, available [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/hello-deployment.yaml).
+- Deploy our hello world deployment:
+{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml %}}
 ```
 kubectl apply -f hello-deployment.yaml
 deployment.apps/hello created
@@ -70,7 +69,8 @@ kubectl rollout status deployment/hello
 deployment "hello" successfully rolled out
 ```
 
-- Deploy our hello world service, which just spits back the IP address the request was served from, available [here](https://github.com/kubernetes/minikube/blob/master/hack/demo/hello-deployment.yaml)
+- Deploy our hello world service, which just spits back the IP address the request was served from:
+{{% readfile file="/docs/tutorials/includes/hello-svc.yaml %}}
 ```
 kubectl apply -f hello-svc.yml
 service/hello created

From 5ac676e7bb7ef92aaabc92a45eae72a5c1183e07 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:23:18 -0700
Subject: [PATCH 590/668] change perforamnce words

---
 site/content/en/docs/handbook/pushing.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 3ea44e0623..47a42524a9 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -18,10 +18,10 @@ Here is a comparison table to help you choose:
 
 | Method   	| Supported Runtimes   	|  Supported Drivers* 	|  Performance 	|
 |---	|---	|---	|---	|---	|
-|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  all	|  best 	|
-|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|   all  |  best 	|
-|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	| all   	|  good 	|
-|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   all but [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  good 	|
+|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  all	|  good 	|
+|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|   all  |  good 	|
+|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	| all   	|  ok 	|
+|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   all but [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
 |  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|   all |  best 	|
 
 

From 3575367b110132950d67d93fe2f936c42a333803 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:25:00 -0700
Subject: [PATCH 591/668] fix number words

---
 site/content/en/docs/handbook/pushing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 47a42524a9..576626004f 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -2,7 +2,7 @@
 title: "Pushing images"
 weight: 5
 description: >
- comparing 3 ways to push your image into minikiube.
+ comparing 5 ways to push your image into a minikiube cluster.
 aliases:
  - /docs/tasks/building
  - /docs/tasks/caching

From 4d8a3f5805b8cbbbd973efc5964fd8bbc9906c33 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:28:38 -0700
Subject: [PATCH 592/668] syntax is hard

---
 site/content/en/docs/tutorials/multi_node.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index dfebc7d76e..a87a6159aa 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -44,7 +44,7 @@ multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
 
 - Install a CNI (e.g. flannel):
 NOTE: This currently needs to be done manually after the apiserver is running, the multi-node feature is still experimental as of 1.9.2.
-{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml %}}
+{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
 ```
 kubectl apply -f kube-flannel.yaml
 podsecuritypolicy.policy/psp.flannel.unprivileged created
@@ -60,7 +60,7 @@ daemonset.apps/kube-flannel-ds-s390x created
 ```
 
 - Deploy our hello world deployment:
-{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml %}}
+{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}
 ```
 kubectl apply -f hello-deployment.yaml
 deployment.apps/hello created
@@ -70,7 +70,7 @@ deployment "hello" successfully rolled out
 ```
 
 - Deploy our hello world service, which just spits back the IP address the request was served from:
-{{% readfile file="/docs/tutorials/includes/hello-svc.yaml %}}
+{{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
 ```
 kubectl apply -f hello-svc.yml
 service/hello created

From 86ead0e3ba01defd56f52b933e929a4c74876680 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:34:31 -0700
Subject: [PATCH 593/668] formatting needs some work huh

---
 site/content/en/docs/tutorials/multi_node.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index a87a6159aa..6459cd8d80 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -44,8 +44,13 @@ multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
 
 - Install a CNI (e.g. flannel):
 NOTE: This currently needs to be done manually after the apiserver is running, the multi-node feature is still experimental as of 1.9.2.
+{{% tabs %}}
+{{% tab kube-flannel.yaml %}}
+```
 {{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
 ```
+{{% /tab %}}
+```
 kubectl apply -f kube-flannel.yaml
 podsecuritypolicy.policy/psp.flannel.unprivileged created
 clusterrole.rbac.authorization.k8s.io/flannel created

From 880f3a7ce9df302c5d6368408fe1ec0b9304ca68 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:37:29 -0700
Subject: [PATCH 594/668] issues

---
 site/content/en/docs/handbook/pushing.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 576626004f..79b6b388dd 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -16,13 +16,13 @@ Here is a comparison table to help you choose:
 
 
 
-| Method   	| Supported Runtimes   	|  Supported Drivers* 	|  Performance 	|
+| Method   	| Supported Runtimes   	|  Issues 	|  Performance 	|
 |---	|---	|---	|---	|---	|
-|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  all	|  good 	|
-|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|   all  |  good 	|
-|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	| all   	|  ok 	|
-|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   all but [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
-|  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|   all |  best 	|
+|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  	|  good 	|
+|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|     |  good 	|
+|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	|    	|  ok 	|
+|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
+|  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|    |  best 	|
 
 
 * note1 : the default container-runtime on minikube is 'docker'.

From ce3754465aff02e7b0cf45e1d5bfe5ec2b88c5cb Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:38:13 -0700
Subject: [PATCH 595/668] add wip

---
 site/content/en/docs/handbook/pushing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 79b6b388dd..5a53b5f259 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -21,7 +21,7 @@ Here is a comparison table to help you choose:
 |  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  	|  good 	|
 |  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|     |  good 	|
 |  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	|    	|  ok 	|
-|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
+|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   work in progress for [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
 |  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|    |  best 	|
 
 

From 48dfa602c182a9d39d404ffb8a6c1a0d90616946 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:40:08 -0700
Subject: [PATCH 596/668] even more formatting awesome

---
 site/content/en/docs/tutorials/multi_node.md | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index 6459cd8d80..d2eb5d301e 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -44,12 +44,6 @@ multinode-demo-m02   Ready    <none>   9m5s    v1.18.0
 
 - Install a CNI (e.g. flannel):
 NOTE: This currently needs to be done manually after the apiserver is running, the multi-node feature is still experimental as of 1.9.2.
-{{% tabs %}}
-{{% tab kube-flannel.yaml %}}
-```
-{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
-```
-{{% /tab %}}
 ```
 kubectl apply -f kube-flannel.yaml
 podsecuritypolicy.policy/psp.flannel.unprivileged created
@@ -63,9 +57,14 @@ daemonset.apps/kube-flannel-ds-arm created
 daemonset.apps/kube-flannel-ds-ppc64le created
 daemonset.apps/kube-flannel-ds-s390x created
 ```
+{{% tabs %}}
+{{% tab kube-flannel.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
+```
+{{% /tab %}}
 
 - Deploy our hello world deployment:
-{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}
 ```
 kubectl apply -f hello-deployment.yaml
 deployment.apps/hello created
@@ -73,6 +72,12 @@ deployment.apps/hello created
 kubectl rollout status deployment/hello
 deployment "hello" successfully rolled out
 ```
+{{% tabs %}}
+{{% tab hello-deployment.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}
+```
+{{% /tab %}}
 
 - Deploy our hello world service, which just spits back the IP address the request was served from:
 {{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
@@ -81,6 +86,13 @@ kubectl apply -f hello-svc.yml
 service/hello created
 ```
 
+{{% tabs %}}
+{{% tab hello-svc.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
+```
+{{% /tab %}}
+
 - Check out the IP addresses of our pods, to note for future reference
 ```
 kubectl get pods -o wide

From 5239ee6e70c330c3d447e5038d09daa3e5e9042a Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:44:12 -0700
Subject: [PATCH 597/668] moving includes around

---
 site/content/en/docs/tutorials/multi_node.md | 38 ++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index d2eb5d301e..9a95c29f90 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -57,12 +57,6 @@ daemonset.apps/kube-flannel-ds-arm created
 daemonset.apps/kube-flannel-ds-ppc64le created
 daemonset.apps/kube-flannel-ds-s390x created
 ```
-{{% tabs %}}
-{{% tab kube-flannel.yaml %}}
-```
-{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
-```
-{{% /tab %}}
 
 - Deploy our hello world deployment:
 ```
@@ -72,12 +66,7 @@ deployment.apps/hello created
 kubectl rollout status deployment/hello
 deployment "hello" successfully rolled out
 ```
-{{% tabs %}}
-{{% tab hello-deployment.yaml %}}
-```
-{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}
-```
-{{% /tab %}}
+
 
 - Deploy our hello world service, which just spits back the IP address the request was served from:
 {{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
@@ -86,12 +75,6 @@ kubectl apply -f hello-svc.yml
 service/hello created
 ```
 
-{{% tabs %}}
-{{% tab hello-svc.yaml %}}
-```
-{{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
-```
-{{% /tab %}}
 
 - Check out the IP addresses of our pods, to note for future reference
 ```
@@ -129,3 +112,22 @@ Hello from hello-c7b8df44f-xv4v6 (10.244.0.2)
 ```
 
 - Multiple nodes!
+
+
+- Referenced YAML files
+{{% tabs %}}
+{{% tab kube-flannel.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
+```
+{{% /tab %}
+{{% tab hello-deployment.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}
+```
+{{% /tab %}}
+{{% tab hello-svc.yaml %}}
+```
+{{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
+```
+{{% /tab %}}

From ed67b770d410d868b9d8df21f37d36b8d5229c44 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 17:53:48 -0700
Subject: [PATCH 598/668] bullet number the items

---
 site/content/en/docs/handbook/pushing.md | 26 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 5a53b5f259..0f43ce99c2 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -10,12 +10,11 @@ aliases:
  - /docs/tasks/docker_daemon
 ---
 
-## What is best method to push image to minikiube ?
+## Comparison table for different methods 
 the answer depends on the container-runtime driver you choose. 
 Here is a comparison table to help you choose:
 
 
-
 | Method   	| Supported Runtimes   	|  Issues 	|  Performance 	|
 |---	|---	|---	|---	|---	|
 |  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  	|  good 	|
@@ -28,8 +27,9 @@ Here is a comparison table to help you choose:
 * note1 : the default container-runtime on minikube is 'docker'.
 * note2 : 'none' driver (bare metal) does not need pushing image to the cluster, as any image on your system is already available to the kuberentes.
 
+---
 
-# Pushing directly to the in-cluster Docker daemon
+## 1.Pushing directly to the in-cluster Docker daemon (docker-env)
 When using a container or VM driver (all drivers except none), you can reuse the Docker daemon inside minikube cluster.
 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 docker daemon as minikube which speeds up local experiments.
 
@@ -54,13 +54,16 @@ docker build -t myimage .
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-#### docker-env will be 
-Please remember by closing the terminal, you will go back to using your own system's docker daemon.
+
+Please remember evalulating the docker-env is only valid for the current terminal.
+and by closing the terminal, you will go back to using your own system's docker daemon.
 to verify your terminal is using minikuber's docker-env you can check the value of the environment MINIKUBE_ACTIVE_DOCKERD
 
 more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 
-# Push images using Cache Command.
+---
+
+## 2.Push images using 'cache' command.
 
 From the host, you can push a Docker image directly to minikube. It will also be cached for all minikube clusters .
 
@@ -93,8 +96,9 @@ For more information, see:
 
 * [Reference: cache command]({{< ref "/docs/commands/cache.md" >}})
 
+---
 
-# Pushing directly to in-cluster CRIO
+## 3. Pushing directly to in-cluster CRIO. (podman-env)
 
 To push directly to CRIO, configure podman client on your mac/linux host using the podman-env command in your shell:
 
@@ -110,7 +114,9 @@ podman-remote help
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-# Pushing to an in-cluster using a Registry addon
+---
+
+## 4. Pushing to an in-cluster using Registry addon
 
 For illustration purpose, we will assume that minikube VM has one of the ip from `192.168.39.0/24` subnet. If you have not overridden these subnets as per [networking guide](https://minikube.sigs.k8s.io/reference/networking/), you can find out default subnet being used by minikube for a specific OS and driver combination [here](https://github.com/kubernetes/minikube/blob/dfd9b6b83d0ca2eeab55588a16032688bc26c348/pkg/minikube/cluster/cluster.go#L408) which is subject to change. Replace `192.168.39.0/24` with appropriate values for your environment wherever applicable.
 
@@ -136,7 +142,9 @@ Push docker image to minikube registry:
 docker push $(minikube ip):5000/test-img
 ```
 
-# Building images inside of minikube using SSH
+---
+
+## 5. Building images inside of minikube using SSH
 
 Use `minikube ssh` to go inside a minikube node, and run the `docker build` directly there.
 any command you run there will run against the same daemon that kubernetes is using.

From fdc51cd328a14889a41b6a9ac2bd647fa89ae353 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:54:23 -0700
Subject: [PATCH 599/668] trying to guess syntax was a bad idea

---
 site/content/en/docs/tutorials/multi_node.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index 9a95c29f90..8e15789614 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -131,3 +131,4 @@ Hello from hello-c7b8df44f-xv4v6 (10.244.0.2)
 {{% readfile file="/docs/tutorials/includes/hello-svc.yaml" %}}
 ```
 {{% /tab %}}
+{{% /tabs %}}

From 5e0be853d904adc5deda920bcfc27d4e50c16220 Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Wed, 8 Apr 2020 17:55:54 -0700
Subject: [PATCH 600/668] Update accessing.md

---
 site/content/en/docs/handbook/accessing.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/content/en/docs/handbook/accessing.md b/site/content/en/docs/handbook/accessing.md
index 5df12ed3df..3b79ecfd2b 100644
--- a/site/content/en/docs/handbook/accessing.md
+++ b/site/content/en/docs/handbook/accessing.md
@@ -41,6 +41,7 @@ By default, minikube only exposes ports 30000-32767. If this does not work for y
 
 This flag also accepts a comma separated list of ports and port ranges.
 
+----
 ## LoadBalancer access
 
 A LoadBalancer service is the standard way to expose a service to the internet. With this method, each service gets its own IP address.

From 77482165426ac1df485c9f3db8f4c2accb23d544 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 8 Apr 2020 17:58:16 -0700
Subject: [PATCH 601/668] S Y N T A X

---
 site/content/en/docs/tutorials/multi_node.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index 8e15789614..971cadc992 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -120,7 +120,7 @@ Hello from hello-c7b8df44f-xv4v6 (10.244.0.2)
 ```
 {{% readfile file="/docs/tutorials/includes/kube-flannel.yaml" %}}
 ```
-{{% /tab %}
+{{% /tab %}}
 {{% tab hello-deployment.yaml %}}
 ```
 {{% readfile file="/docs/tutorials/includes/hello-deployment.yaml" %}}

From 16a8c386821dbba82296b9437f0071a19f882554 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 18:20:30 -0700
Subject: [PATCH 602/668] none: Add support for OpenRC init (Google CloudShell)

---
 cmd/minikube/cmd/docker-env.go                |   6 +-
 cmd/minikube/cmd/status.go                    |  12 +-
 hack/preload-images/generate.go               |   5 +-
 pkg/drivers/kic/kic.go                        |   8 +-
 pkg/drivers/none/none.go                      |  10 +-
 pkg/minikube/bootstrapper/bootstrapper.go     |   1 -
 pkg/minikube/bootstrapper/bsutil/binaries.go  |  14 ++-
 pkg/minikube/bootstrapper/bsutil/files.go     |  22 +---
 .../bsutil/kverify/system_pods.go             |  23 +---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go  |  75 ++++++-----
 pkg/minikube/cluster/pause.go                 |  19 ++-
 pkg/minikube/cruntime/containerd.go           |  19 +--
 pkg/minikube/cruntime/crio.go                 |  17 +--
 pkg/minikube/cruntime/cruntime.go             |  21 +++-
 pkg/minikube/cruntime/cruntime_test.go        |  26 ++--
 pkg/minikube/cruntime/docker.go               |  25 ++--
 pkg/minikube/kubelet/kubelet.go               | 117 ------------------
 pkg/minikube/node/start.go                    |   1 +
 pkg/minikube/registry/drvs/none/none.go       |   9 +-
 19 files changed, 154 insertions(+), 276 deletions(-)
 delete mode 100644 pkg/minikube/kubelet/kubelet.go

diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
index 76ae9d4f5a..c4432c6b58 100644
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@@ -24,7 +24,6 @@ import (
 	"io"
 	"net"
 	"os"
-	"os/exec"
 	"strconv"
 	"strings"
 
@@ -38,6 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/shell"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 var dockerEnvTmpl = fmt.Sprintf("{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerTLSVerify }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerCertPath }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .MinikubeDockerdProfile }}{{ .Suffix }}{{ if .NoProxyVar }}{{ .Prefix }}{{ .NoProxyVar }}{{ .Delimiter }}{{ .NoProxyValue }}{{ .Suffix }}{{end}}{{ .UsageHint }}", constants.DockerTLSVerifyEnv, constants.DockerHostEnv, constants.DockerCertPathEnv, constants.MinikubeActiveDockerdEnv)
@@ -116,9 +116,7 @@ func (EnvNoProxyGetter) GetNoProxyVar() (string, string) {
 
 // isDockerActive checks if Docker is active
 func isDockerActive(r command.Runner) bool {
-	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "docker")
-	_, err := r.RunCmd(c)
-	return err == nil
+	return sysinit.New(r).Active("docker")
 }
 
 // dockerEnvCmd represents the docker-env command
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
index 95d21e3079..a95c7978cb 100644
--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -208,15 +208,9 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status
 		return st, err
 	}
 
-	stk, err := kverify.KubeletStatus(cr)
-	glog.Infof("%s kubelet status = %s (err=%v)", name, stk, err)
-
-	if err != nil {
-		glog.Warningf("kubelet err: %v", err)
-		st.Kubelet = state.Error.String()
-	} else {
-		st.Kubelet = stk.String()
-	}
+	stk := kverify.KubeletStatus(cr)
+	glog.Infof("%s kubelet status = %s", name, stk)
+	st.Kubelet = stk.String()
 
 	// Early exit for regular nodes
 	if !controlPlane {
diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go
index f178a6592b..1a22e7404d 100644
--- a/hack/preload-images/generate.go
+++ b/hack/preload-images/generate.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string) error {
@@ -86,7 +87,9 @@ func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string
 		KubernetesVersion: kubernetesVersion,
 	}
 	runner := command.NewKICRunner(profile, driver.OCIBinary)
-	if err := bsutil.TransferBinaries(kcfg, runner); err != nil {
+	sm := sysinit.New(runner)
+
+	if err := bsutil.TransferBinaries(kcfg, runner, sm); err != nil {
 		return errors.Wrap(err, "transferring k8s binaries")
 	}
 	// Create image tarball
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 692bcdf485..7a342afcbc 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -37,7 +37,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/download"
-	"k8s.io/minikube/pkg/minikube/kubelet"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 // Driver represents a kic driver https://minikube.sigs.k8s.io/docs/reference/drivers/docker
@@ -245,7 +245,7 @@ func (d *Driver) GetState() (state.State, error) {
 func (d *Driver) Kill() error {
 	// on init this doesn't get filled when called from cmd
 	d.exec = command.NewKICRunner(d.MachineName, d.OCIBinary)
-	if err := kubelet.ForceStop(d.exec); err != nil {
+	if err := sysinit.New(d.exec).ForceStop("kubelet"); err != nil {
 		glog.Warningf("couldn't force stop kubelet. will continue with kill anyways: %v", err)
 	}
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName)
@@ -318,9 +318,9 @@ func (d *Driver) Stop() error {
 	d.exec = command.NewKICRunner(d.MachineName, d.OCIBinary)
 	// docker does not send right SIG for systemd to know to stop the systemd.
 	// to avoid bind address be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
-	if err := kubelet.Stop(d.exec); err != nil {
+	if err := sysinit.New(d.exec).Stop("kubelet"); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
-		if err := kubelet.ForceStop(d.exec); err != nil {
+		if err := sysinit.New(d.exec).ForceStop("kubelet"); err != nil {
 			glog.Warningf("couldn't force stop kubelet. will continue with stop anyways: %v", err)
 		}
 	}
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 91ab305464..1049f713fe 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
-	"k8s.io/minikube/pkg/minikube/kubelet"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
@@ -142,12 +142,12 @@ func (d *Driver) GetState() (state.State, error) {
 		return state.Running, nil
 	}
 
-	return kverify.KubeletStatus(d.exec)
+	return kverify.KubeletStatus(d.exec), nil
 }
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
-	if err := kubelet.ForceStop(d.exec); err != nil {
+	if err := sysinit.New(d.exec).ForceStop("kubelet"); err != nil {
 		glog.Warningf("couldn't force stop kubelet. will continue with kill anyways: %v", err)
 	}
 
@@ -211,9 +211,9 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
-	if err := kubelet.Stop(d.exec); err != nil {
+	if err := sysinit.New(d.exec).Stop("kubelet"); err != nil {
 		glog.Warningf("couldn't stop kubelet. will continue with stop anyways: %v", err)
-		if err := kubelet.ForceStop(d.exec); err != nil {
+		if err := sysinit.New(d.exec).ForceStop("kubelet"); err != nil {
 			glog.Warningf("couldn't force stop kubelet. will continue with stop anyways: %v", err)
 		}
 	}
diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go
index c724b2607f..0019b1750d 100644
--- a/pkg/minikube/bootstrapper/bootstrapper.go
+++ b/pkg/minikube/bootstrapper/bootstrapper.go
@@ -45,7 +45,6 @@ type Bootstrapper interface {
 	// LogCommands returns a map of log type to a command which will display that log.
 	LogCommands(config.ClusterConfig, LogOptions) map[string]string
 	SetupCerts(config.KubernetesConfig, config.Node) error
-	GetKubeletStatus() (string, error)
 	GetAPIServerStatus(string, int) (string, error)
 }
 
diff --git a/pkg/minikube/bootstrapper/bsutil/binaries.go b/pkg/minikube/bootstrapper/bsutil/binaries.go
index 0ffcaa05ad..341a5b295b 100644
--- a/pkg/minikube/bootstrapper/bsutil/binaries.go
+++ b/pkg/minikube/bootstrapper/bsutil/binaries.go
@@ -32,11 +32,12 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
 // TransferBinaries transfers all required Kubernetes binaries
-func TransferBinaries(cfg config.KubernetesConfig, c command.Runner) error {
+func TransferBinaries(cfg config.KubernetesConfig, c command.Runner, sm sysinit.Manager) error {
 	ok, err := binariesExist(cfg, c)
 	if err == nil && ok {
 		glog.Info("Found k8s binaries, skipping transfer")
@@ -50,11 +51,6 @@ func TransferBinaries(cfg config.KubernetesConfig, c command.Runner) error {
 		return err
 	}
 
-	// stop kubelet to avoid "Text File Busy" error
-	if _, err := c.RunCmd(exec.Command("/bin/bash", "-c", "pgrep kubelet && sudo systemctl stop kubelet")); err != nil {
-		glog.Warningf("unable to stop kubelet: %s", err)
-	}
-
 	var g errgroup.Group
 	for _, name := range constants.KubernetesReleaseBinaries {
 		name := name
@@ -64,6 +60,12 @@ func TransferBinaries(cfg config.KubernetesConfig, c command.Runner) error {
 				return errors.Wrapf(err, "downloading %s", name)
 			}
 
+			if name == "kubelet" {
+				if err := sm.ForceStop("kubelet"); err != nil {
+					glog.Errorf("unable to stop kubelet: %v", err)
+				}
+			}
+
 			dst := path.Join(dir, name)
 			if err := machine.CopyBinary(c, src, dst); err != nil {
 				return errors.Wrapf(err, "copybinary %s -> %s", src, dst)
diff --git a/pkg/minikube/bootstrapper/bsutil/files.go b/pkg/minikube/bootstrapper/bsutil/files.go
index cec6d69085..8d6bc05bc3 100644
--- a/pkg/minikube/bootstrapper/bsutil/files.go
+++ b/pkg/minikube/bootstrapper/bsutil/files.go
@@ -20,8 +20,6 @@ package bsutil
 import (
 	"path"
 
-	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
@@ -35,20 +33,8 @@ const (
 	KubeletServiceFile = "/lib/systemd/system/kubelet.service"
 	// KubeletSystemdConfFile is config for the systemd kubelet.service
 	KubeletSystemdConfFile = "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
+	// InitRestartWrapper is ...
+	InitRestartWrapper = "/etc/init.d/.restart_wrapper.sh"
+	// KubeletInitPath is where Sys-V style init script is installed
+	KubeletInitPath = "/etc/init.d/kubelet"
 )
-
-// ConfigFileAssets returns configuration file assets
-func ConfigFileAssets(cfg config.KubernetesConfig, kubeadm []byte, kubelet []byte, kubeletSvc []byte, defaultCNIConfig []byte) []assets.CopyableFile {
-	fs := []assets.CopyableFile{
-		assets.NewMemoryAssetTarget(kubeadm, KubeadmYamlPath+".new", "0640"),
-		assets.NewMemoryAssetTarget(kubelet, KubeletSystemdConfFile+".new", "0644"),
-		assets.NewMemoryAssetTarget(kubeletSvc, KubeletServiceFile+".new", "0644"),
-	}
-	// Copy the default CNI config (k8s.conf), so that kubelet can successfully
-	// start a Pod in the case a user hasn't manually installed any CNI plugin
-	// and minikube was started with "--extra-config=kubelet.network-plugin=cni".
-	if defaultCNIConfig != nil {
-		fs = append(fs, assets.NewMemoryAssetTarget(defaultCNIConfig, DefaultCNIConfigPath, "0644"))
-	}
-	return fs
-}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
index d13f3b3ea3..35dd40a858 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go
@@ -19,7 +19,6 @@ package kverify
 
 import (
 	"fmt"
-	"os/exec"
 	"strings"
 	"time"
 
@@ -36,6 +35,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 // WaitForSystemPods verifies essential pods for running kurnetes is running
@@ -156,22 +156,11 @@ func announceProblems(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg conf
 }
 
 // KubeletStatus checks the kubelet status
-func KubeletStatus(cr command.Runner) (state.State, error) {
+func KubeletStatus(cr command.Runner) state.State {
 	glog.Infof("Checking kubelet status ...")
-	rr, err := cr.RunCmd(exec.Command("sudo", "systemctl", "is-active", "kubelet"))
-	if err != nil {
-		// Do not return now, as we still have parsing to do!
-		glog.Warningf("%s returned error: %v", rr.Command(), err)
+	active := sysinit.New(cr).Active("kubelet")
+	if active {
+		return state.Running
 	}
-	s := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("kubelet is-active: %s", s)
-	switch s {
-	case "active":
-		return state.Running, nil
-	case "inactive":
-		return state.Stopped, nil
-	case "activating":
-		return state.Starting, nil
-	}
-	return state.Error, nil
+	return state.Stopped
 }
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 10bac2d726..b97707a5cf 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -51,9 +51,9 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
-	"k8s.io/minikube/pkg/minikube/kubelet"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 	"k8s.io/minikube/pkg/minikube/vmpath"
 	"k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/util/retry"
@@ -82,26 +82,6 @@ func NewBootstrapper(api libmachine.API, cc config.ClusterConfig, n config.Node)
 	return &Bootstrapper{c: runner, contextName: cc.Name, k8sClient: nil}, nil
 }
 
-// GetKubeletStatus returns the kubelet status
-func (k *Bootstrapper) GetKubeletStatus() (string, error) {
-	rr, err := k.c.RunCmd(exec.Command("sudo", "systemctl", "is-active", "kubelet"))
-	if err != nil {
-		// Do not return now, as we still have parsing to do!
-		glog.Warningf("%s returned error: %v", rr.Command(), err)
-	}
-	s := strings.TrimSpace(rr.Stdout.String())
-	glog.Infof("kubelet is-active: %s", s)
-	switch s {
-	case "active":
-		return state.Running.String(), nil
-	case "inactive":
-		return state.Stopped.String(), nil
-	case "activating":
-		return state.Starting.String(), nil
-	}
-	return state.Error.String(), nil
-}
-
 // GetAPIServerStatus returns the api-server status
 func (k *Bootstrapper) GetAPIServerStatus(hostname string, port int) (string, error) {
 	s, err := kverify.APIServerStatus(k.c, hostname, port)
@@ -190,7 +170,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 	}
 
 	extraFlags := bsutil.CreateFlagsFromExtraArgs(cfg.KubernetesConfig.ExtraOptions)
-	r, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime})
+	r, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
 	if err != nil {
 		return err
 	}
@@ -615,7 +595,7 @@ func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
 		glog.Warningf("%s: %v", rr.Command(), err)
 	}
 
-	if err := kubelet.ForceStop(k.c); err != nil {
+	if err := sysinit.New(k.c).ForceStop("kubelet"); err != nil {
 		glog.Warningf("stop kubelet: %v", err)
 	}
 
@@ -679,6 +659,11 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error {
 
 // UpdateNode updates a node.
 func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cruntime.Manager) error {
+	now := time.Now()
+	defer func() {
+		glog.Infof("reloadKubelet took %s", time.Since(now))
+	}()
+
 	kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, n, r)
 	if err != nil {
 		return errors.Wrap(err, "generating kubeadm cfg")
@@ -696,24 +681,40 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru
 
 	glog.Infof("kubelet %s config:\n%+v", kubeletCfg, cfg.KubernetesConfig)
 
-	if err := bsutil.TransferBinaries(cfg.KubernetesConfig, k.c); err != nil {
+	sm := sysinit.New(k.c)
+
+	if err := bsutil.TransferBinaries(cfg.KubernetesConfig, k.c, sm); err != nil {
 		return errors.Wrap(err, "downloading binaries")
 	}
 
-	var cniFile []byte
+	files := []assets.CopyableFile{
+		assets.NewMemoryAssetTarget(kubeadmCfg, bsutil.KubeadmYamlPath+".new", "0640"),
+		assets.NewMemoryAssetTarget(kubeletCfg, bsutil.KubeletSystemdConfFile+".new", "0644"),
+		assets.NewMemoryAssetTarget(kubeletService, bsutil.KubeletServiceFile+".new", "0644"),
+	}
+	// Copy the default CNI config (k8s.conf), so that kubelet can successfully
+	// start a Pod in the case a user hasn't manually installed any CNI plugin
+	// and minikube was started with "--extra-config=kubelet.network-plugin=cni".
 	if cfg.KubernetesConfig.EnableDefaultCNI {
-		cniFile = []byte(defaultCNIConfig)
+		files = append(files, assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), bsutil.DefaultCNIConfigPath, "0644"))
 	}
 
-	// Install assets into temporary files
-	files := bsutil.ConfigFileAssets(cfg.KubernetesConfig, kubeadmCfg, kubeletCfg, kubeletService, cniFile)
+	// Installs compatibility shims for non-systemd environments
+	kubeletPath := path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl")
+	shims, err := sm.GenerateInitShim("kubelet", kubeletPath, bsutil.KubeletSystemdConfFile)
+	if err != nil {
+		return errors.Wrap(err, "shim")
+	}
+	files = append(files, shims...)
+
 	if err := copyFiles(k.c, files); err != nil {
-		return err
+		return errors.Wrap(err, "copy")
 	}
 
-	if err := reloadKubelet(k.c); err != nil {
-		return err
+	if err := startKubeletIfRequired(k.c, sm); err != nil {
+		return errors.Wrap(err, "reload")
 	}
+
 	return nil
 }
 
@@ -736,7 +737,12 @@ func copyFiles(runner command.Runner, files []assets.CopyableFile) error {
 	return nil
 }
 
-func reloadKubelet(runner command.Runner) error {
+func startKubeletIfRequired(runner command.Runner, sm sysinit.Manager) error {
+	now := time.Now()
+	defer func() {
+		glog.Infof("reloadKubelet took %s", time.Since(now))
+	}()
+
 	svc := bsutil.KubeletServiceFile
 	conf := bsutil.KubeletSystemdConfFile
 
@@ -746,11 +752,12 @@ func reloadKubelet(runner command.Runner) error {
 		return nil
 	}
 
-	startCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo cp %s.new %s && sudo cp %s.new %s && sudo systemctl daemon-reload && sudo systemctl restart kubelet", svc, svc, conf, conf))
+	startCmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo cp %s.new %s && sudo cp %s.new %s", svc, svc, conf, conf))
 	if _, err := runner.RunCmd(startCmd); err != nil {
 		return errors.Wrap(err, "starting kubelet")
 	}
-	return nil
+
+	return sm.Start("kubelet")
 }
 
 // applyKicOverlay applies the CNI plugin needed to make kic work
diff --git a/pkg/minikube/cluster/pause.go b/pkg/minikube/cluster/pause.go
index d7661f1274..09b1a10c24 100644
--- a/pkg/minikube/cluster/pause.go
+++ b/pkg/minikube/cluster/pause.go
@@ -21,27 +21,33 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/kubelet"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 // Pause pauses a Kubernetes cluster
 func Pause(cr cruntime.Manager, r command.Runner, namespaces []string) ([]string, error) {
 	ids := []string{}
+
 	// Disable the kubelet so it does not attempt to restart paused pods
-	if err := kubelet.Disable(r); err != nil {
+	sm := sysinit.New(r)
+	if err := sm.Disable("kubelet"); err != nil {
 		return ids, errors.Wrap(err, "kubelet disable")
 	}
-	if err := kubelet.Stop(r); err != nil {
+
+	if err := sm.Stop("kubelet"); err != nil {
 		return ids, errors.Wrap(err, "kubelet stop")
 	}
+
 	ids, err := cr.ListContainers(cruntime.ListOptions{State: cruntime.Running, Namespaces: namespaces})
 	if err != nil {
 		return ids, errors.Wrap(err, "list running")
 	}
+
 	if len(ids) == 0 {
 		glog.Warningf("no running containers to pause")
 		return ids, nil
 	}
+
 	return ids, cr.PauseContainers(ids)
 
 }
@@ -59,11 +65,14 @@ func Unpause(cr cruntime.Manager, r command.Runner, namespaces []string) ([]stri
 		return ids, errors.Wrap(err, "unpause")
 	}
 
-	if err := kubelet.Enable(r); err != nil {
+	sm := sysinit.New(r)
+	if err := sm.Enable("kubelet"); err != nil {
 		return ids, errors.Wrap(err, "kubelet enable")
 	}
-	if err := kubelet.Start(r); err != nil {
+
+	if err := sm.Start("kubelet"); err != nil {
 		return ids, errors.Wrap(err, "kubelet start")
 	}
+
 	return ids, nil
 }
diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go
index 89a2e3912a..8eadb57392 100644
--- a/pkg/minikube/cruntime/containerd.go
+++ b/pkg/minikube/cruntime/containerd.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 const (
@@ -116,6 +117,7 @@ type Containerd struct {
 	Runner            CommandRunner
 	ImageRepository   string
 	KubernetesVersion semver.Version
+	Init              sysinit.Manager
 }
 
 // Name is a human readable name for containerd
@@ -158,9 +160,7 @@ func (r *Containerd) DefaultCNI() bool {
 
 // Active returns if containerd is active on the host
 func (r *Containerd) Active() bool {
-	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "containerd")
-	_, err := r.Runner.RunCmd(c)
-	return err == nil
+	return r.Init.Active("containerd")
 }
 
 // Available returns an error if it is not possible to use this runtime on a host
@@ -208,21 +208,14 @@ func (r *Containerd) Enable(disOthers bool) error {
 	if err := enableIPForwarding(r.Runner); err != nil {
 		return err
 	}
+
 	// Otherwise, containerd will fail API requests with 'Unimplemented'
-	c := exec.Command("sudo", "systemctl", "restart", "containerd")
-	if _, err := r.Runner.RunCmd(c); err != nil {
-		return errors.Wrap(err, "restart containerd")
-	}
-	return nil
+	return r.Init.Restart("containerd")
 }
 
 // Disable idempotently disables containerd on a host
 func (r *Containerd) Disable() error {
-	c := exec.Command("sudo", "systemctl", "stop", "-f", "containerd")
-	if _, err := r.Runner.RunCmd(c); err != nil {
-		return errors.Wrapf(err, "stop containerd")
-	}
-	return nil
+	return r.Init.ForceStop("containerd")
 }
 
 // ImageExists checks if an image exists, expected input format
diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go
index 5678a9d6a4..250d765df4 100644
--- a/pkg/minikube/cruntime/crio.go
+++ b/pkg/minikube/cruntime/crio.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 const (
@@ -41,6 +42,7 @@ type CRIO struct {
 	Runner            CommandRunner
 	ImageRepository   string
 	KubernetesVersion semver.Version
+	Init              sysinit.Manager
 }
 
 // generateCRIOConfig sets up /etc/crio/crio.conf
@@ -104,9 +106,7 @@ func (r *CRIO) Available() error {
 
 // Active returns if CRIO is active on the host
 func (r *CRIO) Active() bool {
-	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "crio")
-	_, err := r.Runner.RunCmd(c)
-	return err == nil
+	return r.Init.Active("crio")
 }
 
 // Enable idempotently enables CRIO on a host
@@ -125,19 +125,12 @@ func (r *CRIO) Enable(disOthers bool) error {
 	if err := enableIPForwarding(r.Runner); err != nil {
 		return err
 	}
-
-	if _, err := r.Runner.RunCmd(exec.Command("sudo", "systemctl", "restart", "crio")); err != nil {
-		return errors.Wrapf(err, "enable crio.")
-	}
-	return nil
+	return r.Init.Start("crio")
 }
 
 // Disable idempotently disables CRIO on a host
 func (r *CRIO) Disable() error {
-	if _, err := r.Runner.RunCmd(exec.Command("sudo", "systemctl", "stop", "-f", "crio")); err != nil {
-		return errors.Wrapf(err, "disable crio.")
-	}
-	return nil
+	return r.Init.ForceStop("crio")
 }
 
 // ImageExists checks if an image exists
diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go
index d7153d0830..9bde921993 100644
--- a/pkg/minikube/cruntime/cruntime.go
+++ b/pkg/minikube/cruntime/cruntime.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 // ContainerState is the run state of a container
@@ -131,13 +132,27 @@ type ListOptions struct {
 
 // New returns an appropriately configured runtime
 func New(c Config) (Manager, error) {
+	sm := sysinit.New(c.Runner)
+
 	switch c.Type {
 	case "", "docker":
-		return &Docker{Socket: c.Socket, Runner: c.Runner}, nil
+		return &Docker{Socket: c.Socket, Runner: c.Runner, Init: sm}, nil
 	case "crio", "cri-o":
-		return &CRIO{Socket: c.Socket, Runner: c.Runner, ImageRepository: c.ImageRepository, KubernetesVersion: c.KubernetesVersion}, nil
+		return &CRIO{
+			Socket:            c.Socket,
+			Runner:            c.Runner,
+			ImageRepository:   c.ImageRepository,
+			KubernetesVersion: c.KubernetesVersion,
+			Init:              sm,
+		}, nil
 	case "containerd":
-		return &Containerd{Socket: c.Socket, Runner: c.Runner, ImageRepository: c.ImageRepository, KubernetesVersion: c.KubernetesVersion}, nil
+		return &Containerd{
+			Socket:            c.Socket,
+			Runner:            c.Runner,
+			ImageRepository:   c.ImageRepository,
+			KubernetesVersion: c.KubernetesVersion,
+			Init:              sm,
+		}, nil
 	default:
 		return nil, fmt.Errorf("unknown runtime type: %q", c.Type)
 	}
diff --git a/pkg/minikube/cruntime/cruntime_test.go b/pkg/minikube/cruntime/cruntime_test.go
index 9523f1126a..aef420cf84 100644
--- a/pkg/minikube/cruntime/cruntime_test.go
+++ b/pkg/minikube/cruntime/cruntime_test.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/golang/glog"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/pkg/errors"
@@ -406,12 +407,27 @@ func (f *FakeRunner) crictl(args []string, _ bool) (string, error) {
 
 // systemctl is a fake implementation of systemctl
 func (f *FakeRunner) systemctl(args []string, root bool) (string, error) { // nolint result 0 (string) is always ""
+	glog.Infof("fake systemctl: %v", args)
 	action := args[0]
-	svcs := args[1:]
+
+	if action == "--version" {
+		return "systemd 123 (321.2-1)", nil
+	}
+
+	if action == "daemon-reload" {
+		return "ok", nil
+	}
+
+	var svcs []string
+	if len(args) > 0 {
+		svcs = args[1:]
+	}
+
 	// force
 	if svcs[0] == "-f" {
 		svcs = svcs[1:]
 	}
+
 	out := ""
 
 	for i, arg := range args {
@@ -496,7 +512,6 @@ func TestVersion(t *testing.T) {
 // defaultServices reflects the default boot state for the minikube VM
 var defaultServices = map[string]serviceState{
 	"docker":        SvcRunning,
-	"docker.socket": SvcRunning,
 	"crio":          SvcExited,
 	"crio-shutdown": SvcExited,
 	"containerd":    SvcExited,
@@ -507,7 +522,7 @@ func TestDisable(t *testing.T) {
 		runtime string
 		want    []string
 	}{
-		{"docker", []string{"sudo", "systemctl", "stop", "-f", "docker", "docker.socket"}},
+		{"docker", []string{"sudo", "systemctl", "stop", "-f", "docker"}},
 		{"crio", []string{"sudo", "systemctl", "stop", "-f", "crio"}},
 		{"containerd", []string{"sudo", "systemctl", "stop", "-f", "containerd"}},
 	}
@@ -539,23 +554,20 @@ func TestEnable(t *testing.T) {
 	}{
 		{"docker", map[string]serviceState{
 			"docker":        SvcRunning,
-			"docker.socket": SvcRunning,
 			"containerd":    SvcExited,
 			"crio":          SvcExited,
 			"crio-shutdown": SvcExited,
 		}},
 		{"containerd", map[string]serviceState{
 			"docker":        SvcExited,
-			"docker.socket": SvcExited,
 			"containerd":    SvcRestarted,
 			"crio":          SvcExited,
 			"crio-shutdown": SvcExited,
 		}},
 		{"crio", map[string]serviceState{
 			"docker":        SvcExited,
-			"docker.socket": SvcExited,
 			"containerd":    SvcExited,
-			"crio":          SvcRestarted,
+			"crio":          SvcRunning,
 			"crio-shutdown": SvcExited,
 		}},
 	}
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index df9577f47c..236ae3510a 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/docker"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/sysinit"
 )
 
 // KubernetesContainerPrefix is the prefix of each kubernetes container
@@ -56,6 +57,7 @@ func (e *ErrISOFeature) Error() string {
 type Docker struct {
 	Socket string
 	Runner CommandRunner
+	Init   sysinit.Manager
 }
 
 // Name is a human readable name for Docker
@@ -97,9 +99,7 @@ func (r *Docker) Available() error {
 
 // Active returns if docker is active on the host
 func (r *Docker) Active() bool {
-	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "docker")
-	_, err := r.Runner.RunCmd(c)
-	return err == nil
+	return r.Init.Active("docker")
 }
 
 // Enable idempotently enables Docker on a host
@@ -109,29 +109,18 @@ func (r *Docker) Enable(disOthers bool) error {
 			glog.Warningf("disableOthers: %v", err)
 		}
 	}
-	c := exec.Command("sudo", "systemctl", "start", "docker")
-	if _, err := r.Runner.RunCmd(c); err != nil {
-		return errors.Wrap(err, "enable docker.")
-	}
-	return nil
+
+	return r.Init.Start("docker")
 }
 
 // Restart restarts Docker on a host
 func (r *Docker) Restart() error {
-	c := exec.Command("sudo", "systemctl", "restart", "docker")
-	if _, err := r.Runner.RunCmd(c); err != nil {
-		return errors.Wrap(err, "restarting docker.")
-	}
-	return nil
+	return r.Init.Restart("docker")
 }
 
 // Disable idempotently disables Docker on a host
 func (r *Docker) Disable() error {
-	c := exec.Command("sudo", "systemctl", "stop", "-f", "docker", "docker.socket")
-	if _, err := r.Runner.RunCmd(c); err != nil {
-		return errors.Wrap(err, "disable docker")
-	}
-	return nil
+	return r.Init.ForceStop("docker")
 }
 
 // ImageExists checks if an image exists
diff --git a/pkg/minikube/kubelet/kubelet.go b/pkg/minikube/kubelet/kubelet.go
deleted file mode 100644
index 8f15e6aca0..0000000000
--- a/pkg/minikube/kubelet/kubelet.go
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package kubelet
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/minikube/command"
-	"k8s.io/minikube/pkg/util/retry"
-)
-
-// Stop idempotently stops the kubelet
-func Stop(cr command.Runner) error {
-	return stop(cr, false)
-}
-
-// ForceStop idempotently force stops the kubelet
-func ForceStop(cr command.Runner) error {
-	return stop(cr, true)
-}
-
-// stop dempotently stops the kubelet
-func stop(cr command.Runner, force bool) error {
-	glog.Infof("stopping kubelet ...")
-	stp := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
-		if force {
-			cmd = exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
-		}
-		if rr, err := cr.RunCmd(cmd); err != nil {
-			return fmt.Errorf("temporary error for %q : %v", rr.Command(), err)
-		}
-		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
-		rr, err := cr.RunCmd(cmd)
-		if err != nil {
-			return fmt.Errorf("temporary error: for %q : %v", rr.Command(), err)
-		}
-		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
-			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
-		}
-		return nil
-	}
-
-	if err := retry.Expo(stp, 1*time.Second, time.Minute, 2); err != nil {
-		return errors.Wrapf(err, "error stopping kubelet")
-	}
-	return nil
-}
-
-// Start starts the kubelet
-func Start(cr command.Runner) error {
-	glog.Infof("restarting kubelet.service ...")
-	c := exec.Command("sudo", "systemctl", "start", "kubelet")
-	if _, err := cr.RunCmd(c); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Restart restarts the kubelet
-func Restart(cr command.Runner) error {
-	glog.Infof("restarting kubelet.service ...")
-	c := exec.Command("sudo", "systemctl", "restart", "kubelet.service")
-	if _, err := cr.RunCmd(c); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Check checks on the status of the kubelet
-func Check(cr command.Runner) error {
-	glog.Infof("checking for running kubelet ...")
-	c := exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", "kubelet")
-	if _, err := cr.RunCmd(c); err != nil {
-		return errors.Wrap(err, "check kubelet")
-	}
-	return nil
-}
-
-// Disable disables the Kubelet
-func Disable(cr command.Runner) error {
-	glog.Infof("disabling kubelet ...")
-	c := exec.Command("sudo", "systemctl", "disable", "kubelet")
-	if _, err := cr.RunCmd(c); err != nil {
-		return errors.Wrap(err, "disable")
-	}
-	return nil
-}
-
-// Enable enables the Kubelet
-func Enable(cr command.Runner) error {
-	glog.Infof("enabling kubelet ...")
-	c := exec.Command("sudo", "systemctl", "enable", "kubelet")
-	if _, err := cr.RunCmd(c); err != nil {
-		return errors.Wrap(err, "enable")
-	}
-	return nil
-}
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index b2129662cd..46af9f8bd8 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -125,6 +125,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 		// setup kubeadm (must come after setupKubeconfig)
 		bs = setupKubeAdm(machineAPI, cc, n)
+
 		err = bs.StartCluster(cc)
 		if err != nil {
 			exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, cc, mRunner))
diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index fd7e42a6de..3c7ef6b48c 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -52,10 +52,15 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 }
 
 func status() registry.State {
-	if _, err := exec.LookPath("systemctl"); err != nil {
-		return registry.State{Error: err, Fix: "Use a systemd based Linux distribution", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
+	_, err := exec.LookPath("iptables")
+	if err != nil {
+		return registry.State{Error: err, Fix: "iptables must be installed", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
 	}
 
+	/* if _, err := exec.LookPath("systemctl"); err != nil {
+		return registry.State{Error: err, Fix: "Use a systemd based Linux distribution", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
+	}*/
+
 	if _, err := exec.LookPath("docker"); err != nil {
 		return registry.State{Error: err, Installed: false, Fix: "Install docker", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
 	}

From 7d2b045c40eb6eabf0607f8c1d32835b6bfb2318 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 18:23:09 -0700
Subject: [PATCH 603/668] Remove obsolete comment

---
 pkg/minikube/registry/drvs/none/none.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
index 3c7ef6b48c..ec8cea71d8 100644
--- a/pkg/minikube/registry/drvs/none/none.go
+++ b/pkg/minikube/registry/drvs/none/none.go
@@ -57,10 +57,6 @@ func status() registry.State {
 		return registry.State{Error: err, Fix: "iptables must be installed", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
 	}
 
-	/* if _, err := exec.LookPath("systemctl"); err != nil {
-		return registry.State{Error: err, Fix: "Use a systemd based Linux distribution", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
-	}*/
-
 	if _, err := exec.LookPath("docker"); err != nil {
 		return registry.State{Error: err, Installed: false, Fix: "Install docker", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}
 	}

From b742c84ee7686546c9d4e9822620fbe3f3b01259 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 18:26:17 -0700
Subject: [PATCH 604/668] Add sysinit package

---
 pkg/minikube/sysinit/openrc.go  | 170 ++++++++++++++++++++++++++++++++
 pkg/minikube/sysinit/sysinit.go |  85 ++++++++++++++++
 pkg/minikube/sysinit/systemd.go |  98 ++++++++++++++++++
 3 files changed, 353 insertions(+)
 create mode 100644 pkg/minikube/sysinit/openrc.go
 create mode 100644 pkg/minikube/sysinit/sysinit.go
 create mode 100644 pkg/minikube/sysinit/systemd.go

diff --git a/pkg/minikube/sysinit/openrc.go b/pkg/minikube/sysinit/openrc.go
new file mode 100644
index 0000000000..822c4157d0
--- /dev/null
+++ b/pkg/minikube/sysinit/openrc.go
@@ -0,0 +1,170 @@
+/*
+Copyright 2019 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package sysinit provides an abstraction over init systems like systemctl
+package sysinit
+
+import (
+	"bytes"
+	"context"
+	"html/template"
+	"os/exec"
+	"path"
+	"time"
+
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/assets"
+	"k8s.io/minikube/pkg/minikube/vmpath"
+)
+
+var restartWrapper = `#!/bin/bash
+# Wrapper script to emulate systemd restart on non-systemd systems
+readonly UNIT_PATH=$1
+
+while true; do
+  if [[ -f "${UNIT_PATH}" ]]; then
+	eval $(egrep "^ExecStart=" "${UNIT_PATH}" | cut -d"=" -f2-)
+  fi
+  sleep 1
+done
+`
+
+var initScriptTmpl = template.Must(template.New("initScript").Parse(`#!/bin/bash
+# OpenRC init script shim for systemd units
+readonly NAME="{{.Name}}"
+readonly RESTART_WRAPPER="{{.Wrapper}}"
+readonly UNIT_PATH="{{.Unit}}"
+readonly PID_PATH="/var/run/${NAME}.pid"
+
+function start() {
+    start-stop-daemon --oknodo --pidfile "${PID_PATH}" --background --start --make-pid --exec "${RESTART_WRAPPER}" "${UNIT_PATH}"
+}
+
+function stop() {
+	if [[ -f "${PID_PATH}" ]]; then
+		pkill -P "$(cat ${PID_PATH})"
+	fi
+	start-stop-daemon --oknodo --pidfile "${PID_PATH}" --stop
+}
+
+case "$1" in
+    start)
+        start
+		;;
+    stop)
+        stop
+		;;
+    restart)
+        stop
+        start
+		;;
+    status)
+        start-stop-daemon --pidfile "${PID_PATH}" --status
+		;;
+	*)
+	    echo "Usage: {{.Name}} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+`))
+
+// OpenRC is a service manager for OpenRC-like init systems
+type OpenRC struct {
+	r Runner
+}
+
+// Name returns the name of the init system
+func (s *OpenRC) Name() string {
+	return "OpenRC"
+}
+
+// Active checks if a service is running
+func (s *OpenRC) Active(svc string) bool {
+	_, err := s.r.RunCmd(exec.Command("sudo", "service", svc, "status"))
+	return err == nil
+}
+
+// Start starts a service idempotently
+func (s *OpenRC) Start(svc string) error {
+	if s.Active(svc) {
+		return nil
+	}
+	ctx, cb := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cb()
+
+	rr, err := s.r.RunCmd(exec.CommandContext(ctx, "sudo", "service", svc, "start"))
+	glog.Infof("start output: %s", rr.Output())
+	return err
+}
+
+// Disable does nothing
+func (s *OpenRC) Disable(svc string) error {
+	return nil
+}
+
+// Enable does nothing
+func (s *OpenRC) Enable(svc string) error {
+	return nil
+}
+
+// Restart restarts a service
+func (s *OpenRC) Restart(svc string) error {
+	rr, err := s.r.RunCmd(exec.Command("sudo", "service", svc, "restart"))
+	glog.Infof("restart output: %s", rr.Output())
+	return err
+}
+
+// Stop stops a service
+func (s *OpenRC) Stop(svc string) error {
+	rr, err := s.r.RunCmd(exec.Command("sudo", "service", svc, "stop"))
+	glog.Infof("stop output: %s", rr.Output())
+	return err
+}
+
+// ForceStop stops a service with prejuidice
+func (s *OpenRC) ForceStop(svc string) error {
+	return s.Stop(svc)
+}
+
+// GenerateInitShim generates any additional init files required for this service
+func (s *OpenRC) GenerateInitShim(svc string, binary string, unit string) ([]assets.CopyableFile, error) {
+	restartWrapperPath := path.Join(vmpath.GuestPersistentDir, "openrc-restart-wrapper.sh")
+
+	opts := struct {
+		Binary  string
+		Wrapper string
+		Name    string
+		Unit    string
+	}{
+		Name:    svc,
+		Binary:  binary,
+		Wrapper: restartWrapperPath,
+		Unit:    unit,
+	}
+
+	var b bytes.Buffer
+	if err := initScriptTmpl.Execute(&b, opts); err != nil {
+		return nil, errors.Wrap(err, "template execute")
+	}
+
+	files := []assets.CopyableFile{
+		assets.NewMemoryAssetTarget([]byte(restartWrapper), restartWrapperPath, "0755"),
+		assets.NewMemoryAssetTarget(b.Bytes(), path.Join("/etc/init.d/", svc), "0755"),
+	}
+
+	return files, nil
+}
diff --git a/pkg/minikube/sysinit/sysinit.go b/pkg/minikube/sysinit/sysinit.go
new file mode 100644
index 0000000000..fc20479ded
--- /dev/null
+++ b/pkg/minikube/sysinit/sysinit.go
@@ -0,0 +1,85 @@
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sysinit
+
+import (
+	"os/exec"
+
+	"k8s.io/minikube/pkg/minikube/assets"
+	"k8s.io/minikube/pkg/minikube/command"
+)
+
+var cachedSystemdCheck *bool
+
+// Runner is the subset of command.Runner this package consumes
+type Runner interface {
+	RunCmd(cmd *exec.Cmd) (*command.RunResult, error)
+}
+
+// Manager is a common interface for init systems
+type Manager interface {
+	// Name returns the name of the init manager
+	Name() string
+
+	// Active returns if a service is active
+	Active(string) bool
+
+	// Disable disables a service
+	Disable(string) error
+
+	// Enable enables a service
+	Enable(string) error
+
+	// Start starts a service idempotently
+	Start(string) error
+
+	// Restart restarts a service
+	Restart(string) error
+
+	// Stop stops a service
+	Stop(string) error
+
+	// ForceStop stops a service with prejudice
+	ForceStop(string) error
+
+	// GenerateInitShim generates any additional init files required for this service
+	GenerateInitShim(svc string, binary string, unit string) ([]assets.CopyableFile, error)
+}
+
+// New returns an appropriately configured service manager
+func New(r Runner) Manager {
+	// If we are not provided a runner, we can't do anything anyways
+	if r == nil {
+		return nil
+	}
+
+	var systemd bool
+
+	// Caching the result is important, as this manager may be created in many places,
+	// and ssh calls are expensive on some drivers, such as Docker.
+	if cachedSystemdCheck != nil {
+		systemd = *cachedSystemdCheck
+	} else {
+		systemd = usesSystemd(r)
+		cachedSystemdCheck = &systemd
+	}
+
+	if systemd {
+		return &Systemd{r: r}
+	}
+	return &OpenRC{r: r}
+}
diff --git a/pkg/minikube/sysinit/systemd.go b/pkg/minikube/sysinit/systemd.go
new file mode 100644
index 0000000000..4bb53a186b
--- /dev/null
+++ b/pkg/minikube/sysinit/systemd.go
@@ -0,0 +1,98 @@
+/*
+Copyright 2019 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package sysinit provides an abstraction over init systems like systemctl
+package sysinit
+
+import (
+	"os/exec"
+
+	"k8s.io/minikube/pkg/minikube/assets"
+)
+
+// Systemd is a service manager for systemd distributions
+type Systemd struct {
+	r Runner
+}
+
+// Name returns the name of the init system
+func (s *Systemd) Name() string {
+	return "systemd"
+}
+
+// reload reloads systemd configuration
+func (s *Systemd) reload() error {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "daemon-reload"))
+	return err
+}
+
+// Active checks if a service is running
+func (s *Systemd) Active(svc string) bool {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "is-active", "--quiet", "service", svc))
+	return err == nil
+}
+
+// Disable disables a service
+func (s *Systemd) Disable(svc string) error {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "disable", svc))
+	return err
+}
+
+// Enable enables a service
+func (s *Systemd) Enable(svc string) error {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "enable", svc))
+	return err
+}
+
+// Start starts a service
+func (s *Systemd) Start(svc string) error {
+	if err := s.reload(); err != nil {
+		return err
+	}
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "start", svc))
+	return err
+}
+
+// Restart restarts a service
+func (s *Systemd) Restart(svc string) error {
+	if err := s.reload(); err != nil {
+		return err
+	}
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "restart", svc))
+	return err
+}
+
+// Stop stops a service
+func (s *Systemd) Stop(svc string) error {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "stop", svc))
+	return err
+}
+
+// ForceStop terminates a service with prejudice
+func (s *Systemd) ForceStop(svc string) error {
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "stop", "-f", svc))
+	return err
+}
+
+// GenerateInitShim does nothing for systemd
+func (s *Systemd) GenerateInitShim(svc string, binary string, unit string) ([]assets.CopyableFile, error) {
+	return nil, nil
+}
+
+func usesSystemd(r Runner) bool {
+	_, err := r.RunCmd(exec.Command("systemctl", "--version"))
+	return err == nil
+}

From 93d9e523583129561768893f16af947e3d4b51d0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 18:50:18 -0700
Subject: [PATCH 605/668] address review comments

---
 site/content/en/docs/handbook/pushing.md | 26 ++++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 0f43ce99c2..d636640042 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -11,17 +11,17 @@ aliases:
 ---
 
 ## Comparison table for different methods 
-the answer depends on the container-runtime driver you choose. 
+The best method to push your image to minikube depends on the container-runtime you built your cluster with (default docker).
 Here is a comparison table to help you choose:
 
 
 | Method   	| Supported Runtimes   	|  Issues 	|  Performance 	|
 |---	|---	|---	|---	|---	|
-|  [docker-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-the-in-cluster-docker-daemon)	|   only docker	|  	|  good 	|
-|  [podman-env command](http://localhost:1313/docs/handbook/pushing/#pushing-directly-to-in-cluster-crio)	|   only cri-o	|     |  good 	|
-|  [cache add command](http://localhost:1313/docs/handbook/pushing/#push-images-using-cache-command) 	|  all 	|    	|  ok 	|
-|  [registry addon](http://localhost:1313/docs/handbook/pushing/#pushing-to-an-in-cluster-using-a-registry-addon)   |   all	|   work in progress for [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
-|  [minikube ssh](http://localhost:1313/docs/handbook/pushing/#building-images-inside-of-minikube-using-ssh)   |   all	|    |  best 	|
+|  [docker-env command](/docs/handbook/pushing/#1pushing-directly-to-the-in-cluster-docker-daemon-docker-env)	|   only docker	|  	|  good 	|
+|  [podman-env command](/docs/handbook/pushing/#3-pushing-directly-to-in-cluster-crio-podman-env)	|   only cri-o	|     |  good 	|
+|  [cache add command](/pushing/#push-images-using-cache-command) 	|  all 	|    	|  ok 	|
+|  [registry addon](/docs/handbook/pushing/#4-pushing-to-an-in-cluster-using-registry-addon)   |   all	|   work in progress for [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
+|  [minikube ssh](/docs/handbook/pushing/#5-building-images-inside-of-minikube-using-ssh)   |   all	|    |  best 	|
 
 
 * note1 : the default container-runtime on minikube is 'docker'.
@@ -54,10 +54,14 @@ docker build -t myimage .
 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
 
-
-Please remember evalulating the docker-env is only valid for the current terminal.
+{{% pageinfo %}}
+Evaluating the docker-env is only valid for the current terminal.
 and by closing the terminal, you will go back to using your own system's docker daemon.
-to verify your terminal is using minikuber's docker-env you can check the value of the environment MINIKUBE_ACTIVE_DOCKERD
+
+in some drivers such as Docker or Podman, you will need to re-do docker-env each time you restart your minikube.
+{{% /pageinfo %}}
+
+To verify your terminal is using minikuber's docker-env you can check the value of the environment variable MINIKUBE_ACTIVE_DOCKERD to reflect the profile name.
 
 more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 
@@ -146,8 +150,8 @@ docker push $(minikube ip):5000/test-img
 
 ## 5. Building images inside of minikube using SSH
 
-Use `minikube ssh` to go inside a minikube node, and run the `docker build` directly there.
-any command you run there will run against the same daemon that kubernetes is using.
+Use `minikube ssh` to run commands inside the minikube node, and run the `docker build` directly there.
+Any command you run there will run against the same daemon that kubernetes cluster is using.
 
 ```shell
 docker build

From 794d78a788c988fa926b55cae3a8046ec210b44d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 18:55:21 -0700
Subject: [PATCH 606/668] document registery limitation on docker mac

---
 site/content/en/docs/drivers/docker.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md
index bf47ed840b..248428753d 100644
--- a/site/content/en/docs/drivers/docker.md
+++ b/site/content/en/docs/drivers/docker.md
@@ -21,12 +21,16 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta
 
 - On macOS, containers might get hung and require a restart of Docker for Desktop. See [docker/for-mac#1835](https://github.com/docker/for-mac/issues/1835)
 
-- The `ingress` and `ingress-dns` addons are currently only supported on Linux. See [#7332](https://github.com/kubernetes/minikube/issues/7332)
+- The `ingress`, `ingress-dns` and `registry` addons are currently only supported on Linux. See [#7332](https://github.com/kubernetes/minikube/issues/7332) and [#7535](https://github.com/kubernetes/minikube/issues/7535)
 
 - On WSL2 (experimental - see [#5392](https://github.com/kubernetes/minikube/issues/5392)), you may need to run:
 
    `sudo mkdir /sys/fs/cgroup/systemd && sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd`.
 
+- Addon 'registry' for mac and windows is not supported yet and it is [a work in progress](https://github.com/kubernetes/minikube/issues/7535).
+
+
+
 ## Troubleshooting
 
 - On macOS or Windows, you may need to restart Docker for Desktop if a command gets hung

From a823b9b80b9646a00c3937ce0708b53cd0aea3a5 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 19:09:02 -0700
Subject: [PATCH 607/668] address review comments

---
 site/content/en/docs/handbook/pushing.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index d636640042..3647aa4058 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -72,10 +72,19 @@ more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/dock
 From the host, you can push a Docker image directly to minikube. It will also be cached for all minikube clusters .
 
 ```shell
-minikube cache add ubuntu:16.04
+minikube cache add alpine:latest
 ```
 
-The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the VM's container runtime environment next time `minikube start` is called.
+The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the minikube cluster's container runtime environment automatically.
+
+{{% pageinfo %}}
+if your image changes after your cached it, you could do `cache reload` to ensure minikube gets the last updates.
+
+```
+shell
+minikube cache reload
+```
+{{% /pageinfo %}}
 
 To display images you have added to the cache:
 
@@ -85,11 +94,6 @@ minikube cache list
 
 This listing will not include the images minikube's built-in system images.
 
-to ensure your running cluster has cached the updated images use reload:
-
-```shell
-minikube cache reload
-```
 
 
 ```shell

From 620823e77b0483dbacc5eab8592ee6aaf09145c3 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 19:10:04 -0700
Subject: [PATCH 608/668] address review comments

---
 site/content/en/docs/handbook/pushing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 3647aa4058..ed2cc65506 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -69,7 +69,7 @@ more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/dock
 
 ## 2.Push images using 'cache' command.
 
-From the host, you can push a Docker image directly to minikube. It will also be cached for all minikube clusters .
+From your host, you can push a Docker image directly to minikube. This image will be cached and automatically pulled into all future minikube clusters created on the machine
 
 ```shell
 minikube cache add alpine:latest

From 89b28c482e9e0549125cee0b8b88e1ed09dd803a Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 20:14:55 -0700
Subject: [PATCH 609/668] Filter describe for non-running pods

---
 test/integration/helpers.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 7daac4aa6f..af8f8698d9 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -241,8 +241,8 @@ func clusterLogs(t *testing.T, profile string) {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 	}
 
-	t.Logf("------++> post-mortem[%s]: describe pods", t.Name())
-	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A"))
+	t.Logf("------++> post-mortem[%s]: !running pods", t.Name())
+	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A", "--field-selector=status.phase!=Running"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
 	} else {

From 1e8801ceb868e9ba47dad570e5f411048da7f541 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 21:23:35 -0700
Subject: [PATCH 610/668] Make addons.Start thread-safe

---
 cmd/minikube/cmd/config/addons_list.go | 31 ++++-----
 cmd/minikube/cmd/config/disable.go     |  2 +-
 cmd/minikube/cmd/config/enable.go      |  2 +-
 cmd/minikube/cmd/config/open.go        |  8 +--
 cmd/minikube/cmd/dashboard.go          |  9 +--
 pkg/addons/addons.go                   | 94 +++++++++++++++-----------
 pkg/addons/addons_test.go              | 52 +++++++-------
 pkg/minikube/assets/addons.go          | 17 ++---
 pkg/minikube/exit/exit.go              |  2 +
 pkg/minikube/node/config.go            |  2 +-
 pkg/minikube/node/start.go             | 10 +--
 11 files changed, 114 insertions(+), 115 deletions(-)

diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go
index 5ed95a850b..521182f226 100644
--- a/cmd/minikube/cmd/config/addons_list.go
+++ b/cmd/minikube/cmd/config/addons_list.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -49,11 +50,12 @@ var addonsListCmd = &cobra.Command{
 			exit.UsageT("usage: minikube addons list")
 		}
 
+		_, cc := mustload.Partial(ClusterFlagValue())
 		switch strings.ToLower(addonListOutput) {
 		case "list":
-			printAddonsList()
+			printAddonsList(cc)
 		case "json":
-			printAddonsJSON()
+			printAddonsJSON(cc)
 		default:
 			exit.WithCodeT(exit.BadUsage, fmt.Sprintf("invalid output format: %s. Valid values: 'list', 'json'", addonListOutput))
 		}
@@ -85,27 +87,24 @@ var stringFromStatus = func(addonStatus bool) string {
 	return "disabled"
 }
 
-var printAddonsList = func() {
+var printAddonsList = func(cc *config.ClusterConfig) {
 	addonNames := make([]string, 0, len(assets.Addons))
 	for addonName := range assets.Addons {
 		addonNames = append(addonNames, addonName)
 	}
 	sort.Strings(addonNames)
+
 	var tData [][]string
 	table := tablewriter.NewWriter(os.Stdout)
 	table.SetHeader([]string{"Addon Name", "Profile", "Status"})
 	table.SetAutoFormatHeaders(true)
 	table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true})
 	table.SetCenterSeparator("|")
-	pName := ClusterFlagValue()
 
 	for _, addonName := range addonNames {
 		addonBundle := assets.Addons[addonName]
-		addonStatus, err := addonBundle.IsEnabled(pName)
-		if err != nil {
-			out.WarningT("Unable to get addon status for {{.name}}: {{.error}}", out.V{"name": addonName, "error": err})
-		}
-		tData = append(tData, []string{addonName, pName, fmt.Sprintf("%s %s", stringFromStatus(addonStatus), iconFromStatus(addonStatus))})
+		enabled := addonBundle.IsEnabled(cc)
+		tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled))})
 	}
 
 	table.AppendBulk(tData)
@@ -120,9 +119,8 @@ var printAddonsList = func() {
 	}
 }
 
-var printAddonsJSON = func() {
+var printAddonsJSON = func(cc *config.ClusterConfig) {
 	addonNames := make([]string, 0, len(assets.Addons))
-	pName := ClusterFlagValue()
 	for addonName := range assets.Addons {
 		addonNames = append(addonNames, addonName)
 	}
@@ -132,16 +130,11 @@ var printAddonsJSON = func() {
 
 	for _, addonName := range addonNames {
 		addonBundle := assets.Addons[addonName]
-
-		addonStatus, err := addonBundle.IsEnabled(pName)
-		if err != nil {
-			glog.Errorf("Unable to get addon status for %s: %v", addonName, err)
-			continue
-		}
+		enabled := addonBundle.IsEnabled(cc)
 
 		addonsMap[addonName] = map[string]interface{}{
-			"Status":  stringFromStatus(addonStatus),
-			"Profile": pName,
+			"Status":  stringFromStatus(enabled),
+			"Profile": cc.Name,
 		}
 	}
 	jsonString, _ := json.Marshal(addonsMap)
diff --git a/cmd/minikube/cmd/config/disable.go b/cmd/minikube/cmd/config/disable.go
index 552eaf7108..a77f44092d 100644
--- a/cmd/minikube/cmd/config/disable.go
+++ b/cmd/minikube/cmd/config/disable.go
@@ -33,7 +33,7 @@ var addonsDisableCmd = &cobra.Command{
 		}
 
 		addon := args[0]
-		err := addons.Set(addon, "false", ClusterFlagValue())
+		err := addons.SetAndSave(ClusterFlagValue(), addon, "false")
 		if err != nil {
 			exit.WithError("disable failed", err)
 		}
diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go
index 99cbb3bb88..f05daadfd6 100644
--- a/cmd/minikube/cmd/config/enable.go
+++ b/cmd/minikube/cmd/config/enable.go
@@ -32,7 +32,7 @@ var addonsEnableCmd = &cobra.Command{
 			exit.UsageT("usage: minikube addons enable ADDON_NAME")
 		}
 		addon := args[0]
-		err := addons.Set(addon, "true", ClusterFlagValue())
+		err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
 		if err != nil {
 			exit.WithError("enable failed", err)
 		}
diff --git a/cmd/minikube/cmd/config/open.go b/cmd/minikube/cmd/config/open.go
index 93bca9f735..b49dce72fe 100644
--- a/cmd/minikube/cmd/config/open.go
+++ b/cmd/minikube/cmd/config/open.go
@@ -66,11 +66,9 @@ var addonsOpenCmd = &cobra.Command{
 To see the list of available addons run:
 minikube addons list`, out.V{"name": addonName})
 		}
-		ok, err := addon.IsEnabled(cname)
-		if err != nil {
-			exit.WithError("IsEnabled failed", err)
-		}
-		if !ok {
+
+		enabled := addon.IsEnabled(co.Config)
+		if !enabled {
 			exit.WithCodeT(exit.Unavailable, `addon '{{.name}}' is currently not enabled.
 To enable this addon run:
 minikube addons enable {{.name}}`, out.V{"name": addonName})
diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go
index e3c9e93b6b..51957e4b58 100644
--- a/cmd/minikube/cmd/dashboard.go
+++ b/cmd/minikube/cmd/dashboard.go
@@ -67,13 +67,14 @@ var dashboardCmd = &cobra.Command{
 		var err error
 
 		// Check dashboard status before enabling it
-		dashboardAddon := assets.Addons["dashboard"]
-		dashboardStatus, _ := dashboardAddon.IsEnabled(cname)
-		if !dashboardStatus {
+		addon := assets.Addons["dashboard"]
+		enabled := addon.IsEnabled(co.Config)
+
+		if !enabled {
 			// Send status messages to stderr for folks re-using this output.
 			out.ErrT(out.Enabling, "Enabling dashboard ...")
 			// Enable the dashboard add-on
-			err = addons.Set("dashboard", "true", cname)
+			err = addons.SetAndSave(cname, "dashboard", "true")
 			if err != nil {
 				exit.WithError("Unable to enable dashboard", err)
 			}
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index de0ec4dccb..3edc54b61b 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -42,32 +42,49 @@ import (
 // defaultStorageClassProvisioner is the name of the default storage class provisioner
 const defaultStorageClassProvisioner = "standard"
 
-// Set sets a value
-func Set(name, value, profile string) error {
-	glog.Infof("Setting %s=%s in profile %q", name, value, profile)
+// RunCallbacks runs all actions associated to an addon, but does not set it (thread-safe)
+func RunCallbacks(cc *config.ClusterConfig, name string, value string) error {
+	glog.Infof("Setting %s=%s in profile %q", name, value, cc.Name)
 	a, valid := isAddonValid(name)
 	if !valid {
 		return errors.Errorf("%s is not a valid addon", name)
 	}
 
-	cc, err := config.Load(profile)
-	if err != nil {
-		return errors.Wrap(err, "loading profile")
-	}
-
 	// Run any additional validations for this property
 	if err := run(cc, name, value, a.validations); err != nil {
 		return errors.Wrap(err, "running validations")
 	}
 
-	if err := a.set(cc, name, value); err != nil {
-		return errors.Wrap(err, "setting new value of addon")
-	}
-
 	// Run any callbacks for this property
 	if err := run(cc, name, value, a.callbacks); err != nil {
 		return errors.Wrap(err, "running callbacks")
 	}
+	return nil
+}
+
+// Set sets a value in the config (not threadsafe)
+func Set(cc *config.ClusterConfig, name string, value string) error {
+	a, valid := isAddonValid(name)
+	if !valid {
+		return errors.Errorf("%s is not a valid addon", name)
+	}
+	return a.set(cc, name, value)
+}
+
+// SetAndSave sets a value and saves the config
+func SetAndSave(profile string, name string, value string) error {
+	cc, err := config.Load(profile)
+	if err != nil {
+		return errors.Wrap(err, "loading profile")
+	}
+
+	if err := RunCallbacks(cc, name, value); err != nil {
+		return errors.Wrap(err, "run callbacks")
+	}
+
+	if err := Set(cc, name, value); err != nil {
+		return errors.Wrap(err, "set")
+	}
 
 	glog.Infof("Writing out %q config to set %s=%v...", profile, name, value)
 	return config.Write(profile, cc)
@@ -88,7 +105,7 @@ func run(cc *config.ClusterConfig, name string, value string, fns []setFn) error
 	return nil
 }
 
-// SetBool sets a bool value
+// SetBool sets a bool value in the config (not threadsafe)
 func SetBool(cc *config.ClusterConfig, name string, val string) error {
 	b, err := strconv.ParseBool(val)
 	if err != nil {
@@ -111,13 +128,7 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 	addon := assets.Addons[name]
 
 	// check addon status before enabling/disabling it
-	alreadySet, err := isAddonAlreadySet(addon, enable, cc.Name)
-	if err != nil {
-		out.ErrT(out.Conflict, "{{.error}}", out.V{"error": err})
-		return err
-	}
-
-	if alreadySet {
+	if isAddonAlreadySet(cc, addon, enable) {
 		glog.Warningf("addon %s should already be in state %v", name, val)
 		if !enable {
 			return nil
@@ -161,7 +172,7 @@ https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Dri
 	mName := driver.MachineName(*cc, cp)
 	host, err := machine.LoadHost(api, mName)
 	if err != nil || !machine.IsRunning(api, mName) {
-		glog.Warningf("%q is not running, writing %s=%v to disk and skipping enablement (err=%v)", mName, addon.Name(), enable, err)
+		glog.Warningf("%q is not running, setting %s=%v and skipping enablement (err=%v)", mName, addon.Name(), enable, err)
 		return nil
 	}
 
@@ -174,19 +185,17 @@ https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Dri
 	return enableOrDisableAddonInternal(cc, addon, cmd, data, enable)
 }
 
-func isAddonAlreadySet(addon *assets.Addon, enable bool, profile string) (bool, error) {
-	addonStatus, err := addon.IsEnabled(profile)
-	if err != nil {
-		return false, errors.Wrap(err, "is enabled")
+func isAddonAlreadySet(cc *config.ClusterConfig, addon *assets.Addon, enable bool) bool {
+	enabled := addon.IsEnabled(cc)
+	if enabled && enable {
+		return true
 	}
 
-	if addonStatus && enable {
-		return true, nil
-	} else if !addonStatus && !enable {
-		return true, nil
+	if !enabled && !enable {
+		return true
 	}
 
-	return false, nil
+	return false
 }
 
 func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon, cmd command.Runner, data interface{}, enable bool) error {
@@ -288,7 +297,7 @@ func enableOrDisableStorageClasses(cc *config.ClusterConfig, name string, val st
 }
 
 // Start enables the default addons for a profile, plus any additional
-func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, additional []string) {
+func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]bool, additional []string) {
 	wg.Add(1)
 	defer wg.Done()
 
@@ -300,11 +309,7 @@ func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, addition
 
 	// Get the default values of any addons not saved to our config
 	for name, a := range assets.Addons {
-		defaultVal, err := a.IsEnabled(profile)
-		if err != nil {
-			glog.Errorf("is-enabled failed for %q: %v", a.Name(), err)
-			continue
-		}
+		defaultVal := a.IsEnabled(cc)
 
 		_, exists := toEnable[name]
 		if !exists {
@@ -325,16 +330,25 @@ func Start(wg sync.WaitGroup, profile string, toEnable map[string]bool, addition
 	}
 	sort.Strings(toEnableList)
 
+	var awg sync.WaitGroup
+
 	out.T(out.AddonEnable, "Enabling addons: {{.addons}}", out.V{"addons": strings.Join(toEnableList, ", ")})
 	for _, a := range toEnableList {
-		wg.Add(1)
+		awg.Add(1)
 		go func(name string) {
-			err := Set(name, "true", profile)
+			err := RunCallbacks(cc, name, "true")
 			if err != nil {
-				// Intentionally non-fatal
 				out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": name, "error": err})
 			}
-			wg.Done()
+			awg.Done()
 		}(a)
 	}
+
+	// Wait until all of the addons are enabled before updating the config (not thread safe)
+	awg.Wait()
+	for _, a := range toEnableList {
+		if err := Set(cc, a, "true"); err != nil {
+			glog.Errorf("store failed: %v", err)
+		}
+	}
 }
diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go
index 6862aaf542..8c52c2929a 100644
--- a/pkg/addons/addons_test.go
+++ b/pkg/addons/addons_test.go
@@ -20,6 +20,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 
 	"k8s.io/minikube/pkg/minikube/assets"
@@ -59,47 +60,42 @@ func createTestProfile(t *testing.T) string {
 }
 
 func TestIsAddonAlreadySet(t *testing.T) {
-	profile := createTestProfile(t)
-	if err := Set("registry", "true", profile); err != nil {
+	cc := &config.ClusterConfig{Name: "test"}
+
+	if err := Set(cc, "registry", "true"); err != nil {
 		t.Errorf("unable to set registry true: %v", err)
 	}
-	enabled, err := assets.Addons["registry"].IsEnabled(profile)
-	if err != nil {
-		t.Errorf("registry: %v", err)
-	}
-	if !enabled {
+	if !assets.Addons["registry"].IsEnabled(cc) {
 		t.Errorf("expected registry to be enabled")
 	}
 
-	enabled, err = assets.Addons["ingress"].IsEnabled(profile)
-	if err != nil {
-		t.Errorf("ingress: %v", err)
-	}
-	if enabled {
+	if assets.Addons["ingress"].IsEnabled(cc) {
 		t.Errorf("expected ingress to not be enabled")
 	}
 
 }
 
 func TestDisableUnknownAddon(t *testing.T) {
-	profile := createTestProfile(t)
-	if err := Set("InvalidAddon", "false", profile); err == nil {
+	cc := &config.ClusterConfig{Name: "test"}
+
+	if err := Set(cc, "InvalidAddon", "false"); err == nil {
 		t.Fatalf("Disable did not return error for unknown addon")
 	}
 }
 
 func TestEnableUnknownAddon(t *testing.T) {
-	profile := createTestProfile(t)
-	if err := Set("InvalidAddon", "true", profile); err == nil {
+	cc := &config.ClusterConfig{Name: "test"}
+
+	if err := Set(cc, "InvalidAddon", "true"); err == nil {
 		t.Fatalf("Enable did not return error for unknown addon")
 	}
 }
 
-func TestEnableAndDisableAddon(t *testing.T) {
+func TestSetAndSave(t *testing.T) {
 	profile := createTestProfile(t)
 
 	// enable
-	if err := Set("dashboard", "true", profile); err != nil {
+	if err := SetAndSave("dashboard", "true", profile); err != nil {
 		t.Errorf("Disable returned unexpected error: " + err.Error())
 	}
 
@@ -112,7 +108,7 @@ func TestEnableAndDisableAddon(t *testing.T) {
 	}
 
 	// disable
-	if err := Set("dashboard", "false", profile); err != nil {
+	if err := SetAndSave("dashboard", "false", profile); err != nil {
 		t.Errorf("Disable returned unexpected error: " + err.Error())
 	}
 
@@ -126,14 +122,18 @@ func TestEnableAndDisableAddon(t *testing.T) {
 }
 
 func TestStart(t *testing.T) {
-	profile := createTestProfile(t)
-	Start(profile, map[string]bool{}, []string{"dashboard"})
-
-	enabled, err := assets.Addons["dashboard"].IsEnabled(profile)
-	if err != nil {
-		t.Errorf("dashboard: %v", err)
+	cc := &config.ClusterConfig{
+		Name:             "start",
+		CPUs:             2,
+		Memory:           2500,
+		KubernetesConfig: config.KubernetesConfig{},
 	}
-	if !enabled {
+
+	var wg sync.WaitGroup
+	Start(&wg, cc, map[string]bool{}, []string{"dashboard"})
+	wg.Wait()
+
+	if !assets.Addons["dashboard"].IsEnabled(cc) {
 		t.Errorf("expected dashboard to be enabled")
 	}
 }
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 852eb27252..6d8d3f9ef6 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -19,8 +19,6 @@ package assets
 import (
 	"runtime"
 
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/vmpath"
@@ -49,21 +47,14 @@ func (a *Addon) Name() string {
 }
 
 // IsEnabled checks if an Addon is enabled for the given profile
-func (a *Addon) IsEnabled(profile string) (bool, error) {
-	c, err := config.Load(profile)
-	if err != nil {
-		return false, errors.Wrap(err, "load")
-	}
-
-	// Is this addon explicitly listed in their configuration?
-	status, ok := c.Addons[a.Name()]
-	glog.V(1).Infof("IsEnabled %q = %v (listed in config=%v)", a.Name(), status, ok)
+func (a *Addon) IsEnabled(cc *config.ClusterConfig) bool {
+	status, ok := cc.Addons[a.Name()]
 	if ok {
-		return status, nil
+		return status
 	}
 
 	// Return the default unconfigured state of the addon
-	return a.enabled, nil
+	return a.enabled
 }
 
 // Addons is the list of addons
diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go
index 3290363ef4..5e6d706295 100644
--- a/pkg/minikube/exit/exit.go
+++ b/pkg/minikube/exit/exit.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"runtime"
+	"runtime/debug"
 
 	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -59,6 +60,7 @@ func WithCodeT(code int, format string, a ...out.V) {
 
 // WithError outputs an error and exits.
 func WithError(msg string, err error) {
+	glog.Infof("WithError(%s)=%v called from:\n%s", msg, err, debug.Stack())
 	p := problem.FromError(err, runtime.GOOS)
 	if p != nil {
 		WithProblem(msg, err, p)
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index 8cb8a27296..5b646d24d1 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -47,7 +47,7 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
 }
 
 // configureMounts configures any requested filesystem mounts
-func configureMounts(wg sync.WaitGroup) {
+func configureMounts(wg *sync.WaitGroup) {
 	wg.Add(1)
 	defer wg.Done()
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 0f33ed3ae1..87acc87d70 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -138,11 +138,10 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	}
 
 	var wg sync.WaitGroup
+	go configureMounts(&wg)
 
-	go configureMounts(wg)
-
+	wg.Add(1)
 	go func() {
-		wg.Add(1)
 		if err := CacheAndLoadImagesInConfig(); err != nil {
 			out.FailureT("Unable to load cached images from config file: {{error}}", out.V{"error": err})
 		}
@@ -151,7 +150,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 	// enable addons, both old and new!
 	if existingAddons != nil {
-		go addons.Start(wg, viper.GetString(config.ProfileName), existingAddons, config.AddonList)
+		go addons.Start(&wg, &cc, existingAddons, config.AddonList)
 	}
 
 	if apiServer {
@@ -193,7 +192,8 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 
 	wg.Wait()
 
-	return kcs, nil
+	// Write enabled addons to the config before completion
+	return kcs, config.Write(viper.GetString(config.ProfileName), &cc)
 }
 
 // ConfigureRuntimes does what needs to happen to get a runtime going.

From 38843d97b488c28bf45afed4bb564551c440bf9e Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Wed, 8 Apr 2020 21:27:38 -0700
Subject: [PATCH 611/668] Update SetAndSave argument order

---
 pkg/addons/addons_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go
index 8c52c2929a..004d0f5047 100644
--- a/pkg/addons/addons_test.go
+++ b/pkg/addons/addons_test.go
@@ -95,7 +95,7 @@ func TestSetAndSave(t *testing.T) {
 	profile := createTestProfile(t)
 
 	// enable
-	if err := SetAndSave("dashboard", "true", profile); err != nil {
+	if err := SetAndSave(profile, "dashboard", "true"); err != nil {
 		t.Errorf("Disable returned unexpected error: " + err.Error())
 	}
 
@@ -108,7 +108,7 @@ func TestSetAndSave(t *testing.T) {
 	}
 
 	// disable
-	if err := SetAndSave("dashboard", "false", profile); err != nil {
+	if err := SetAndSave(profile, "dashboard", "false"); err != nil {
 		t.Errorf("Disable returned unexpected error: " + err.Error())
 	}
 

From 9637790fa0f69d0fa6a1a05d97b94903baa1865c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 18:23:50 -0700
Subject: [PATCH 612/668] detect docker service not running

---
 pkg/minikube/registry/drvs/docker/docker.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index a9191a35d9..e6e0d39e8a 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -78,9 +78,14 @@ func status() registry.State {
 	defer cancel()
 
 	err = exec.CommandContext(ctx, oci.Docker, "info").Run()
-	if err != nil {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running or is responding too slow. Try: restarting docker desktop."}
+
+	if ctx.Err() == context.DeadlineExceeded {
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is responding too slow. Try: restarting docker."}
+	}
+	if err != nil{
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker service is not running. Try: starting docker service."}
 	}
 
 	return registry.State{Installed: true, Healthy: true}
 }
+

From 62d271c3fe2e8f3c11e45cc43ea65fe89f2ea08e Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 19:15:17 -0700
Subject: [PATCH 613/668] more user-friendly exit when docker is not running

---
 pkg/minikube/node/cache.go                  | 10 ++++++++--
 pkg/minikube/registry/drvs/docker/docker.go |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index ebeb04fdc0..233f0d5ff9 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -19,6 +19,7 @@ package node
 import (
 	"os"
 	"runtime"
+	"strings"
 
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
@@ -111,8 +112,13 @@ func beginDownloadKicArtifacts(g *errgroup.Group) {
 // WaitDownloadKicArtifacts blocks until the required artifacts for KIC are downloaded.
 func waitDownloadKicArtifacts(g *errgroup.Group) {
 	if err := g.Wait(); err != nil {
-		glog.Errorln("Error downloading kic artifacts: ", err)
-		return
+		if strings.Contains(err.Error(), "Cannot connect to the Docker daemon") {
+			out.WarningT("Failed to connect to docker daemon: {{.error}}", out.V{"error": err.Error()})
+			exit.UsageT("Please make sure Docker service is running.")
+		} else {
+			exit.WithError("Failed to download kic base image", err)
+		}
+
 	}
 	glog.Info("Successfully downloaded all kic artifacts")
 }
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index e6e0d39e8a..113cebb54f 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -82,10 +82,9 @@ func status() registry.State {
 	if ctx.Err() == context.DeadlineExceeded {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is responding too slow. Try: restarting docker."}
 	}
-	if err != nil{
+	if err != nil {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker service is not running. Try: starting docker service."}
 	}
 
 	return registry.State{Installed: true, Healthy: true}
 }
-

From 3d8bb44fdbad6c6ff9a38b89de298c842ffec601 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Tue, 7 Apr 2020 19:25:24 -0700
Subject: [PATCH 614/668] tweak error msg

---
 pkg/minikube/node/cache.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index 233f0d5ff9..f17ee30b66 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -113,7 +113,7 @@ func beginDownloadKicArtifacts(g *errgroup.Group) {
 func waitDownloadKicArtifacts(g *errgroup.Group) {
 	if err := g.Wait(); err != nil {
 		if strings.Contains(err.Error(), "Cannot connect to the Docker daemon") {
-			out.WarningT("Failed to connect to docker daemon: {{.error}}", out.V{"error": err.Error()})
+			out.WarningT("Failed to connect to docker daemon : {{.error}}", out.V{"error": err.Error()})
 			exit.UsageT("Please make sure Docker service is running.")
 		} else {
 			exit.WithError("Failed to download kic base image", err)

From 0109af5b778c29b33d2107d0127cd0f62a6ed97d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 15:37:55 -0700
Subject: [PATCH 615/668] revert handling

---
 pkg/minikube/node/cache.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index f17ee30b66..ebeb04fdc0 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -19,7 +19,6 @@ package node
 import (
 	"os"
 	"runtime"
-	"strings"
 
 	"github.com/golang/glog"
 	"github.com/spf13/viper"
@@ -112,13 +111,8 @@ func beginDownloadKicArtifacts(g *errgroup.Group) {
 // WaitDownloadKicArtifacts blocks until the required artifacts for KIC are downloaded.
 func waitDownloadKicArtifacts(g *errgroup.Group) {
 	if err := g.Wait(); err != nil {
-		if strings.Contains(err.Error(), "Cannot connect to the Docker daemon") {
-			out.WarningT("Failed to connect to docker daemon : {{.error}}", out.V{"error": err.Error()})
-			exit.UsageT("Please make sure Docker service is running.")
-		} else {
-			exit.WithError("Failed to download kic base image", err)
-		}
-
+		glog.Errorln("Error downloading kic artifacts: ", err)
+		return
 	}
 	glog.Info("Successfully downloaded all kic artifacts")
 }

From 030228406cab9ecad062d8e0cc516732a45da26d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 15:40:46 -0700
Subject: [PATCH 616/668] add better doc link

---
 pkg/minikube/registry/drvs/docker/docker.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 113cebb54f..8d592db6c7 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -70,7 +70,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 func status() registry.State {
 	_, err := exec.LookPath(oci.Docker)
 	if err != nil {
-		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"}
+		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker"}
 	}
 
 	// Allow no more than 3 seconds for docker info
@@ -80,7 +80,7 @@ func status() registry.State {
 	err = exec.CommandContext(ctx, oci.Docker, "info").Run()
 
 	if ctx.Err() == context.DeadlineExceeded {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is responding too slow. Try: restarting docker."}
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker was too slow to respond. Try: restarting docker."}
 	}
 	if err != nil {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker service is not running. Try: starting docker service."}

From ef0c1aea8b790080452423e71934133206d02ed8 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 15:51:24 -0700
Subject: [PATCH 617/668] add driver docs url to failure

---
 cmd/minikube/cmd/start.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index eba9b9c7e9..fe0cfe2e85 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -521,7 +521,9 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 		}
 
 		if !viper.GetBool(force) {
-			exit.WithCodeT(exit.Unavailable, "Failed to validate '{{.driver}}' driver", out.V{"driver": name})
+			docURL := fmt.Sprintf("https://minikube.sigs.k8s.io/docs/drivers/%s/", strings.ToLower(name))
+			out.ErrT(out.URL, "Read more : {{.URL}}", out.V{"URL": docURL})
+			exit.WithCodeT(exit.Unavailable, "Failed to validate '{{.driver}}' driver.", out.V{"driver": name})
 		}
 	}
 }

From 34ce512474948b7f0efcd00ebc0a28180363fc6c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 16:15:56 -0700
Subject: [PATCH 618/668] address code review

---
 pkg/minikube/registry/drvs/docker/docker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 8d592db6c7..c4a5cbfb59 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -83,7 +83,7 @@ func status() registry.State {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker was too slow to respond. Try: restarting docker."}
 	}
 	if err != nil {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker service is not running. Try: starting docker service."}
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running. Please start the docker service."}
 	}
 
 	return registry.State{Installed: true, Healthy: true}

From 3057b02384045d8c85925aa74c030f1f67bacf58 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 21:48:10 -0700
Subject: [PATCH 619/668] add doc links correctly

---
 cmd/minikube/cmd/start.go                   | 4 +---
 pkg/minikube/registry/drvs/docker/docker.go | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index fe0cfe2e85..eba9b9c7e9 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -521,9 +521,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 		}
 
 		if !viper.GetBool(force) {
-			docURL := fmt.Sprintf("https://minikube.sigs.k8s.io/docs/drivers/%s/", strings.ToLower(name))
-			out.ErrT(out.URL, "Read more : {{.URL}}", out.V{"URL": docURL})
-			exit.WithCodeT(exit.Unavailable, "Failed to validate '{{.driver}}' driver.", out.V{"driver": name})
+			exit.WithCodeT(exit.Unavailable, "Failed to validate '{{.driver}}' driver", out.V{"driver": name})
 		}
 	}
 }
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index c4a5cbfb59..fee546774e 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -70,7 +70,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 func status() registry.State {
 	_, err := exec.LookPath(oci.Docker)
 	if err != nil {
-		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker"}
+		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Docker.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker"}
 	}
 
 	// Allow no more than 3 seconds for docker info
@@ -80,10 +80,10 @@ func status() registry.State {
 	err = exec.CommandContext(ctx, oci.Docker, "info").Run()
 
 	if ctx.Err() == context.DeadlineExceeded {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker was too slow to respond. Try: restarting docker."}
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker responds too slow. Restart the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
 	}
 	if err != nil {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running. Please start the docker service."}
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Start the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
 	}
 
 	return registry.State{Installed: true, Healthy: true}

From aba681ac301c198df7a5143d37c18409b623a241 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 8 Apr 2020 22:08:10 -0700
Subject: [PATCH 620/668] improve suggestions

---
 pkg/minikube/registry/drvs/docker/docker.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index fee546774e..1e512d9f87 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -21,9 +21,11 @@ import (
 	"fmt"
 	"os/exec"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
+	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -83,7 +85,14 @@ func status() registry.State {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker responds too slow. Restart the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
 	}
 	if err != nil {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Start the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
+		glog.Infof("docker info returned error: %v", err)
+		if strings.Contains(err.Error(), "Cannot connect to the Docker daemon") {
+			return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Start the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
+		}
+		// if we get here, something is really wrong on their docker.
+		// our best suggestion would be re-install latest docker.
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Re-install the latest version of Docker.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
+
 	}
 
 	return registry.State{Installed: true, Healthy: true}

From 25743dd198ee095cb75c97c6aa6e75cd39edd927 Mon Sep 17 00:00:00 2001
From: Radoslaw Smigielski <radoslaw.smigielski@nokia.com>
Date: Thu, 9 Apr 2020 07:54:11 +0100
Subject: [PATCH 621/668] Remove reference to not existing section on Minikube
 sigs

The only content of docs/networking.md is an URL to non-existing page
https://minikube.sigs.k8s.io/docs/reference/networking/
---
 docs/networking.md | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 docs/networking.md

diff --git a/docs/networking.md b/docs/networking.md
deleted file mode 100644
index cc3ba1e46e..0000000000
--- a/docs/networking.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/networking/
-  
\ No newline at end of file

From 3c3d14b436333c6b16ba4637a2b3eddf652a2732 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 00:52:30 -0700
Subject: [PATCH 622/668] improve wording on the docker push site

---
 site/content/en/docs/handbook/pushing.md | 33 +++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index ed2cc65506..ef71e6cb5d 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -39,29 +39,38 @@ To point your terminal to use the docker daemon inside minikube run this:
 eval $(minikube docker-env)
 ```
 
-now any 'docker' command you run in this current terminal will run against the docker inside minikube VM or Container.
-Try it:
+now any 'docker' command you run in this current terminal will run against the docker inside minikube cluster.
+
+so if you do the following commands, it will show you the containers inside the minikube inside minikube's VM or Container.
 
 ```shell
 docker ps
 ```
 
-now you 'build' against the docker inside minikube. which is instantly accessible to kubernetes cluster.
+now you can 'build' against the docker inside minikube. which is instantly accessible to kubernetes cluster.
 
-'''
-docker build -t myimage .
-'''
+```shell
+docker build -t my_image .
+```
 
-Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`), as otherwise Kubernetes won't use images you built locally.
+To verify your terminal is using minikuber's docker-env you can check the value of the environment variable MINIKUBE_ACTIVE_DOCKERD to reflect the cluster name.
 
 {{% pageinfo %}}
-Evaluating the docker-env is only valid for the current terminal.
-and by closing the terminal, you will go back to using your own system's docker daemon.
-
-in some drivers such as Docker or Podman, you will need to re-do docker-env each time you restart your minikube.
+Tip 1: 
+Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`) in your yaml file.otherwise Kubernetes won't use your locally build image and it will pull from the network.
+{{% /pageinfo %}}
+
+{{% pageinfo %}}
+Tip 2: 
+Evaluating the docker-env is only valid for the current terminal.
+and by closing the terminal, you will go back to using your own system's docker daemon.
+{{% /pageinfo %}}
+
+{{% pageinfo %}}
+Tip 3:
+In container-based drivers such as Docker or Podman, you will need to re-do docker-env each time you restart your minikube cluster.
 {{% /pageinfo %}}
 
-To verify your terminal is using minikuber's docker-env you can check the value of the environment variable MINIKUBE_ACTIVE_DOCKERD to reflect the profile name.
 
 more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/docker-env/)
 

From da2736d84e0ec1a531bae47bd75d7ca4e7425dd0 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 01:01:22 -0700
Subject: [PATCH 623/668] add hot tips

---
 site/content/en/docs/handbook/pushing.md | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index ef71e6cb5d..81a167d86a 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -86,15 +86,22 @@ minikube cache add alpine:latest
 
 The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the minikube cluster's container runtime environment automatically.
 
-{{% pageinfo %}}
-if your image changes after your cached it, you could do `cache reload` to ensure minikube gets the last updates.
-
-```
-shell
+minikube refreshes the cache images on each start. however to reload all the cached images on demand run this command :
+```shell
 minikube cache reload
 ```
+
+{{% pageinfo %}}
+Tip1 :
+If your image changes after your cached it, you need to do 'cache reload' for minikube to pick up the image.
 {{% /pageinfo %}}
 
+{{% pageinfo %}}
+Tip2 :
+if you have multiple cluster, cache command will load the image for all of them.
+{{% /pageinfo %}}
+
+
 To display images you have added to the cache:
 
 ```shell
@@ -117,6 +124,7 @@ For more information, see:
 
 ## 3. Pushing directly to in-cluster CRIO. (podman-env)
 
+This is simmilar to docker-env but only for cri-o runtime.
 To push directly to CRIO, configure podman client on your mac/linux host using the podman-env command in your shell:
 
 ```shell

From af87f3ddcb5f1b61c06a05d8772a8f28a61c8ed9 Mon Sep 17 00:00:00 2001
From: Kenta Iso <type.mafty@gmail.com>
Date: Thu, 9 Apr 2020 19:26:18 +0900
Subject: [PATCH 624/668] Doc fix: use LC_ALL which has priority for system
 locale instead of LANG

---
 site/content/en/docs/contrib/translations.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/content/en/docs/contrib/translations.md b/site/content/en/docs/contrib/translations.md
index 0fb40d0b10..3250965698 100644
--- a/site/content/en/docs/contrib/translations.md
+++ b/site/content/en/docs/contrib/translations.md
@@ -79,11 +79,12 @@ All translations are stored in the top-level `translations` directory.
 
 * You now have a fresh minikube binary in the `out` directory. If your system locale is that of the language you added translations for, a simple `out/minikube start` will work as a test, assuming you translated phrases from `minikube start`. You can use whatever command you'd like in that way. 
 
-* If you have a different system locale, you can override the printed language using the LANG environment variable:
+* If you have a different system locale, you can override the printed language using the LC_ALL environment variable:
 	```
-	~/minikube$ LANG=fr out/minikube start
-	😄  minikube v1.9.0-beta.2 sur Darwin 10.14.6
-	✨  Choix automatique du driver hyperkit
+	~/minikube$ LC_ALL=fr out/minikube start
+	😄  minikube v1.9.2 sur Darwin 10.14.5
+	✨  Choix automatique du driver hyperkit. Autres choix: <no value>
+	👍  Starting control plane node minikube in cluster minikube
 	🔥  Création de VM hyperkit (CPUs=2, Mémoire=4000MB, Disque=20000MB)...
 	🐳  Préparation de Kubernetes v1.18.0 sur Docker 19.03.8...
 	🌟  Installation des addons: default-storageclass, storage-provisioner

From d89142f1e75d44320562caa50d0da10ffe254e3f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 05:00:42 -0700
Subject: [PATCH 625/668] Rename test

---
 .../{no_error_shown_test.go => error_spam_test.go}          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename test/integration/{no_error_shown_test.go => error_spam_test.go} (92%)

diff --git a/test/integration/no_error_shown_test.go b/test/integration/error_spam_test.go
similarity index 92%
rename from test/integration/no_error_shown_test.go
rename to test/integration/error_spam_test.go
index 9f28855377..98a4fa1508 100644
--- a/test/integration/no_error_shown_test.go
+++ b/test/integration/error_spam_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 )
 
-// TestMultiNodeNoErrorShown asserts that there are no errors displayed
-func TestNoErrorShown(t *testing.T) {
+// TestErrorSpam asserts that there are no errors displayed
+func TestErrorSpam(t *testing.T) {
 	if NoneDriver() {
 		t.Skip("none driver always shows a warning")
 	}
@@ -36,7 +36,7 @@ func TestNoErrorShown(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(25))
 	defer CleanupWithLogs(t, profile, cancel)
 
-	// TODO: make this multi-node once it's stable
+	// This should likely use multi-node once it's ready
 	args := append([]string{"start", "-p", profile, "-n=1", "--memory=2250", "--wait=false"}, StartArgs()...)
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))

From 4d24e651a4f4e1e800878ccc3069da61e7d1ac14 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 05:17:28 -0700
Subject: [PATCH 626/668] Remove field selector

---
 test/integration/helpers.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index af8f8698d9..7daac4aa6f 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -241,8 +241,8 @@ func clusterLogs(t *testing.T, profile string) {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 	}
 
-	t.Logf("------++> post-mortem[%s]: !running pods", t.Name())
-	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A", "--field-selector=status.phase!=Running"))
+	t.Logf("------++> post-mortem[%s]: describe pods", t.Name())
+	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
 	} else {

From 8733f07e442c26941a158e4c637f7d70bad3a4a6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 05:21:05 -0700
Subject: [PATCH 627/668] Higher vis

---
 test/integration/helpers.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 7daac4aa6f..e8bd0b1d9f 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -203,7 +203,7 @@ func clusterLogs(t *testing.T, profile string) {
 
 	t.Logf("-----------------------post-mortem--------------------------------")
 	t.Logf("<<< %s FAILED: start of post-mortem logs <<<", t.Name())
-	t.Logf("------++> post-mortem[%s]: minikube logs", t.Name())
+	t.Logf("======>  post-mortem[%s]: minikube logs <======", t.Name())
 
 	rr, err := Run(t, exec.Command(Target(), "-p", profile, "logs", "--problems"))
 	if err != nil {
@@ -212,7 +212,7 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("%s logs: %s", t.Name(), rr.Output())
 
-	t.Logf("------++> post-mortem[%s]: disk usage", t.Name())
+	t.Logf("======> post-mortem[%s]: disk usage <======", t.Name())
 	rr, err = Run(t, exec.Command(Target(), "-p", profile, "ssh", "df -h /var/lib/docker/overlay2 /var /; du -hs /var/lib/docker/overlay2"))
 	if err != nil {
 		t.Logf("failed df error: %v", err)
@@ -225,7 +225,7 @@ func clusterLogs(t *testing.T, profile string) {
 		return
 	}
 
-	t.Logf("------++> post-mortem[%s]: get pods", t.Name())
+	t.Logf("======> post-mortem[%s]: get pods <======", t.Name())
 	rr, rerr := Run(t, exec.Command("kubectl", "--context", profile, "get", "po", "-A", "--show-labels"))
 	if rerr != nil {
 		t.Logf("%s: %v", rr.Command(), rerr)
@@ -233,7 +233,7 @@ func clusterLogs(t *testing.T, profile string) {
 	}
 	t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 
-	t.Logf("------++> post-mortem[%s]: describe node", t.Name())
+	t.Logf("======> post-mortem[%s]: describe node <======", t.Name())
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "node"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)
@@ -241,7 +241,7 @@ func clusterLogs(t *testing.T, profile string) {
 		t.Logf("(dbg) %s:\n%s", rr.Command(), rr.Output())
 	}
 
-	t.Logf("------++> post-mortem[%s]: describe pods", t.Name())
+	t.Logf("======> post-mortem[%s]: describe pods <======", t.Name())
 	rr, err = Run(t, exec.Command("kubectl", "--context", profile, "describe", "po", "-A"))
 	if err != nil {
 		t.Logf("%s: %v", rr.Command(), err)

From 069d919b935bcc673ec08ba5dd058908961949d2 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 05:53:23 -0700
Subject: [PATCH 628/668] Double docker driver timeout, use version instead of
 info

---
 pkg/minikube/registry/drvs/docker/docker.go | 36 +++++++++++++--------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 1e512d9f87..db82619eb8 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -70,30 +70,40 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 }
 
 func status() registry.State {
+	docURL := "https://minikube.sigs.k8s.io/docs/drivers/docker/"
 	_, err := exec.LookPath(oci.Docker)
 	if err != nil {
-		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Docker.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker/#install-docker"}
+		return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Docker", Doc: docURL}
 	}
 
-	// Allow no more than 3 seconds for docker info
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 6*time.Second)
 	defer cancel()
 
-	err = exec.CommandContext(ctx, oci.Docker, "info").Run()
+	// Quickly returns an error code if server is not running
+	cmd := exec.CommandContext(ctx, oci.Docker, "version", "--format", "{{.Server.Version}}")
+	_, err = cmd.Output()
+	if err == nil {
+		return registry.State{Installed: true, Healthy: true}
+	}
 
+	glog.Warningf("docker returned error: %v", err)
+
+	// Basic timeout
 	if ctx.Err() == context.DeadlineExceeded {
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker responds too slow. Restart the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
+		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Restart the Docker service", Doc: docURL}
 	}
-	if err != nil {
-		glog.Infof("docker info returned error: %v", err)
-		if strings.Contains(err.Error(), "Cannot connect to the Docker daemon") {
-			return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Start the Docker Service.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
+
+	if exitErr, ok := err.(*exec.ExitError); ok {
+		stderr := strings.TrimSpace(string(exitErr.Stderr))
+		newErr := fmt.Errorf(`%q %v: %s`, strings.Join(cmd.Args, " "), exitErr, stderr)
+
+		if strings.Contains(stderr, "Cannot connect") || strings.Contains(stderr, "refused") || strings.Contains(stderr, "Is the docker daemon running") {
+			return registry.State{Error: newErr, Installed: true, Healthy: false, Fix: "Start the Docker service", Doc: docURL}
 		}
-		// if we get here, something is really wrong on their docker.
-		// our best suggestion would be re-install latest docker.
-		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Re-install the latest version of Docker.", Doc: "https://minikube.sigs.k8s.io/docs/drivers/docker"}
 
+		// We don't have good advice, but at least we can provide a good error message
+		return registry.State{Error: newErr, Installed: true, Healthy: false, Doc: docURL}
 	}
 
-	return registry.State{Installed: true, Healthy: true}
+	return registry.State{Error: err, Installed: true, Healthy: false, Doc: docURL}
 }

From bb6e25f8d9213345c4da29a162dccaead292fbfe Mon Sep 17 00:00:00 2001
From: Radoslaw Smigielski <radoslaw.smigielski@nokia.com>
Date: Thu, 9 Apr 2020 14:01:42 +0100
Subject: [PATCH 629/668] Remove unused docs/ directory

docs/ directory became obsoleted since massive reorganization
made in commit 7559952
---
 Makefile                                |  2 +-
 docs/README.md                          | 49 -------------------------
 docs/accessing_etcd.md                  |  1 -
 docs/addons.md                          |  1 -
 docs/alternative_runtimes.md            |  1 -
 docs/building_images_within_the_vm.md   |  1 -
 docs/cache.md                           |  1 -
 docs/cli_commands.md                    |  1 -
 docs/configuring_kubernetes.md          |  1 -
 docs/contributors/README.md             |  1 -
 docs/contributors/adding_an_addon.md    |  1 -
 docs/contributors/adding_driver.md      |  1 -
 docs/contributors/build_guide.md        |  1 -
 docs/contributors/ci_builds.md          |  1 -
 docs/contributors/minikube_iso.md       |  1 -
 docs/contributors/principles.md         |  1 -
 docs/contributors/releasing_minikube.md |  1 -
 docs/contributors/roadmap.md            |  1 -
 docs/dashboard.md                       |  1 -
 docs/debugging.md                       |  1 -
 docs/drivers.md                         |  1 -
 docs/env_vars.md                        |  1 -
 docs/gpu.md                             |  1 -
 docs/host_folder_mount.md               |  1 -
 docs/http_proxy.md                      |  1 -
 docs/insecure_registry.md               |  1 -
 docs/offline.md                         |  1 -
 docs/openid_connect_auth.md             |  1 -
 docs/persistent_volumes.md              |  1 -
 docs/reusing_the_docker_daemon.md       |  1 -
 docs/syncing-files.md                   |  1 -
 docs/tunnel.md                          |  1 -
 docs/vmdriver-none.md                   |  1 -
 33 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 docs/README.md
 delete mode 100644 docs/accessing_etcd.md
 delete mode 100644 docs/addons.md
 delete mode 100644 docs/alternative_runtimes.md
 delete mode 100644 docs/building_images_within_the_vm.md
 delete mode 100644 docs/cache.md
 delete mode 100644 docs/cli_commands.md
 delete mode 100644 docs/configuring_kubernetes.md
 delete mode 100644 docs/contributors/README.md
 delete mode 100644 docs/contributors/adding_an_addon.md
 delete mode 100644 docs/contributors/adding_driver.md
 delete mode 100644 docs/contributors/build_guide.md
 delete mode 100644 docs/contributors/ci_builds.md
 delete mode 100644 docs/contributors/minikube_iso.md
 delete mode 100644 docs/contributors/principles.md
 delete mode 100644 docs/contributors/releasing_minikube.md
 delete mode 100644 docs/contributors/roadmap.md
 delete mode 100644 docs/dashboard.md
 delete mode 100644 docs/debugging.md
 delete mode 100644 docs/drivers.md
 delete mode 100644 docs/env_vars.md
 delete mode 100644 docs/gpu.md
 delete mode 100644 docs/host_folder_mount.md
 delete mode 100644 docs/http_proxy.md
 delete mode 100644 docs/insecure_registry.md
 delete mode 100644 docs/offline.md
 delete mode 100644 docs/openid_connect_auth.md
 delete mode 100644 docs/persistent_volumes.md
 delete mode 100644 docs/reusing_the_docker_daemon.md
 delete mode 100644 docs/syncing-files.md
 delete mode 100644 docs/tunnel.md
 delete mode 100644 docs/vmdriver-none.md

diff --git a/Makefile b/Makefile
index 1665b17c58..e0fe592f0a 100755
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ MINIKUBE_TEST_FILES := ./cmd/... ./pkg/...
 MARKDOWNLINT ?= markdownlint
 
 
-MINIKUBE_MARKDOWN_FILES := README.md docs CONTRIBUTING.md CHANGELOG.md
+MINIKUBE_MARKDOWN_FILES := README.md CONTRIBUTING.md CHANGELOG.md
 
 MINIKUBE_BUILD_TAGS := container_image_ostree_stub containers_image_openpgp
 MINIKUBE_BUILD_TAGS += go_getter_nos3 go_getter_nogcs
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 16e26d9369..0000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Advanced Topics and Tutorials
-
-## Cluster Configuration
-
-* **Alternative Runtimes** ([alternative_runtimes.md](alternative_runtimes.md)): How to run minikube without Docker as the container runtime
-
-* **Environment Variables** ([env_vars.md](env_vars.md)): The different environment variables that minikube understands
-
-* **Minikube Addons** ([addons.md](addons.md)): Information on configuring addons to be run on minikube
-
-* **Configuring Kubernetes** ([configuring_kubernetes.md](configuring_kubernetes.md)): Configuring different Kubernetes components in minikube
-
-* **Caching Images** ([cache.md](cache.md)): Caching non-minikube images in minikube
-
-* **GPUs** ([gpu.md](gpu.md)): Using NVIDIA GPUs on minikube
-
-* **OpenID Connect Authentication** ([openid_connect_auth.md](openid_connect_auth.md)): Using OIDC Authentication on minikube
-
-### Installation and debugging
-
-* **Driver installation** ([drivers.md](drivers.md)): In depth instructions for installing the various hypervisor drivers
-
-* **Debugging minikube** ([debugging.md](debugging.md)): General practices for debugging the minikube binary itself
-
-### Developing on the minikube cluster
-
-* **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
-
-* **Host Folder Mounting** ([host_folder_mount.md](host_folder_mount.md)): How to mount your files from your host into the minikube VM
-
-* **Syncing files into the VM** ([syncing-files.md](syncing-files.md)): How to sync files from your host into the minikube VM
-
-#### Networking
-
-* **HTTP Proxy** ([http_proxy.md](http_proxy.md)): Instruction on how to run minikube behind a HTTP Proxy
-
-* **Insecure or Private Registries** ([insecure_registry.md](insecure_registry.md)): How to use private or insecure registries with minikube
-
-* **Accessing etcd from inside the cluster** ([accessing_etcd.md](accessing_etcd.md))
-
-* **Networking** ([networking.md](networking.md)): FAQ about networking between the host and minikube VM
-
-* **Offline** ([offline.md](offline.md)): Details about using minikube offline
diff --git a/docs/accessing_etcd.md b/docs/accessing_etcd.md
deleted file mode 100644
index b1593333d5..0000000000
--- a/docs/accessing_etcd.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/accessing-host-resources/
\ No newline at end of file
diff --git a/docs/addons.md b/docs/addons.md
deleted file mode 100644
index ca879ccab8..0000000000
--- a/docs/addons.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/addons/
diff --git a/docs/alternative_runtimes.md b/docs/alternative_runtimes.md
deleted file mode 100644
index d0d648734e..0000000000
--- a/docs/alternative_runtimes.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/runtimes/
diff --git a/docs/building_images_within_the_vm.md b/docs/building_images_within_the_vm.md
deleted file mode 100644
index 5b22a32031..0000000000
--- a/docs/building_images_within_the_vm.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/building_within/
diff --git a/docs/cache.md b/docs/cache.md
deleted file mode 100644
index 475bb7332c..0000000000
--- a/docs/cache.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/caching
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
deleted file mode 100644
index b547b26a5d..0000000000
--- a/docs/cli_commands.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/commands/
diff --git a/docs/configuring_kubernetes.md b/docs/configuring_kubernetes.md
deleted file mode 100644
index cb7db70ae8..0000000000
--- a/docs/configuring_kubernetes.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/
diff --git a/docs/contributors/README.md b/docs/contributors/README.md
deleted file mode 100644
index a8952b3c5f..0000000000
--- a/docs/contributors/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/
diff --git a/docs/contributors/adding_an_addon.md b/docs/contributors/adding_an_addon.md
deleted file mode 100644
index 9fae54108c..0000000000
--- a/docs/contributors/adding_an_addon.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/addons/
\ No newline at end of file
diff --git a/docs/contributors/adding_driver.md b/docs/contributors/adding_driver.md
deleted file mode 100644
index fb3ad4579d..0000000000
--- a/docs/contributors/adding_driver.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/drivers/
diff --git a/docs/contributors/build_guide.md b/docs/contributors/build_guide.md
deleted file mode 100644
index dddbe5d7b3..0000000000
--- a/docs/contributors/build_guide.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/building/
\ No newline at end of file
diff --git a/docs/contributors/ci_builds.md b/docs/contributors/ci_builds.md
deleted file mode 100644
index 33f7b21f42..0000000000
--- a/docs/contributors/ci_builds.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/building/
diff --git a/docs/contributors/minikube_iso.md b/docs/contributors/minikube_iso.md
deleted file mode 100644
index b9bc175ffa..0000000000
--- a/docs/contributors/minikube_iso.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/iso/
diff --git a/docs/contributors/principles.md b/docs/contributors/principles.md
deleted file mode 100644
index 2caffd4f37..0000000000
--- a/docs/contributors/principles.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/concepts/principles/
diff --git a/docs/contributors/releasing_minikube.md b/docs/contributors/releasing_minikube.md
deleted file mode 100644
index 4da4199c09..0000000000
--- a/docs/contributors/releasing_minikube.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/releasing/
diff --git a/docs/contributors/roadmap.md b/docs/contributors/roadmap.md
deleted file mode 100644
index 45e47a31e2..0000000000
--- a/docs/contributors/roadmap.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/contributing/roadmap/
diff --git a/docs/dashboard.md b/docs/dashboard.md
deleted file mode 100644
index cb7ff8f2d8..0000000000
--- a/docs/dashboard.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/dashboard/
diff --git a/docs/debugging.md b/docs/debugging.md
deleted file mode 100644
index b087d9c57f..0000000000
--- a/docs/debugging.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/debug/
diff --git a/docs/drivers.md b/docs/drivers.md
deleted file mode 100644
index 7b69ddd912..0000000000
--- a/docs/drivers.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/drivers/
diff --git a/docs/env_vars.md b/docs/env_vars.md
deleted file mode 100644
index b90a70617b..0000000000
--- a/docs/env_vars.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/environment_variables
diff --git a/docs/gpu.md b/docs/gpu.md
deleted file mode 100644
index 56725b80fb..0000000000
--- a/docs/gpu.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/
diff --git a/docs/host_folder_mount.md b/docs/host_folder_mount.md
deleted file mode 100644
index 689f23f986..0000000000
--- a/docs/host_folder_mount.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/mount/
diff --git a/docs/http_proxy.md b/docs/http_proxy.md
deleted file mode 100644
index 789508a20f..0000000000
--- a/docs/http_proxy.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/networking/proxy/
diff --git a/docs/insecure_registry.md b/docs/insecure_registry.md
deleted file mode 100644
index c02296e26c..0000000000
--- a/docs/insecure_registry.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/registry/
diff --git a/docs/offline.md b/docs/offline.md
deleted file mode 100644
index bca6193eec..0000000000
--- a/docs/offline.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/disk_cache/
diff --git a/docs/openid_connect_auth.md b/docs/openid_connect_auth.md
deleted file mode 100644
index cbb2515911..0000000000
--- a/docs/openid_connect_auth.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tutorials/openid_connect_auth/
diff --git a/docs/persistent_volumes.md b/docs/persistent_volumes.md
deleted file mode 100644
index df28b852af..0000000000
--- a/docs/persistent_volumes.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/persistent_volumes/
diff --git a/docs/reusing_the_docker_daemon.md b/docs/reusing_the_docker_daemon.md
deleted file mode 100644
index 2b76f9534b..0000000000
--- a/docs/reusing_the_docker_daemon.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/docker_daemon/
diff --git a/docs/syncing-files.md b/docs/syncing-files.md
deleted file mode 100644
index ea217b2d38..0000000000
--- a/docs/syncing-files.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/sync/
diff --git a/docs/tunnel.md b/docs/tunnel.md
deleted file mode 100644
index b92c4c1b16..0000000000
--- a/docs/tunnel.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/tasks/loadbalancer/
diff --git a/docs/vmdriver-none.md b/docs/vmdriver-none.md
deleted file mode 100644
index 143ec71b2b..0000000000
--- a/docs/vmdriver-none.md
+++ /dev/null
@@ -1 +0,0 @@
-This document has moved to https://minikube.sigs.k8s.io/docs/reference/drivers/none/

From 903fe744b199915f58ca69fd458943a1ffea58e5 Mon Sep 17 00:00:00 2001
From: Kenta Iso <type.mafty@gmail.com>
Date: Fri, 10 Apr 2020 00:15:20 +0900
Subject: [PATCH 630/668] Add output deleteingHost using KIC driver

---
 cmd/minikube/cmd/delete.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
index 5f4ad12513..22c16062d3 100644
--- a/cmd/minikube/cmd/delete.go
+++ b/cmd/minikube/cmd/delete.go
@@ -208,7 +208,13 @@ func deleteProfileContainersAndVolumes(name string) {
 
 func deleteProfile(profile *config.Profile) error {
 	viper.Set(config.ProfileName, profile.Name)
-	deleteProfileContainersAndVolumes(profile.Name)
+	if profile.Config != nil {
+		// if driver is oci driver, delete containers and volumes
+		if driver.IsKIC(profile.Config.Driver) {
+			out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": profile.Name, "driver_name": profile.Config.Driver})
+			deleteProfileContainersAndVolumes(profile.Name)
+		}
+	}
 
 	api, err := machine.NewAPIClient()
 	if err != nil {

From d2dbf539ab931134f5c69547e49c5191e5630a02 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 09:32:05 -0700
Subject: [PATCH 631/668] fix node name regression

---
 pkg/minikube/node/start.go | 8 +++++---
 pkg/minikube/out/out.go    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index e86ccc48a3..0fda6de595 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -114,7 +114,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 		bs = setupKubeAdm(starter.MachineAPI, *starter.Cfg, *starter.Node)
 		err = bs.StartCluster(*starter.Cfg)
 
-    if err != nil {
+		if err != nil {
 			out.LogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, *starter.Cfg, starter.Runner))
 			return nil, err
 		}
@@ -187,10 +187,12 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 
 // 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) {
+
+	name := driver.MachineName(*cc, *n)
 	if apiServer {
-		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
+		out.T(out.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name})
 	} else {
-		out.T(out.ThumbsUp, "Starting node {{.name}} in cluster {{.cluster}}", out.V{"name": n.Name, "cluster": cc.Name})
+		out.T(out.ThumbsUp, "Starting node {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name})
 	}
 
 	if driver.IsKIC(cc.Driver) {
diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
index 4b6dd0bf6f..618b5fd36e 100644
--- a/pkg/minikube/out/out.go
+++ b/pkg/minikube/out/out.go
@@ -195,7 +195,7 @@ func LogEntries(msg string, err error, entries map[string][]string) {
 	}
 }
 
-// DisplayError
+// DisplayError prints the error and displays the standard minikube error messaging
 func DisplayError(msg string, err error) {
 	// use Warning because Error will display a duplicate message to stderr
 	glog.Warningf(fmt.Sprintf("%s: %v", msg, err))

From fca0b50f9abd02fb328d051ac657614b070b75e4 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 10:25:41 -0700
Subject: [PATCH 632/668] Add error to 'Unable to load cached images' message

---
 pkg/minikube/node/cache.go | 5 +++--
 pkg/minikube/node/start.go | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index ebeb04fdc0..2c598fcd53 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -21,6 +21,7 @@ import (
 	"runtime"
 
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
@@ -145,7 +146,7 @@ func saveImagesToTarFromConfig() error {
 func CacheAndLoadImagesInConfig() error {
 	images, err := imagesInConfigFile()
 	if err != nil {
-		return err
+		return errors.Wrap(err, "images")
 	}
 	if len(images) == 0 {
 		return nil
@@ -156,7 +157,7 @@ func CacheAndLoadImagesInConfig() error {
 func imagesInConfigFile() ([]string, error) {
 	configFile, err := config.ReadConfig(localpath.ConfigFile())
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "read")
 	}
 	if values, ok := configFile[cacheImageConfigKey]; ok {
 		var images []string
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 46af9f8bd8..8c8ffc52d7 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -149,7 +149,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
 	configureMounts()
 
 	if err := CacheAndLoadImagesInConfig(); err != nil {
-		out.FailureT("Unable to load cached images from config file.")
+		out.FailureT("Unable to push cached images from config: {{.error}}", out.V{"error": err})
 	}
 
 	// enable addons, both old and new!

From 198247d9f1fb8f4c4f2e7203ea3fe84664d1677b Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 10:32:25 -0700
Subject: [PATCH 633/668] make alternate driver text more clear

---
 cmd/minikube/cmd/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 545694a85f..7855e91085 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -160,7 +160,7 @@ func runStart(cmd *cobra.Command, args []string) {
 			success := false
 			// Walk down the rest of the options
 			for _, alt := range alts {
-				out.WarningT("Startup with {{.old_driver}} driver failed, trying with {{.new_driver}}: {{.error}}", out.V{"old_driver": ds.Name, "new_driver": alt.Name, "error": err})
+				out.WarningT("Startup with {{.old_driver}} driver failed, trying with alternate driver {{.new_driver}}: {{.error}}", out.V{"old_driver": ds.Name, "new_driver": alt.Name, "error": err})
 				ds = alt
 				// Delete the existing cluster and try again with the next driver on the list
 				profile, err := config.LoadProfile(ClusterFlagValue())

From 3a12fbd1f5b80a3e6eed94f1abfd2712b26640ec Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Thu, 9 Apr 2020 10:50:20 -0700
Subject: [PATCH 634/668] Fix spelling

---
 pkg/drivers/kic/oci/oci.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 372dad8620..f1e53843eb 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -84,8 +84,8 @@ func DeleteContainer(ociBin string, name string) error {
 	return nil
 }
 
-// PrepareContainerNode sets up the container node befpre CreateContainerNode is caleld
-// for the docker runtime, it creates a docker volume which will be mounted into kic
+// PrepareContainerNode sets up the container node before CreateContainerNode is called.
+// For the docker runtime, it creates a docker volume which will be mounted into kic
 func PrepareContainerNode(p CreateParams) error {
 	if p.OCIBinary != Docker {
 		return nil

From 98532748df266bca1ac8a5ed36c74728782365ca Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 11:02:08 -0700
Subject: [PATCH 635/668] fix build failure

---
 pkg/minikube/exit/exit.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go
index d9e4403e52..4f9f734b2c 100644
--- a/pkg/minikube/exit/exit.go
+++ b/pkg/minikube/exit/exit.go
@@ -22,6 +22,7 @@ import (
 	"runtime"
 	"runtime/debug"
 
+	"github.com/golang/glog"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/problem"
 )

From 322b5d52f6c09987f7e603933e73261df672eb58 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 11:05:31 -0700
Subject: [PATCH 636/668] fix build errors for realsies this time

---
 pkg/minikube/node/start.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index 6ef365e8da..5abfa40151 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -147,7 +147,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 
 	// enable addons, both old and new!
 	if starter.ExistingAddons != nil {
-		go addons.Start(&wg, &cc, starter.ExistingAddons, config.AddonList)
+		go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList)
 	}
 
 	if apiServer {
@@ -190,7 +190,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 	wg.Wait()
 
 	// Write enabled addons to the config before completion
-	return kcs, config.Write(viper.GetString(config.ProfileName), &cc)
+	return kcs, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
 }
 
 // Provision provisions the machine/container for the node

From 35ef02b4fb495fa887bb58e980fb0186030335c3 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 11:39:39 -0700
Subject: [PATCH 637/668] updating some french translations for minikube start

---
 site/content/en/docs/contrib/translations.md |  4 ++--
 translations/de.json                         |  8 +++----
 translations/es.json                         |  8 +++----
 translations/fr.json                         | 24 ++++++++++----------
 translations/ja.json                         |  8 +++----
 translations/ko.json                         |  7 +++---
 translations/pl.json                         | 10 ++++----
 translations/zh-CN.json                      |  8 +++----
 8 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/site/content/en/docs/contrib/translations.md b/site/content/en/docs/contrib/translations.md
index 3250965698..38f5016600 100644
--- a/site/content/en/docs/contrib/translations.md
+++ b/site/content/en/docs/contrib/translations.md
@@ -83,8 +83,8 @@ All translations are stored in the top-level `translations` directory.
 	```
 	~/minikube$ LC_ALL=fr out/minikube start
 	😄  minikube v1.9.2 sur Darwin 10.14.5
-	✨  Choix automatique du driver hyperkit. Autres choix: <no value>
-	👍  Starting control plane node minikube in cluster minikube
+	✨  Choix automatique du driver hyperkit. Autres choix: docker
+	👍  Démarrage du noeud de plan de contrôle minikube dans le cluster minikube
 	🔥  Création de VM hyperkit (CPUs=2, Mémoire=4000MB, Disque=20000MB)...
 	🐳  Préparation de Kubernetes v1.18.0 sur Docker 19.03.8...
 	🌟  Installation des addons: default-storageclass, storage-provisioner
diff --git a/translations/de.json b/translations/de.json
index 2d25461edb..ab60064092 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -405,8 +405,8 @@
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "Der Treiber \"{{.driver_name}}\" benötigt Root-Rechte. Führen Sie minikube aus mit 'sudo minikube --vm-driver = {{. Driver_name}}.",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Der Cluster \"{{.name}}\" wurde gelöscht.",
 	"The \"{{.name}}\" cluster has been deleted.__1": "Der Cluster \"{{.name}}\" wurde gelöscht.",
@@ -579,13 +579,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Sie scheinen einen Proxy zu verwenden, aber Ihre NO_PROXY-Umgebung enthält keine minikube-IP ({{.ip_address}}). Weitere Informationen finden Sie unter {{.documentation_url}}",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Möglicherweise müssen Sie die VM \"{{.name}}\" manuell von Ihrem Hypervisor entfernen",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/es.json b/translations/es.json
index 70891b4897..fe61127b7e 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -406,8 +406,8 @@
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "El controlador \"{{.driver_name}}\" requiere privilegios de raíz. Ejecuta minikube mediante sudo minikube --vm-driver={{.driver_name}}",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Se ha eliminado el clúster \"{{.name}}\".",
 	"The \"{{.name}}\" cluster has been deleted.__1": "Se ha eliminado el clúster \"{{.name}}\".",
@@ -580,13 +580,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Parece que estás usando un proxy, pero tu entorno NO_PROXY no incluye la dirección IP de minikube ({{.ip_address}}). Consulta {{.documentation_url}} para obtener más información",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Puede que tengas que retirar manualmente la VM \"{{.name}}\" de tu hipervisor",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/fr.json b/translations/fr.json
index e58f4e571a..1272546bb8 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -37,8 +37,8 @@
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "",
 	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "",
-	"Automatically selected the {{.driver}} driver": "Choix automatique du driver {{.driver}}",
-	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du driver {{.driver}}. Autres choix: {{.alternatives}}",
+	"Automatically selected the {{.driver}} driver": "Choix automatique du pilote {{.driver}}",
+	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du pilote {{.driver}}. Autres choix: {{.alternatives}}",
 	"Available Commands": "",
 	"Basic Commands:": "",
 	"Because you are using docker driver on Mac, the terminal needs to be open to run it.": "",
@@ -386,8 +386,8 @@
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Start failed after cluster deletion": "",
 	"StartHost failed, but will try again: {{.error}}": "",
-	"Starting control plane node {{.name}} in cluster {{.cluster}}": "",
-	"Starting node {{.name}} in cluster {{.cluster}}": "",
+	"Starting control plane node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud de plan de contrôle {{.name}} dans le cluster {{.cluster}}",
+	"Starting node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud {{.name}} dans le cluster {{.cluster}}",
 	"Starting tunnel for service {{.service}}.": "",
 	"Starts a local kubernetes cluster": "Démarre un cluster Kubernetes local.",
 	"Starts a node.": "",
@@ -404,8 +404,8 @@
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "Le pilote \"{{.driver_name}}\" nécessite de disposer de droits racine. Veuillez exécuter minikube à l'aide de \"sudo minikube --vm-driver={{.driver_name}}\".",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The 'none' driver provides limited isolation and may reduce system security and reliability.": "L'isolation fournie par le pilote \"none\" (aucun) est limitée, ce qui peut diminuer la sécurité et la fiabilité du système.",
@@ -533,7 +533,7 @@
 	"Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "",
 	"Unset variables instead of setting them": "",
 	"Update server returned an empty list": "",
-	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "",
+	"Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "Mise à jour du {{.machine_type}} {{.driver_name}} en marche \"{{.cluster}}\" ...",
 	"Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "",
 	"Upgrading from Kubernetes {{.old}} to {{.new}}": "Mise à niveau de Kubernetes de la version {{.old}} à la version {{.new}}…",
 	"Usage": "Usage",
@@ -554,8 +554,8 @@
 	"Userspace file server:": "",
 	"Using image repository {{.name}}": "Utilisation du dépôt d'images {{.name}}…",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
-	"Using the {{.driver}} driver based on existing profile": "",
-	"Using the {{.driver}} driver based on user configuration": "",
+	"Using the {{.driver}} driver based on existing profile": "Utilisation du pilote {{.driver}} basé sur le profil existant",
+	"Using the {{.driver}} driver based on user configuration": "Utilisation du pilote {{.driver}} basé sur la configuration de l'utilisateur",
 	"VM driver is one of: %v": "Le pilote de la VM appartient à : %v",
 	"Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
@@ -579,13 +579,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Il semble que vous utilisiez un proxy, mais votre environment NO_PROXY n'inclut pas l'adresse IP ({{.ip_address}}) de minikube. Consultez la documentation à l'adresse {{.documentation_url}} pour en savoir plus.",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Vous devrez peut-être supprimer la VM \"{{.name}}\" manuellement de votre hyperviseur.",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
@@ -684,4 +684,4 @@
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} sur {{.platform}}",
 	"{{.type}} is not yet a supported filesystem. We will try anyways!": "",
 	"{{.url}} is not accessible: {{.error}}": ""
-}
\ No newline at end of file
+}
diff --git a/translations/ja.json b/translations/ja.json
index 4f5796890f..25add034bc 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -416,8 +416,8 @@
 	"Suggestion: {{.advice}}": "",
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "「{{.driver_name}}」ドライバにはルート権限が必要です。「sudo minikube --vm-driver={{.driver_name}}」を使用して minikube を実行してください",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスタが削除されました",
 	"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスタが削除されました",
@@ -590,13 +590,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "プロキシを使用しようとしていますが、現在の NO_PROXY 環境に minikube IP（{{.ip_address}}）は含まれていません。詳細については、{{.documentation_url}} をご覧ください",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "「 minikube kubectl -- get pods 」で、一致するバージョンを表示することができます",
 	"You can delete them using the following command(s):": "以下のコマンドで削除することができます",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザから「{{.name}}」VM を手動で削除することが必要な可能性があります",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "Hyper-V マネージャを停止して、「 minikube delete 」を再実行する必要があるかもしれません　",
 	"You must specify a service name": "サービスの名前を明示する必要があります",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストマシーンは KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認してください。「 virt-host-validate 」を実行して、デバッグしてください",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "ホストマシーンは仮想化をサポートしていません。もし VM 内で minikube を動かすのであれば、「 --driver=docker 」を試してください。そうでなければ、 BIOS で仮想化を有効にしてください",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "ホストマシーンが minikube の VM にパケットをルーティングすることができていません。もし VPN を有効しているのであれば、VPN を無効にする、あるいは VM の IP アドレスに再ルーティングしないように設定してください。もし VPN を使用していないのであれば、 VM 環境のルーティング周りのオプションを確認してください",
diff --git a/translations/ko.json b/translations/ko.json
index 8ee88f5c72..0024eb688e 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -413,6 +413,7 @@
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "타겟 폴더 {{.path}} 는 절대 경로여야 합니다",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되어야 합니다. minikube 를 다음과 같이 실행하세요 'sudo minikube --driver={{.driver_name}}'",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되면 안 됩니다",
 	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
 	"The '{{.addonName}}' addon is enabled": "",
@@ -570,13 +571,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "맞는 버전의 kubectl 을 사용하기 위해서는 다음과 같이 사용 가능합니다. minikube kubectl -- get pods'",
 	"You can delete them using the following command(s):": "다음 커맨드(들)을 사용하여 제거할 수 있습니다",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "service 이름을 명시해야 합니다",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "호스트가 KVM 가상화를 지원하지 않습니다. qemu-kvm 이 설치되었는지 확인 후, 문제 디버그를 위해 'virt-host-validate' 를 실행하세요",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=none'. Otherwise, enable virtualization in your BIOS": "호스트가 가상화를 지원하지 않습니다. 가상 머신 안에서 minikube 를 실행 중인 경우, '--driver=none' 로 시도하세요. 그렇지 않다면, BIOS 에서 가상화를 활성화하세요",
diff --git a/translations/pl.json b/translations/pl.json
index 57fb8ee888..a59064b72a 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -190,8 +190,8 @@
 	"Failed to setup kubeconfig": "Konfiguracja kubeconfig nie powiodła się",
 	"Failed to stop node {{.name}}": "",
 	"Failed to update cluster": "Aktualizacja klastra nie powiodła się",
-	"Failed to validate '{{.driver}}' driver": "",
 	"Failed to update config": "Aktualizacja konfiguracji nie powiodła się",
+	"Failed to validate '{{.driver}}' driver": "",
 	"Failed unmount: {{.error}}": "",
 	"File permissions used for the mount": "",
 	"Filter to use only VM Drivers": "",
@@ -410,8 +410,8 @@
 	"Suggestion: {{.fix}}": "",
 	"Target directory {{.path}} must be an absolute path": "",
 	"The \"{{.cluster_name}}\" cluster has been deleted.": "Klaster \"{{.cluster_name}}\" został usunięty",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.": "Sterownik \"{{.driver_name}}\" wymaga uprawnień root'a. Użyj 'sudo minikube --vm-driver={{.driver_name}}'",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "Klaster \"{{.name}}\" został usunięty",
 	"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
@@ -578,13 +578,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "Musisz podać nazwę serwisu",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Twoje środowisko nie wspiera virtualizacji KVM. Upewnij się że qemu-kvm jest zainstalowane i uruchom 'virt-host-validate' aby rozwiązać problem.",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 75433ea0a9..7b5d40ad81 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -471,8 +471,8 @@
 	"Suggestion: {{.advice}}": "建议：{{.advice}}",
 	"Suggestion: {{.fix}}": "建议：{{.fix}}",
 	"Target directory {{.path}} must be an absolute path": "",
-	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "“{{.driver_name}}”驱动程序需要根权限。请使用“sudo minikube --vm-driver={{.driver_name}}”运行 minikube",
+	"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube start --driver={{.driver_name}}'.": "",
 	"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
 	"The \"{{.name}}\" cluster has been deleted.": "“{{.name}}”集群已删除。",
 	"The \"{{.name}}\" cluster has been deleted.__1": "“{{.name}}”集群已删除。",
@@ -658,13 +658,13 @@
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "您似乎正在使用代理，但您的 NO_PROXY 环境不包含 minikube IP ({{.ip_address}})。如需了解详情，请参阅 {{.documentation_url}}",
 	"You can also use 'minikube kubectl -- get pods' to invoke a matching version": "",
 	"You can delete them using the following command(s):": "",
+	"You cannot change the CPUs for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the Disk size for an exiting minikube cluster. Please first delete the cluster.": "",
+	"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster.": "",
 	"You have selected Kubernetes v{{.new}}, but the existing cluster is running Kubernetes v{{.old}}": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "您可能需要从管理程序中手动移除“{{.name}}”虚拟机",
 	"You may need to stop the Hyper-V Manager and run `minikube delete` again.": "",
 	"You must specify a service name": "",
-	"You not the change the CPUs for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the Disk size for an exiting minikube cluster. Pease first delete the cluster.": "",
-	"You not the change the memory size for an exiting minikube cluster. Pease first delete the cluster.": "",
 	"Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "",
 	"Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "",
 	"Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "",

From 793a267780474eeb9424071f0ebb1f16b95674ce Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 9 Apr 2020 12:15:50 -0700
Subject: [PATCH 638/668] code comments

---
 site/content/en/docs/tutorials/multi_node.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/tutorials/multi_node.md b/site/content/en/docs/tutorials/multi_node.md
index 971cadc992..88ec4bfd5f 100644
--- a/site/content/en/docs/tutorials/multi_node.md
+++ b/site/content/en/docs/tutorials/multi_node.md
@@ -1,5 +1,5 @@
 ---
-title: "Using Multi-Node Clusters"
+title: "Using Multi-Node Clusters (Experimental)"
 linkTitle: "Using multi-node clusters"
 weight: 1
 date: 2019-11-24
@@ -11,7 +11,7 @@ date: 2019-11-24
 
 ## Prerequisites
 
-- Minikube 1.9.0 (experimental) or higher
+- minikube 1.9.0 or higher
 - kubectl
 
 ## Tutorial

From bf784d8bf3602a38a9d7da712be38d28820965eb Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 13:24:14 -0700
Subject: [PATCH 639/668] Refactor CommandRunner.Copy functions for consistency

---
 pkg/addons/addons.go                   |   2 +-
 pkg/gvisor/enable.go                   |   2 +-
 pkg/minikube/assets/vm_assets.go       |  34 ++++----
 pkg/minikube/bootstrapper/certs.go     |   3 +-
 pkg/minikube/command/command_runner.go | 109 +++++++++++++++++++++++--
 pkg/minikube/command/exec_runner.go    |  34 ++++----
 pkg/minikube/command/fake_runner.go    |   4 +-
 pkg/minikube/command/kic_runner.go     |  87 +++++++++++++-------
 pkg/minikube/command/ssh_runner.go     | 107 ++++++------------------
 pkg/minikube/machine/filesync_test.go  |   2 +-
 10 files changed, 227 insertions(+), 157 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 63ae1507df..fd4634d0b4 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -197,7 +197,7 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
 		if addon.IsTemplate() {
 			f, err = addon.Evaluate(data)
 			if err != nil {
-				return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
+				return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetSourcePath())
 			}
 
 		} else {
diff --git a/pkg/gvisor/enable.go b/pkg/gvisor/enable.go
index 40f69b2fc9..27d0260406 100644
--- a/pkg/gvisor/enable.go
+++ b/pkg/gvisor/enable.go
@@ -181,7 +181,7 @@ func copyAssetToDest(targetName, dest string) error {
 	log.Printf("%s asset path: %s", targetName, src)
 	contents, err := ioutil.ReadFile(src)
 	if err != nil {
-		return errors.Wrapf(err, "getting contents of %s", asset.GetAssetName())
+		return errors.Wrapf(err, "getting contents of %s", asset.GetSourcePath())
 	}
 	if _, err := os.Stat(dest); err == nil {
 		if err := os.Remove(dest); err != nil {
diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go
index e3b4678544..3751a85e08 100644
--- a/pkg/minikube/assets/vm_assets.go
+++ b/pkg/minikube/assets/vm_assets.go
@@ -29,11 +29,15 @@ import (
 	"github.com/pkg/errors"
 )
 
+// MemorySource is the source name used for in-memory copies
+const MemorySource = "memory"
+
 // CopyableFile is something that can be copied
 type CopyableFile interface {
 	io.Reader
 	GetLength() int
-	GetAssetName() string
+	GetSourcePath() string
+
 	GetTargetDir() string
 	GetTargetName() string
 	GetPermissions() string
@@ -43,15 +47,16 @@ type CopyableFile interface {
 
 // BaseAsset is the base asset class
 type BaseAsset struct {
-	AssetName   string
+	SourcePath  string
 	TargetDir   string
 	TargetName  string
 	Permissions string
+	Source      string
 }
 
-// GetAssetName returns asset name
-func (b *BaseAsset) GetAssetName() string {
-	return b.AssetName
+// GetSourcePath returns asset name
+func (b *BaseAsset) GetSourcePath() string {
+	return b.SourcePath
 }
 
 // GetTargetDir returns target dir
@@ -99,7 +104,7 @@ func NewFileAsset(src, targetDir, targetName, permissions string) (*FileAsset, e
 	r := io.NewSectionReader(f, 0, info.Size())
 	return &FileAsset{
 		BaseAsset: BaseAsset{
-			AssetName:   src,
+			SourcePath:  src,
 			TargetDir:   targetDir,
 			TargetName:  targetName,
 			Permissions: permissions,
@@ -110,7 +115,7 @@ func NewFileAsset(src, targetDir, targetName, permissions string) (*FileAsset, e
 
 // GetLength returns the file length, or 0 (on error)
 func (f *FileAsset) GetLength() (flen int) {
-	fi, err := os.Stat(f.AssetName)
+	fi, err := os.Stat(f.SourcePath)
 	if err != nil {
 		return 0
 	}
@@ -119,7 +124,7 @@ func (f *FileAsset) GetLength() (flen int) {
 
 // GetModTime returns modification time of the file
 func (f *FileAsset) GetModTime() (time.Time, error) {
-	fi, err := os.Stat(f.AssetName)
+	fi, err := os.Stat(f.SourcePath)
 	if err != nil {
 		return time.Time{}, err
 	}
@@ -168,6 +173,7 @@ func NewMemoryAsset(d []byte, targetDir, targetName, permissions string) *Memory
 			TargetDir:   targetDir,
 			TargetName:  targetName,
 			Permissions: permissions,
+			SourcePath:  MemorySource,
 		},
 		reader: bytes.NewReader(d),
 		length: len(d),
@@ -195,7 +201,7 @@ func MustBinAsset(name, targetDir, targetName, permissions string, isTemplate bo
 func NewBinAsset(name, targetDir, targetName, permissions string, isTemplate bool) (*BinAsset, error) {
 	m := &BinAsset{
 		BaseAsset: BaseAsset{
-			AssetName:   name,
+			SourcePath:  name,
 			TargetDir:   targetDir,
 			TargetName:  targetName,
 			Permissions: permissions,
@@ -218,13 +224,13 @@ func defaultValue(defValue string, val interface{}) string {
 }
 
 func (m *BinAsset) loadData(isTemplate bool) error {
-	contents, err := Asset(m.AssetName)
+	contents, err := Asset(m.SourcePath)
 	if err != nil {
 		return err
 	}
 
 	if isTemplate {
-		tpl, err := template.New(m.AssetName).Funcs(template.FuncMap{"default": defaultValue}).Parse(string(contents))
+		tpl, err := template.New(m.SourcePath).Funcs(template.FuncMap{"default": defaultValue}).Parse(string(contents))
 		if err != nil {
 			return err
 		}
@@ -234,9 +240,9 @@ func (m *BinAsset) loadData(isTemplate bool) error {
 
 	m.length = len(contents)
 	m.reader = bytes.NewReader(contents)
-	glog.V(1).Infof("Created asset %s with %d bytes", m.AssetName, m.length)
+	glog.V(1).Infof("Created asset %s with %d bytes", m.SourcePath, m.length)
 	if m.length == 0 {
-		return fmt.Errorf("%s is an empty asset", m.AssetName)
+		return fmt.Errorf("%s is an empty asset", m.SourcePath)
 	}
 	return nil
 }
@@ -249,7 +255,7 @@ func (m *BinAsset) IsTemplate() bool {
 // Evaluate evaluates the template to a new asset
 func (m *BinAsset) Evaluate(data interface{}) (*MemoryAsset, error) {
 	if !m.IsTemplate() {
-		return nil, errors.Errorf("the asset %s is not a template", m.AssetName)
+		return nil, errors.Errorf("the asset %s is not a template", m.SourcePath)
 
 	}
 
diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go
index 35833705e0..3099a29b32 100644
--- a/pkg/minikube/bootstrapper/certs.go
+++ b/pkg/minikube/bootstrapper/certs.go
@@ -117,9 +117,8 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
 	}
 
 	for _, f := range copyableFiles {
-		glog.Infof("copying: %s/%s", f.GetTargetDir(), f.GetTargetName())
 		if err := cmd.Copy(f); err != nil {
-			return nil, errors.Wrapf(err, "Copy %s", f.GetAssetName())
+			return nil, errors.Wrapf(err, "Copy %s", f.GetSourcePath())
 		}
 	}
 
diff --git a/pkg/minikube/command/command_runner.go b/pkg/minikube/command/command_runner.go
index dfd30c5233..06be22eb36 100644
--- a/pkg/minikube/command/command_runner.go
+++ b/pkg/minikube/command/command_runner.go
@@ -17,12 +17,17 @@ limitations under the License.
 package command
 
 import (
+	"bufio"
 	"bytes"
 	"fmt"
+	"io"
+	"os"
 	"os/exec"
-	"path"
+	"strconv"
 	"strings"
+	"time"
 
+	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/assets"
 )
 
@@ -55,10 +60,6 @@ type Runner interface {
 	Remove(assets.CopyableFile) error
 }
 
-func getDeleteFileCommand(f assets.CopyableFile) string {
-	return fmt.Sprintf("sudo rm %s", path.Join(f.GetTargetDir(), f.GetTargetName()))
-}
-
 // Command returns a human readable command string that does not induce eye fatigue
 func (rr RunResult) Command() string {
 	var sb strings.Builder
@@ -84,3 +85,101 @@ func (rr RunResult) Output() string {
 	}
 	return sb.String()
 }
+
+// teePrefix copies bytes from a reader to writer, logging each new line.
+func teePrefix(prefix string, r io.Reader, w io.Writer, logger func(format string, args ...interface{})) error {
+	scanner := bufio.NewScanner(r)
+	scanner.Split(bufio.ScanBytes)
+	var line bytes.Buffer
+
+	for scanner.Scan() {
+		b := scanner.Bytes()
+		if _, err := w.Write(b); err != nil {
+			return err
+		}
+		if bytes.IndexAny(b, "\r\n") == 0 {
+			if line.Len() > 0 {
+				logger("%s%s", prefix, line.String())
+				line.Reset()
+			}
+			continue
+		}
+		line.Write(b)
+	}
+	// Catch trailing output in case stream does not end with a newline
+	if line.Len() > 0 {
+		logger("%s%s", prefix, line.String())
+	}
+	return nil
+}
+
+// fileExists checks that the same file exists on the other end
+func fileExists(r Runner, f assets.CopyableFile, dst string) (bool, error) {
+	// It's too difficult to tell if the file exists with the exact contents
+	if f.GetSourcePath() == assets.MemorySource {
+		return false, nil
+	}
+
+	// get file size and modtime of the source
+	srcSize := f.GetLength()
+	srcModTime, err := f.GetModTime()
+	if err != nil {
+		return false, err
+	}
+	if srcModTime.IsZero() {
+		return false, nil
+	}
+
+	// get file size and modtime of the destination
+	rr, err := r.RunCmd(exec.Command("stat", "-c", "%s %y", dst))
+	if err != nil {
+		if rr.ExitCode == 1 {
+			return false, nil
+		}
+
+		// avoid the noise because ssh doesn't propagate the exit code
+		if strings.HasSuffix(err.Error(), "status 1") {
+			return false, nil
+		}
+
+		return false, err
+	}
+
+	stdout := strings.TrimSpace(rr.Stdout.String())
+	outputs := strings.SplitN(stdout, " ", 2)
+	dstSize, err := strconv.Atoi(outputs[0])
+	if err != nil {
+		return false, err
+	}
+
+	dstModTime, err := time.Parse(layout, outputs[1])
+	if err != nil {
+		return false, err
+	}
+
+	if srcSize != dstSize {
+		return false, errors.New("source file and destination file are different sizes")
+	}
+
+	return srcModTime.Equal(dstModTime), nil
+}
+
+// writeFile is like ioutil.WriteFile, but does not require reading file into memory
+func writeFile(dst string, f assets.CopyableFile, perms os.FileMode) error {
+	w, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE, perms)
+	if err != nil {
+		return errors.Wrap(err, "create")
+	}
+	defer w.Close()
+
+	r := f.(io.Reader)
+	n, err := io.Copy(w, r)
+	if err != nil {
+		return errors.Wrap(err, "copy")
+	}
+
+	if n != int64(f.GetLength()) {
+		return fmt.Errorf("%s: expected to write %d bytes, but wrote %d instead", dst, f.GetLength(), n)
+	}
+	return w.Close()
+}
diff --git a/pkg/minikube/command/exec_runner.go b/pkg/minikube/command/exec_runner.go
index e25346c990..43b49c59f2 100644
--- a/pkg/minikube/command/exec_runner.go
+++ b/pkg/minikube/command/exec_runner.go
@@ -86,35 +86,31 @@ func (*execRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 
 // Copy copies a file and its permissions
 func (*execRunner) Copy(f assets.CopyableFile) error {
-	targetPath := path.Join(f.GetTargetDir(), f.GetTargetName())
-	if _, err := os.Stat(targetPath); err == nil {
-		if err := os.Remove(targetPath); err != nil {
-			return errors.Wrapf(err, "error removing file %s", targetPath)
+	dst := path.Join(f.GetTargetDir(), f.GetTargetName())
+	if _, err := os.Stat(dst); err == nil {
+		glog.Infof("found %s, removing ...", dst)
+		if err := os.Remove(dst); err != nil {
+			return errors.Wrapf(err, "error removing file %s", dst)
 		}
+	}
 
+	src := f.GetSourcePath()
+	glog.Infof("cp: %s --> %s (%d bytes)", src, dst, f.GetLength())
+	if f.GetLength() == 0 {
+		glog.Warningf("0 byte asset: %+v", f)
 	}
-	target, err := os.Create(targetPath)
-	if err != nil {
-		return errors.Wrapf(err, "error creating file at %s", targetPath)
-	}
+
 	perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0)
 	if err != nil {
 		return errors.Wrapf(err, "error converting permissions %s to integer", f.GetPermissions())
 	}
-	if err := os.Chmod(targetPath, os.FileMode(perms)); err != nil {
-		return errors.Wrapf(err, "error changing file permissions for %s", targetPath)
-	}
 
-	if _, err = io.Copy(target, f); err != nil {
-		return errors.Wrapf(err, `error copying file %s to target location:
-do you have the correct permissions?`,
-			targetPath)
-	}
-	return target.Close()
+	return writeFile(dst, f, os.FileMode(perms))
 }
 
 // Remove removes a file
 func (*execRunner) Remove(f assets.CopyableFile) error {
-	targetPath := filepath.Join(f.GetTargetDir(), f.GetTargetName())
-	return os.Remove(targetPath)
+	dst := filepath.Join(f.GetTargetDir(), f.GetTargetName())
+	glog.Infof("rm: %s", dst)
+	return os.Remove(dst)
 }
diff --git a/pkg/minikube/command/fake_runner.go b/pkg/minikube/command/fake_runner.go
index 82a6d833df..9da8377a26 100644
--- a/pkg/minikube/command/fake_runner.go
+++ b/pkg/minikube/command/fake_runner.go
@@ -97,13 +97,13 @@ func (f *FakeCommandRunner) Copy(file assets.CopyableFile) error {
 	if err != nil {
 		return errors.Wrapf(err, "error reading file: %+v", file)
 	}
-	f.fileMap.Store(file.GetAssetName(), b.String())
+	f.fileMap.Store(file.GetSourcePath(), b.String())
 	return nil
 }
 
 // Remove removes the filename, file contents key value pair from the stored map
 func (f *FakeCommandRunner) Remove(file assets.CopyableFile) error {
-	f.fileMap.Delete(file.GetAssetName())
+	f.fileMap.Delete(file.GetSourcePath())
 	return nil
 }
 
diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go
index 754fc64b18..018fe3bfae 100644
--- a/pkg/minikube/command/kic_runner.go
+++ b/pkg/minikube/command/kic_runner.go
@@ -128,44 +128,73 @@ func (k *kicRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 
 // Copy copies a file and its permissions
 func (k *kicRunner) Copy(f assets.CopyableFile) error {
-	src := f.GetAssetName()
-	if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) {
-		fc := make([]byte, f.GetLength()) // Read  asset file into a []byte
-		if _, err := f.Read(fc); err != nil {
-			return errors.Wrap(err, "can't copy non-existing file")
-		} // we have a MemoryAsset, will write to disk before copying
+	dst := path.Join(path.Join(f.GetTargetDir(), f.GetTargetName()))
 
-		tmpFile, err := ioutil.TempFile(os.TempDir(), "tmpf-memory-asset")
+	// For tiny files, it's cheaper to overwrite than check
+	if f.GetLength() > 4096 {
+		exists, err := fileExists(k, f, dst)
 		if err != nil {
-			return errors.Wrap(err, "creating temporary file")
+			glog.Infof("existence error for %s: %v", dst, err)
 		}
-		//  clean up the temp file
-		defer os.Remove(tmpFile.Name())
-		if _, err = tmpFile.Write(fc); err != nil {
-			return errors.Wrap(err, "write to temporary file")
+		if exists {
+			glog.Infof("copy: skipping %s (exists)", dst)
+			return nil
 		}
+	}
 
-		// Close the file
-		if err := tmpFile.Close(); err != nil {
-			return errors.Wrap(err, "close temporary file")
-		}
-		src = tmpFile.Name()
+	src := f.GetSourcePath()
+	if f.GetLength() == 0 {
+		glog.Warningf("0 byte asset: %+v", f)
 	}
 
 	perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0)
 	if err != nil {
-		return errors.Wrapf(err, "converting permissions %s to integer", f.GetPermissions())
+		return errors.Wrapf(err, "error converting permissions %s to integer", f.GetPermissions())
 	}
 
-	// Rely on cp -a to propagate permissions
-	if err := os.Chmod(src, os.FileMode(perms)); err != nil {
-		return errors.Wrapf(err, "chmod")
+	if src != assets.MemorySource {
+		// Take the fast path
+		fi, err := os.Stat(src)
+		if err == nil {
+			if fi.Mode() == os.FileMode(perms) {
+				glog.Infof("%s (direct): %s --> %s (%d bytes)", k.ociBin, src, dst, f.GetLength())
+				return k.copy(src, dst)
+			}
+
+			// If >1MB, avoid local copy
+			if fi.Size() > (1024 * 1024) {
+				glog.Infof("%s (chmod): %s --> %s (%d bytes)", k.ociBin, src, dst, f.GetLength())
+				if err := k.copy(src, dst); err != nil {
+					return err
+				}
+				return k.chmod(dst, f.GetPermissions())
+			}
+		}
 	}
-	dest := fmt.Sprintf("%s:%s", k.nameOrID, path.Join(f.GetTargetDir(), f.GetTargetName()))
+	glog.Infof("%s (temp): %s --> %s (%d bytes)", k.ociBin, src, dst, f.GetLength())
+	tf, err := ioutil.TempFile("", "tmpf-memory-asset")
+	if err != nil {
+		return errors.Wrap(err, "creating temporary file")
+	}
+	defer os.Remove(tf.Name())
+
+	if err := writeFile(tf.Name(), f, os.FileMode(perms)); err != nil {
+		return errors.Wrap(err, "write")
+	}
+	return k.copy(tf.Name(), dst)
+}
+
+func (k *kicRunner) copy(src string, dst string) error {
+	fullDest := fmt.Sprintf("%s:%s", k.nameOrID, dst)
 	if k.ociBin == oci.Podman {
-		return copyToPodman(src, dest)
+		return copyToPodman(src, fullDest)
 	}
-	return copyToDocker(src, dest)
+	return copyToDocker(src, fullDest)
+}
+
+func (k *kicRunner) chmod(dst string, perm string) error {
+	_, err := k.RunCmd(exec.Command("sudo", "chmod", perm, dst))
+	return err
 }
 
 // Podman cp command doesn't match docker and doesn't have -a
@@ -185,11 +214,11 @@ func copyToDocker(src string, dest string) error {
 
 // Remove removes a file
 func (k *kicRunner) Remove(f assets.CopyableFile) error {
-	fp := path.Join(f.GetTargetDir(), f.GetTargetName())
-	if rr, err := k.RunCmd(exec.Command("sudo", "rm", fp)); err != nil {
-		return errors.Wrapf(err, "removing file %q output: %s", fp, rr.Output())
-	}
-	return nil
+	dst := path.Join(f.GetTargetDir(), f.GetTargetName())
+	glog.Infof("rm: %s", dst)
+
+	_, err := k.RunCmd(exec.Command("sudo", "rm", dst))
+	return err
 }
 
 // isTerminal returns true if the writer w is a terminal
diff --git a/pkg/minikube/command/ssh_runner.go b/pkg/minikube/command/ssh_runner.go
index 9d1f03a04d..ce3cc58522 100644
--- a/pkg/minikube/command/ssh_runner.go
+++ b/pkg/minikube/command/ssh_runner.go
@@ -17,14 +17,11 @@ limitations under the License.
 package command
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
 	"io"
 	"os/exec"
 	"path"
-	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -55,13 +52,16 @@ func NewSSHRunner(c *ssh.Client) *SSHRunner {
 
 // Remove runs a command to delete a file on the remote.
 func (s *SSHRunner) Remove(f assets.CopyableFile) error {
+	dst := path.Join(f.GetTargetDir(), f.GetTargetName())
+	glog.Infof("rm: %s", dst)
+
 	sess, err := s.c.NewSession()
 	if err != nil {
 		return errors.Wrap(err, "getting ssh session")
 	}
+
 	defer sess.Close()
-	cmd := getDeleteFileCommand(f)
-	return sess.Run(cmd)
+	return sess.Run(fmt.Sprintf("sudo rm %s", dst))
 }
 
 // teeSSH runs an SSH command, streaming stdout, stderr to logs
@@ -150,14 +150,26 @@ func (s *SSHRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 // Copy copies a file to the remote over SSH.
 func (s *SSHRunner) Copy(f assets.CopyableFile) error {
 	dst := path.Join(path.Join(f.GetTargetDir(), f.GetTargetName()))
-	exists, err := s.sameFileExists(f, dst)
-	if err != nil {
-		glog.Infof("Checked if %s exists, but got error: %v", dst, err)
+
+	// For small files, don't bother risking being wrong for no performance benefit
+	if f.GetLength() > 2048 {
+		exists, err := fileExists(s, f, dst)
+		if err != nil {
+			glog.Infof("existence check for %s: %v", dst, err)
+		}
+
+		if exists {
+			glog.Infof("copy: skipping %s (exists)", dst)
+			return nil
+		}
 	}
-	if exists {
-		glog.Infof("Skipping copying %s as it already exists", dst)
-		return nil
+
+	src := f.GetSourcePath()
+	glog.Infof("scp %s --> %s (%d bytes)", src, dst, f.GetLength())
+	if f.GetLength() == 0 {
+		glog.Warningf("0 byte asset: %+v", f)
 	}
+
 	sess, err := s.c.NewSession()
 	if err != nil {
 		return errors.Wrap(err, "NewSession")
@@ -171,14 +183,13 @@ func (s *SSHRunner) Copy(f assets.CopyableFile) error {
 	// StdinPipe is closed. But let's use errgroup to make it explicit.
 	var g errgroup.Group
 	var copied int64
-	glog.Infof("Transferring %d bytes to %s", f.GetLength(), dst)
 
 	g.Go(func() error {
 		defer w.Close()
 		header := fmt.Sprintf("C%s %d %s\n", f.GetPermissions(), f.GetLength(), f.GetTargetName())
 		fmt.Fprint(w, header)
 		if f.GetLength() == 0 {
-			glog.Warningf("%s is a 0 byte asset!", f.GetTargetName())
+			glog.Warningf("asked to copy a 0 byte asset: %+v", f)
 			fmt.Fprint(w, "\x00")
 			return nil
 		}
@@ -190,7 +201,6 @@ func (s *SSHRunner) Copy(f assets.CopyableFile) error {
 		if copied != int64(f.GetLength()) {
 			return fmt.Errorf("%s: expected to copy %d bytes, but copied %d instead", f.GetTargetName(), f.GetLength(), copied)
 		}
-		glog.Infof("%s: copied %d bytes", f.GetTargetName(), copied)
 		fmt.Fprint(w, "\x00")
 		return nil
 	})
@@ -208,72 +218,3 @@ func (s *SSHRunner) Copy(f assets.CopyableFile) error {
 	}
 	return g.Wait()
 }
-
-func (s *SSHRunner) sameFileExists(f assets.CopyableFile, dst string) (bool, error) {
-	// get file size and modtime of the source
-	srcSize := f.GetLength()
-	srcModTime, err := f.GetModTime()
-	if err != nil {
-		return false, err
-	}
-	if srcModTime.IsZero() {
-		return false, nil
-	}
-
-	// get file size and modtime of the destination
-	sess, err := s.c.NewSession()
-	if err != nil {
-		return false, err
-	}
-
-	cmd := "stat -c \"%s %y\" " + dst
-	out, err := sess.CombinedOutput(cmd)
-	if err != nil {
-		return false, err
-	}
-	outputs := strings.SplitN(strings.Trim(string(out), "\n"), " ", 2)
-
-	dstSize, err := strconv.Atoi(outputs[0])
-	if err != nil {
-		return false, err
-	}
-	dstModTime, err := time.Parse(layout, outputs[1])
-	if err != nil {
-		return false, err
-	}
-	glog.Infof("found %s: %d bytes, modified at %s", dst, dstSize, dstModTime)
-
-	// compare sizes and modtimes
-	if srcSize != dstSize {
-		return false, errors.New("source file and destination file are different sizes")
-	}
-
-	return srcModTime.Equal(dstModTime), nil
-}
-
-// teePrefix copies bytes from a reader to writer, logging each new line.
-func teePrefix(prefix string, r io.Reader, w io.Writer, logger func(format string, args ...interface{})) error {
-	scanner := bufio.NewScanner(r)
-	scanner.Split(bufio.ScanBytes)
-	var line bytes.Buffer
-
-	for scanner.Scan() {
-		b := scanner.Bytes()
-		if _, err := w.Write(b); err != nil {
-			return err
-		}
-		if bytes.IndexAny(b, "\r\n") == 0 {
-			if line.Len() > 0 {
-				logger("%s%s", prefix, line.String())
-				line.Reset()
-			}
-			continue
-		}
-		line.Write(b)
-	}
-	// Catch trailing output in case stream does not end with a newline
-	if line.Len() > 0 {
-		logger("%s%s", prefix, line.String())
-	}
-	return nil
-}
diff --git a/pkg/minikube/machine/filesync_test.go b/pkg/minikube/machine/filesync_test.go
index 99a674e8e8..143c3e9ab7 100644
--- a/pkg/minikube/machine/filesync_test.go
+++ b/pkg/minikube/machine/filesync_test.go
@@ -149,7 +149,7 @@ func TestAssetsFromDir(t *testing.T) {
 
 			got := make(map[string]string)
 			for _, actualFile := range actualFiles {
-				got[actualFile.GetAssetName()] = actualFile.GetTargetDir()
+				got[actualFile.GetSourcePath()] = actualFile.GetTargetDir()
 			}
 			if diff := cmp.Diff(want, got); diff != "" {
 				t.Errorf("files differ: (-want +got)\n%s", diff)

From 897af043f9f90e22e08b300e575051b3b2a5c55a Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 17:08:02 -0700
Subject: [PATCH 640/668] fix broken screenshot link on the README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eeb78f1c0b..3f002b3713 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@
 
 minikube implements a local Kubernetes cluster on macOS, Linux, and Windows. minikube's [primary goals](https://minikube.sigs.k8s.io/docs/concepts/principles/) are to be the best tool for local Kubernetes application development and to support all Kubernetes features that fit. 
 
-<img src="https://github.com/kubernetes/minikube/raw/master/site/content/en/start.png" width="738" alt="screenshot">
+<img src="https://raw.githubusercontent.com/kubernetes/minikube/master/site/static/images/screenshot.png" width="738" alt="screenshot">
+
 
 ## Features
 

From 7a9ce4fe527fe53c8ec48ac96e9979ffecef1f4f Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 17:16:59 -0700
Subject: [PATCH 641/668] Quick Start v2.0

---
 site/assets/scss/_variables_project.scss      |  54 ++++-
 .../en/docs/handbook/troubleshooting.md       |   2 -
 site/content/en/docs/start/_index.md          | 188 +++++++++++++++++-
 .../en/docs/start/includes/post_install.inc   |  22 --
 site/content/en/docs/start/linux.md           |  79 --------
 site/content/en/docs/start/macos.md           |  76 -------
 site/content/en/docs/start/windows.md         |  56 ------
 site/layouts/partials/hooks/head-end.html     |   3 +-
 site/static/css/tabs.css                      |  28 ++-
 9 files changed, 250 insertions(+), 258 deletions(-)
 delete mode 100644 site/content/en/docs/start/includes/post_install.inc
 delete mode 100644 site/content/en/docs/start/linux.md
 delete mode 100644 site/content/en/docs/start/macos.md
 delete mode 100644 site/content/en/docs/start/windows.md

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index f9c97d406a..e89aa65e28 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -3,6 +3,7 @@
 // minikube colors, taken from the logo
 $mk-dark: #306EE5;
 $mk-medium: #1FC3CF;
+$mk-midlight: #e8f3f3;
 $mk-light:#C7EAEC;
 $mk-verydark: darken($mk-dark, 15%);
 
@@ -10,9 +11,9 @@ $mk-verydark: darken($mk-dark, 15%);
 $dark: #403F4C !default;
 $blue: #72A1E5 !default;
 $orange: #BA5A31 !default;
-$gray-100: #f8f9fa !default;
+$gray-100: #f6f6f8 !default;
 $gray-200: #eee !default;
-$gray-300: #dee2e6 !default;
+$gray-300: #dedeef !default;
 $gray-400: #ccc !default;
 $gray-500: #adb5bd !default;
 $gray-600: #888 !default;
@@ -31,7 +32,30 @@ $danger: #ED6A5A !default;
 $white: #fff !default;
 $light: $mk-light;
 $medium: $mk-medium;
+$spacer: 0.5em;
 
+body, p {
+    font-family: 'Lora', serif !important;
+}
+
+
+h1,h2,h3,h4,h5 {
+    font-family: 'Open Sans', sans-serif !important;
+}
+
+.step {
+    margin-top: 2em;
+    font-family: 'Open Sans', sans-serif !important;
+
+    .text-primary {
+        color: $mk-dark !important;
+    }
+
+    .fa-stack {
+        color: $mk-midlight !important;
+        margin-right: 0.4em;
+    }
+}
 
 // Navigation bar
 $navbar-dark-color: $mk-dark;
@@ -151,21 +175,35 @@ section.td-box--height-auto {
 }
 
 
+
+// Allow code tags to span most of a window length (default is 80%)
+pre {
+    max-width: 99% !important;
+    font-family: 'Inconsolata', monospace !important;
+    font-size: 12px !important;
+}
+
 div.td-content {
-    // Allow code tags to span most of a window length (default is 80%)
-    pre {
-        max-width: 99% !important;
-    }
     h2 {
-        font-size: 1.4rem !important;
+        font-size: 1.6rem !important;
     }
+
     h3 {
         font-size: 1.3rem !important;
     }
+
+    .highlight {
+        padding: 0.5em !important;
+        margin-top: 1.25em;
+        margin-bottom: 1.25em;
+    }
 }
 
+
+
 // make search bar wider https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
 .popover.offline-search-result {
     background-color: $gray-200 !important;
     max-width: 460px;
-}
\ No newline at end of file
+}
+
diff --git a/site/content/en/docs/handbook/troubleshooting.md b/site/content/en/docs/handbook/troubleshooting.md
index b4606f0116..0f8e4a1432 100644
--- a/site/content/en/docs/handbook/troubleshooting.md
+++ b/site/content/en/docs/handbook/troubleshooting.md
@@ -1,8 +1,6 @@
 ---
 title: "Troubleshooting"
-linkTitle: "Troubleshoot"
 weight: 20
-date: 2019-08-01
 description: >
   How to troubleshoot minikube issues
 ---
diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md
index 6d58d2df6d..df077d6a8b 100644
--- a/site/content/en/docs/start/_index.md
+++ b/site/content/en/docs/start/_index.md
@@ -1,8 +1,190 @@
 ---
-title: "Get Started!"
+title: "minikube start"
+linkTitle: "Get Started!"
 weight: 1
-description: >
-  How to install minikube
 aliases:
   - /docs/start
 ---
+
+minikube is local Kubernetes, focusing on making it easy to learn and develop for Kubernetes. 
+
+All you need is Docker (or similarly compatible) container or a Virtual Machine environment, and Kubernetes is a single command away: `minikube start`
+
+
+## What you’ll need
+
+* 2GB of free memory
+* 20GB of free disk space
+* Internet connection
+* Container or virtual machine manager, such as: [Docker]({{<ref "/docs/drivers/docker">}}), [Hyperkit]({{<ref "/docs/drivers/hyperkit">}}), [Hyper-V]({{<ref "/docs/drivers/hyperv">}}), [KVM]({{<ref "/docs/drivers/kvm2">}}), [Parallels]({{<ref "/docs/drivers/parallels">}}), [Podman]({{<ref "/docs/drivers/podman">}}), [VirtualBox]({{<ref "/docs/drivers/virtualbox">}}), or [VMWare]({{<ref "/docs/drivers/vmware">}})
+
+<h2 class="step"><span class="fa-stack fa-1x"><i class="fa fa-circle fa-stack-2x"></i><strong class="fa-stack-1x text-primary">1</strong></span>Installation</h2>
+
+{{% tabs %}}
+{{% tab "Linux" %}}
+
+For Linux users, we provide 3 easy download options:
+
+### Binary download
+
+```shell
+ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
+ sudo install minikube-linux-amd64 /usr/local/bin/minikube
+```
+
+### Debian package
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_{{< latest >}}-0_amd64.deb
+sudo dpkg -i minikube_{{< latest >}}-0_amd64.deb
+```
+
+### RPM package
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< latest >}}-0.x86_64.rpm
+sudo rpm -ivh minikube-{{< latest >}}-0.x86_64.rpm
+```
+
+{{% /tab %}}
+{{% tab "macOS" %}}
+
+If the [Brew Package Manager](https://brew.sh/) installed:
+
+```shell
+brew install minikube
+```
+
+Otherwise, download minikube directly:
+
+```shell
+curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64
+sudo install minikube-darwin-amd64 /usr/local/bin/minikube
+```
+
+{{% /tab %}}
+{{% tab "Windows" %}}
+
+If the [Chocolatey Package Manager](https://chocolatey.org/) is installed, use it to install minikube:
+
+```shell
+choco install minikube
+```
+
+Otherwise, download and run the [Windows installer](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe)
+
+{{% /tab %}}
+{{% /tabs %}}
+
+<h2 class="step"><span class="fa-stack fa-1x"><i class="fa fa-circle fa-stack-2x"></i><strong class="fa-stack-1x text-primary">2</strong></span>Start your cluster</h2>
+
+From a terminal with administrator access (but not logged in as root), run:
+
+```shell
+minikube start
+```
+
+If minikube fails to start, see the [drivers page]({{<ref "/docs/drivers">}}) for help setting up a compatible container or virtual-machine manager.
+
+<h2 class="step"><span class="fa-stack fa-1x"><i class="fa fa-circle fa-stack-2x"></i><strong class="fa-stack-1x text-primary">3</strong></span>Interact with your cluster</h2>
+
+If you already have kubectl installed, you can now use it to access your shiny new cluster:
+
+```shell
+kubectl get po -A
+```
+
+Alternatively, minikube can download the appropriate version of kubectl, if you don't mind the double-dashes in the command-line:
+
+```shell
+minikube kubectl -- get po -A
+```
+
+minikube bundles the Kubernetes Dashboard, allowing you to get easily acclimated to your new environment:
+
+```shell
+minikube dashboard
+```
+
+<h2 class="step"><span class="fa-stack fa-1x"><i class="fa fa-circle fa-stack-2x"></i><strong class="fa-stack-1x text-primary">4</strong></span>Deploy applications</h2>
+
+Create a sample deployment and expose it on port 8080:
+
+```shell
+kubectl create deployment hello-minikube --image=k8s.gcr.io/echoserver:1.4
+kubectl expose deployment hello-minikube --type=NodePort --port=8080
+```
+
+Find your cluster IP:
+
+```shell
+minikube ip
+```
+
+Either navigate to &lt;your ip&gt;:8080 in your web browser, or let minikube do it for you:
+
+```shell
+minikube service hello-minikube
+```
+
+To access a LoadBalancer application, use the "minikube tunnel" feature. Here is an example deployment:
+
+```shell
+kubectl create deployment balanced --image=k8s.gcr.io/echoserver:1.4  
+kubectl expose deployment balanced --type=LoadBalancer --port=8081
+```
+
+In another window, start the tunnel to create a routable IP for the deployment:
+
+```shell
+minikube tunnel
+```
+
+Access the application using the "service" command, or your web browser. If you are using macOS, minikube will also forward DNS requests for you: [http://balanced.default.svc.cluster.local:8081/](http://balanced.default.svc.cluster.local:8081/)
+
+<h2 class="step"><span class="fa-stack fa-1x"><i class="fa fa-circle fa-stack-2x"></i><strong class="fa-stack-1x text-primary">5</strong></span>Manage your cluster</h2>
+
+Pause Kubernetes without impacting deployed applications:
+
+```shell
+minikube pause
+```
+
+Halt the cluster:
+
+```shell
+minikube stop
+```
+
+Increase the default memory limit (requires a restart):
+
+```shell
+minikube config set memory 16384
+```
+
+Browse the catalog of easily installed Kubernetes services:
+
+```shell
+minikube addons list
+```
+
+Create a second cluster running an older Kubernetes release:
+
+```shell
+minikube start -p aged --kubernetes-version=v1.16.1
+```
+
+Delete all of the minikube clusters:
+
+
+```shell
+minikube delete --all
+```
+
+## Take the next step
+
+* [The minikube handbook]({{<ref "/docs/handbook">}})
+* [Community-contributed tutorials]({{<ref "/docs/tutorials">}})
+* [minikube command reference]({{<ref "/docs/commands">}})
+* [Contributors guide]({{<ref "/docs/contrib">}})
+* Take our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A) to share your thoughts 🙏
\ No newline at end of file
diff --git a/site/content/en/docs/start/includes/post_install.inc b/site/content/en/docs/start/includes/post_install.inc
deleted file mode 100644
index 03ed41bb61..0000000000
--- a/site/content/en/docs/start/includes/post_install.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-## Getting to know Kubernetes
-
-Once started, you can use any regular Kubernetes command to interact with your minikube cluster. For example, you can see the pod states by running:
-
-```shell
- kubectl get po -A
-```
-
-## Increasing memory allocation
-
-minikube auto-selects the memory size based on your system up to 6000mb. For larger 
-deployments, increase the memory allocation using the `--memory` flag, or make the setting persistent using:
-
-```shell
-minikube config set memory 8096
-```
-
-## Where to go next?
-
-Visit the [examples](/docs/examples) page to get an idea of what you can do with minikube.
-
-📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🏽🎉
\ No newline at end of file
diff --git a/site/content/en/docs/start/linux.md b/site/content/en/docs/start/linux.md
deleted file mode 100644
index d4036af85c..0000000000
--- a/site/content/en/docs/start/linux.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-title: "Linux"
-linkTitle: "Linux"
-weight: 1
-aliases:
-  - /docs/start/linux/
----
-
-## Installation
-
-{{% tabs %}}
-{{% tab "Direct" %}}
-
-Download and install minikube to /usr/local/bin:
-
-```shell
- curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
-   && sudo install minikube-linux-amd64 /usr/local/bin/minikube
-```
-{{% /tab %}}
-{{% tab "Debian/Ubuntu (deb)" %}}
-
-Download and install minikube:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_{{< latest >}}-0_amd64.deb \
- && sudo dpkg -i minikube_{{< latest >}}-0_amd64.deb
- ```
-
-{{% /tab %}}
-
-{{% tab "Fedora/Red Hat (rpm)" %}}
-
-Download and install minikube:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-{{< latest >}}-0.x86_64.rpm \
- && sudo rpm -ivh minikube-{{< latest >}}-0.x86_64.rpm
- ```
-
-{{% /tab %}}
-{{% /tabs %}}
-
-## Driver Setup
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-## Check container support
-{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-
-{{% tab "KVM" %}}
-## Check virtualization support
-{{% readfile file="/docs/drivers/includes/check_virtualization_linux.inc" %}}
-
-{{% readfile file="/docs/drivers/includes/kvm2_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-## Check virtualization support
-{{% readfile file="/docs/drivers/includes/check_virtualization_linux.inc" %}}
-
-{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% tab "None (bare-metal)" %}}
-## Check baremetal support
-{{% readfile file="/docs/drivers/includes/check_baremetal_linux.inc" %}}
-
-If you are already running minikube from inside a VM, it is possible to skip the creation of an additional VM layer by using the `none` driver.
-
-{{% readfile file="/docs/drivers/includes/none_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
-{{% /tab %}}
-
-
-{{% /tabs %}}
-
-{{% readfile file="/docs/start/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/start/macos.md b/site/content/en/docs/start/macos.md
deleted file mode 100644
index 5350cbe2d0..0000000000
--- a/site/content/en/docs/start/macos.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-title: "macOS"
-linkTitle: "macOS"
-weight: 2
-aliases:
-  - /docs/start/macos/
----
-
-### Prerequisites
-
-* macOS 10.12 (Sierra)
-* A hypervisor such as Hyperkit, Parallels, VirtualBox, or VMware Fusion
-
-### Installation
-
-{{% tabs %}}
-{{% tab "Brew" %}}
-
-If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and install minikube:
-
-```shell
-brew install minikube
-```
-
-{{% /tab %}}
-{{% tab "Direct" %}}
-
-Download and install minikube to /usr/local/bin:
-
-```shell
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 \
-  && sudo install minikube-darwin-amd64 /usr/local/bin/minikube
-```
-{{% /tab %}}
-{{% /tabs %}}
-
-### Upgrading minikube
-
-{{% tabs %}}
-{{% tab "Brew" %}}
-
-If the [Brew Package Manager](https://brew.sh/) is installed, use it to download and upgrade minikube:
-
-```shell
-brew update
-brew upgrade minikube
-```
-
-{{% /tab %}}
-{{% /tabs %}}
-
-## Hypervisor Setup
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Hyperkit" %}}
-{{% readfile file="/docs/drivers/includes/hyperkit_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Parallels" %}}
-{{% readfile file="/docs/drivers/includes/parallels_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VMware" %}}
-{{% readfile file="/docs/drivers/includes/vmware_macos_usage.inc" %}}
-{{% /tab %}}
-{{% tab "Podman (experimental)" %}}
-{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
-{{% /tab %}}
-
-{{% /tabs %}}
-
-{{% readfile file="/docs/start/includes/post_install.inc" %}}
diff --git a/site/content/en/docs/start/windows.md b/site/content/en/docs/start/windows.md
deleted file mode 100644
index 7e31831846..0000000000
--- a/site/content/en/docs/start/windows.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: "Windows"
-linkTitle: "Windows"
-weight: 3
-aliases:
-  - /docs/start/windows/
----
-
-### Prerequisites
-
-* Windows 8 or above
-* 4GB of RAM
-
-### Installation
-
-{{% tabs %}}
-{{% tab "Direct" %}}
-Download and run the [minikube installer](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe)
-{{% /tab %}}
-
-{{% tab "Chocolatey" %}}
-
-If the [Chocolatey Package Manager](https://chocolatey.org/) is installed, use it to install minikube:
-
-```shell
-choco install minikube
-```
-
-After it has installed, close the current CLI session and reopen it. minikube should have been added to your path automatically.
-{{% /tab %}}
-{{% /tabs %}}
-
-{{% tabs %}}
-{{% tab "Docker" %}}
-{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}}
-{{% /tab %}}
-
-{{% tab "Hyper-V" %}}
-
-## Check Hypervisor 
-
-{{% readfile file="/docs/drivers/includes/check_virtualization_windows.inc" %}}
-
-{{% readfile file="/docs/drivers/includes/hyperv_usage.inc" %}}
-{{% /tab %}}
-{{% tab "VirtualBox" %}}
-
-## Check Hypervisor
-
-{{% readfile file="/docs/drivers/includes/check_virtualization_windows.inc" %}}
-
-{{% readfile file="/docs/drivers/includes/virtualbox_usage.inc" %}}
-{{% /tab %}}
-{{% /tabs %}}
-
-{{% readfile file="/docs/start/includes/post_install.inc" %}}
diff --git a/site/layouts/partials/hooks/head-end.html b/site/layouts/partials/hooks/head-end.html
index 0ff1699c98..ed11ad10a1 100644
--- a/site/layouts/partials/hooks/head-end.html
+++ b/site/layouts/partials/hooks/head-end.html
@@ -1,4 +1,5 @@
 <!-- start: minikube override head-end partial -->
+<link href="https://fonts.googleapis.com/css2?family=Inconsolata&family=Lora&family=Open+Sans:wght@600;700&display=swap" rel="stylesheet">
 <link href="/css/tabs.css" rel="stylesheet">
 <script src="/js/tabs.js"></script>
-<!-- end: minikube override head-end partial -->
+<!-- end: minikube override head-end partial -->
\ No newline at end of file
diff --git a/site/static/css/tabs.css b/site/static/css/tabs.css
index d3c83fd294..829991f8c0 100644
--- a/site/static/css/tabs.css
+++ b/site/static/css/tabs.css
@@ -12,25 +12,26 @@ div.code-tabs li.nav-tab {
     float: left;
     text-align: center;
     text-decoration: none;
-    color: #666;
+    color: #444;
     font-size: 14px;
+    font-family: 'Open Sans', sans-serif;
 
-    border-top: 1px solid #C7EAEC;
-    border-left: 1px solid #C7EAEC;
-    border-right: 1px solid #C7EAEC;
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
     margin-right: 0.5em;
 
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-    background-color: #c7eaec;
+    background-color: #dededf;
 }
 
 div.code-tabs li.active {
     color: #f2771a;
-    border-top: 1px solid #C7EAEC;
-    border-left: 1px solid #C7EAEC;
-    border-right: 1px solid #C7EAEC;
-    background: rgb(244, 255, 255);
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    background: #f6f6f8;
     font-weight: bold;
 }
 
@@ -39,6 +40,11 @@ div.code-tabs a.nav-tab {
     cursor: pointer;
 }
 
+div.code-tabs div.highlight {
+    border: 1px solid #ccc;
+    background-color: #fff;
+}
+
 div.tab-pane {
     display: none;
     margin-bottom: 3rem;
@@ -47,8 +53,8 @@ div.tab-pane {
 div.tab-pane.active {
     display: block;
     padding: 2em;
-    background: rgb(244, 255, 255);
-    border: 1px solid #C7EAEC;
+    background: #f6f6f8;
+    border: 1px solid #ccc;
 }
 
 div.code-tabs code {

From 0f325f069d4d76692f676011186e88b5e8fb39c6 Mon Sep 17 00:00:00 2001
From: remraz <38458023+remraz@users.noreply.github.com>
Date: Fri, 10 Apr 2020 02:24:59 +0200
Subject: [PATCH 642/668] Use Github's GUI for quick contributions

Refers to Github's repositories and integrated markdown editor that already exists in Kubernetes's general guidelines.
---
 site/content/en/docs/contrib/documentation.en.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/content/en/docs/contrib/documentation.en.md b/site/content/en/docs/contrib/documentation.en.md
index ef0be91b83..f2bab66420 100644
--- a/site/content/en/docs/contrib/documentation.en.md
+++ b/site/content/en/docs/contrib/documentation.en.md
@@ -12,6 +12,10 @@ minikube's documentation is in [Markdown](https://www.markdownguide.org/cheat-sh
 
 In production, the minikube website is served using [Netlify](https://netlify.com/)
 
+## Small or cosmetic contributions
+
+Use Github's repositories and markdown editor as described by [Kubernetes's general guideline for documentation contributing](https://kubernetes.io/docs/contribute/start/#submit-a-pull-request)
+
 ## Local documentation website
 
 To serve documentation pages locally, clone the `minikube` repository and run:

From 83f4fd4dbab34e5b144f063d685d915cf9bb3859 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 18:45:59 -0700
Subject: [PATCH 643/668] fix stoCRIContainers

---
 pkg/minikube/cruntime/cri.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/cruntime/cri.go b/pkg/minikube/cruntime/cri.go
index 2cf50c78e2..6f05551235 100644
--- a/pkg/minikube/cruntime/cri.go
+++ b/pkg/minikube/cruntime/cri.go
@@ -195,7 +195,7 @@ func stopCRIContainers(cr CommandRunner, ids []string) error {
 	glog.Infof("Stopping containers: %s", ids)
 
 	crictl := getCrictlPath(cr)
-	args := append([]string{crictl, "rm"}, ids...)
+	args := append([]string{crictl, "stop"}, ids...)
 	c := exec.Command("sudo", args...)
 	if _, err := cr.RunCmd(c); err != nil {
 		return errors.Wrap(err, "crictl")

From 9426c25ba305dbf9ebbea3ef91cdddf6fa28e12a Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 18:48:18 -0700
Subject: [PATCH 644/668] Lighten the colors, increase pre font size

---
 site/assets/scss/_variables_project.scss |  3 +-
 site/static/css/tabs.css                 | 40 ++++++++++++++----------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index e89aa65e28..bf07dd1008 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -5,6 +5,7 @@ $mk-dark: #306EE5;
 $mk-medium: #1FC3CF;
 $mk-midlight: #e8f3f3;
 $mk-light:#C7EAEC;
+$mk-verylight:#f3f9fa;
 $mk-verydark: darken($mk-dark, 15%);
 
 // bootstrap colors
@@ -180,7 +181,7 @@ section.td-box--height-auto {
 pre {
     max-width: 99% !important;
     font-family: 'Inconsolata', monospace !important;
-    font-size: 12px !important;
+    font-size: 13px !important;
 }
 
 div.td-content {
diff --git a/site/static/css/tabs.css b/site/static/css/tabs.css
index 829991f8c0..0aa7a98148 100644
--- a/site/static/css/tabs.css
+++ b/site/static/css/tabs.css
@@ -13,7 +13,7 @@ div.code-tabs li.nav-tab {
     text-align: center;
     text-decoration: none;
     color: #444;
-    font-size: 14px;
+    font-size: 18px;
     font-family: 'Open Sans', sans-serif;
 
     border-top: 1px solid #ccc;
@@ -23,39 +23,47 @@ div.code-tabs li.nav-tab {
 
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-    background-color: #dededf;
+    /* inactive tab (title) */
+    background-color: #C7EAEC; /* $mk-light */
 }
 
+/* active tab (title) */
 div.code-tabs li.active {
     color: #f2771a;
-    border-top: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    background: #f6f6f8;
+    border-top: 1px solid #b0b6b6
+    border-left: 1px solid #b0b6b6
+    border-right: 1px solid #b0b6b6;
+    background: #f3f9fa; /* $mk-verylight */
     font-weight: bold;
 }
 
+/* active tab background */
+div.tab-pane.active {
+    display: block;
+    padding: 2em;
+    background: #f3f9fa; /* $mk-verylight */
+    border: 1px solid #b0b6b6;
+}
+
+
+/* active tab code sample */
+div.code-tabs div.highlight {
+    border: 1px solid #ccc;
+    background-color: #fff;
+}
+
+
 div.code-tabs a.nav-tab {
     all: unset;
     cursor: pointer;
 }
 
-div.code-tabs div.highlight {
-    border: 1px solid #ccc;
-    background-color: #fff;
-}
 
 div.tab-pane {
     display: none;
     margin-bottom: 3rem;
 }
 
-div.tab-pane.active {
-    display: block;
-    padding: 2em;
-    background: #f6f6f8;
-    border: 1px solid #ccc;
-}
 
 div.code-tabs code {
     word-break: keep-all;

From b28c3b2e7cf6cfef05dd08e589c44fc24e483487 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 18:53:13 -0700
Subject: [PATCH 645/668] Narrower tab titles

---
 site/static/css/tabs.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/static/css/tabs.css b/site/static/css/tabs.css
index 0aa7a98148..94fe585b32 100644
--- a/site/static/css/tabs.css
+++ b/site/static/css/tabs.css
@@ -8,7 +8,7 @@ ul.nav.nav-tabs {
 
 div.code-tabs li.nav-tab {
     margin-top: 1.5rem;
-    padding: 10px 20px;
+    padding: 7px 18px;
     float: left;
     text-align: center;
     text-decoration: none;

From 2ed7b13edd2eeef67b1fed58cb494851785e28ad Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 18:55:05 -0700
Subject: [PATCH 646/668] Darken inactive tag just by a hair

---
 site/static/css/tabs.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/static/css/tabs.css b/site/static/css/tabs.css
index 94fe585b32..60410a2fec 100644
--- a/site/static/css/tabs.css
+++ b/site/static/css/tabs.css
@@ -24,14 +24,14 @@ div.code-tabs li.nav-tab {
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
     /* inactive tab (title) */
-    background-color: #C7EAEC; /* $mk-light */
+    background-color: #C5E8EA; /* $mk-light - minus two shades*/
 }
 
 /* active tab (title) */
 div.code-tabs li.active {
     color: #f2771a;
-    border-top: 1px solid #b0b6b6
-    border-left: 1px solid #b0b6b6
+    border-top: 1px solid #b0b6b6;
+    border-left: 1px solid #b0b6b6;
     border-right: 1px solid #b0b6b6;
     background: #f3f9fa; /* $mk-verylight */
     font-weight: bold;

From 6d7e978e4683b80e20f7de64ed0c13df521a4b7a Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 19:07:22 -0700
Subject: [PATCH 647/668] Brighten mk-light, add midlight to sidebar

---
 site/assets/scss/_variables_project.scss | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index bf07dd1008..949f17bd25 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -4,8 +4,8 @@
 $mk-dark: #306EE5;
 $mk-medium: #1FC3CF;
 $mk-midlight: #e8f3f3;
-$mk-light:#C7EAEC;
-$mk-verylight:#f3f9fa;
+$mk-light:#CCEBEC;
+$mk-verylight: lighten($mk-light, 15%);
 $mk-verydark: darken($mk-dark, 15%);
 
 // bootstrap colors
@@ -200,7 +200,13 @@ div.td-content {
     }
 }
 
+.td-sidebar {
+    background-color: $mk-midlight !important;
+}
 
+.td-search-input {
+    background-color: #fff !important;
+}
 
 // make search bar wider https://www.docsy.dev/docs/adding-content/navigation/#configure-local-search-with-lunr
 .popover.offline-search-result {

From 3804c16954348c6e4a791c6747f2d7836271a780 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 19:44:20 -0700
Subject: [PATCH 648/668] Only call stop on the kubelet if it's running

---
 pkg/minikube/bootstrapper/bsutil/binaries.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/binaries.go b/pkg/minikube/bootstrapper/bsutil/binaries.go
index 341a5b295b..3eecdf905c 100644
--- a/pkg/minikube/bootstrapper/bsutil/binaries.go
+++ b/pkg/minikube/bootstrapper/bsutil/binaries.go
@@ -60,8 +60,8 @@ func TransferBinaries(cfg config.KubernetesConfig, c command.Runner, sm sysinit.
 				return errors.Wrapf(err, "downloading %s", name)
 			}
 
-			if name == "kubelet" {
-				if err := sm.ForceStop("kubelet"); err != nil {
+			if name == "kubelet" && sm.Active(name) {
+				if err := sm.ForceStop(name); err != nil {
 					glog.Errorf("unable to stop kubelet: %v", err)
 				}
 			}

From 871d7a52fdeb47fa98a2b2be52266f42c54962fd Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 19:55:12 -0700
Subject: [PATCH 649/668] Neutral-grey sidebar

---
 site/assets/scss/_variables_project.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/assets/scss/_variables_project.scss b/site/assets/scss/_variables_project.scss
index 949f17bd25..768b6b8662 100644
--- a/site/assets/scss/_variables_project.scss
+++ b/site/assets/scss/_variables_project.scss
@@ -201,7 +201,7 @@ div.td-content {
 }
 
 .td-sidebar {
-    background-color: $mk-midlight !important;
+    background-color: $gray-100 !important;
 }
 
 .td-search-input {

From ded8273a2eadd3aa562177e52373cbfe725eb9d9 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 20:01:11 -0700
Subject: [PATCH 650/668] add kill containers to kic stop

---
 pkg/drivers/kic/kic.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index b75c4138d4..3ea8e88878 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -347,7 +347,10 @@ func (d *Driver) Stop() error {
 		}
 		if len(containers) > 0 {
 			if err := runtime.StopContainers(containers); err != nil {
-				glog.Errorf("unable to stop containers : %v", err)
+				glog.Infof("unable to stop containers : %v", err)
+			}
+			if err := runtime.KillContainers(containers); err != nil {
+				glog.Errorf("unable to kill containers : %v", err)
 			}
 		}
 		glog.Infof("successfully stopped kubernetes!")

From f7f04a83c2d19549d10ac48b4b9b6aaa6fc6671c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 20:53:15 -0700
Subject: [PATCH 651/668] add killing apiserver proc to both kic and none

---
 pkg/drivers/common.go    | 18 ++++++++++++++++++
 pkg/drivers/kic/kic.go   |  4 ++++
 pkg/drivers/none/none.go |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index 2fde2efde8..9acc57a372 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -20,7 +20,9 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"strconv"
 	"syscall"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -29,6 +31,7 @@ import (
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/command"
 )
 
 // This file is for common code shared among internal machine drivers
@@ -122,6 +125,21 @@ func MakeDiskImage(d *drivers.BaseDriver, boot2dockerURL string, diskSize int) e
 	return nil
 }
 
+// KillApiServerProc will kill an api server proc if it exists
+func KillApiServerProc(runner command.Runner) error {
+	// first check if it exists
+	rr, err := runner.RunCmd(exec.Command("pgrep", "kube-apiserver"))
+	if err == nil { // this means we might have a running kube-apiserver
+		pid, err := strconv.Atoi(rr.Stdout.String())
+		if err == nil { // this means we have a valid pid
+			if _, err = runner.RunCmd(exec.Command("kill", "-9", string(pid))); err != nil {
+				return errors.Wrap(err, "kill")
+			}
+		}
+	}
+	return nil
+}
+
 func fixMachinePermissions(path string) error {
 	glog.Infof("Fixing permissions on %s ...", path)
 	if err := os.Chown(path, syscall.Getuid(), syscall.Getegid()); err != nil {
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 3ea8e88878..844de876e3 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -357,6 +357,10 @@ func (d *Driver) Stop() error {
 
 	}
 
+	if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
+		glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
+	}
+
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
 	if err := cmd.Run(); err != nil {
 		return errors.Wrapf(err, "stopping %s", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 1049f713fe..49532671e3 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -172,6 +172,9 @@ func (d *Driver) Kill() error {
 		return nil
 	}
 	if err := d.runtime.KillContainers(containers); err != nil {
+		if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
+			glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
+		}
 		return errors.Wrap(err, "kill")
 	}
 	return nil

From 983808f956b276f002b93e0e78686cd7bf6a613c Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 21:01:49 -0700
Subject: [PATCH 652/668] lint

---
 pkg/drivers/common.go    | 4 ++--
 pkg/drivers/kic/kic.go   | 2 +-
 pkg/drivers/none/none.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index 9acc57a372..dfb3a2497b 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -125,8 +125,8 @@ func MakeDiskImage(d *drivers.BaseDriver, boot2dockerURL string, diskSize int) e
 	return nil
 }
 
-// KillApiServerProc will kill an api server proc if it exists
-func KillApiServerProc(runner command.Runner) error {
+// KillAPIServerProc will kill an api server proc if it exists
+func KillAPIServerProc(runner command.Runner) error {
 	// first check if it exists
 	rr, err := runner.RunCmd(exec.Command("pgrep", "kube-apiserver"))
 	if err == nil { // this means we might have a running kube-apiserver
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 844de876e3..dacdb9501e 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -357,7 +357,7 @@ func (d *Driver) Stop() error {
 
 	}
 
-	if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
+	if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
 		glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
 	}
 
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 49532671e3..400c8e3e5e 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -172,7 +172,7 @@ func (d *Driver) Kill() error {
 		return nil
 	}
 	if err := d.runtime.KillContainers(containers); err != nil {
-		if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
+		if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
 			glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
 		}
 		return errors.Wrap(err, "kill")

From e7e9f3ca1c78eacdad7de9cd8b5ea2d42f719791 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 21:50:09 -0700
Subject: [PATCH 653/668] address review comments

---
 pkg/drivers/common.go    | 18 ------------------
 pkg/drivers/kic/kic.go   | 19 ++++++++++++++++++-
 pkg/drivers/none/none.go |  3 ---
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index dfb3a2497b..2fde2efde8 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -20,9 +20,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"strconv"
 	"syscall"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -31,7 +29,6 @@ import (
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/minikube/command"
 )
 
 // This file is for common code shared among internal machine drivers
@@ -125,21 +122,6 @@ func MakeDiskImage(d *drivers.BaseDriver, boot2dockerURL string, diskSize int) e
 	return nil
 }
 
-// KillAPIServerProc will kill an api server proc if it exists
-func KillAPIServerProc(runner command.Runner) error {
-	// first check if it exists
-	rr, err := runner.RunCmd(exec.Command("pgrep", "kube-apiserver"))
-	if err == nil { // this means we might have a running kube-apiserver
-		pid, err := strconv.Atoi(rr.Stdout.String())
-		if err == nil { // this means we have a valid pid
-			if _, err = runner.RunCmd(exec.Command("kill", "-9", string(pid))); err != nil {
-				return errors.Wrap(err, "kill")
-			}
-		}
-	}
-	return nil
-}
-
 func fixMachinePermissions(path string) error {
 	glog.Infof("Fixing permissions on %s ...", path)
 	if err := os.Chown(path, syscall.Getuid(), syscall.Getegid()); err != nil {
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index dacdb9501e..6fc4beb070 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -357,7 +357,7 @@ func (d *Driver) Stop() error {
 
 	}
 
-	if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
+	if err := killAPIServerProc(d.exec); err != nil {
 		glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
 	}
 
@@ -372,3 +372,20 @@ func (d *Driver) Stop() error {
 func (d *Driver) RunSSHCommandFromDriver() error {
 	return fmt.Errorf("driver does not support RunSSHCommandFromDriver commands")
 }
+
+// killAPIServerProc will kill an api server proc if it exists
+// to ensure this never happens https://github.com/kubernetes/minikube/issues/7521
+func killAPIServerProc(runner command.Runner) error {
+	// first check if it exists
+	rr, err := runner.RunCmd(exec.Command("pgrep", "kube-apiserver"))
+	if err == nil { // this means we might have a running kube-apiserver
+		pid, err := strconv.Atoi(rr.Stdout.String())
+		if err == nil { // this means we have a valid pid
+			glog.Warrningf("Found a kube-apiserver running with pid %d, will try killing the proc", pid)
+			if _, err = runner.RunCmd(exec.Command("pkill", "-9", string(pid))); err != nil {
+				return errors.Wrap(err, "kill")
+			}
+		}
+	}
+	return nil
+}
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 400c8e3e5e..1049f713fe 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -172,9 +172,6 @@ func (d *Driver) Kill() error {
 		return nil
 	}
 	if err := d.runtime.KillContainers(containers); err != nil {
-		if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
-			glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
-		}
 		return errors.Wrap(err, "kill")
 	}
 	return nil

From 1eb6ce1710651b875bc18c7d06ea225878410886 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 21:56:00 -0700
Subject: [PATCH 654/668] build error

---
 pkg/drivers/kic/kic.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 6fc4beb070..0378c78626 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -381,7 +381,7 @@ func killAPIServerProc(runner command.Runner) error {
 	if err == nil { // this means we might have a running kube-apiserver
 		pid, err := strconv.Atoi(rr.Stdout.String())
 		if err == nil { // this means we have a valid pid
-			glog.Warrningf("Found a kube-apiserver running with pid %d, will try killing the proc", pid)
+			glog.Warningf("Found a kube-apiserver running with pid %d, will try to kill the proc", pid)
 			if _, err = runner.RunCmd(exec.Command("pkill", "-9", string(pid))); err != nil {
 				return errors.Wrap(err, "kill")
 			}

From b791cdcd08756e7bd856b819012c7addb81658ba Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 22:12:36 -0700
Subject: [PATCH 655/668] Make tests noise-free again by default

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 21eae1dfed..79a3501648 100755
--- a/test.sh
+++ b/test.sh
@@ -60,7 +60,7 @@ then
     echo "mode: count" >"${COVERAGE_PATH}"
     pkgs=$(go list -f '{{ if .TestGoFiles }}{{.ImportPath}}{{end}}' ./cmd/... ./pkg/... | xargs)
     go test \
-        -v -ldflags="$MINIKUBE_LDFLAGS" \
+        -ldflags="$MINIKUBE_LDFLAGS" \
         -tags "container_image_ostree_stub containers_image_openpgp" \
         -covermode=count \
         -coverprofile="${cov_tmp}" \

From de5121c95144596bdd4ef2ea17d46ef14580aa19 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 9 Apr 2020 22:40:23 -0700
Subject: [PATCH 656/668] use sudo for du

---
 test/integration/helpers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index e8bd0b1d9f..bd1fe19525 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -213,7 +213,7 @@ func clusterLogs(t *testing.T, profile string) {
 	t.Logf("%s logs: %s", t.Name(), rr.Output())
 
 	t.Logf("======> post-mortem[%s]: disk usage <======", t.Name())
-	rr, err = Run(t, exec.Command(Target(), "-p", profile, "ssh", "df -h /var/lib/docker/overlay2 /var /; du -hs /var/lib/docker/overlay2"))
+	rr, err = Run(t, exec.Command(Target(), "-p", profile, "ssh", "sudo df -h /var/lib/docker/overlay2 /var /;sudo du -hs /var/lib/docker/overlay2"))
 	if err != nil {
 		t.Logf("failed df error: %v", err)
 	}

From 80d4ae529a6ef278b0374bd8ebd34dc5bb3cfde1 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 22:41:00 -0700
Subject: [PATCH 657/668] Restart crio after applying the kic overlay (in
 background)

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 34 ++++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index b97707a5cf..ddfd8f0292 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -212,15 +212,18 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
-	// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
-	if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
-		if err := k.applyKicOverlay(cfg); err != nil {
-			return errors.Wrap(err, "apply kic overlay")
-		}
-	}
-
 	var wg sync.WaitGroup
-	wg.Add(3)
+	wg.Add(4)
+
+	go func() {
+		// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
+		if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
+			if err := k.applyKicOverlay(cfg); err != nil {
+				glog.Errorf("failed to apply kic overlay: %v", err)
+			}
+		}
+		wg.Done()
+	}()
 
 	go func() {
 		if err := k.applyNodeLabels(cfg); err != nil {
@@ -242,6 +245,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		}
 		wg.Done()
 	}()
+
 	wg.Wait()
 	return nil
 }
@@ -762,20 +766,30 @@ func startKubeletIfRequired(runner command.Runner, sm sysinit.Manager) error {
 
 // applyKicOverlay applies the CNI plugin needed to make kic work
 func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
-	// Allow no more than 5 seconds for apply kic overlay
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
+
 	cmd := exec.CommandContext(ctx, "sudo",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"-f", "-")
+
 	b := bytes.Buffer{}
 	if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil {
 		return err
 	}
+
 	cmd.Stdin = bytes.NewReader(b.Bytes())
 	if rr, err := k.c.RunCmd(cmd); err != nil {
 		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
 	}
+
+	// CRIO needs to eventually know about CNI changes (#7380)
+	if cfg.KubernetesConfig.ContainerRuntime == "crio" {
+		sm := sysinit.New(k.c)
+		err := sm.Restart("crio")
+		return errors.Wrap(err, "restart crio")
+	}
+
 	return nil
 }
 

From 94a1e87f13e0bce1b42d8cafd802fa6a94c2aea2 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 22:43:03 -0700
Subject: [PATCH 658/668] Shorten comment

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index ddfd8f0292..618437ef17 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -216,7 +216,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 	wg.Add(4)
 
 	go func() {
-		// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
+		// the overlay is required for containerd and cri-o runtime: see #7428
 		if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
 			if err := k.applyKicOverlay(cfg); err != nil {
 				glog.Errorf("failed to apply kic overlay: %v", err)

From fbde33d10d110f9ff3a4628135dc8c51eee1a46b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Thu, 9 Apr 2020 22:44:23 -0700
Subject: [PATCH 659/668] simplify

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 618437ef17..735032af12 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -783,11 +783,11 @@ func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
 		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
 	}
 
-	// CRIO needs to eventually know about CNI changes (#7380)
+	// Inform cri-o that the CNI has changed
 	if cfg.KubernetesConfig.ContainerRuntime == "crio" {
-		sm := sysinit.New(k.c)
-		err := sm.Restart("crio")
-		return errors.Wrap(err, "restart crio")
+		if err := sysinit.New(k.c).Restart("crio"); err != nil {
+			return errors.Wrap(err, "restart crio")
+		}
 	}
 
 	return nil

From 4dd2152fae8123ca9573bf716839ab8d93f16d5d Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 10 Apr 2020 01:42:58 -0700
Subject: [PATCH 660/668] update crio version in kicbase

---
 hack/images/kicbase.Dockerfile | 6 +++---
 pkg/drivers/kic/types.go       | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hack/images/kicbase.Dockerfile b/hack/images/kicbase.Dockerfile
index 5afbe6e146..97a29b7371 100644
--- a/hack/images/kicbase.Dockerfile
+++ b/hack/images/kicbase.Dockerfile
@@ -2,7 +2,7 @@ ARG COMMIT_SHA
 # using base image created by kind https://github.com/kubernetes-sigs/kind/blob/master/images/base/Dockerfile
 # which is an ubuntu 19.10 with an entry-point that helps running systemd
 # could be changed to any debian that can run systemd
-FROM kindest/base:v20200122-2dfe64b2 as base
+FROM kindest/base:v20200317-92225082 as base
 USER root
 # specify version of everything explicitly using 'apt-cache policy'
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -19,9 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_19.10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \    
     curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_19.10/Release.key && \
     apt-key add - < Release.key && apt-get update && \
-    apt-get install -y --no-install-recommends cri-o-1.17=1.17.0-3
+    apt-get install -y --no-install-recommends cri-o-1.17=1.17.2~1
 # install podman
-RUN apt-get install -y --no-install-recommends podman=1.8.2~1
+RUN apt-get install -y --no-install-recommends podman=1.8.2~144
 # disable non-docker runtimes by default
 RUN systemctl disable containerd && systemctl disable crio && rm /etc/crictl.yaml
 # enable docker which is default
diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index d31aac0b85..2b01019b2e 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -30,13 +30,12 @@ const (
 	DefaultPodCIDR = "10.244.0.0/16"
 
 	// Version is the current version of kic
-	Version = "v0.0.8"
+	Version = "v0.0.9"
 	// SHA of the kic base image
-	baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81"
-
+	baseImageSHA = "82a826cc03c3e59ead5969b8020ca138de98f366c1907293df91fc57205dbb53"
 	// OverlayImage is the cni plugin used for overlay image, created by kind.
 	// CNI plugin image used for kic drivers created by kind.
-	OverlayImage = "kindest/kindnetd:0.5.3"
+	OverlayImage = "kindest/kindnetd:0.5.4"
 )
 
 var (

From 204e469eeb3340cec118daec7b6cd6ab255b0ae2 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 10 Apr 2020 03:10:06 -0700
Subject: [PATCH 661/668] increase time out for dashboard

---
 test/integration/start_stop_delete_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index fc3462261f..ccf1670882 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -135,10 +135,10 @@ func TestStartStop(t *testing.T) {
 				if strings.Contains(tc.name, "cni") {
 					t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(")
 				} else {
-					if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4)); err != nil {
+					if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(7)); err != nil {
 						t.Fatalf("failed waiting for pod 'busybox' post-stop-start: %v", err)
 					}
-					if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(4)); err != nil {
+					if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(7)); err != nil {
 						t.Fatalf("failed waiting for 'addon dashboard' pod post-stop-start: %v", err)
 					}
 				}

From 10f924df4a5d1a7a5312424fb220970b28adf485 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 10 Apr 2020 03:58:22 -0700
Subject: [PATCH 662/668] increase dashboard more

---
 test/integration/start_stop_delete_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index ccf1670882..593019c06f 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -138,7 +138,7 @@ func TestStartStop(t *testing.T) {
 					if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(7)); err != nil {
 						t.Fatalf("failed waiting for pod 'busybox' post-stop-start: %v", err)
 					}
-					if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(7)); err != nil {
+					if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(9)); err != nil {
 						t.Fatalf("failed waiting for 'addon dashboard' pod post-stop-start: %v", err)
 					}
 				}

From 3d0632043d5ff8e459db86ef8b973a72d76056d2 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 10 Apr 2020 04:24:10 -0700
Subject: [PATCH 663/668] change color of tip

---
 site/content/en/docs/handbook/pushing.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 81a167d86a..90d6f9598b 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -55,18 +55,18 @@ docker build -t my_image .
 
 To verify your terminal is using minikuber's docker-env you can check the value of the environment variable MINIKUBE_ACTIVE_DOCKERD to reflect the cluster name.
 
-{{% pageinfo %}}
+{{% pageinfo color="info" %}}
 Tip 1: 
 Remember to turn off the `imagePullPolicy:Always` (use `imagePullPolicy:IfNotPresent` or `imagePullPolicy:Never`) in your yaml file.otherwise Kubernetes won't use your locally build image and it will pull from the network.
 {{% /pageinfo %}}
 
-{{% pageinfo %}}
+{{% pageinfo color="info" %}}
 Tip 2: 
 Evaluating the docker-env is only valid for the current terminal.
 and by closing the terminal, you will go back to using your own system's docker daemon.
 {{% /pageinfo %}}
 
-{{% pageinfo %}}
+{{% pageinfo color="info" %}}
 Tip 3:
 In container-based drivers such as Docker or Podman, you will need to re-do docker-env each time you restart your minikube cluster.
 {{% /pageinfo %}}
@@ -86,18 +86,19 @@ minikube cache add alpine:latest
 
 The add command will store the requested image to `$MINIKUBE_HOME/cache/images`, and load it into the minikube cluster's container runtime environment automatically.
 
+{{% pageinfo color="info" %}}
+Tip 1 :
+If your image changes after your cached it, you need to do 'cache reload'.
+{{% /pageinfo %}}
+
+
 minikube refreshes the cache images on each start. however to reload all the cached images on demand run this command :
 ```shell
 minikube cache reload
 ```
 
-{{% pageinfo %}}
-Tip1 :
-If your image changes after your cached it, you need to do 'cache reload' for minikube to pick up the image.
-{{% /pageinfo %}}
-
-{{% pageinfo %}}
-Tip2 :
+{{% pageinfo color="info" %}}
+Tip 2 :
 if you have multiple cluster, cache command will load the image for all of them.
 {{% /pageinfo %}}
 

From 7b8b6b027c5ea97e18684935d323476db1ca3624 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@stromberg.org>
Date: Fri, 10 Apr 2020 08:32:41 -0700
Subject: [PATCH 664/668] cert test flakiness: make write atomic, add log msgs

---
 pkg/minikube/assets/vm_assets.go    | 16 ++++++++++++----
 test/integration/functional_test.go |  9 +++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go
index 3751a85e08..3d4541d754 100644
--- a/pkg/minikube/assets/vm_assets.go
+++ b/pkg/minikube/assets/vm_assets.go
@@ -93,15 +93,21 @@ func NewMemoryAssetTarget(d []byte, targetPath, permissions string) *MemoryAsset
 // NewFileAsset creates a new FileAsset
 func NewFileAsset(src, targetDir, targetName, permissions string) (*FileAsset, error) {
 	glog.V(4).Infof("NewFileAsset: %s -> %s", src, path.Join(targetDir, targetName))
+
 	f, err := os.Open(src)
 	if err != nil {
-		return nil, errors.Wrapf(err, "Error opening file asset: %s", src)
+		return nil, errors.Wrap(err, "open")
 	}
+
 	info, err := os.Stat(src)
 	if err != nil {
-		return nil, errors.Wrapf(err, "Error getting info for %s", src)
+		return nil, errors.Wrapf(err, "stat")
 	}
-	r := io.NewSectionReader(f, 0, info.Size())
+
+	if info.Size() == 0 {
+		glog.Warningf("NewFileAsset: %s is an empty file!", src)
+	}
+
 	return &FileAsset{
 		BaseAsset: BaseAsset{
 			SourcePath:  src,
@@ -109,7 +115,7 @@ func NewFileAsset(src, targetDir, targetName, permissions string) (*FileAsset, e
 			TargetName:  targetName,
 			Permissions: permissions,
 		},
-		reader: r,
+		reader: io.NewSectionReader(f, 0, info.Size()),
 	}, nil
 }
 
@@ -117,6 +123,7 @@ func NewFileAsset(src, targetDir, targetName, permissions string) (*FileAsset, e
 func (f *FileAsset) GetLength() (flen int) {
 	fi, err := os.Stat(f.SourcePath)
 	if err != nil {
+		glog.Errorf("stat(%q) failed: %v", f.SourcePath, err)
 		return 0
 	}
 	return int(fi.Size())
@@ -126,6 +133,7 @@ func (f *FileAsset) GetLength() (flen int) {
 func (f *FileAsset) GetModTime() (time.Time, error) {
 	fi, err := os.Stat(f.SourcePath)
 	if err != nil {
+		glog.Errorf("stat(%q) failed: %v", f.SourcePath, err)
 		return time.Time{}, err
 	}
 	return fi.ModTime(), nil
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 8545e811a7..5f1ef0124b 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -814,11 +814,16 @@ func setupFileSync(ctx context.Context, t *testing.T, profile string) {
 
 	testPem := "./testdata/minikube_test.pem"
 
-	err = copy.Copy(testPem, localTestCertPath())
-	if err != nil {
+	// Write to a temp file for an atomic write
+	tmpPem := localTestCertPath() + ".pem"
+	if err := copy.Copy(testPem, tmpPem); err != nil {
 		t.Fatalf("failed to copy %s: %v", testPem, err)
 	}
 
+	if err := os.Rename(tmpPem, localTestCertPath()); err != nil {
+		t.Fatalf("failed to rename %s: %v", tmpPem, err)
+	}
+
 	want, err := os.Stat(testPem)
 	if err != nil {
 		t.Fatalf("stat failed: %v", err)

From de45f94401231df539ca3f1fad38dc2bbc2d1bf6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 10 Apr 2020 12:32:43 -0700
Subject: [PATCH 665/668] Skip containerd shutdown if Docker is bound to it

---
 pkg/minikube/cruntime/cruntime.go | 10 ++++++++++
 pkg/minikube/cruntime/docker.go   | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go
index 9bde921993..bbb410be13 100644
--- a/pkg/minikube/cruntime/cruntime.go
+++ b/pkg/minikube/cruntime/cruntime.go
@@ -166,6 +166,7 @@ func ContainerStatusCommand() string {
 
 // disableOthers disables all other runtimes except for me.
 func disableOthers(me Manager, cr CommandRunner) error {
+
 	// valid values returned by manager.Name()
 	runtimes := []string{"containerd", "crio", "docker"}
 	for _, name := range runtimes {
@@ -178,13 +179,22 @@ func disableOthers(me Manager, cr CommandRunner) error {
 		if r.Name() == me.Name() {
 			continue
 		}
+
+		// Don't disable containerd if we are bound to it
+		if me.Name() == "Docker" && r.Name() == "containerd" && dockerBoundToContainerd(cr) {
+			glog.Infof("skipping containerd shutdown because we are bound to it")
+			continue
+		}
+
 		// runtime is already disabled, nothing to do.
 		if !r.Active() {
 			continue
 		}
+
 		if err = r.Disable(); err != nil {
 			glog.Warningf("disable failed: %v", err)
 		}
+
 		// Validate that the runtime really is offline - and that Active & Disable are properly written.
 		if r.Active() {
 			return fmt.Errorf("%s is still active", r.Name())
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 236ae3510a..95f8554152 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -364,3 +364,18 @@ func DockerImagesPreloaded(runner command.Runner, images []string) bool {
 	}
 	return true
 }
+
+func dockerBoundToContainerd(runner command.Runner) bool {
+	// NOTE: assumes systemd
+	rr, err := runner.RunCmd(exec.Command("sudo", "systemctl", "cat", "docker.service"))
+	if err != nil {
+		glog.Warningf("unable to check if docker is bound to containerd")
+		return false
+	}
+
+	if strings.Contains(rr.Stdout.String(), "\nBindsTo=containerd") {
+		return true
+	}
+
+	return false
+}

From 004f4da1e3d7e984a6d6ac00e58d5486230107b4 Mon Sep 17 00:00:00 2001
From: Balint Pato <balopat@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:35:04 -0700
Subject: [PATCH 666/668] fix broken link

---
 site/content/en/docs/handbook/pushing.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md
index 90d6f9598b..32c58edf2f 100644
--- a/site/content/en/docs/handbook/pushing.md
+++ b/site/content/en/docs/handbook/pushing.md
@@ -19,7 +19,7 @@ Here is a comparison table to help you choose:
 |---	|---	|---	|---	|---	|
 |  [docker-env command](/docs/handbook/pushing/#1pushing-directly-to-the-in-cluster-docker-daemon-docker-env)	|   only docker	|  	|  good 	|
 |  [podman-env command](/docs/handbook/pushing/#3-pushing-directly-to-in-cluster-crio-podman-env)	|   only cri-o	|     |  good 	|
-|  [cache add command](/pushing/#push-images-using-cache-command) 	|  all 	|    	|  ok 	|
+|  [cache add command](/pushing/#2-push-images-using-cache-command) 	|  all 	|    	|  ok 	|
 |  [registry addon](/docs/handbook/pushing/#4-pushing-to-an-in-cluster-using-registry-addon)   |   all	|   work in progress for [docker on mac](https://github.com/kubernetes/minikube/issues/7535) |  ok 	|
 |  [minikube ssh](/docs/handbook/pushing/#5-building-images-inside-of-minikube-using-ssh)   |   all	|    |  best 	|
 
@@ -76,7 +76,7 @@ more information on [docker-env](https://minikube.sigs.k8s.io/docs/commands/dock
 
 ---
 
-## 2.Push images using 'cache' command.
+## 2. Push images using 'cache' command.
 
 From your host, you can push a Docker image directly to minikube. This image will be cached and automatically pulled into all future minikube clusters created on the machine
 

From 35eb50fafa5f0dac8a907af5a86ff44ed71aee4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Fri, 10 Apr 2020 15:24:52 -0700
Subject: [PATCH 667/668] Revert "Restart crio after applying the kic overlay
 (in background)"

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 34 ++++++--------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index 735032af12..b97707a5cf 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -212,18 +212,15 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
-	var wg sync.WaitGroup
-	wg.Add(4)
-
-	go func() {
-		// the overlay is required for containerd and cri-o runtime: see #7428
-		if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
-			if err := k.applyKicOverlay(cfg); err != nil {
-				glog.Errorf("failed to apply kic overlay: %v", err)
-			}
+	// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
+	if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
+		if err := k.applyKicOverlay(cfg); err != nil {
+			return errors.Wrap(err, "apply kic overlay")
 		}
-		wg.Done()
-	}()
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(3)
 
 	go func() {
 		if err := k.applyNodeLabels(cfg); err != nil {
@@ -245,7 +242,6 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		}
 		wg.Done()
 	}()
-
 	wg.Wait()
 	return nil
 }
@@ -766,30 +762,20 @@ func startKubeletIfRequired(runner command.Runner, sm sysinit.Manager) error {
 
 // applyKicOverlay applies the CNI plugin needed to make kic work
 func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	// Allow no more than 5 seconds for apply kic overlay
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-
 	cmd := exec.CommandContext(ctx, "sudo",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"-f", "-")
-
 	b := bytes.Buffer{}
 	if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil {
 		return err
 	}
-
 	cmd.Stdin = bytes.NewReader(b.Bytes())
 	if rr, err := k.c.RunCmd(cmd); err != nil {
 		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
 	}
-
-	// Inform cri-o that the CNI has changed
-	if cfg.KubernetesConfig.ContainerRuntime == "crio" {
-		if err := sysinit.New(k.c).Restart("crio"); err != nil {
-			return errors.Wrap(err, "restart crio")
-		}
-	}
-
 	return nil
 }
 

From 9fffd5f877312eda6e2ec19ca1ea6e9a8b785b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= <tstromberg@google.com>
Date: Fri, 10 Apr 2020 16:06:17 -0700
Subject: [PATCH 668/668] Revert "Revert "Restart crio after applying the kic
 overlay (in background)""

---
 pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 34 ++++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
index b97707a5cf..735032af12 100644
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -212,15 +212,18 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		return errors.Wrap(err, "run")
 	}
 
-	// this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
-	if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
-		if err := k.applyKicOverlay(cfg); err != nil {
-			return errors.Wrap(err, "apply kic overlay")
-		}
-	}
-
 	var wg sync.WaitGroup
-	wg.Add(3)
+	wg.Add(4)
+
+	go func() {
+		// the overlay is required for containerd and cri-o runtime: see #7428
+		if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
+			if err := k.applyKicOverlay(cfg); err != nil {
+				glog.Errorf("failed to apply kic overlay: %v", err)
+			}
+		}
+		wg.Done()
+	}()
 
 	go func() {
 		if err := k.applyNodeLabels(cfg); err != nil {
@@ -242,6 +245,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		}
 		wg.Done()
 	}()
+
 	wg.Wait()
 	return nil
 }
@@ -762,20 +766,30 @@ func startKubeletIfRequired(runner command.Runner, sm sysinit.Manager) error {
 
 // applyKicOverlay applies the CNI plugin needed to make kic work
 func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error {
-	// Allow no more than 5 seconds for apply kic overlay
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
+
 	cmd := exec.CommandContext(ctx, "sudo",
 		path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"-f", "-")
+
 	b := bytes.Buffer{}
 	if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil {
 		return err
 	}
+
 	cmd.Stdin = bytes.NewReader(b.Bytes())
 	if rr, err := k.c.RunCmd(cmd); err != nil {
 		return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output())
 	}
+
+	// Inform cri-o that the CNI has changed
+	if cfg.KubernetesConfig.ContainerRuntime == "crio" {
+		if err := sysinit.New(k.c).Restart("crio"); err != nil {
+			return errors.Wrap(err, "restart crio")
+		}
+	}
+
 	return nil
 }