Skip to content

Kicbase/ISO: Update buildkit from v0.15.0 to v0.15.1 #19355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.33.1-1722248113-19339
ISO_VERSION ?= v1.33.1-1722420371-19355

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ sha256 9e1478af43ba7ac6635cae30a8dda3ebce4dca70a8def939ac64ee395d03d647 buildki
sha256 bcc4cb4fec79847682fbb2ce8f612e5e854636ae6c262cee4b657d2b5c2fd46c buildkit-v0.13.2.linux-arm64.tar.gz
sha256 e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildkit-v0.14.1.linux-arm64.tar.gz
sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildkit-v0.15.0.linux-arm64.tar.gz
sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

BUILDKIT_BIN_AARCH64_VERSION = v0.15.0
BUILDKIT_BIN_AARCH64_COMMIT = e83d79a51fb49aeb921d8a2348ae14a58701c98c
BUILDKIT_BIN_AARCH64_VERSION = v0.15.1
BUILDKIT_BIN_AARCH64_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8
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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ sha256 5d4a6ef438851d7a0b22d17c7e806651c24c0982ddd6af8c02117fca84f167ec buildki
sha256 9cd121931b015f05d7e4337f08272e36a83f69724c40141947eb11246ca0bb9d buildkit-v0.13.2.linux-amd64.tar.gz
sha256 836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildkit-v0.14.1.linux-amd64.tar.gz
sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildkit-v0.15.0.linux-amd64.tar.gz
sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

BUILDKIT_BIN_VERSION = v0.15.0
BUILDKIT_BIN_COMMIT = e83d79a51fb49aeb921d8a2348ae14a58701c98c
BUILDKIT_BIN_VERSION = v0.15.1
BUILDKIT_BIN_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8
BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion deploy/kicbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.0"
ARG BUILDKIT_VERSION="v0.15.1"
ARG CRIO_VERSION="1.24"
ARG CRI_DOCKERD_VERSION="v0.3.15"
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/19339"
isoBucket := "minikube-builds/iso/19355"

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