From b9cf5d556181802d3efb680b2c7154f434e3f0f5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 18 Oct 2025 08:09:51 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update nerdctl from 1.7.7 to 2.1.6 --- .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash | 1 + .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk | 4 ++-- .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash | 1 + .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash index afd5e28ff006..914afa405e82 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash @@ -9,3 +9,4 @@ sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348 nerdctl-1.7.6-linux-arm64.tar.gz sha256 230ad8f4f88100774d123213a427d3d43071e0dcf9f70efbea50ab9efff1cd4c nerdctl-1.7.7-linux-arm64.tar.gz +sha256 5c30be3ec118eb222bf635f8049c2f96b4c46d9343ec445058e9bc2ee9531c28 nerdctl-2.1.6-linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk index 9a3f834c788a..f8fc0584fc32 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_AARCH64_VERSION = 1.7.7 -NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83 +NERDCTL_BIN_AARCH64_VERSION = 2.1.6 +NERDCTL_BIN_AARCH64_COMMIT = 59253e9931873e79b92fe3400f14e69d6be34025 NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION) NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash index af8717f8afac..47def41a97a6 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash @@ -9,3 +9,4 @@ sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0 nerdctl-1.7.6-linux-amd64.tar.gz sha256 298bb95aee485b24d566115ef7e4e90951dd232447b05de5646a652a23db70a9 nerdctl-1.7.7-linux-amd64.tar.gz +sha256 22857b373edea479a4534ba62cae1c77f2af38f0aac4c91c1c68cf09e29d6f9e nerdctl-2.1.6-linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk index ae5f6baf0f4a..ba5bd27446fd 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_VERSION = 1.7.7 -NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83 +NERDCTL_BIN_VERSION = 2.1.6 +NERDCTL_BIN_COMMIT = 59253e9931873e79b92fe3400f14e69d6be34025 NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION) NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz NERDCTL_BIN_STRIP_COMPONENTS = 0 diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 59c9456fd219..b3f532c2680e 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -48,7 +48,7 @@ ARG CRI_DOCKERD_VERSION="v0.4.0" ARG CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb" ARG CNI_PLUGINS_VERSION="v1.4.0" ARG TARGETARCH -ARG NERDCTL_VERSION="1.7.7" +ARG NERDCTL_VERSION="2.1.6" ARG NERDCTLD_VERSION="0.7.0" # copy in static files (configs, scripts) From 9fe460efd7048942937f0ec6d67efaff5413fdf0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 18 Oct 2025 09:09:05 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.48-1760777400-21768 --- 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 a89f88b5d21e..44a4161177d8 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.48-1760609789-21757" + Version = "v0.0.48-1760777400-21768" // SHA of the kic base image - baseImageSHA = "9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6" + baseImageSHA = "c1ce7e71702b7c9488213b3aa41ec9672ce0670d8fa8c64f3bf2812ca9ebfeca" // 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 d7f812ebc274..646fe0900998 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.48-1760609789-21757@sha256:9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6") + --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.48-1760777400-21768@sha256:c1ce7e71702b7c9488213b3aa41ec9672ce0670d8fa8c64f3bf2812ca9ebfeca") --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 815a54cd6f5c56aba7c2fce77a206f3fb2f71c38 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 18 Oct 2025 14:56:33 +0000 Subject: [PATCH 3/3] Updating ISO to v1.37.0-1760787022-21768 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d32493059c24..04d63fb4a6a0 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.37.0-1760609724-21757 +ISO_VERSION ?= v1.37.0-1760787022-21768 # 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 a08736ee9aaa..706320f99bed 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/21757" + isoBucket := "minikube-builds/iso/21768" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),