diff --git a/Makefile b/Makefile index af6197ac653d..56c826d44f2d 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.36.0-1753487480-21147 +ISO_VERSION ?= v1.36.0-1756894033-21482 # 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/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash index b24b60dd2b7d..cf75ec4dd5c6 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash @@ -15,3 +15,4 @@ sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildki sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz sha256 1b70bb7955ddda66537d4bf9aa540e79e79e19aa989901613da58f5f133a53ef buildkit-v0.16.0.linux-arm64.tar.gz sha256 484a725519bd15a3b3d1f84c2dfc37749af6f06bc6c40d83395312e4d1fb18f1 buildkit-v0.18.1.linux-arm64.tar.gz +sha256 6385ff70b2fb4134b50ac3183eea3a0b06c6f6129173940d73178ae0477368f1 buildkit-v0.23.2.linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk index 25593db28a56..f3d7d7160600 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_AARCH64_VERSION = v0.18.1 -BUILDKIT_BIN_AARCH64_COMMIT = eb68885955169461d72dc2b7e6d084100fcaba86 +BUILDKIT_BIN_AARCH64_VERSION = v0.23.2 +BUILDKIT_BIN_AARCH64_COMMIT = 40b2ede0ac0a37030f9959b4a28e9c6c8ea036e7 BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION) BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash index 55b13a66e2d7..b85ed89f94f4 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash @@ -19,3 +19,4 @@ sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildki sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz sha256 a07a01da821d39bdb6e03a2f98ee407bb861cc61ece2e69e2ea4d61b3a4ab7f1 buildkit-v0.16.0.linux-amd64.tar.gz sha256 02b986569330f09dc837486f80d9818812aba1ac8bd892b337adeb56eafe3794 buildkit-v0.18.1.linux-amd64.tar.gz +sha256 2771c3403e3a1f75a83cde387a05365794d3b900c355e864772a36c3ce541f82 buildkit-v0.23.2.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk index b0c395250abe..58a5e007c197 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.18.1 -BUILDKIT_BIN_COMMIT = eb68885955169461d72dc2b7e6d084100fcaba86 +BUILDKIT_BIN_VERSION = v0.23.2 +BUILDKIT_BIN_COMMIT = 40b2ede0ac0a37030f9959b4a28e9c6c8ea036e7 BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index e8da57d055ba..dce1e3c51570 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -ARG BUILDKIT_VERSION="v0.18.1" +ARG BUILDKIT_VERSION="v0.23.2" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.4.0" ARG CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb" diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 50a0ed7421ff..2c28f5afea88 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.47-1756116447-21413" + Version = "v0.0.47-1756894048-21482" // SHA of the kic base image - baseImageSHA = "0420dcb4b989a4f3e21680d5952b2239e0fcff16c7f6520d036ddb10d7c257d9" + baseImageSHA = "34ad21111108d570b5b7ee88189acbd263e89964fe5874f27c6e0d900a5b6033" // 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 e950c224b476..473d854dcda5 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/21147" + isoBucket := "minikube-builds/iso/21482" 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 d1cac427fe7d..0877172189c4 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.47-1756116447-21413@sha256:0420dcb4b989a4f3e21680d5952b2239e0fcff16c7f6520d036ddb10d7c257d9") + --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.47-1756894048-21482@sha256:34ad21111108d570b5b7ee88189acbd263e89964fe5874f27c6e0d900a5b6033") --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)