Merge pull request #17145 from minikube-bot/auto_bump_nerdctl_version…

…-e32f56c Kicbase/ISO: Update nerdctl from 1.0.0 to 1.5.0
kubernetes · Aug 31, 2023 · 4b4ad95 · 4b4ad95
2 parents 995069f + 1884827
commit 4b4ad95
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 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
@@ -1 +1,2 @@
 sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1  nerdctl-1.4.0-linux-arm64.tar.gz
+sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7  nerdctl-1.5.0-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
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NERDCTL_BIN_AARCH64_VERSION = 1.4.0
-NERDCTL_BIN_AARCH64_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
+NERDCTL_BIN_AARCH64_VERSION = 1.5.0
+NERDCTL_BIN_AARCH64_COMMIT = b33a58f288bc42351404a016e694190b897cd252
 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
@@ -1 +1,2 @@
 sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc  nerdctl-1.4.0-linux-amd64.tar.gz
+sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1  nerdctl-1.5.0-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
@@ -4,8 +4,8 @@
 # 
 ################################################################################
 
-NERDCTL_BIN_VERSION = 1.4.0
-NERDCTL_BIN_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
+NERDCTL_BIN_VERSION = 1.5.0
+NERDCTL_BIN_COMMIT = b33a58f288bc42351404a016e694190b897cd252
 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
@@ -49,7 +49,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.0.0"
+ARG NERDCTL_VERSION="1.5.0"
 ARG NERDCTLD_VERSION="0.2.0"
 
 # copy in static files (configs, scripts)

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.40-1692872184-17120"
+	Version = "v0.0.40-1693218425-17145"
 
 	// SHA of the kic base image
-	baseImageSHA = "42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec"
+	baseImageSHA = "b79ac53e13f1f04e9fd9bdd5eb7d937a6931d86b3cdddf46e6e66227aea180ad"
 	// 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
@@ -26,7 +26,7 @@ minikube start [flags]
       --apiserver-names strings           A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine
       --apiserver-port int                The apiserver listening port (default 8443)
       --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-1692872184-17120@sha256:42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec")
+      --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-1693218425-17145@sha256:b79ac53e13f1f04e9fd9bdd5eb7d937a6931d86b3cdddf46e6e66227aea180ad")
       --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)