fix merge conflict

291e5b69 · Priya Wadhwa · 93003312 · 689b3db4 · 93003312 · 291e5b69
35 changed file
--- a/.travis.yml
+++ b/.travis.yml
---
-# linted with yamllint
-os: linux
-language: go
-go:
-  - 1.15.2
-env:
-  global:
-    - GOPROXY=https://proxy.golang.org
-matrix:
-  include:
-    - language: go
-      name: Code Lint
-      go: 1.15.2
-      env:
-        - TESTSUITE=lintall
-      before_install:
-        - sudo apt-get install -y libvirt-dev
-      script: make test
-
-    - language: go
-      name: Unit Test
-      go: 1.15.2
-      env:
-        - TESTSUITE=unittest
-      before_install:
-        - sudo apt-get install -y libvirt-dev
-      script: make test
-
-    - language: go
-      name: Build
-      go: 1.15.2
-      script: make
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-notifications:
-  webhooks:
-    urls:
-      - https://www.travisbuddy.com?only=failed,errored
-    on_success: never  # don't comment on successful builds.
-    on_failure: always
-    on_cancel: always
-    on_error: always
--- a/Makefile
+++ b/Makefile
@@ -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 ?= v1.14.0
+ISO_VERSION ?= v1.15.0-snapshot1
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 RPM_VERSION ?= $(DEB_VERSION)

--- a/README.md
+++ b/README.md
 # minikube

-[![BuildStatus Widget]][BuildStatus Result]
+[![Actions Status](https://github.com/kubernetes/minikube/workflows/Master/badge.svg)](https://github.com/kubernetes/minikube/actions)
 [![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
-
 [GoReport Status]: https://goreportcard.com/report/github.com/kubernetes/minikube
 [GoReport Widget]: https://goreportcard.com/badge/github.com/kubernetes/minikube


--- a/cmd/minikube/cmd/status.go
+++ b/cmd/minikube/cmd/status.go
@@ -44,6 +44,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/node"
+	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/out/register"
 	"k8s.io/minikube/pkg/minikube/reason"
 	"k8s.io/minikube/pkg/version"
@@ -196,10 +197,13 @@ var statusCmd = &cobra.Command{
 	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)`,
 	Run: func(cmd *cobra.Command, args []string) {
+		output = strings.ToLower(output)
 		if output != "text" && statusFormat != defaultStatusFormat {
 			exit.Message(reason.Usage, "Cannot use both --output and --format options")
 		}

+		out.SetJSON(output == "json")
+
 		cname := ClusterFlagValue()
 		api, cc := mustload.Partial(cname)

@@ -233,7 +237,7 @@ var statusCmd = &cobra.Command{
 			}
 		}

-		switch strings.ToLower(output) {
+		switch output {
 		case "text":
 			for _, st := range statuses {
 				if err := statusText(st, os.Stdout); err != nil {
@@ -544,7 +548,7 @@ func clusterState(sts []*Status) ClusterState {
 			}
 			exitCode, err := strconv.Atoi(data["exitcode"])
 			if err != nil {
-				klog.Errorf("unable to convert exit code to int: %v", err)
+				klog.Errorf("exit code not found: %v", err)
 				continue
 			}
 			if val, ok := exitCodeToHTTPCode[exitCode]; ok {

--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -18,6 +18,7 @@ package cmd

 import (
 	"log"
+	"os"
 	"runtime"
 	"time"

@@ -73,9 +74,13 @@ func init() {
 // runStop handles the executes the flow of "minikube stop"
 func runStop(cmd *cobra.Command, args []string) {
 	out.SetJSON(outputFormat == "json")
-	register.SetEventLogPath(localpath.EventLog(ClusterFlagValue()))
 	register.Reg.SetStep(register.Stopping)

+	// check if profile path exists, if no PathError log file exists for valid profile
+	if _, err := os.Stat(localpath.Profile(ClusterFlagValue())); err == nil {
+		register.SetEventLogPath(localpath.EventLog(ClusterFlagValue()))
+	}
+
 	// new code
 	var profilesToStop []string
 	if stopAll {

--- a/deploy/addons/dashboard/dashboard-dp.yaml
+++ b/deploy/addons/dashboard/dashboard-dp.yaml
@@ -36,7 +36,7 @@ spec:
    spec:
      containers:
        - name: dashboard-metrics-scraper
-          image: kubernetesui/metrics-scraper:v1.0.4
+          image: {{default "kubernetesui" .ImageRepository}}/metrics-scraper:v1.0.4
          ports:
            - containerPort: 8000
              protocol: TCP
@@ -91,7 +91,7 @@ spec:
      containers:
        - name: kubernetes-dashboard
          # WARNING: This must match pkg/minikube/bootstrapper/images/images.go
-          image: kubernetesui/dashboard:v2.0.3
+          image: {{default "kubernetesui" .ImageRepository}}/dashboard:v2.0.3
          ports:
            - containerPort: 9090
              protocol: TCP

--- a/deploy/addons/efk/elasticsearch-rc.yaml.tmpl
+++ b/deploy/addons/efk/elasticsearch-rc.yaml.tmpl
@@ -62,7 +62,7 @@ spec:
        - name: ES_JAVA_OPTS
          value: "-Xms1024m -Xmx1024m"
      initContainers:
-      - image: registry.hub.docker.com/library/alpine:3.6
+      - image: {{default "registry.hub.docker.com/library" .ImageRepository}}/alpine:3.6
        command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
        name: elasticsearch-logging-init
        securityContext:

--- a/deploy/addons/efk/kibana-rc.yaml.tmpl
+++ b/deploy/addons/efk/kibana-rc.yaml.tmpl
@@ -34,7 +34,7 @@ spec:
    spec:
      containers:
      - name: kibana-logging
-        image: docker.elastic.co/kibana/kibana:5.6.2
+        image: {{default "docker.elastic.co/kibana" .ImageRepository}}/kibana:5.6.2
        resources:
          limits:
            cpu: 500m

--- a/deploy/addons/gcp-auth/gcp-auth-webhook.yaml
+++ b/deploy/addons/gcp-auth/gcp-auth-webhook.yaml
@@ -54,7 +54,7 @@ spec:
      serviceAccountName: minikube-gcp-auth-certs
      containers:
        - name: create
-          image: jettech/kube-webhook-certgen:v1.3.0
+          image: {{default "jettech" .ImageRepository}}/kube-webhook-certgen:v1.3.0
          imagePullPolicy: IfNotPresent
          args:
            - create
@@ -80,7 +80,7 @@ spec:
    spec:
      containers:
        - name: gcp-auth
-          image: gcr.io/k8s-minikube/gcp-auth-webhook:v0.0.3
+          image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/gcp-auth-webhook:v0.0.3
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8443
@@ -113,7 +113,7 @@ spec:
      serviceAccountName: minikube-gcp-auth-certs
      containers:
        - name: patch
-          image: jettech/kube-webhook-certgen:v1.3.0
+          image: {{default "jettech" .ImageRepository}}/kube-webhook-certgen:v1.3.0
          imagePullPolicy: IfNotPresent
          args:
            - patch

--- a/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl
@@ -50,7 +50,7 @@ spec:
        hostPath:
          path: /
      initContainers:
-      - image: {{default "k8s.gcr.io" .ImageRepository}}/minikube-nvidia-driver-installer@sha256:492d46f2bc768d6610ec5940b6c3c33c75e03e201cc8786e04cc488659fd6342
+      - image: {{default "k8s.gcr.io" .ImageRepository}}/minikube-nvidia-driver-installer
        name: nvidia-driver-installer
        resources:
          requests:

--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml
@@ -43,7 +43,7 @@ spec:
        hostPath:
          path: /var/lib/kubelet/device-plugins
      containers:
-      - image: "nvidia/k8s-device-plugin:1.0.0-beta4"
+      - image: {{default "nvidia" .ImageRepository}}/k8s-device-plugin:1.0.0-beta4
        command: ["/usr/bin/nvidia-device-plugin", "-logtostderr"]
        name: nvidia-gpu-device-plugin
        resources:

--- 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.12
+          image: {{default "gcr.io/kubernetes-helm" .ImageRepository}}/tiller:v2.16.12
          imagePullPolicy: IfNotPresent
          livenessProbe:
            failureThreshold: 3

--- a/deploy/addons/ingress-dns/ingress-dns-pod.yaml
+++ b/deploy/addons/ingress-dns/ingress-dns-pod.yaml
@@ -80,7 +80,7 @@ spec:
  hostNetwork: true
  containers:
    - name: minikube-ingress-dns
-      image: "cryptexlabs/minikube-ingress-dns:0.3.0"
+      image: {{default "cryptexlabs" .ImageRepository}}/minikube-ingress-dns:0.3.0
      imagePullPolicy: IfNotPresent
      ports:
        - containerPort: 53

--- a/deploy/addons/ingress/ingress-dp.yaml.tmpl
+++ b/deploy/addons/ingress/ingress-dp.yaml.tmpl
@@ -49,7 +49,7 @@ spec:
      serviceAccountName: ingress-nginx
      containers:
        - name: controller
-          image: k8s.gcr.io/ingress-nginx/controller:v0.40.2@sha256:46ba23c3fbaafd9e5bd01ea85b2f921d9f2217be082580edc22e6c704a83f02f
+          image: {{default "us.gcr.io/k8s-artifacts-prod/ingress-nginx" .ImageRepository}}/controller:v0.40.2
          imagePullPolicy: IfNotPresent
          lifecycle:
            preStop:
@@ -217,7 +217,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: jettech/kube-webhook-certgen:v1.2.2
+          image: {{default "jettech" .ImageRepository}}/kube-webhook-certgen:v1.2.2
          imagePullPolicy: IfNotPresent
          args:
            - create
@@ -252,7 +252,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: docker.io/jettech/kube-webhook-certgen:v1.3.0
+          image: {{default "jettech" .ImageRepository}}/kube-webhook-certgen:v1.3.0
          imagePullPolicy:
          args:
            - patch

--- a/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl
+++ b/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl
@@ -42,7 +42,7 @@ spec:
      containers:
      - name: logviewer
        imagePullPolicy: Always
-        image: docker.io/ivans3/minikube-log-viewer:latest
+        image: {{default "docker.io/ivans3" .ImageRepository}}/minikube-log-viewer:latest
        volumeMounts:
         - name: logs
           mountPath: /var/log/containers/

--- a/deploy/addons/metallb/metallb.yaml
+++ b/deploy/addons/metallb/metallb.yaml
@@ -212,7 +212,7 @@ spec:
          valueFrom:
            fieldRef:
              fieldPath: status.hostIP
-        image: metallb/speaker:v0.8.2
+        image: {{default "metallb" .ImageRepository}}/speaker:v0.8.2
        imagePullPolicy: IfNotPresent
        name: speaker
        ports:
@@ -268,7 +268,7 @@ spec:
      - args:
        - --port=7472
        - --config=config
-        image: metallb/controller:v0.8.2
+        image: {{default "metallb" .ImageRepository}}/controller:v0.8.2
        imagePullPolicy: IfNotPresent
        name: controller
        ports:

--- a/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
+++ b/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
@@ -17,7 +17,7 @@ spec:
    spec:
      initContainers:
        - name: update
-          image: alpine:3.11
+          image: {{default "registry.hub.docker.com/library" .ImageRepository}}/alpine:3.11
          volumeMounts:
            - name: etchosts
              mountPath: /host-etc/hosts
@@ -43,7 +43,7 @@ spec:
              echo "Done."
      containers:
        - name: pause-for-update
-          image: gcr.io/google_containers/pause-amd64:3.1
+          image: {{default "gcr.io/google_containers" .ImageRepository}}/pause-amd64:3.1
      terminationGracePeriodSeconds: 30
      volumes:
        - name: etchosts

--- a/deploy/addons/registry-aliases/patch-coredns-job.tmpl
+++ b/deploy/addons/registry-aliases/patch-coredns-job.tmpl
@@ -15,7 +15,7 @@ spec:
           path: /var/lib/minikube/binaries
      containers:
       - name: core-dns-patcher
-         image:  quay.io/rhdevelopers/core-dns-patcher
+         image:  {{default "quay.io/rhdevelopers" .ImageRepository}}/core-dns-patcher
         imagePullPolicy: IfNotPresent
         # using the kubectl from the minikube instance
         volumeMounts:

--- a/deploy/addons/registry-aliases/registry-aliases-config.tmpl
+++ b/deploy/addons/registry-aliases/registry-aliases-config.tmpl
@@ -13,6 +13,7 @@ data:
    example.com
    test.com
    test.org
+    registry.minikube
  # default registry address in minikube when enabled via minikube addons enable registry
  registrySvc: registry.kube-system.svc.cluster.local

--- a/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl
+++ b/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl
@@ -18,7 +18,7 @@ spec:
        addonmanager.kubernetes.io/mode: Reconcile
    spec:
      containers:
-      - image: upmcenterprises/registry-creds:1.10
+      - image: {{default "upmcenterprises" .ImageRepository}}/registry-creds:1.10
        name: registry-creds
        imagePullPolicy: Always
        env:

--- a/deploy/addons/registry/registry-proxy.yaml.tmpl
+++ b/deploy/addons/registry/registry-proxy.yaml.tmpl
@@ -19,7 +19,7 @@ spec:
        addonmanager.kubernetes.io/mode: Reconcile
    spec:
      containers:
-      - image: gcr.io/google_containers/kube-registry-proxy:0.4
+      - image: {{default "gcr.io/google_containers" .ImageRepository}}/kube-registry-proxy:0.4
        imagePullPolicy: IfNotPresent
        name: registry-proxy
        ports:

--- a/deploy/addons/registry/registry-rc.yaml.tmpl
+++ b/deploy/addons/registry/registry-rc.yaml.tmpl
@@ -18,7 +18,7 @@ spec:
        addonmanager.kubernetes.io/mode: Reconcile
    spec:
      containers:
-      - image: registry.hub.docker.com/library/registry:2.7.1
+      - image: {{default "registry.hub.docker.com/library" .ImageRepository}}/registry:2.7.1
        imagePullPolicy: IfNotPresent
        name: registry
        ports:

--- a/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl
+++ b/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl
@@ -31,7 +31,7 @@ spec:
      #  kubernetes.io/hostname: minikube
      hostNetwork: true
      containers:
-      - image: quay.io/nixpanic/glusterfs-server:pr_fake-disk
+      - image: {{default "quay.io/nixpanic" .ImageRepository}}/glusterfs-server:pr_fake-disk
        imagePullPolicy: IfNotPresent
        name: glusterfs
        env:

--- a/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl
+++ b/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl
@@ -116,7 +116,7 @@ spec:
    spec:
      serviceAccountName: heketi-service-account
      containers:
-      - image: heketi/heketi:latest
+      - image: {{default "heketi" .ImageRepository}}/heketi:latest
        imagePullPolicy: IfNotPresent
        name: heketi
        env:

--- a/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml
+++ b/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml
@@ -23,7 +23,7 @@ spec:
      containers:
        - name: volume-snapshot-controller
          # TODO(xyang): Replace with an official image when it is released
-          image: gcr.io/k8s-staging-csi/snapshot-controller:v2.0.0-rc2
+          image: {{default "gcr.io/k8s-staging-csi" .ImageRepository}}/snapshot-controller:v2.0.0-rc2
          args:
            - "--v=5"
          imagePullPolicy: Always
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -17,3 +17,4 @@ sha256 865ded95aceb3a33a391b252522682de6b37b39498704c490b3a321dbefaafcb v1.18.0.
 sha256 794ddc36c2a20fde91fc6cc2c6f02ebdaea85c69b51b67f3994090dbbdbc2a50 v1.18.1.tar.gz
 sha256 25dc558fbabc987bd58c7eab5230121b258a7b0eb34a49dc6595f1c6f3969116 v1.18.2.tar.gz
 sha256 d5c6442e3990938badc966cdd1eb9ebe2fc11345452c233aa0d87ca38fbeed81 v1.18.3.tar.gz
+sha256 74a4e916acddc6cf47ab5752bdebb6732ce2c028505ef57b7edc21d2da9039b6 v1.18.4.tar.gz
--- 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.18.3
-CRIO_BIN_COMMIT = 61de18161fb4ccda720768c001713592b5a04e46
+CRIO_BIN_VERSION = v1.18.4
+CRIO_BIN_COMMIT = aba91e59ec78e3299e443a7364e2cf8909af4606
 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

--- a/deploy/kicbase/Dockerfile
+++ b/deploy/kicbase/Dockerfile
@@ -107,16 +107,16 @@ RUN sh -c "echo 'deb https://download.docker.com/linux/ubuntu focal stable' > /e
    clean-install docker-ce docker-ce-cli containerd.io

 # Install cri-o/podman dependencies:
-RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \ 
+RUN sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
    curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_20.04/Release.key && \
    apt-key add - < Release.key && \
    clean-install containers-common catatonit conmon containernetworking-plugins cri-tools podman-plugins varlink

-# 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:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
-    curl -LO https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/Release.key && \
+# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.18/README.md#installing-cri-o
+RUN sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:1.18.list" && \
+    curl -LO https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18/xUbuntu_20.04/Release.key && \
    apt-key add - < Release.key && \
-    clean-install cri-o=1.18.3~3
+    clean-install cri-o cri-o-runc

 # install podman
 RUN sh -c "echo 'deb https://dl.bintray.com/afbjorklund/podman focal main' > /etc/apt/sources.list.d/podman.list" && \
@@ -124,8 +124,6 @@ RUN sh -c "echo 'deb https://dl.bintray.com/afbjorklund/podman focal main' > /et
    apt-key add - < afbjorklund-public.key.asc && \
    clean-install podman=1.9.3~1

-RUN mkdir -p /usr/lib/cri-o-runc/sbin && cp /usr/bin/runc /usr/lib/cri-o-runc/sbin/runc
-
 # automount service
 COPY automount/minikube-automount /usr/sbin/minikube-automount
 COPY automount/minikube-automount.service /usr/lib/systemd/system/minikube-automount.service

--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -33,6 +33,9 @@ export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin"
 # installing golang so we could do go get for gopogh
 sudo ./installers/check_install_golang.sh "1.15.2" "/usr/local" || true

+# install docker and kubectl if not present
+sudo ./installers/check_install_docker.sh
+
 docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
 docker volume prune -f || true
 docker system df || true

--- a/hack/jenkins/installers/check_install_docker.sh
+++ b/hack/jenkins/installers/check_install_docker.sh
+#!/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.
+
+set -eux -o pipefail
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  echo "detected darwin, exiting"
+  return
+fi
+
+echo "Installing latest docker"
+sudo apt-get -y update
+sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common  
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
+sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian `lsb_release -cs` stable"
+sudo apt-get -y update
+sudo apt-get -y install docker-ce docker-ce-cli containerd.io
+sudo usermod -aG docker jenkins
+
+echo "Installing latest kubectl"
+curl -LO "https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl"
+sudo install ./kubectl /usr/local/bin/kubectl
--- a/hack/jenkins/installers/check_install_golang.sh
+++ b/hack/jenkins/installers/check_install_golang.sh
@@ -18,7 +18,7 @@ set -eux -o pipefail

 if (($# < 2)); then
  echo "ERROR: given ! ($#) number of parameters but expect 2."
-  echo "USAGE: ./check_and_install_golang.sh VERSION_TO_INSTALL INSTALL_PATH"
+  echo "USAGE: ./check_install_golang.sh VERSION_TO_INSTALL INSTALL_PATH"
  exit 1
 fi


--- a/hack/update/kicbase_version/update_kicbase_version.go
+++ b/hack/update/kicbase_version/update_kicbase_version.go
@@ -55,6 +55,7 @@ import (
 	"time"

 	"k8s.io/klog/v2"
+
 	"k8s.io/minikube/hack/update"
 )

@@ -75,13 +76,13 @@ var (
 		},
 	}

-	// pull request data
+	// PR data
 	prBranchPrefix = "update-kicbase-version_" // will be appended with first 7 characters of the PR commit SHA
-	prTitle        = `update-kicbase-version: {"{{.StableVersion}}"}`
+	prTitle        = `update-kicbase-version: {stable: "{{.StableVersion}}"}`
 	prIssue        = 9420
 )

-// Data holds current and stable KIC Base image versions
+// Data holds current and stable KIC base image versions
 type Data struct {
 	CurrentVersion string `json:"CurrentVersion"`
 	StableVersion  string `json:"StableVersion"`
@@ -92,33 +93,33 @@ func main() {
 	ctx, cancel := context.WithTimeout(context.Background(), cxTimeout)
 	defer cancel()

-	// determine current and stable kic base image versions
+	// determine current and stable KIC base image versions
 	current, stable, err := KICVersions()
 	if err != nil {
-		klog.Fatalf("failed getting kic base image versions: %v", err)
+		klog.Fatalf("Unable to get KIC base image versions: %v", err)
 	}
 	if len(current) == 0 || len(stable) == 0 {
-		klog.Fatalf("cannot determine kic base image versions")
+		klog.Fatalf("Unable to determine KIC base image versions")
 	}
 	data := Data{CurrentVersion: current, StableVersion: stable}
-	klog.Infof("kic base image versions: 'current' is %s and 'stable' would be %s", data.CurrentVersion, data.StableVersion)
+	klog.Infof("KIC base image versions: 'current' is %s and 'stable' would be %s", data.CurrentVersion, data.StableVersion)

-	// prepare local kic base image
+	// prepare local KIC base image
 	image, err := prepareImage(ctx, data)
 	if err != nil {
-		klog.Fatalf("failed preparing local kic base reference image: %v", err)
+		klog.Fatalf("Unable to prepare local KIC base reference image: %v", err)
 	}
-	klog.Infof("local kic base reference image: %s", image)
+	klog.Infof("Local KIC base reference image: %s", image)

 	// update registries
 	if updated := update.CRUpdateAll(ctx, image, data.StableVersion); !updated {
-		klog.Fatalf("failed updating all registries")
+		klog.Fatalf("Unable to update any registry")
 	}

 	update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue)
 }

-// KICVersions returns current and stable kic base image versions and any error
+// KICVersions returns current and stable KIC base image versions and any error occurred.
 func KICVersions() (current, stable string, err error) {
 	blob, err := ioutil.ReadFile(filepath.Join(update.FSRoot, kicFile))
 	if err != nil {
@@ -134,8 +135,8 @@ func KICVersions() (current, stable string, err error) {
 	return current, stable, nil
 }

-// prepareImage checks if current image exists locally, tries to pull it if not,
-// tags it with release version, returns reference image url and any error
+// prepareImage checks if current image exists locally, tries to pull it if not, tags it with release version.
+// Returns reference image url and any error occurred.
 func prepareImage(ctx context.Context, data Data) (image string, err error) {
 	image, err = update.PullImage(ctx, data.CurrentVersion, data.StableVersion)
 	if err != nil {

--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -24,9 +24,9 @@ import (

 const (
 	// Version is the current version of kic
-	Version = "v0.0.14-snapshot"
+	Version = "v0.0.14-snapshot2"
 	// SHA of the kic base image
-	baseImageSHA = "1e303d96e9d72371235cb28ed77f9b3ba67fb4966085202238e635f1d80181f8"
+	baseImageSHA = "2bd97b482faf5b6a403ac39dd5e7c6fe2006425c6663a12f94f64f5f81a7787e"
 )

 var (

--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -67,7 +67,7 @@ var Addons = map[string]*Addon{
 		MustBinAsset("deploy/addons/dashboard/dashboard-clusterrole.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrole.yaml", "0640", false),
 		MustBinAsset("deploy/addons/dashboard/dashboard-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrolebinding.yaml", "0640", false),
 		MustBinAsset("deploy/addons/dashboard/dashboard-configmap.yaml", vmpath.GuestAddonsDir, "dashboard-configmap.yaml", "0640", false),
-		MustBinAsset("deploy/addons/dashboard/dashboard-dp.yaml", vmpath.GuestAddonsDir, "dashboard-dp.yaml", "0640", false),
+		MustBinAsset("deploy/addons/dashboard/dashboard-dp.yaml.tmpl", vmpath.GuestAddonsDir, "dashboard-dp.yaml", "0640", true),
 		MustBinAsset("deploy/addons/dashboard/dashboard-role.yaml", vmpath.GuestAddonsDir, "dashboard-role.yaml", "0640", false),
 		MustBinAsset("deploy/addons/dashboard/dashboard-rolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-rolebinding.yaml", "0640", false),
 		MustBinAsset("deploy/addons/dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640", false),
@@ -110,13 +110,13 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"glusterfs-daemonset.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"heketi-deployment.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl",
 			vmpath.GuestAddonsDir,
@@ -154,7 +154,7 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"kibana-rc.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/efk/kibana-svc.yaml.tmpl",
 			vmpath.GuestAddonsDir,
@@ -246,7 +246,7 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"registry-rc.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/registry/registry-svc.yaml.tmpl",
 			vmpath.GuestAddonsDir,
@@ -258,7 +258,7 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"registry-proxy.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "registry"),
 	"registry-creds": NewAddon([]*BinAsset{
 		MustBinAsset(
@@ -292,13 +292,13 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"node-etc-hosts-update.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/registry-aliases/patch-coredns-job.tmpl",
 			vmpath.GuestAddonsDir,
 			"patch-coredns-job.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "registry-aliases"),
 	"freshpod": NewAddon([]*BinAsset{
 		MustBinAsset(
@@ -318,11 +318,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",
+			"deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"nvidia-gpu-device-plugin.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "nvidia-gpu-device-plugin"),
 	"logviewer": NewAddon([]*BinAsset{
 		MustBinAsset(
@@ -380,19 +380,19 @@ var Addons = map[string]*Addon{
 	}, false, "helm-tiller"),
 	"ingress-dns": NewAddon([]*BinAsset{
 		MustBinAsset(
-			"deploy/addons/ingress-dns/ingress-dns-pod.yaml",
+			"deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"ingress-dns-pod.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "ingress-dns"),
 	"metallb": NewAddon([]*BinAsset{
 		MustBinAsset(
-			"deploy/addons/metallb/metallb.yaml",
+			"deploy/addons/metallb/metallb.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"metallb.yaml",
 			"0640",
-			false),
+			true),
 		MustBinAsset(
 			"deploy/addons/metallb/metallb-config.yaml.tmpl",
 			vmpath.GuestAddonsDir,
@@ -434,11 +434,11 @@ var Addons = map[string]*Addon{
 			"0640",
 			false),
 		MustBinAsset(
-			"deploy/addons/gcp-auth/gcp-auth-webhook.yaml",
+			"deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"gcp-auth-webhook.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "gcp-auth"),
 	"volumesnapshots": NewAddon([]*BinAsset{
 		MustBinAsset(
@@ -466,11 +466,11 @@ var Addons = map[string]*Addon{
 			"0640",
 			false),
 		MustBinAsset(
-			"deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml",
+			"deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl",
 			vmpath.GuestAddonsDir,
 			"volume-snapshot-controller-deployment.yaml",
 			"0640",
-			false),
+			true),
 	}, false, "volumesnapshots"),
 	"csi-hostpath-driver": NewAddon([]*BinAsset{
 		MustBinAsset(

--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -26,7 +26,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)
-      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.14-snapshot@sha256:1e303d96e9d72371235cb28ed77f9b3ba67fb4966085202238e635f1d80181f8")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.14-snapshot2@sha256:2bd97b482faf5b6a403ac39dd5e7c6fe2006425c6663a12f94f64f5f81a7787e")
      --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
      --cni string                        CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)
      --container-runtime string          The container runtime to be used (docker, cri-o, containerd). (default "docker")
@@ -64,7 +64,7 @@ minikube start [flags]
      --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.14.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.14.0/minikube-v1.14.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.14.0.iso])
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.15.0-snapshot1.iso,https://github.com/kubernetes/minikube/releases/download/v1.15.0-snapshot1/minikube-v1.15.0-snapshot1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.15.0-snapshot1.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.19.2, 'latest' for v1.19.2). Defaults to 'stable'.
      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube