From 7155c538656ea1e880f5cafa85edc664cb2a3e3d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 10 Nov 2023 10:05:09 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update cri-o from v1.24.1 to v1.28.2 --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash index 14ed7e6fa8f0..2f652b2250e5 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -27,3 +27,4 @@ sha256 6e1c0e393cd16af907fabb24e4cc068e27c606c5f1071060d46efdcd29cb5c0d v1.22.1. sha256 34097a0f535aa79cf990aaee5d3ff6226663587b188cbee11089f120e7f869e4 v1.22.2.tar.gz sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.tar.gz sha256 5543b96b668e964a24d5fc4af9a0e51e4c571c4c4bec5f0cf2cfd5df76debd7f v1.24.1.tar.gz +sha256 998cea029c808fcc00e5ca2db37a798c7dd25abe74b424900b29fe2bd9f87250 v1.28.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 4bb1e240e701..2fae9547074f 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRIO_BIN_VERSION = v1.24.1 -CRIO_BIN_COMMIT = a3bbde8a77c323aa6a485da9a9046299155c6016 +CRIO_BIN_VERSION = v1.28.2 +CRIO_BIN_COMMIT = e7be4e160f3cc3810b3f6c9fbf225697d772a9ad CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz CRIO_BIN_DEPENDENCIES = host-go libgpgme diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 5ea8977b76ed..0441d548a9a1 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -42,7 +42,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui FROM ${UBUNTU_JAMMY_IMAGE} as kicbase ARG BUILDKIT_VERSION="v0.12.3" -ARG CRIO_VERSION="1.24" +ARG CRIO_VERSION="1.28" ARG CRI_DOCKERD_VERSION="v0.3.3" ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" ARG CNI_PLUGINS_VERSION="v1.3.0" From efc419ae1250b8907c5cd7c81e87b85c9117d9e7 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 10 Nov 2023 10:28:21 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.42-1699610847-17599 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index dbda423deee9..8bbc3aa6a0ca 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.42" + Version = "v0.0.42-1699610847-17599" // SHA of the kic base image - baseImageSHA = "d35ac07dfda971cabee05e0deca8aeac772f885a5348e1a0c0b0a36db20fcfc0" + baseImageSHA = "f050196e2e2eebd8599d84bd84eb9d28c53fd4bee43880bb43993a3ec1b7ab9b" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fc8188e5e86a..bb12f00180bd 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -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). To disable, set to 0s (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:v0.0.42@sha256:d35ac07dfda971cabee05e0deca8aeac772f885a5348e1a0c0b0a36db20fcfc0") + --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-1699610847-17599@sha256:f050196e2e2eebd8599d84bd84eb9d28c53fd4bee43880bb43993a3ec1b7ab9b") --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) From aed9f1441f00409eafeb1aca65b83877f91b7f58 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 10 Nov 2023 15:56:08 +0000 Subject: [PATCH 3/3] Updating ISO to v1.32.1-1699611309-17599 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81b589a07b84..f06ba82f8cc1 100644 --- a/Makefile +++ b/Makefile @@ -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.32.1 +ISO_VERSION ?= v1.32.1-1699611309-17599 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 9b22af405883..24186f50955e 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -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/iso" + isoBucket := "minikube-builds/iso/17599" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),