From bfdc570d783c3a69b159ed3f86f8ebdfd543f117 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Oct 2023 10:04:50 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update nerdctl from 1.6.0 to 1.6.2 --- .../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 d28204930f0b..b12cbecdb2ec 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 @@ -1,3 +1,4 @@ sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1 nerdctl-1.4.0-linux-arm64.tar.gz sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7 nerdctl-1.5.0-linux-arm64.tar.gz sha256 d5f1ed3cda151385d313f9007afc708cae0018c9da581088b092328db154d0c6 nerdctl-1.6.0-linux-arm64.tar.gz +sha256 ece848045290dd61f542942248587e91125563af46c0ea972a7c908d0d39c96c nerdctl-1.6.2-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 b989de47f95f..27dbd22f39b4 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.6.0 -NERDCTL_BIN_AARCH64_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929 +NERDCTL_BIN_AARCH64_VERSION = 1.6.2 +NERDCTL_BIN_AARCH64_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794 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 6c0fc6cba8b9..660970d812de 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 @@ -1,3 +1,4 @@ sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc nerdctl-1.4.0-linux-amd64.tar.gz sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1 nerdctl-1.5.0-linux-amd64.tar.gz sha256 fc3e7eef775eff85eb6c16b2761a574e83de444831312bc92e755a1f5577872d nerdctl-1.6.0-linux-amd64.tar.gz +sha256 67991fc144b03596f15be6c20ca112d10bd92ad467414e95b0f1d60d332ae34e nerdctl-1.6.2-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 ea71745895e4..c3d5e486eaed 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.6.0 -NERDCTL_BIN_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929 +NERDCTL_BIN_VERSION = 1.6.2 +NERDCTL_BIN_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794 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 5993cefaf7b8..cf7843cc0a49 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3" ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" ARG CNI_PLUGINS_VERSION="v1.3.0" ARG TARGETARCH -ARG NERDCTL_VERSION="1.6.0" +ARG NERDCTL_VERSION="1.6.2" ARG NERDCTLD_VERSION="0.2.0" # copy in static files (configs, scripts) From 6e2da18fa659c284fc3c56639557bfbc17ffb2a6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Oct 2023 10:42:50 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.40-1697451950-17434 --- 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 cd08a7b81363..6cbdb3549b97 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.40-1696360059-17345" + Version = "v0.0.40-1697451950-17434" // SHA of the kic base image - baseImageSHA = "76d99edd1576614d5c20a839dd16ae1d7c810f3b909a01797063d483159ea3ae" + baseImageSHA = "ffb8117e66207cacd642c0a64aeec4341f57c4614f38dcbc5681f42d9f0759c9" // 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 e01ee8ad82d6..3fef76c9ccde 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-builds:v0.0.40-1696360059-17345@sha256:76d99edd1576614d5c20a839dd16ae1d7c810f3b909a01797063d483159ea3ae") + --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.40-1697451950-17434@sha256:ffb8117e66207cacd642c0a64aeec4341f57c4614f38dcbc5681f42d9f0759c9") --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 6e8cafb67f912d97bb1d41406088a180c23d9d9b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Oct 2023 21:30:22 +0000 Subject: [PATCH 3/3] Updating ISO to v1.31.0-1697471113-17434 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5f5d745ff358..6d3cc9d0acb2 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.31.0-1695060926-17240 +ISO_VERSION ?= v1.31.0-1697471113-17434 # 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 451cad34d71f..a6a990825194 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/17240" + isoBucket := "minikube-builds/iso/17434" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),