Kicbase/ISO: Update nerdctl from 1.7.7 to 2.0.0

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.34.0-1730913550-19917
+ISO_VERSION ?= v1.34.0-1731941818-19973
 
 # 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

@@ -9,3 +9,4 @@ sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d  nerdctl
 sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c  nerdctl-1.7.5-linux-arm64.tar.gz
 sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348  nerdctl-1.7.6-linux-arm64.tar.gz
 sha256 230ad8f4f88100774d123213a427d3d43071e0dcf9f70efbea50ab9efff1cd4c  nerdctl-1.7.7-linux-arm64.tar.gz
+sha256 568b0383996cb51e1a5f97abb3973ebac2af1a26268fc7d9ae0d34165ba033e1  nerdctl-2.0.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.7.7
-NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
+NERDCTL_BIN_AARCH64_VERSION = 2.0.0
+NERDCTL_BIN_AARCH64_COMMIT = ef588dafa080e3dbc9c061ff3802affb66aef291
 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

@@ -9,3 +9,4 @@ sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7  nerdctl
 sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921  nerdctl-1.7.5-linux-amd64.tar.gz
 sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0  nerdctl-1.7.6-linux-amd64.tar.gz
 sha256 298bb95aee485b24d566115ef7e4e90951dd232447b05de5646a652a23db70a9  nerdctl-1.7.7-linux-amd64.tar.gz
+sha256 b3920c4a04dc7972d9e2977147c1ef5c415551802b3c4b0b613ba9d0c46cfbbf  nerdctl-2.0.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.7.7
-NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
+NERDCTL_BIN_VERSION = 2.0.0
+NERDCTL_BIN_COMMIT = ef588dafa080e3dbc9c061ff3802affb66aef291
 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.15"
 ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9"
 ARG CNI_PLUGINS_VERSION="v1.4.0"
 ARG TARGETARCH
-ARG NERDCTL_VERSION="1.7.7"
+ARG NERDCTL_VERSION="2.0.0"
 ARG NERDCTLD_VERSION="0.6.1"
 
 # copy in static files (configs, scripts)

hack/kicbase_version/os-package-list.txt

@@ -16,7 +16,7 @@ ii  ca-certificates                 20240203~22.04.1                        all
 ii  catatonit                       0.1.7-1                                 amd64        init process for containers
 ii  conmon                          100:2.1.2~0                             amd64        OCI container runtime monitor
 ii  conntrack                       1:1.4.6-2build2                         amd64        Program to modify the conntrack tables
-ii  containerd.io                   1.7.22-1                                amd64        An open and reliable container runtime
+ii  containerd.io                   1.7.23-1                                amd64        An open and reliable container runtime
 ii  containernetworking-plugins     0.9.1+ds1-1                             amd64        standard networking plugins - binaries
 ii  coreutils                       8.32-4.1ubuntu1.2                       amd64        GNU core utilities
 ii  cri-o                           1.24.6~0                                amd64        OCI-based implementation of Kubernetes Container Runtime Interface.
@@ -137,8 +137,8 @@ ii  libnghttp2-14:amd64             1.43.0-1ubuntu0.2                       amd6
 ii  libnl-3-200:amd64               3.5.0-0.1                               amd64        library for dealing with netlink sockets
 ii  libnpth0:amd64                  1.6-3build2                             amd64        replacement for GNU Pth using system threads
 ii  libnsl2:amd64                   1.3.0-2build2                           amd64        Public client interface for NIS(YP) and NIS+
-ii  libnvidia-container-tools       1.17.0-1                                amd64        NVIDIA container runtime library (command-line tools)
-ii  libnvidia-container1:amd64      1.17.0-1                                amd64        NVIDIA container runtime library
+ii  libnvidia-container-tools       1.17.2-1                                amd64        NVIDIA container runtime library (command-line tools)
+ii  libnvidia-container1:amd64      1.17.2-1                                amd64        NVIDIA container runtime library
 ii  libp11-kit0:amd64               0.24.0-6build1                          amd64        library for loading and coordinating access to PKCS#11 modules - runtime
 ii  libpam-modules:amd64            1.4.0-11ubuntu2.4                       amd64        Pluggable Authentication Modules for PAM
 ii  libpam-modules-bin              1.4.0-11ubuntu2.4                       amd64        Pluggable Authentication Modules for PAM - helper binaries
@@ -196,8 +196,8 @@ ii  ncurses-bin                     6.3-2ubuntu0.1                          amd6
 ii  netbase                         6.3                                     all          Basic TCP/IP networking system
 ii  netcat-openbsd                  1.218-4ubuntu1                          amd64        TCP/IP swiss army knife
 ii  nfs-common                      1:2.6.1-1ubuntu1.2                      amd64        NFS support files common to client and server
-ii  nvidia-container-toolkit        1.17.0-1                                amd64        NVIDIA Container toolkit
-ii  nvidia-container-toolkit-base   1.17.0-1                                amd64        NVIDIA Container Toolkit Base
+ii  nvidia-container-toolkit        1.17.2-1                                amd64        NVIDIA Container toolkit
+ii  nvidia-container-toolkit-base   1.17.2-1                                amd64        NVIDIA Container Toolkit Base
 ii  openssh-client                  1:8.9p1-3ubuntu0.10                     amd64        secure shell (SSH) client, for secure access to remote machines
 ii  openssh-server                  1:8.9p1-3ubuntu0.10                     amd64        secure shell (SSH) server, for secure access from remote machines
 ii  openssh-sftp-server             1:8.9p1-3ubuntu0.10                     amd64        secure shell (SSH) sftp server module, for SFTP access from remote machines
@@ -231,7 +231,7 @@ ii  ucf                             3.0043                                  all
 ii  udev                            249.11-0ubuntu3.12                      amd64        /dev/ and hotplug management daemon
 ii  usrmerge                        25ubuntu2                               all          Convert the system to the merged /usr directories scheme
 ii  util-linux                      2.37.2-4ubuntu3.4                       amd64        miscellaneous system utilities
-ii  vim-common                      2:8.2.3995-1ubuntu2.19                  all          Vi IMproved - Common files
-ii  vim-tiny                        2:8.2.3995-1ubuntu2.19                  amd64        Vi IMproved - enhanced vi editor - compact version
-ii  xxd                             2:8.2.3995-1ubuntu2.19                  amd64        tool to make (or reverse) a hex dump
+ii  vim-common                      2:8.2.3995-1ubuntu2.20                  all          Vi IMproved - Common files
+ii  vim-tiny                        2:8.2.3995-1ubuntu2.20                  amd64        Vi IMproved - enhanced vi editor - compact version
+ii  xxd                             2:8.2.3995-1ubuntu2.20                  amd64        tool to make (or reverse) a hex dump
 ii  zlib1g:amd64                    1:1.2.11.dfsg-2ubuntu9.2                amd64        compression library - runtime

pkg/drivers/kic/types.go

@@ -24,10 +24,10 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.45-1730888964-19917"
+	Version = "v0.0.45-1731924445-19973"
 
 	// SHA of the kic base image
-	baseImageSHA = "629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615"
+	baseImageSHA = "a990cb27f4e2d25ac84afbf7ecd18818169face2fbe5fa9d526bf3c23db73e45"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository

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/19917"
+	isoBucket := "minikube-builds/iso/19973"
 
 	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) (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.45-1730888964-19917@sha256:629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615")
+      --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.45-1731924445-19973@sha256:a990cb27f4e2d25ac84afbf7ecd18818169face2fbe5fa9d526bf3c23db73e45")
       --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)