Skip to content

Commit 0ebdda9

Browse files
authored
Merge pull request #17738 from minikube-bot/auto_bump_buildkit_version-c56894f
Kicbase/ISO: Update buildkit from v0.12.3 to v0.12.4
2 parents c73f5f4 + 8768890 commit 0ebdda9

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
2323
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
2424

2525
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
26-
ISO_VERSION ?= v1.32.1-1701788780-17711
26+
ISO_VERSION ?= v1.32.1-1701996673-17738
2727

2828
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2929
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
@@ -5,3 +5,4 @@ sha256 252408105ef1c2256980a105f727912603a831d6c57d3243b5d4cbb25fafb1b1 buildki
55
sha256 82b7452ffea166d3ef445597f9dbe3fa57c4d651e51ca7a9a581199116905524 buildkit-v0.11.6.linux-arm64.tar.gz
66
sha256 78846e12435f00e0ee5b9ca0af28ec78691fa712ebe7d2c799ec8a074c791969 buildkit-v0.12.2.linux-arm64.tar.gz
77
sha256 a6809c7983834f5a4dd3a92a421a9ff9a306e774ce2866d53636e8d5a3f2e82b buildkit-v0.12.3.linux-arm64.tar.gz
8+
sha256 9166eeaff11721122b9398d6385c7b73d6e4df86797e537c16ac6b6d05eab899 buildkit-v0.12.4.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.12.3
8-
BUILDKIT_BIN_AARCH64_COMMIT = 438f47256f0decd64cc96084e22d3357da494c27
7+
BUILDKIT_BIN_AARCH64_VERSION = v0.12.4
8+
BUILDKIT_BIN_AARCH64_COMMIT = 833949d0f7908608b00ab6b93b8f92bdb147fcca
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
@@ -9,3 +9,4 @@ sha256 6de87c88b1da0b1e899371dd4c0b883581401e2ddfb21a065510eeb3a8ac8743 buildki
99
sha256 3f66f5bfbe509aadf1c21a26acfa472fe4c19046aa00a2d59b99733da867cd76 buildkit-v0.11.6.linux-amd64.tar.gz
1010
sha256 c856bb4e6584d75ca6b2a7b6e946b7b14628e82bf1eccb4a43bc731bbc8e67ea buildkit-v0.12.2.linux-amd64.tar.gz
1111
sha256 01682ab9e8e7cada519396b5f7b72c964c0c30da0c2eb7ee46caf30622717fa1 buildkit-v0.12.3.linux-amd64.tar.gz
12+
sha256 75ffe406e4284b77af35447d829767cfa935eb7dd2ea2e3407223d6885bd8ebd buildkit-v0.12.4.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.12.3
8-
BUILDKIT_BIN_COMMIT = 438f47256f0decd64cc96084e22d3357da494c27
7+
BUILDKIT_BIN_VERSION = v0.12.4
8+
BUILDKIT_BIN_COMMIT = 833949d0f7908608b00ab6b93b8f92bdb147fcca
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
@@ -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.12.3"
44+
ARG BUILDKIT_VERSION="v0.12.4"
4545
ARG CRIO_VERSION="1.24"
4646
ARG CRI_DOCKERD_VERSION="v0.3.3"
4747
ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"

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.42-1701974066-17719"
27+
Version = "v0.0.42-1701996201-17738"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "cec630e7d143790c46e2dc54dbb8f39a22d8ede3e3c25e34638082e2c107a85c"
30+
baseImageSHA = "762cf4043ae4a952648fa2b64c30a2e88a4a1a052facb1120d8e17b35444edf0"
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/17711"
44+
isoBucket := "minikube-builds/iso/17738"
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). To disable, set to 0s (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.42-1701974066-17719@sha256:cec630e7d143790c46e2dc54dbb8f39a22d8ede3e3c25e34638082e2c107a85c")
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.42-1701996201-17738@sha256:762cf4043ae4a952648fa2b64c30a2e88a4a1a052facb1120d8e17b35444edf0")
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)