From a4306901cde7e0b07f0ab6728394062ebdf7952d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 15 Apr 2024 10:04:21 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update nerdctl from 1.7.4 to 1.7.5 --- .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash | 1 + .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk | 4 ++-- .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash | 1 + .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash index 9afccf425aba..c51240fd419d 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash @@ -6,3 +6,4 @@ sha256 1255eea5bc2dbac9339d0a9acfb0651dda117504d52cd52b38cf3c2251db4f39 nerdctl sha256 46affa0564bb74f595a817e7d5060140099d9cfd9e00e1272b4dbe8b0b85c655 nerdctl-1.7.1-linux-arm64.tar.gz sha256 de68d5380d65604cd26c164988547cf46b698f7819a5d51d98e3a0f031f5594d nerdctl-1.7.2-linux-arm64.tar.gz sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl-1.7.4-linux-arm64.tar.gz +sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk index 6eb242b7d6c1..ab24b26ce38b 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_AARCH64_VERSION = 1.7.4 -NERDCTL_BIN_AARCH64_COMMIT = 7b5f7e0d8f705ed4e54f7040512327e231433366 +NERDCTL_BIN_AARCH64_VERSION = 1.7.5 +NERDCTL_BIN_AARCH64_COMMIT = cffed372371dcbea3dc9a646ce5a913fc1c09513 NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION) NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash index 6c6d1d331d94..c09a6218d1ed 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash @@ -6,3 +6,4 @@ sha256 844c47b175a3d6bc8eaad0c51f23624a5ef10c09e55607803ec2bc846fb04df9 nerdctl sha256 5fc0a6e8c3a71cbba95fbdb6833fb8a7cd8e78f53de10988362d4029c14b905a nerdctl-1.7.1-linux-amd64.tar.gz sha256 aed7d33d645bfb97c8df978d952a1e1f7e02b0b3ed2c0089ee4285af7f8f971b nerdctl-1.7.2-linux-amd64.tar.gz sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl-1.7.4-linux-amd64.tar.gz +sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk index 006c10201daf..c298ff207736 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_VERSION = 1.7.4 -NERDCTL_BIN_COMMIT = 7b5f7e0d8f705ed4e54f7040512327e231433366 +NERDCTL_BIN_VERSION = 1.7.5 +NERDCTL_BIN_COMMIT = cffed372371dcbea3dc9a646ce5a913fc1c09513 NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION) NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz NERDCTL_BIN_STRIP_COMPONENTS = 0 diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 492d0cef450a..91f5e42bbb67 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.12" ARG CRI_DOCKERD_COMMIT="c2e3805c946c16ec7e3a6d35ec5d72d72dc0c742" ARG CNI_PLUGINS_VERSION="v1.4.0" ARG TARGETARCH -ARG NERDCTL_VERSION="1.7.4" +ARG NERDCTL_VERSION="1.7.5" ARG NERDCTLD_VERSION="0.5.1" # copy in static files (configs, scripts) From d50c6cbf1d439949fb090a40c868bbd40e341809 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 15 Apr 2024 10:46:17 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.43-1713176859-18634 --- 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 d75aa115a605..20bdd1425d9d 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-1712854342-18621" + Version = "v0.0.43-1713176859-18634" // SHA of the kic base image - baseImageSHA = "ed83a14d1540ae575c52399493a92b74b64f457445525b45c4b55f3ec4ca873f" + baseImageSHA = "aa626f490dfc5e9a013f239555a8c57845d8eb915cd55dbd63f6a05070c2709b" // 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 6ac0e4cb6fe2..e30edbd5efef 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-1712854342-18621@sha256:ed83a14d1540ae575c52399493a92b74b64f457445525b45c4b55f3ec4ca873f") + --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-1713176859-18634@sha256:aa626f490dfc5e9a013f239555a8c57845d8eb915cd55dbd63f6a05070c2709b") --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 743ee2f6c19b1c9aeee0e19f36a4d6af542f1699 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 15 Apr 2024 15:55:26 +0000 Subject: [PATCH 3/3] Updating ISO to v1.33.0-1713175573-18634 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 72b7e0e0c351..04686c70e572 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-1712854267-18621 +ISO_VERSION ?= v1.33.0-1713175573-18634 # 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 272e2078c0e6..19c3fce8656c 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/18621" + isoBucket := "minikube-builds/iso/18634" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),