Merge pull request #18706 from minikube-bot/auto_bump_docker_version-…

…6a8f9f9 Kicbase/ISO: Update docker from 26.0.1 to 26.0.2
kubernetes · Apr 22, 2024 · 98bd6df · 98bd6df
2 parents 3ba8ea3 + c94ef6f
commit 98bd6df
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.33.0
+ISO_VERSION ?= v1.33.0-1713736271-18706
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
@@ -17,3 +17,4 @@ sha256 fe6cf4b509307665af542a89454c2ecfbbd62670fc5a5d17bac7150a6f6a6776  docker-
 sha256 ce7b2ffb522cde59f2bb4b67a17db4aaf66b058532effcd583ab85d02ede529f  docker-25.0.4.tgz
 sha256 f01642695115d8ceca64772ea65336ef7210ddc36096f1e533145f443bc718b3  docker-26.0.0.tgz
 sha256 ffb86d77f764e544fe9dcf1c10296adebb7db01a18a5b9bce7d41814d852a8f4  docker-26.0.1.tgz
+sha256 daf6326d790e114db759733f88ebe8a4d0dc56abf0e810fe62548c5f8e054b56  docker-26.0.2.tgz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_AARCH64_VERSION = 26.0.1
+DOCKER_BIN_AARCH64_VERSION = 26.0.2
 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
 

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash
@@ -53,3 +53,4 @@ sha256 984d59a77fa6acab97ea725a966facd33725e0e09c2fee975397fe1c6379bd3d  docker-
 sha256 23db817b99aac6d5d7fcb1f706e50b5a412d78a9438975d6b4a54c58dc409bfb  docker-25.0.4.tgz
 sha256 d69e8eedc72d6d219933ab53b8e7f2dbd9e64695d5db68a2df17333db433c456  docker-26.0.0.tgz
 sha256 d362e648f6a7cccbe313145864d2316ab3114abb22c15a685427ebd5cb306078  docker-26.0.1.tgz
+sha256 118a556898671cceb4d5d726b9114ca5cbbae5b5956716eb92f465932f1c6363  docker-26.0.2.tgz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 26.0.1
+DOCKER_BIN_VERSION = 26.0.2
 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 

diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
@@ -24,10 +24,10 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.43-1713569670-18702"
+	Version = "v0.0.43-1713736339-18706"
 
 	// SHA of the kic base image
-	baseImageSHA = "1db7a12e122807eaef46d49daa14095f818f9bfb653fcf62060f6eb507c1f0d8"
+	baseImageSHA = "bccd96633fa59b612ea2e24c6961d2499fe576afbab2e6056a6801ffbd3b1a7e"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository

diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
@@ -41,7 +41,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/iso"
+	isoBucket := "minikube-builds/iso/18706"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
@@ -27,7 +27,7 @@ minikube start [flags]
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-pause-interval duration      Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
       --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-builds:v0.0.43-1713569670-18702@sha256:1db7a12e122807eaef46d49daa14095f818f9bfb653fcf62060f6eb507c1f0d8")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.43-1713736339-18706@sha256:bccd96633fa59b612ea2e24c6961d2499fe576afbab2e6056a6801ffbd3b1a7e")
       --binary-mirror string              Location to fetch kubectl, kubelet, & kubeadm binaries from.
       --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --cert-expiration duration          Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)