Merge pull request #10647 from afbjorklund/docker-20.10.4

ISO Upgrade Docker, from 20.10.3 to 20.10.4

Author: medyagh

Diff for: 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.18.0-1615350772-10704
+ISO_VERSION ?= v1.18.0-1616464260-10647
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0

Diff for: deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash

@@ -27,3 +27,4 @@ sha256 02936a3585f12f13b21b95e02ae722d74eaf1870b536997e914659ee307b2ac4  docker-
 sha256 8790f3b94ee07ca69a9fdbd1310cbffc729af0a07e5bf9f34a79df1e13d2e50e  docker-20.10.1.tgz
 sha256 97017e32a8ecbdd1826bb3c7b1424303ee0dea3f900d33591b1df5e394ed4eed  docker-20.10.2.tgz
 sha256 47065a47f0692cd5af03073c7386fe090d9ef5ac88a7d8455a884d8e15809be5  docker-20.10.3.tgz
+sha256 6ec28b6a251e093f5cf32569c4bfce4821eda02923b33c060694e6ca2c851daa  docker-20.10.4.tgz

Diff for: deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 20.10.3
+DOCKER_BIN_VERSION = 20.10.4
 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 

Diff for: deploy/iso/minikube-iso/package/runc-master/runc-master.hash

@@ -8,3 +8,4 @@ sha256 257ac2c2bbc9770998f31b73f587718848ebb09465ce2cd20fbac198ebd5726e 425e105d
 sha256 4ffe8323397d85dda7d5875fa6bdaf3f8c93592c1947dfa24a034719dc6f728e d736ef14f0288d6993a1845745d6756cfc9ddd5a.tar.gz
 sha256 defe87a5f15edc54288d3261f5be28219b9b9d904d98c6020eb2e45400a04fb2 dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz
 sha256 bfcbbcb12664d5f8c1b794f37a457a8db53291c82be5a3157d8efb91aab193bf ff819c7e9184c13b7c2607fe6c30ae19403a7aff.tar.gz
+sha256 144973344b73627b5f69aa88b9e6655d692447ec317a0d5fa9777496a8ac186e 12644e614e25b05da6fd08a38ffa0cfe1903fdec.tar.gz

Diff for: deploy/iso/minikube-iso/package/runc-master/runc-master.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# As of 2020-08-05, v1.0.0-rc92
-RUNC_MASTER_VERSION = ff819c7e9184c13b7c2607fe6c30ae19403a7aff
+# As of 2021-02-03, v1.0.0-rc93
+RUNC_MASTER_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
 RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
 RUNC_MASTER_LICENSE = Apache-2.0

Diff for: pkg/minikube/download/iso.go

@@ -40,7 +40,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/10704"
+	isoBucket := "minikube-builds/iso/10647"
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
 		fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),

Diff for: site/content/en/docs/commands/start.md

@@ -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-builds/iso/10704/minikube-v1.18.0-1615350772-10704.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0-1615350772-10704/minikube-v1.18.0-1615350772-10704.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0-1615350772-10704.iso])
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/10647/minikube-v1.18.0-1616464260-10647.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0-1616464260-10647/minikube-v1.18.0-1616464260-10647.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0-1616464260-10647.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.20.2, 'latest' for v1.20.5-rc.0). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube