From 0407c2b875eca210af01d0c0d1dfb1f6f98cf22b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 02:32:48 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update containerd from v1.7.21 to v1.7.22 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index 94669d9837de..a2dd68ab2e0c 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -38,3 +38,4 @@ sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18. sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz +sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index e4b17e8b17a0..8227d12da7c5 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.21 -CONTAINERD_BIN_AARCH64_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 +CONTAINERD_BIN_AARCH64_VERSION = v1.7.22 +CONTAINERD_BIN_AARCH64_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index 94669d9837de..a2dd68ab2e0c 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -38,3 +38,4 @@ sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18. sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz +sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index b4e56839ee6b..9ee3de15fb2e 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.21 -CONTAINERD_BIN_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 +CONTAINERD_BIN_VERSION = v1.7.22 +CONTAINERD_BIN_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme From aa22bea64e6af205ec8570d357f018eaa180967d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 02:54:04 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.45-1726281268-19643 --- 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 d4c3c8c566a6..427b7372a2c4 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.45-1726243947-19640" + Version = "v0.0.45-1726281268-19643" // SHA of the kic base image - baseImageSHA = "bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243" + baseImageSHA = "cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e" // 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 f348b98aea45..c9bfd4d515b0 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.45-1726243947-19640@sha256:bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243") + --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-1726281268-19643@sha256:cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e") --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 17d31f5d116bbb5d9ac8f4a1c2873ea47cdfa40f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 08:31:43 +0000 Subject: [PATCH 3/3] Updating ISO to v1.34.0-1726281733-19643 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c491c76e4eef..206c7ef3fb3a 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.34.0-1726243933-19640 +ISO_VERSION ?= v1.34.0-1726281733-19643 # 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 eb65b851b971..56e3aab41156 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/19640" + isoBucket := "minikube-builds/iso/19643" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),