diff --git a/Makefile b/Makefile index 1ac28d6bd556..bfb6f633db07 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.38.0 +ISO_VERSION ?= v1.38.0-1776768147-22868 # 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/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 0bd7dfaf1193..5f913589ceb8 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -30,3 +30,4 @@ sha256 1ae11980477b789732915dfd7ba4246f5babe5ff76a31021d36365007d9713b0 v1.2.5.t sha256 19b280702341f33ff353fa254d1dbdb67f6aab2c74395f6d651a17524f68e752 v1.2.6.tar.gz sha256 3262492ce42bea0919ee1a2d000b6f303fd14877295bc38d094876b55fdd448b v1.3.0.tar.gz sha256 94d566d8b017d6cdffc684560a4f069bb87f86534976c41d768711c85e194884 v1.4.0.tar.gz +sha256 9e1dcd513e28fac99e7b47fec38ce4f1969a9a9693b80619e9009286e2d0d584 v1.4.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 2753b90e4e3f..e69f50b93494 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUNC_MASTER_VERSION = v1.4.0 -RUNC_MASTER_COMMIT = 8bd78a9977e604c4d5f67a7415d7b8b8c109cdc4 +RUNC_MASTER_VERSION = v1.4.2 +RUNC_MASTER_COMMIT = c241c0bb5e60a8e8c1b2e53d4eca8d0068d8d57e RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index d07645537bf8..e113fe793bd2 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -8,18 +8,18 @@ ii apt 2.6.1 amd64 ii base-files 12.4+deb12u13 amd64 Debian base system miscellaneous files ii base-passwd 3.6.1 amd64 Debian base system master password and group files ii bash 5.2.15-2+b10 amd64 GNU Bourne Again SHell -ii bind9-dnsutils 1:9.18.44-1~deb12u1 amd64 Clients provided with BIND 9 -ii bind9-host 1:9.18.44-1~deb12u1 amd64 DNS Lookup Utility -ii bind9-libs:amd64 1:9.18.44-1~deb12u1 amd64 Shared Libraries used by BIND 9 +ii bind9-dnsutils 1:9.18.47-1~deb12u1 amd64 Clients provided with BIND 9 +ii bind9-host 1:9.18.47-1~deb12u1 amd64 DNS Lookup Utility +ii bind9-libs:amd64 1:9.18.47-1~deb12u1 amd64 Shared Libraries used by BIND 9 ii bsdutils 1:2.38.1-5+deb12u3 amd64 basic utilities from 4.4BSD-Lite ii ca-certificates 20230311+deb12u1 all Common CA certificates 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 2.2.1-1~debian.12~bookworm amd64 An open and reliable container runtime +ii containerd.io 2.2.3-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.35.0-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface +ii cri-o 1.35.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 @@ -34,10 +34,10 @@ ii debianutils 5.7-0.5~deb12u1 amd64 ii diffutils 1:3.8-4 amd64 File comparison utilities ii dirmngr 2.2.40-1.1+deb12u2 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.44-1~deb12u1 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.31.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. -ii docker-ce 5:29.2.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:29.2.1-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine +ii dnsutils 1:9.18.47-1~deb12u1 all Transitional package for bind9-dnsutils +ii docker-buildx-plugin 0.33.0-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. +ii docker-ce 5:29.4.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:29.4.1-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 @@ -141,8 +141,8 @@ ii libnftnl11:amd64 1.2.4-2 amd64 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 ii libnsl2:amd64 1.3.0-2 amd64 Public client interface for NIS(YP) and NIS+ -ii libnvidia-container-tools 1.18.2-1 amd64 NVIDIA container runtime library (command-line tools) -ii libnvidia-container1:amd64 1.18.2-1 amd64 NVIDIA container runtime library +ii libnvidia-container-tools 1.19.0-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.19.0-1 amd64 NVIDIA container runtime library ii libp11-kit0:amd64 0.24.1-2 amd64 library for loading and coordinating access to PKCS#11 modules - runtime ii libpam-modules:amd64 1.5.2-6+deb12u2 amd64 Pluggable Authentication Modules for PAM ii libpam-modules-bin 1.5.2-6+deb12u2 amd64 Pluggable Authentication Modules for PAM - helper binaries @@ -169,7 +169,7 @@ ii libsmartcols1:amd64 2.38.1-5+deb12u3 amd64 ii libsqlite3-0:amd64 3.40.1-2+deb12u2 amd64 SQLite 3 shared library ii libss2:amd64 1.47.0-2+b2 amd64 command-line interface parsing library ii libssh2-1:amd64 1.10.0-3+b1 amd64 SSH2 client-side library -ii libssl3:amd64 3.0.18-1~deb12u2 amd64 Secure Sockets Layer toolkit - shared libraries +ii libssl3:amd64 3.0.19-1~deb12u2 amd64 Secure Sockets Layer toolkit - shared libraries ii libstdc++6:amd64 12.2.0-14+deb12u1 amd64 GNU Standard C++ Library v3 ii libsubid4:amd64 1:4.13+dfsg1-1+deb12u2 amd64 subordinate id handling library -- shared library ii libsystemd-shared:amd64 252.39-1~deb12u1 amd64 systemd shared private library @@ -200,12 +200,12 @@ ii netbase 6.4 all 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.2-1 amd64 NVIDIA Container toolkit -ii nvidia-container-toolkit-base 1.18.2-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 -ii openssh-server 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) server, for secure access from remote machines -ii openssh-sftp-server 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines -ii openssl 3.0.18-1~deb12u2 amd64 Secure Sockets Layer toolkit - cryptographic utility +ii nvidia-container-toolkit 1.19.0-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.19.0-1 amd64 NVIDIA Container Toolkit Base +ii openssh-client 1:9.2p1-2+deb12u9 amd64 secure shell (SSH) client, for secure access to remote machines +ii openssh-server 1:9.2p1-2+deb12u9 amd64 secure shell (SSH) server, for secure access from remote machines +ii openssh-sftp-server 1:9.2p1-2+deb12u9 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines +ii openssl 3.0.19-1~deb12u2 amd64 Secure Sockets Layer toolkit - cryptographic utility ii passwd 1:4.13+dfsg1-1+deb12u2 amd64 change and administer password and group data ii perl-base 5.36.0-7+deb12u3 amd64 minimal Perl system ii pigz 2.6-1 amd64 Parallel Implementation of GZip diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 4f393e2c3bbe..a8757e361c41 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.50-1772266598-22719" + Version = "v0.0.50-1776768222-22868" // SHA of the kic base image - baseImageSHA = "9a1ee811971b9b5e9be1b04408ba2b2ce6fd696483ebc1d8085aa2f1561f1ead" + baseImageSHA = "c30fea6430389da10f3586b664823fb0ac53e94fe2f88104b4d2a2c4d6b08274" // 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 09b858c2a2b4..adec5e3fa656 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/iso" + isoBucket := "minikube-builds/iso/22868" 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 c6609ea7a36d..6a889ee01d4e 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.50-1772266598-22719@sha256:9a1ee811971b9b5e9be1b04408ba2b2ce6fd696483ebc1d8085aa2f1561f1ead") + --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.50-1776768222-22868@sha256:c30fea6430389da10f3586b664823fb0ac53e94fe2f88104b4d2a2c4d6b08274") --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)