diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index b94cde66bb84..99c4d5d65853 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -40,3 +40,4 @@ sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20. sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz +sha256 8c409f8a0ba6015cb365a95e039a0fc9f3663c891a26eb52c0fb8cd291ba75d4 v2.1.4.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index 640a26801220..9de54b007852 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.23 -CONTAINERD_BIN_AARCH64_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27 +CONTAINERD_BIN_AARCH64_VERSION = v2.1.4 +CONTAINERD_BIN_AARCH64_COMMIT = 75cb2b7193e4e490e9fbdc236c0e811ccaba3376 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index b94cde66bb84..99c4d5d65853 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -40,3 +40,4 @@ sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20. sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz +sha256 8c409f8a0ba6015cb365a95e039a0fc9f3663c891a26eb52c0fb8cd291ba75d4 v2.1.4.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 5b87bac39868..d68a359323ae 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.23 -CONTAINERD_BIN_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27 +CONTAINERD_BIN_VERSION = v2.1.4 +CONTAINERD_BIN_COMMIT = 75cb2b7193e4e490e9fbdc236c0e811ccaba3376 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index a09d9146bfff..fcaaf1b7c0e5 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -31,9 +31,9 @@ ii diffutils 1:3.8-4 amd64 ii dirmngr 2.2.40-1.1+deb12u1 amd64 GNU privacy guard - network certificate management service ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library ii dnsutils 1:9.18.33-1~deb12u2 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.29.0-0~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. -ii docker-ce 5:28.4.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:28.4.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine +ii docker-buildx-plugin 0.29.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. +ii docker-ce 5:28.5.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:28.5.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.22 amd64 Debian package management system ii e2fsprogs 1.47.0-2+b2 amd64 ext2/ext3/ext4 file system utilities ii ebtables 2.0.11-5 amd64 Ethernet bridge frame table administration diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 503b0a9e3311..1d5c401c0a44 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-1759382731-21643" + Version = "v0.0.48-1759747846-21705" // SHA of the kic base image - baseImageSHA = "ca1b4db171879edd6bbb9546a4b1afac2eb5be94a0f5528496e62d2ff99de37d" + baseImageSHA = "8ce4c184bd7762be846591716ed1472b37189ced4b34924ab8cc7cc58168e24a" // 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 6b1143a8ff1d..c0f35cd4fe63 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-1759382731-21643@sha256:ca1b4db171879edd6bbb9546a4b1afac2eb5be94a0f5528496e62d2ff99de37d") + --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-1759747846-21705@sha256:8ce4c184bd7762be846591716ed1472b37189ced4b34924ab8cc7cc58168e24a") --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)