Merge pull request #18621 from minikube-bot/auto_bump_containerd_vers…

…ion-6add3e1 Kicbase/ISO: Update containerd from v1.7.14 to v1.7.15
kubernetes · Apr 12, 2024 · 2bf1c4d · 2bf1c4d
2 parents e97c7f9 + bda6e19
commit 2bf1c4d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git 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-1712743565-18610
+ISO_VERSION ?= v1.33.0-1712854267-18621
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

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
@@ -32,3 +32,4 @@ sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.t
 sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
 sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz
 sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
+sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.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
@@ -3,8 +3,8 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_AARCH64_VERSION = v1.7.14
-CONTAINERD_BIN_AARCH64_COMMIT = dcf2847247e18caba8dce86522029642f60fe96b
+CONTAINERD_BIN_AARCH64_VERSION = v1.7.15
+CONTAINERD_BIN_AARCH64_COMMIT = 926c9586fe4a6236699318391cd44976a98e31f1
 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
@@ -32,3 +32,4 @@ sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.t
 sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
 sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz
 sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
+sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.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
@@ -3,8 +3,8 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_VERSION = v1.7.14
-CONTAINERD_BIN_COMMIT = dcf2847247e18caba8dce86522029642f60fe96b
+CONTAINERD_BIN_VERSION = v1.7.15
+CONTAINERD_BIN_COMMIT = 926c9586fe4a6236699318391cd44976a98e31f1
 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
 CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
 CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

diff --git 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-1712743643-18610"
+	Version = "v0.0.43-1712854342-18621"
 
 	// SHA of the kic base image
-	baseImageSHA = "57f6b6f207b748ce717275fbcd6ae3dba156d24f7d9b85b4b7e51b63bacaf9dc"
+	baseImageSHA = "ed83a14d1540ae575c52399493a92b74b64f457445525b45c4b55f3ec4ca873f"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository

diff --git 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/18610"
+	isoBucket := "minikube-builds/iso/18621"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

diff --git 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-1712743643-18610@sha256:57f6b6f207b748ce717275fbcd6ae3dba156d24f7d9b85b4b7e51b63bacaf9dc")
+      --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-1712854342-18621@sha256:ed83a14d1540ae575c52399493a92b74b64f457445525b45c4b55f3ec4ca873f")
       --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)