diff --git a/Makefile b/Makefile index e84d52e59e14..f5874190e463 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.34.0-1730109979-19872 +ISO_VERSION ?= v1.34.0-1730282777-19883 # 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 8d9349856899..c8c96fe9727d 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -12,3 +12,4 @@ sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.1 sha256 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 crun-1.16.tar.gz sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.16.1.tar.gz sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz +sha256 a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a crun-1.18.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 6c12e0573e9c..6b9ada8ecd64 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.17 -CRUN_LATEST_COMMIT = 000fa0d4eeed8938301f3bcf8206405315bc1017 +CRUN_LATEST_VERSION = 1.18 +CRUN_LATEST_COMMIT = 8656b2548509fcc69ea7e8823a870564360a57a1 # 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 501c41ad8e80..6030ba5d1011 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -22,7 +22,7 @@ ii coreutils 8.32-4.1ubuntu1.2 amd6 ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. -ii criu 4.0-2 amd64 checkpoint and restore in userspace +ii criu 4.0-3 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d475918f43e4..c5ab869fabe7 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.45-1730110049-19872" + Version = "v0.0.45-1730282848-19883" // SHA of the kic base image - baseImageSHA = "ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9" + baseImageSHA = "e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4" // 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 014ac2a5b713..22d269b13114 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/19872" + isoBucket := "minikube-builds/iso/19883" 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 c9acce01f09c..08f0ee2e5561 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.45-1730110049-19872@sha256:ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9") + --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.45-1730282848-19883@sha256:e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4") --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)