diff --git a/Makefile b/Makefile index 434f3fa13135..61220b48a384 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-1763503576-21924 +ISO_VERSION ?= v1.37.0-1764065720-21989 # 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 6b66ef2ee597..5c777f2a9388 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -29,3 +29,4 @@ sha256 b12ba86441c259225374640db1cbf915168a04d94e471ec936684df2f05423a0 v1.2.3.t sha256 1ae11980477b789732915dfd7ba4246f5babe5ff76a31021d36365007d9713b0 v1.2.5.tar.gz sha256 19b280702341f33ff353fa254d1dbdb67f6aab2c74395f6d651a17524f68e752 v1.2.6.tar.gz sha256 3262492ce42bea0919ee1a2d000b6f303fd14877295bc38d094876b55fdd448b v1.3.0.tar.gz +sha256 3da010af5c2c1c3d12d460255e4a7dc049c223ebc629c80fbbe4c10720997ffe v1.3.3.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 18690998ccff..9b4ecd3e57cd 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.3.0 -RUNC_MASTER_COMMIT = 4ca628d1d4c974f92d24daccb901aa078aad748e +RUNC_MASTER_VERSION = v1.3.3 +RUNC_MASTER_COMMIT = d842d7719497cc3b774fd71620278ac9e17710e0 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 45838e1776a2..c0110dbc9c4e 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -36,8 +36,8 @@ ii dirmngr 2.2.40-1.1+deb12u1 amd64 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.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 docker-ce 5:29.0.4-1~debian.12~bookworm amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:29.0.4-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 e88aa6c23fa1..8ed62efd06f2 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-1763789673-21948" + Version = "v0.0.48-1764065796-21989" // SHA of the kic base image - baseImageSHA = "bb10ebd3ca086eea12c038085866fb2f6cfa67385dcb830c4deb5e36ced6b53f" + baseImageSHA = "7610f3b95ecfe66733eb1e5af204e646541bd252f02cecb3c80844e2075263c6" // 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 77f5b22bdb24..bdc8a73dc1a5 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/21924" + isoBucket := "minikube-builds/iso/21989" 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 22bf7e4ba105..8168fd832346 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-1763789673-21948@sha256:bb10ebd3ca086eea12c038085866fb2f6cfa67385dcb830c4deb5e36ced6b53f") + --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-1764065796-21989@sha256:7610f3b95ecfe66733eb1e5af204e646541bd252f02cecb3c80844e2075263c6") --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) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 46f008998b40..2a30e393376d 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -736,7 +736,7 @@ makes sure no left over left after deleting a profile such as containers or volu makes sure paused clusters show up in minikube status correctly ## TestPreload -verifies the preload tarballs get pulled in properly by minikube +verifies that disabling the initial preload, pulling a specific image, and restarting the cluster preserves the image across restarts. ## TestScheduledStopWindows tests the schedule stop functionality on Windows