diff --git a/Makefile b/Makefile index 5922c1feb49a..197c19b85ae6 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-1763408543-21899 +ISO_VERSION ?= v1.37.0-1763558875-21925 # 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/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index fb22c9f77e93..b1268fcc6875 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -17,3 +17,4 @@ sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.1 sha256 f37ae4936832a4bde31d50028307e83bcc7af80f2d36779f4ac7c79cdfe682b0 crun-1.19.tar.gz sha256 cc80e3079daffb740d5f586b4a0269567c0961bc8321487fe7a3c2f13a178866 crun-1.23.tar.gz sha256 d752b7cee413d2cb9463cb6995fd50801a0a1574507ebfb550ea9f26d07743f8 crun-1.23.1.tar.gz +sha256 597c211270d8cfc6ae6c184cf1a68fc5e76f1170fa28de4b19a7d3294bddd4c3 crun-1.25.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 360262bcadc5..536ea0e632a7 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.23.1 -CRUN_LATEST_COMMIT = d20b23dba05e822b93b82f2f34fd5dada433e0c2 +CRUN_LATEST_VERSION = 1.25 +CRUN_LATEST_COMMIT = d9a0adce065c7747ab88ea6ccc42b15a626e08e1 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 18358d202273..45838e1776a2 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -16,10 +16,10 @@ ii ca-certificates 20230311+deb12u1 all ii catatonit 0.1.7-1+b2 amd64 init process for containers ii conmon 2.1.6+ds1-1 amd64 OCI container runtime monitor ii conntrack 1:1.4.7-1+b2 amd64 Program to modify the conntrack tables -ii containerd.io 1.7.28-1~debian.12~bookworm amd64 An open and reliable container runtime +ii containerd.io 2.1.5-1~debian.12~bookworm amd64 An open and reliable container runtime ii containernetworking-plugins 1.1.1+ds1-3+b5 amd64 standard networking plugins - binaries ii coreutils 9.1-1 amd64 GNU core utilities -ii cri-o 1.34.1-1.2 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface +ii cri-o 1.34.2-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface ii crun 1.8.1-1+deb12u1 amd64 lightweight OCI runtime for running containers ii curl 7.88.1-10+deb12u14 amd64 command line tool for transferring data with URL syntax ii dash 0.5.12-2 amd64 POSIX-compliant shell @@ -35,9 +35,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.41-1~deb12u1 all Transitional package for bind9-dnsutils -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.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:28.5.1-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine +ii docker-buildx-plugin 0.30.0-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. +ii docker-ce 5:29.0.2-1~debian.12~bookworm amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:29.0.2-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 @@ -114,6 +114,7 @@ ii libicu72:amd64 72.1-3+deb12u1 amd64 ii libidn2-0:amd64 2.3.3-1+b1 amd64 Internationalized domain names (IDNA2008/TR46) library ii libip4tc2:amd64 1.8.9-2 amd64 netfilter libip4tc library ii libip6tc2:amd64 1.8.9-2 amd64 netfilter libip6tc library +ii libjansson4:amd64 2.14-2 amd64 C library for encoding, decoding and manipulating JSON data ii libjemalloc2:amd64 5.3.0-1 amd64 general-purpose scalable concurrent malloc(3) implementation ii libjson-c5:amd64 0.16-2 amd64 JSON manipulation library - shared library ii libk5crypto3:amd64 1.20.1-2+deb12u4 amd64 MIT Kerberos runtime libraries - Crypto Library @@ -135,6 +136,7 @@ ii libnetfilter-conntrack3:amd64 1.0.9-3 amd64 ii libnettle8:amd64 3.8.1-2 amd64 low level cryptographic library (symmetric and one-way cryptos) ii libnfnetlink0:amd64 1.0.2-2 amd64 Netfilter netlink library ii libnfsidmap1:amd64 1:2.6.2-4+deb12u1 amd64 NFS idmapping library +ii libnftables1:amd64 1.0.6-2+deb12u2 amd64 Netfilter nftables high level userspace API library ii libnftnl11:amd64 1.2.4-2 amd64 Netfilter nftables userspace API library ii libnghttp2-14:amd64 1.52.0-1+deb12u2 amd64 library implementing HTTP/2 protocol (shared library) ii libnpth0:amd64 1.6-3 amd64 replacement for GNU Pth using system threads @@ -197,6 +199,7 @@ ii ncurses-bin 6.4-4 amd64 ii netbase 6.4 all Basic TCP/IP networking system ii netcat-openbsd 1.219-1 amd64 TCP/IP swiss army knife ii nfs-common 1:2.6.2-4+deb12u1 amd64 NFS support files common to client and server +ii nftables 1.0.6-2+deb12u2 amd64 Program to control packet filtering rules by Netfilter project ii nvidia-container-toolkit 1.18.0-1 amd64 NVIDIA Container toolkit ii nvidia-container-toolkit-base 1.18.0-1 amd64 NVIDIA Container Toolkit Base ii openssh-client 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) client, for secure access to remote machines diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 41a8916e568f..1d930b83becb 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-1761985721-21837" + Version = "v0.0.48-1763548087-21925" // SHA of the kic base image - baseImageSHA = "a50b37e97dfdea51156e079ca6b45818a801b3d41bbe13d141f35d2e1af6c7d1" + baseImageSHA = "fa20bded434abb44a219435322658023b0fdab9197fda9499736df7196bcbeba" // 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 index 197c01c88324..91f0f0b2f083 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/21899" + isoBucket := "minikube-builds/iso/21925" 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 index 587f62c0fcc6..0fbd056c769e 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-1761985721-21837@sha256:a50b37e97dfdea51156e079ca6b45818a801b3d41bbe13d141f35d2e1af6c7d1") + --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-1763548087-21925@sha256:fa20bded434abb44a219435322658023b0fdab9197fda9499736df7196bcbeba") --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)