From e13c0b1a500a426d32289d9c319a6746a7ce6aeb Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 27 Jun 2024 21:29:14 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update docker from 27.0.1 to 27.0.2 --- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) 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 index 1359dfecaa..6047720334 100644 --- 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 @@ -21,3 +21,4 @@ sha256 daf6326d790e114db759733f88ebe8a4d0dc56abf0e810fe62548c5f8e054b56 docker- sha256 751e0806aa8e80aa16b076ff91e4311f41b69394fdab84ca57cf5115192c3f52 docker-26.1.3.tgz sha256 6f1a5fb161aef875d305ee4f79e65492b3c13e90dbe0a339df2ad6515e4f6849 docker-26.1.4.tgz sha256 8ee4de2ee8598c5d549a181d89eede9ac325c3c9df93da04e557253e487e68b0 docker-27.0.1.tgz +sha256 4973e5e5bb2aeded816b9df4d281652535e82d6a8341653ae96ba7b7832dbb0c docker-27.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 index 4100cd14fb..cba8100f91 100644 --- 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.0.1 +DOCKER_BIN_AARCH64_VERSION = 27.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 index 71b64c180c..dbcf6070ae 100644 --- 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 @@ -57,3 +57,4 @@ sha256 118a556898671cceb4d5d726b9114ca5cbbae5b5956716eb92f465932f1c6363 docker- sha256 a50076d372d3bbe955664707af1a4ce4f5df6b2d896e68b12ecc74e724d1db31 docker-26.1.3.tgz sha256 a9cede81aa3337f310132c2c920dba2edc8d29b7d97065b63ba41cf47ae1ca4f docker-26.1.4.tgz sha256 1e65f8bd3ac5ba8a4267a680a5427b59f8af1c1a3853bdbf77cdcaa33d5f6504 docker-27.0.1.tgz +sha256 cc0dc835067509b7bedb31ed5db5b44f54666f820dd33f5191a9f9f5c68d4fe8 docker-27.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 index d57ade7497..c768668e60 100644 --- 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.0.1 +DOCKER_BIN_VERSION = 27.0.2 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz From 5837a8f03fab6c2d04ccb0729435472b846b353c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 28 Jun 2024 19:13:36 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.44-1719600828-19153 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 40a8916b40..3e135b328b 100644 --- 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-1719413016-19142" + Version = "v0.0.44-1719600828-19153" // SHA of the kic base image - baseImageSHA = "af368900f8c68437efd9db2dba61a03b07068e5b9fe0dc8d7f46be199657779d" + baseImageSHA = "8b9800f08e7c6e04fce5b743c0f19f5e6f6f0895042824a1619fb7f69b11b478" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index ab244ce5f6..f56a19dd1c 100644 --- 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-1719413016-19142@sha256:af368900f8c68437efd9db2dba61a03b07068e5b9fe0dc8d7f46be199657779d") + --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-1719600828-19153@sha256:8b9800f08e7c6e04fce5b743c0f19f5e6f6f0895042824a1619fb7f69b11b478") --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) From a05f3999be35cbe14f2850cdb7177a982d8bee74 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 28 Jun 2024 23:26:17 +0000 Subject: [PATCH 3/3] Updating ISO to v1.33.1-1719596756-19153 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f16db041e4..afa54ee88e 100644 --- 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-1719412936-19142 +ISO_VERSION ?= v1.33.1-1719596756-19153 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 8546f2d5dd..a78c875535 100644 --- 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/19142" + isoBucket := "minikube-builds/iso/19153" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),