Skip to content

Commit 0142445

Browse files
authored
Merge pull request #19452 from minikube-bot/auto_bump_buildkit_version-950bd4d
Kicbase/ISO: Update buildkit from v0.15.1 to v0.15.2
2 parents b0c504b + 667295c commit 0142445

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

Makefile

+1-1
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.33.1-1723650137-19443
27+
ISO_VERSION ?= v1.33.1-1723740674-19452
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

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ sha256 bcc4cb4fec79847682fbb2ce8f612e5e854636ae6c262cee4b657d2b5c2fd46c buildki
1212
sha256 e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildkit-v0.14.1.linux-arm64.tar.gz
1313
sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildkit-v0.15.0.linux-arm64.tar.gz
1414
sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz
15+
sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
BUILDKIT_BIN_AARCH64_VERSION = v0.15.1
8-
BUILDKIT_BIN_AARCH64_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8
7+
BUILDKIT_BIN_AARCH64_VERSION = v0.15.2
8+
BUILDKIT_BIN_AARCH64_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e
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

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ sha256 9cd121931b015f05d7e4337f08272e36a83f69724c40141947eb11246ca0bb9d buildki
1616
sha256 836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildkit-v0.14.1.linux-amd64.tar.gz
1717
sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildkit-v0.15.0.linux-amd64.tar.gz
1818
sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz
19+
sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
BUILDKIT_BIN_VERSION = v0.15.1
8-
BUILDKIT_BIN_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8
7+
BUILDKIT_BIN_VERSION = v0.15.2
8+
BUILDKIT_BIN_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui
4141
# for a kubernetes node image, it doesn't contain much we don't need
4242
FROM ${UBUNTU_JAMMY_IMAGE} as kicbase
4343

44-
ARG BUILDKIT_VERSION="v0.15.1"
44+
ARG BUILDKIT_VERSION="v0.15.2"
4545
ARG CRIO_VERSION="1.24"
4646
ARG CRI_DOCKERD_VERSION="v0.3.15"
4747
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"

pkg/drivers/kic/types.go

+2-2
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.44-1723650208-19443"
27+
Version = "v0.0.44-1723740748-19452"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002"
30+
baseImageSHA = "2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d"
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

+1-1
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/19443"
44+
isoBucket := "minikube-builds/iso/19452"
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

+1-1
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.44-1723650208-19443@sha256:2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002")
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.44-1723740748-19452@sha256:2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d")
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)