Merge pull request #18485 from minikube-bot/auto_bump_docker_version-40b7147

Kicbase/ISO: Update docker from 25.0.4 to 26.0.0

Author: spowelljr

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-beta.0
+ISO_VERSION ?= v1.33.0-1711559712-18485
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash

@@ -15,3 +15,4 @@ sha256 ba911d9ff8a54a7afc8f91e998984f78a704bcb4932134c4dda2c401209a9921  docker-
 sha256 d9f58aecc42451503e82e6e0562cafa1812b334c92186a7f486e111e70a0f5bd  docker-24.0.6.tgz
 sha256 fe6cf4b509307665af542a89454c2ecfbbd62670fc5a5d17bac7150a6f6a6776  docker-24.0.7.tgz
 sha256 ce7b2ffb522cde59f2bb4b67a17db4aaf66b058532effcd583ab85d02ede529f  docker-25.0.4.tgz
+sha256 f01642695115d8ceca64772ea65336ef7210ddc36096f1e533145f443bc718b3  docker-26.0.0.tgz

deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_AARCH64_VERSION = 25.0.4
+DOCKER_BIN_AARCH64_VERSION = 26.0.0
 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
 

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash

@@ -51,3 +51,4 @@ sha256 0a5f3157ce25532c5c1261a97acf3b25065cfe25940ef491fa01d5bea18ddc86  docker-
 sha256 99792dec613df93169a118b05312a722a63604b868e4c941b1b436abcf3bb70f  docker-24.0.6.tgz
 sha256 984d59a77fa6acab97ea725a966facd33725e0e09c2fee975397fe1c6379bd3d  docker-24.0.7.tgz
 sha256 23db817b99aac6d5d7fcb1f706e50b5a412d78a9438975d6b4a54c58dc409bfb  docker-25.0.4.tgz
+sha256 d69e8eedc72d6d219933ab53b8e7f2dbd9e64695d5db68a2df17333db433c456  docker-26.0.0.tgz

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk

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

pkg/drivers/kic/types.go

@@ -24,14 +24,14 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.43-beta.0"
+	Version = "v0.0.43-1711559786-18485"
 
 	// SHA of the kic base image
-	baseImageSHA = "185c97a62a2e62a78b853e29e445f05ffbcf36149614c192af3643aa3888c4e8"
+	baseImageSHA = "2dcab64da240d825290a528fa79ad3c32db45fe5f8be5150468234a7114eff82"
 	// The name of the GCR kicbase repository
-	gcrRepo = "gcr.io/k8s-minikube/kicbase"
+	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository
-	dockerhubRepo = "docker.io/kicbase/stable"
+	dockerhubRepo = "docker.io/kicbase/build"
 )
 
 var (

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/18485"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

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:v0.0.43-beta.0@sha256:185c97a62a2e62a78b853e29e445f05ffbcf36149614c192af3643aa3888c4e8")
+      --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-1711559786-18485@sha256:2dcab64da240d825290a528fa79ad3c32db45fe5f8be5150468234a7114eff82")
       --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)