Skip to content

Commit 9d8f660

Browse files
authored
Merge pull request kubernetes#23516 from minikube-bot/auto_bump_buildkit_version-575943e
Kicbase/ISO: Update buildkit from v0.31.1 to v0.32.2
2 parents 575943e + 768f2b1 commit 9d8f660

9 files changed

Lines changed: 12 additions & 10 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
2424
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
2525

2626
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
27-
ISO_VERSION ?= v1.38.0-1786781750-23491
27+
ISO_VERSION ?= v1.38.0-1787134750-23516
2828

2929
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
3030
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ sha256 484a725519bd15a3b3d1f84c2dfc37749af6f06bc6c40d83395312e4d1fb18f1 buildki
1818
sha256 a98829f1b1b9ec596eb424dd03f03b9c7b596edac83e6700adf83ba0cb0d5f80 buildkit-v0.26.3.linux-arm64.tar.gz
1919
sha256 99a279e30be2947294eece98d82d1461fcfdc47da59514cb85252bb5ef414801 buildkit-v0.29.0.linux-arm64.tar.gz
2020
sha256 a4c9bef205f61c1e4253bdfd196e1db303aca25e8756105d75c6fddfbab7903f buildkit-v0.31.1.linux-arm64.tar.gz
21+
sha256 9e8f46bf309ec0ab262967be5538a4dbe06be756a82621f98253933bac5dcf92 buildkit-v0.32.2.linux-arm64.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
BUILDKIT_BIN_AARCH64_VERSION = v0.31.1
8-
BUILDKIT_BIN_AARCH64_COMMIT = 673b7e0196de0cac83308274b88aaed97a91af74
7+
BUILDKIT_BIN_AARCH64_VERSION = v0.32.2
8+
BUILDKIT_BIN_AARCH64_COMMIT = 991535e0973488b6a429096d21fa13f81f2d89d8
99
BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION)
1010
BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz
1111

deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ sha256 02b986569330f09dc837486f80d9818812aba1ac8bd892b337adeb56eafe3794 buildki
2222
sha256 249ae16ba4be59fadb51a49ff4d632bbf37200e2b6e187fa8574f0f1bce8166b buildkit-v0.26.3.linux-amd64.tar.gz
2323
sha256 ab8d93c72253b450f34a43e1c480abc52380f4aec3a8a395aebf09489efef7a0 buildkit-v0.29.0.linux-amd64.tar.gz
2424
sha256 1fc78750d0c96bdc18799a3c0b551d6807bd4939e8cd79e357823e467451e16e buildkit-v0.31.1.linux-amd64.tar.gz
25+
sha256 2975d0f651ad96ba8b80b9992ae1f9a964f4408569af5b6dc36544165c3926af buildkit-v0.32.2.linux-amd64.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
BUILDKIT_BIN_VERSION = v0.31.1
8-
BUILDKIT_BIN_COMMIT = 673b7e0196de0cac83308274b88aaed97a91af74
7+
BUILDKIT_BIN_VERSION = v0.32.2
8+
BUILDKIT_BIN_COMMIT = 991535e0973488b6a429096d21fa13f81f2d89d8
99
BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
1010
BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
1111

deploy/kicbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ARG KICBASE_IMAGE="debian:bookworm-20260713-slim"
2323
# for a kubernetes node image, it doesn't contain much we don't need.
2424
FROM ${KICBASE_IMAGE} AS kicbase
2525

26-
ARG BUILDKIT_VERSION="v0.31.1"
26+
ARG BUILDKIT_VERSION="v0.32.2"
2727
ARG CRIO_VERSION="v1.35"
2828
ARG CRICTL_VERSION="v1.35.0"
2929
ARG CRI_DOCKERD_VERSION="v0.4.3"

pkg/drivers/kic/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.50-1786781261-23491"
27+
Version = "v0.0.50-1787134061-23516"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "4485feedea3eea01f18131bb2a788065ad07cce96ce47ec742a11308225e2bca"
30+
baseImageSHA = "ad915173564dafc80f319101ab6082c6779bda10dec9b8460494c9a2917ddab9"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

pkg/minikube/download/iso.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const fileScheme = "file"
4141
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4242
func DefaultISOURLs() []string {
4343
v := version.GetISOVersion()
44-
isoBucket := "minikube-builds/iso/23491"
44+
isoBucket := "minikube-builds/iso/23516"
4545

4646
return []string{
4747
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

site/content/en/docs/commands/start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--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-1786781261-23491@sha256:4485feedea3eea01f18131bb2a788065ad07cce96ce47ec742a11308225e2bca")
30+
--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-1787134061-23516@sha256:ad915173564dafc80f319101ab6082c6779bda10dec9b8460494c9a2917ddab9")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)