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

…81ba5ce Kicbase/ISO: Update docker from 27.1.1 to 27.1.2
kubernetes · Aug 14, 2024 · 20e1a71 · 20e1a71
2 parents 29dfe1a + b06913c
commit 20e1a71
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.1-1722420371-19355
+ISO_VERSION ?= v1.33.1-1723567878-19429
 
 # 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
@@ -25,3 +25,4 @@ sha256 4973e5e5bb2aeded816b9df4d281652535e82d6a8341653ae96ba7b7832dbb0c  docker-
 sha256 b6705031e453bd3754b14da5bf0160458322e4927733d31f1e8e6e4d63d391c1  docker-27.0.3.tgz
 sha256 f28bd10be2841063bdd2cc5354eae265df124835f841c1843e1264bab93c91a8  docker-27.1.0.tgz
 sha256 86a395f67a5a23d8eb207ab5a9ab32a51f7fccd8b18dae40887e738db95c6bc4  docker-27.1.1.tgz
+sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822  docker-27.1.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 = 27.1.1
+DOCKER_BIN_AARCH64_VERSION = 27.1.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
@@ -61,3 +61,4 @@ sha256 cc0dc835067509b7bedb31ed5db5b44f54666f820dd33f5191a9f9f5c68d4fe8  docker-
 sha256 f6299aeada422d527cba35061fe56df5e2294776f6d39b7830d699335054b1e6  docker-27.0.3.tgz
 sha256 bc4c2d3ebbfdad92d64eb95a9d77ebe4afcbb9acdfd052cea7e74a71767ba727  docker-27.1.0.tgz
 sha256 118da6b8fc8e8b6c086ab0dd5e64ee549376c3a3f963723bbc9a46db475bf21f  docker-27.1.1.tgz
+sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88  docker-27.1.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 = 27.1.1
+DOCKER_BIN_VERSION = 27.1.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.44-1723026928-19389"
+	Version = "v0.0.44-1723567951-19429"
 
 	// SHA of the kic base image
-	baseImageSHA = "7715fe0c5dce35b4eb757765cbbe02d40cd8b5effa0639735e42ad89f4f51ef0"
+	baseImageSHA = "cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083"
 	// 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-builds/iso/19355"
+	isoBucket := "minikube-builds/iso/19429"
 
 	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.44-1723026928-19389@sha256:7715fe0c5dce35b4eb757765cbbe02d40cd8b5effa0639735e42ad89f4f51ef0")
+      --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.44-1723567951-19429@sha256:cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083")
       --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)