Skip to content

Kicbase/ISO: Update containerd from v1.7.23 to v2.0.4 #20600

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 @@ -40,3 +40,4 @@ sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.
sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz
sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz
sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz
sha256 af0b18d125abf97fbe90d6d2cda53ffa0cd4cbb9e7d65fee61fc095bfb63cef5 v2.0.4.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_AARCH64_VERSION = v1.7.23
CONTAINERD_BIN_AARCH64_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27
CONTAINERD_BIN_AARCH64_VERSION = v2.0.4
CONTAINERD_BIN_AARCH64_COMMIT = 1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20
CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz
CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.
sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz
sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz
sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz
sha256 af0b18d125abf97fbe90d6d2cda53ffa0cd4cbb9e7d65fee61fc095bfb63cef5 v2.0.4.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_VERSION = v1.7.23
CONTAINERD_BIN_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27
CONTAINERD_BIN_VERSION = v2.0.4
CONTAINERD_BIN_COMMIT = 1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
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-1744020999-20600"

// SHA of the kic base image
baseImageSHA = "8de8167e280414c9d16e4c3da59bc85bc7c9cc24228af995863fc7bcabfcf727"
baseImageSHA = "aab97a269b78f4e98cebf76d3f5ac4ca92a643d448635c393de8886b8e224604"
// 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-1744020999-20600@sha256:aab97a269b78f4e98cebf76d3f5ac4ca92a643d448635c393de8886b8e224604")
--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