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.

Sign up for GitHub

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.11.4 to v0.11.6 #16426

Merged
merged 3 commits into from
May 5, 2023
Merged

Kicbase/ISO: Update buildkit from v0.11.4 to v0.11.6 #16426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b56a42
Kicbase/ISO: Update buildkit from v0.11.4 to v0.11.6
minikube-bot May 3, 2023
4084196
Updating kicbase image to v0.0.39-1683246328-16426
minikube-bot May 5, 2023
474c73a
Updating ISO to v1.30.1-1683246251-16426
minikube-bot May 5, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.30.1-1683022510-16417
ISO_VERSION ?= v1.30.1-1683246251-16426

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ sha256 0a834a749e86525e0eb16e7e80ce726e7c6a8e8d26fc5cc36c712305024da4e7 buildki
sha256 27e974e2b07e087f66f0c9c2b43b6f3df6f7e1746a6252580f164427337d668c buildkit-v0.10.3.linux-arm64.tar.gz
sha256 8a8c2274852ea4bac6ccf1862a46679e93c013de8c5c0434a3040bab2e0a42a7 buildkit-v0.11.2.linux-arm64.tar.gz
sha256 252408105ef1c2256980a105f727912603a831d6c57d3243b5d4cbb25fafb1b1 buildkit-v0.11.4.linux-arm64.tar.gz
sha256 82b7452ffea166d3ef445597f9dbe3fa57c4d651e51ca7a9a581199116905524 buildkit-v0.11.6.linux-arm64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

BUILDKIT_BIN_AARCH64_VERSION = v0.11.4
BUILDKIT_BIN_AARCH64_COMMIT = 3abd1ef0c195cdc078d1657cb50f62a2cdc26f8f
BUILDKIT_BIN_AARCH64_VERSION = v0.11.6
BUILDKIT_BIN_AARCH64_COMMIT = 2951a28cd7085eb18979b1f710678623d94ed578
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
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sha256 1b307268735c8f8e68b55781a6f4c03af38acc1bc29ba39ebaec6d422bccfb25 buildki
sha256 fbc9c433cf77c5c00db6f797155edc60b44463524ae59a4961699dca15bcee00 buildkit-v0.10.3.linux-amd64.tar.gz
sha256 6d0fe3f1ec2dce4ed2a5c9baf05fb279225b3b0e3bbee4092304fe284ca7fc47 buildkit-v0.11.2.linux-amd64.tar.gz
sha256 6de87c88b1da0b1e899371dd4c0b883581401e2ddfb21a065510eeb3a8ac8743 buildkit-v0.11.4.linux-amd64.tar.gz
sha256 3f66f5bfbe509aadf1c21a26acfa472fe4c19046aa00a2d59b99733da867cd76 buildkit-v0.11.6.linux-amd64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

BUILDKIT_BIN_VERSION = v0.11.4
BUILDKIT_BIN_COMMIT = 3abd1ef0c195cdc078d1657cb50f62a2cdc26f8f
BUILDKIT_BIN_VERSION = v0.11.6
BUILDKIT_BIN_COMMIT = 2951a28cd7085eb18979b1f710678623d94ed578
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
View file
Open in desktop
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_FOCAL_IMAGE} as kicbase

ARG BUILDKIT_VERSION="v0.11.4"
ARG BUILDKIT_VERSION="v0.11.6"
ARG FUSE_OVERLAYFS_VERSION="v1.7.1"
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3"
ARG CRIO_VERSION="1.24"
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Open in desktop
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.39-1683022590-16417"
Version = "v0.0.39-1683246328-16426"

// SHA of the kic base image
baseImageSHA = "8f1b46127412c0840a74bce90a38c80adf6a7ae539f7aa73e2b9e01e1b2ef80c"
baseImageSHA = "c063371f0e8933096fec0d2952100c31c4e17f2898a91dfbf036ee0048f9ee72"
// 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
View file
Open in desktop
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/16417"
isoBucket := "minikube-builds/iso/16426"

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ minikube start [flags]
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
--apiserver-port int The apiserver listening port (default 8443)
--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.39-1683022590-16417@sha256:8f1b46127412c0840a74bce90a38c80adf6a7ae539f7aa73e2b9e01e1b2ef80c")
--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.39-1683246328-16426@sha256:c063371f0e8933096fec0d2952100c31c4e17f2898a91dfbf036ee0048f9ee72")
--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