Merge pull request #17565 from minikube-bot/auto_bump_nerdctl_version-cbaae54

Kicbase/ISO: Update nerdctl from 1.6.2 to 1.7.0

Author: spowelljr

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.32.1
+ISO_VERSION ?= v1.32.1-1699485311-17565
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash

@@ -2,3 +2,4 @@ sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1  nerdctl
 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
+sha256 1255eea5bc2dbac9339d0a9acfb0651dda117504d52cd52b38cf3c2251db4f39  nerdctl-1.7.0-linux-arm64.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NERDCTL_BIN_AARCH64_VERSION = 1.6.2
-NERDCTL_BIN_AARCH64_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794
+NERDCTL_BIN_AARCH64_VERSION = 1.7.0
+NERDCTL_BIN_AARCH64_COMMIT = e674fe7ba6e49f12e88cd9c6c442e7ea5232502c
 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

deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash

@@ -2,3 +2,4 @@ sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc  nerdctl
 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
+sha256 844c47b175a3d6bc8eaad0c51f23624a5ef10c09e55607803ec2bc846fb04df9  nerdctl-1.7.0-linux-amd64.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk

@@ -4,8 +4,8 @@
 # 
 ################################################################################
 
-NERDCTL_BIN_VERSION = 1.6.2
-NERDCTL_BIN_COMMIT = e3dc23be348efded17d2cd244397b4f7018e0794
+NERDCTL_BIN_VERSION = 1.7.0
+NERDCTL_BIN_COMMIT = e674fe7ba6e49f12e88cd9c6c442e7ea5232502c
 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

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.2"
+ARG NERDCTL_VERSION="1.7.0"
 ARG NERDCTLD_VERSION="0.2.0"
 
 # copy in static files (configs, scripts)

pkg/drivers/kic/types.go

@@ -24,14 +24,14 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.42"
+	Version = "v0.0.42-1699485386-17565"
 
 	// SHA of the kic base image
-	baseImageSHA = "d35ac07dfda971cabee05e0deca8aeac772f885a5348e1a0c0b0a36db20fcfc0"
+	baseImageSHA = "bc7ff092e883443bfc1c9fb6a45d08012db3c0fc68e914887b7f16ccdefcab24"
 	// The name of the GCR kicbase repository
-	gcrRepo = "gcr.io/k8s-minikube/kicbase"
+	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository
-	dockerhubRepo = "docker.io/kicbase/stable"
+	dockerhubRepo = "docker.io/kicbase/build"
 )
 
 var (

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

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:v0.0.42@sha256:d35ac07dfda971cabee05e0deca8aeac772f885a5348e1a0c0b0a36db20fcfc0")
+      --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.42-1699485386-17565@sha256:bc7ff092e883443bfc1c9fb6a45d08012db3c0fc68e914887b7f16ccdefcab24")
       --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)