Skip to content
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

Kicbase/ISO: Update buildkit from v0.16.0 to v0.17.1 #19980

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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.34.0-1730913550-19917
ISO_VERSION ?= v1.34.0-1732097167-19980

# 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 @@ -14,3 +14,4 @@ sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildki
sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz
sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz
sha256 1b70bb7955ddda66537d4bf9aa540e79e79e19aa989901613da58f5f133a53ef buildkit-v0.16.0.linux-arm64.tar.gz
sha256 e232060d7782938e7c3d23c247a438e571f96fd197279c6b021a7f81deae45eb buildkit-v0.17.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.16.0
BUILDKIT_BIN_AARCH64_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d
BUILDKIT_BIN_AARCH64_VERSION = v0.17.1
BUILDKIT_BIN_AARCH64_COMMIT = 8b1b83ef4947c03062cdcdb40c69989d8fe3fd04
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 @@ -18,3 +18,4 @@ sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildki
sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz
sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz
sha256 a07a01da821d39bdb6e03a2f98ee407bb861cc61ece2e69e2ea4d61b3a4ab7f1 buildkit-v0.16.0.linux-amd64.tar.gz
sha256 9352f7362045f4ae5eae55b41f8f30375d35a37f6a5931e2542916c92c3d00f9 buildkit-v0.17.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.16.0
BUILDKIT_BIN_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d
BUILDKIT_BIN_VERSION = v0.17.1
BUILDKIT_BIN_COMMIT = 8b1b83ef4947c03062cdcdb40c69989d8fe3fd04
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.16.0"
ARG BUILDKIT_VERSION="v0.17.1"
ARG CRIO_VERSION="1.24"
ARG CRI_DOCKERD_VERSION="v0.3.15"
ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
Expand Down
34 changes: 17 additions & 17 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ ii ca-certificates 20240203~22.04.1 all
ii catatonit 0.1.7-1 amd64 init process for containers
ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor
ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables
ii containerd.io 1.7.22-1 amd64 An open and reliable container runtime
ii containernetworking-plugins 0.9.1+ds1-1 amd64 standard networking plugins - binaries
ii containerd.io 1.7.23-1 amd64 An open and reliable container runtime
ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.1 amd64 standard networking plugins - binaries
ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities
ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface.
ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime
ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images.
ii criu 4.0-3 amd64 checkpoint and restore in userspace
ii crun 100:1.2-2 amd64 OCI runtime written in C
ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax
ii curl 7.81.0-1ubuntu1.19 amd64 command line tool for transferring data with URL syntax
ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell
ii debconf 1.5.79ubuntu1 all Debian configuration management system
ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian
Expand Down Expand Up @@ -83,7 +83,7 @@ ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd6
ii libcom-err2:amd64 1.46.5-2ubuntu1.2 amd64 common error description library
ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library
ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library
ii libcurl4:amd64 7.81.0-1ubuntu1.18 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour)
ii libcurl4:amd64 7.81.0-1ubuntu1.19 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour)
ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime]
ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library)
ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library
Expand All @@ -96,7 +96,7 @@ ii libffi8:amd64 3.4.2-4 amd6
ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects
ii libgcc-s1:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC support library
ii libgcrypt20:amd64 1.9.4-3ubuntu3 amd64 LGPL Crypto library - runtime library
ii libglib2.0-0:amd64 2.72.4-0ubuntu2.3 amd64 GLib library of C routines
ii libglib2.0-0:amd64 2.72.4-0ubuntu2.4 amd64 GLib library of C routines
ii libgmp10:amd64 2:6.2.1+dfsg-3ubuntu1 amd64 Multiprecision arithmetic library
ii libgnutls30:amd64 3.7.3-4ubuntu1.5 amd64 GNU TLS library - main runtime library
ii libgpg-error0:amd64 1.43-3 amd64 GnuPG development runtime library
Expand Down Expand Up @@ -137,8 +137,8 @@ ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd6
ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets
ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads
ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+
ii libnvidia-container-tools 1.17.0-1 amd64 NVIDIA container runtime library (command-line tools)
ii libnvidia-container1:amd64 1.17.0-1 amd64 NVIDIA container runtime library
ii libnvidia-container-tools 1.17.2-1 amd64 NVIDIA container runtime library (command-line tools)
ii libnvidia-container1:amd64 1.17.2-1 amd64 NVIDIA container runtime library
ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime
ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM
ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries
Expand All @@ -152,8 +152,8 @@ ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd6
ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library
ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries)
ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version)
ii libpython3.10-minimal:amd64 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10)
ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (standard library, version 3.10)
ii libpython3.10-minimal:amd64 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10)
ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (standard library, version 3.10)
ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries
ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library)
ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library
Expand Down Expand Up @@ -196,8 +196,8 @@ ii ncurses-bin 6.3-2ubuntu0.1 amd6
ii netbase 6.3 all Basic TCP/IP networking system
ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife
ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server
ii nvidia-container-toolkit 1.17.0-1 amd64 NVIDIA Container toolkit
ii nvidia-container-toolkit-base 1.17.0-1 amd64 NVIDIA Container Toolkit Base
ii nvidia-container-toolkit 1.17.2-1 amd64 NVIDIA Container toolkit
ii nvidia-container-toolkit-base 1.17.2-1 amd64 NVIDIA Container Toolkit Base
ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines
ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines
ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines
Expand All @@ -206,15 +206,15 @@ ii passwd 1:4.8.1-2ubuntu2.2 amd6
ii perl-base 5.34.0-3ubuntu1.3 amd64 minimal Perl system
ii pigz 2.6-1 amd64 Parallel Implementation of GZip
ii pinentry-curses 1.1.1-1build2 amd64 curses-based PIN or pass-phrase entry dialog for GnuPG
ii podman 3.4.4+ds1-1ubuntu1.22.04.2 amd64 engine to run OCI-based containers in Pods
ii podman 3.4.4+ds1-1ubuntu1.22.04.3 amd64 engine to run OCI-based containers in Pods
ii procps 2:3.3.17-6ubuntu2.1 amd64 /proc file system utilities
ii python3 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version)
ii python3-minimal 3.10.6-1~22.04.1 amd64 minimal subset of the Python language (default python3 version)
ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources
ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers
ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface)
ii python3.10 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (version 3.10)
ii python3.10-minimal 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10)
ii python3.10 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (version 3.10)
ii python3.10-minimal 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10)
ii readline-common 8.1.2-1 all GNU readline and history libraries, common files
ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses
ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool
Expand All @@ -231,7 +231,7 @@ ii ucf 3.0043 all
ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon
ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme
ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities
ii vim-common 2:8.2.3995-1ubuntu2.19 all Vi IMproved - Common files
ii vim-tiny 2:8.2.3995-1ubuntu2.19 amd64 Vi IMproved - enhanced vi editor - compact version
ii xxd 2:8.2.3995-1ubuntu2.19 amd64 tool to make (or reverse) a hex dump
ii vim-common 2:8.2.3995-1ubuntu2.20 all Vi IMproved - Common files
ii vim-tiny 2:8.2.3995-1ubuntu2.20 amd64 Vi IMproved - enhanced vi editor - compact version
ii xxd 2:8.2.3995-1ubuntu2.20 amd64 tool to make (or reverse) a hex dump
ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.45-1730888964-19917"
Version = "v0.0.45-1732097245-19980"

// SHA of the kic base image
baseImageSHA = "629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615"
baseImageSHA = "e1309d0fb60059ceeb85d49d6460fc542f2bafe5c9bd19081ecc956e44f6136f"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
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/19917"
isoBucket := "minikube-builds/iso/19980"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.45-1730888964-19917@sha256:629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615")
--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.45-1732097245-19980@sha256:e1309d0fb60059ceeb85d49d6460fc542f2bafe5c9bd19081ecc956e44f6136f")
--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)
Expand Down