From fa823964f8f84dd2fec1e4597d730c0eca8e3f0a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Sep 2025 10:06:31 +0000 Subject: [PATCH 1/2] Kicbase/ISO: Update nerdctl from 1.7.7 to 2.1.5 --- .../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..68831b59e85c 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 d8d7caea291e0ad828dfb885fed2b9ee6703432be54ff3b62ed81aedd8431f63 nerdctl-2.1.5-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..6a80a4d0832a 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.5 +NERDCTL_BIN_AARCH64_COMMIT = 645e11a1d30b7c0e0c91a710dabd3f6607263e7d 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..9ce0de7da8e0 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 9ff862624084fa1b2c6272c4498754801bff3f4ce09421ac6eba58a760878544 nerdctl-2.1.5-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..0286df6b5f5a 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.5 +NERDCTL_BIN_COMMIT = 645e11a1d30b7c0e0c91a710dabd3f6607263e7d 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 853951cfef28..59f72911d7fc 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -47,7 +47,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.5" ARG NERDCTLD_VERSION="0.6.1" # copy in static files (configs, scripts) From 66d844f1bc68084d6c516b1efc7cbff8d5b91d5e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Sep 2025 11:00:31 +0000 Subject: [PATCH 2/2] Updating kicbase image to v0.0.48-1759142394-21660 --- hack/kicbase_version/os-package-list.txt | 14 +++++++------- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 60292fac813f..3b69dfce0655 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -8,15 +8,15 @@ ii apt 2.4.14 amd6 ii base-files 12ubuntu4.7 amd64 Debian base system miscellaneous files ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell -ii bind9-dnsutils 1:9.18.30-0ubuntu0.22.04.2 amd64 Clients provided with BIND 9 -ii bind9-host 1:9.18.30-0ubuntu0.22.04.2 amd64 DNS Lookup Utility -ii bind9-libs:amd64 1:9.18.30-0ubuntu0.22.04.2 amd64 Shared Libraries used by BIND 9 +ii bind9-dnsutils 1:9.18.39-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 +ii bind9-host 1:9.18.39-0ubuntu0.22.04.1 amd64 DNS Lookup Utility +ii bind9-libs:amd64 1:9.18.39-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite ii ca-certificates 20240203~22.04.1 all Common CA certificates ii catatonit 0.1.7-1 amd64 init process for containers ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables -ii containerd.io 1.7.27-1 amd64 An open and reliable container runtime +ii containerd.io 1.7.28-0~ubuntu.22.04~jammy amd64 An open and reliable container runtime ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.1 amd64 standard networking plugins - binaries ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. @@ -30,8 +30,8 @@ ii debconf 1.5.79ubuntu1 all ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities ii dirmngr 2.2.27-3ubuntu2.4 amd64 GNU privacy guard - network certificate management service -ii dnsutils 1:9.18.30-0ubuntu0.22.04.2 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.27.0-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. +ii dnsutils 1:9.18.39-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils +ii docker-buildx-plugin 0.28.0-0~ubuntu.22.04~jammy amd64 Docker Buildx plugin extends build capabilities with BuildKit. ii docker-ce 5:28.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine ii docker-ce-cli 5:28.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system @@ -179,7 +179,7 @@ ii libunistring2:amd64 1.0-1 amd6 ii libuuid1:amd64 2.37.2-4ubuntu3.4 amd64 Universally Unique ID library ii libuv1:amd64 1.43.0-1ubuntu0.1 amd64 asynchronous event notification library - runtime library ii libwrap0:amd64 7.6.q-31build2 amd64 Wietse Venema's TCP wrappers library -ii libxml2:amd64 2.9.13+dfsg-1ubuntu0.8 amd64 GNOME XML library +ii libxml2:amd64 2.9.13+dfsg-1ubuntu0.9 amd64 GNOME XML library ii libxtables12:amd64 1.8.7-1ubuntu5.2 amd64 netfilter xtables library ii libxxhash0:amd64 0.8.1-1 amd64 shared library for xxhash ii libyajl2:amd64 2.1.0-3ubuntu0.22.04.1 amd64 Yet Another JSON Library diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 780f7c0e45f2..f4c1351c2206 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.48" + Version = "v0.0.48-1759142394-21660" // SHA of the kic base image - baseImageSHA = "7171c97a51623558720f8e5878e4f4637da093e2f2ed589997bedc6c1549b2b1" + baseImageSHA = "6963bcb99ea82b6c80378b031771e52976ee24798da7f4de40059f384730d088" // 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 ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 3efdd4b75ec3..bbf7fb933da6 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:v0.0.48@sha256:7171c97a51623558720f8e5878e4f4637da093e2f2ed589997bedc6c1549b2b1") + --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-1759142394-21660@sha256:6963bcb99ea82b6c80378b031771e52976ee24798da7f4de40059f384730d088") --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)