From f0f00dbda427c1ddbf691dfb30e3022b3db87a48 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 10 Apr 2024 10:01:02 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update crun from 1.14 to 1.14.4 --- deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index 605e80efe45e..873267e94792 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -7,3 +7,4 @@ sha256 e1745172bf603c6832e1a77ee2b7ac9ad4644cd0f4349704df84b66385bbbe61 crun-1. sha256 5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b crun-1.1.tar.gz sha256 1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978 crun-1.2.tar.gz sha256 f6ceb53ef6c686b1e8bc7e4a52cfac3ebec915edc6bc750ac600a8b3decb6e13 crun-1.14.tar.gz +sha256 5527013bfdac4001f242fbc3b544d01837d942f426fdefcc296f0d271594eeb4 crun-1.14.4.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index e6111579e49d..dbd115544dc3 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.14 -CRUN_LATEST_COMMIT = 667e6ebd4e2442d39512e63215e79d693d0780aa +CRUN_LATEST_VERSION = 1.14.4 +CRUN_LATEST_COMMIT = a220ca661ce078f2c37b38c92e66cf66c012d9c1 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 From 56e01f5e76b5b37dee07423c311f8755c39d6daa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 10 Apr 2024 10:26:52 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.43-1712743643-18610 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 4c03b65569b4..00e1f3447fa4 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.43-1712593525-18585" + Version = "v0.0.43-1712743643-18610" // SHA of the kic base image - baseImageSHA = "82295aae32f93620eb23c604c6fbfbc087f5827d39119a722f4d08f3622b1dfd" + baseImageSHA = "57f6b6f207b748ce717275fbcd6ae3dba156d24f7d9b85b4b7e51b63bacaf9dc" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fccec18fc623..6bf7320eaa3c 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) (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.43-1712593525-18585@sha256:82295aae32f93620eb23c604c6fbfbc087f5827d39119a722f4d08f3622b1dfd") + --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.43-1712743643-18610@sha256:57f6b6f207b748ce717275fbcd6ae3dba156d24f7d9b85b4b7e51b63bacaf9dc") --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 67827f9862f5d1dcb60fbd876ba9804ed0a42712 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 10 Apr 2024 15:51:35 +0000 Subject: [PATCH 3/3] Updating ISO to v1.33.0-1712743565-18610 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e4819080f0ce..96718b1ab6db 100644 --- a/Makefile +++ b/Makefile @@ -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.0-1712570768-18585 +ISO_VERSION ?= v1.33.0-1712743565-18610 # 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 ef9b6f0da913..20754f51bda5 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-builds/iso/18585" + isoBucket := "minikube-builds/iso/18610" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),