Skip to content

Kicbase/ISO: Update nerdctl from 1.7.7 to 2.0.4 #20599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 1f394e3aabc2b202ad17a5ece0495ca554ae3ca346a5dd0aa8344a891734763d nerdctl-2.0.4-linux-arm64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_AARCH64_VERSION = 1.7.7
NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_AARCH64_VERSION = 2.0.4
NERDCTL_BIN_AARCH64_COMMIT = 39058fbce68e29feecc9cec992ade74b272817d8
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 2f9d22179868db4f0a1daf2fd65f58a24f8a78efd2d9b17659f56bcdce85efd0 nerdctl-2.0.4-linux-amd64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_VERSION = 1.7.7
NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_VERSION = 2.0.4
NERDCTL_BIN_COMMIT = 39058fbce68e29feecc9cec992ade74b272817d8
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
Expand Down
2 changes: 1 addition & 1 deletion deploy/kicbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
ARG NERDCTLD_VERSION="0.6.1"

# copy in static files (configs, scripts)
Expand Down
22 changes: 11 additions & 11 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd6
ii debconf 1.5.79ubuntu1 all Debian configuration management system
ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian
ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities
ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service
ii dirmngr 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - network certificate management service
ii dnsutils 1:9.18.30-0ubuntu0.22.04.2 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.22.0-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:28.0.4-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
Expand All @@ -40,18 +40,18 @@ ii ebtables 2.0.11-4build2 amd6
ii ethtool 1:5.16-1ubuntu0.1 amd64 display or change Ethernet device settings
ii findutils 4.8.0-1ubuntu3 amd64 utilities for finding files--find, xargs
ii gcc-12-base:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC, the GNU Compiler Collection (base package)
ii gnupg 2.2.27-3ubuntu2.1 all GNU privacy guard - a free PGP replacement
ii gnupg-l10n 2.2.27-3ubuntu2.1 all GNU privacy guard - localization files
ii gnupg-utils 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - utility programs
ii gnupg 2.2.27-3ubuntu2.3 all GNU privacy guard - a free PGP replacement
ii gnupg-l10n 2.2.27-3ubuntu2.3 all GNU privacy guard - localization files
ii gnupg-utils 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - utility programs
ii golang-github-containers-common 0.44.4+ds1-1 all Common files for github.com/containers repositories
ii golang-github-containers-image 5.16.0-3 all Configuration files and manpages for github.com/containers repositories
ii gpg 2.2.27-3ubuntu2.1 amd64 GNU Privacy Guard -- minimalist public key operations
ii gpg-agent 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - cryptographic agent
ii gpg-wks-client 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service client
ii gpg-wks-server 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service server
ii gpgconf 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - core configuration utilities
ii gpgsm 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - S/MIME version
ii gpgv 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - signature verification tool
ii gpg 2.2.27-3ubuntu2.3 amd64 GNU Privacy Guard -- minimalist public key operations
ii gpg-agent 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - cryptographic agent
ii gpg-wks-client 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - Web Key Service client
ii gpg-wks-server 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - Web Key Service server
ii gpgconf 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - core configuration utilities
ii gpgsm 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - S/MIME version
ii gpgv 2.2.27-3ubuntu2.3 amd64 GNU privacy guard - signature verification tool
ii grep 3.7-1build1 amd64 GNU grep, egrep and fgrep
ii gzip 1.10-4ubuntu4.1 amd64 GNU compression utilities
ii hostname 3.23ubuntu2 amd64 utility to set/show the host name or domain name
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.46-1743675393-20591"
Version = "v0.0.46-1744022411-20599"

// SHA of the kic base image
baseImageSHA = "8de8167e280414c9d16e4c3da59bc85bc7c9cc24228af995863fc7bcabfcf727"
baseImageSHA = "6c007097f92d14addee6e89a021d3957dd48df26867a0f4cab2fc425a3ccccd2"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.46-1743675393-20591@sha256:8de8167e280414c9d16e4c3da59bc85bc7c9cc24228af995863fc7bcabfcf727")
--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.46-1744022411-20599@sha256:6c007097f92d14addee6e89a021d3957dd48df26867a0f4cab2fc425a3ccccd2")
--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)
Expand Down