Skip to content
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.

Sign up for GitHub

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

Kicbase/ISO: Update containerd from v1.7.23 to v2.0.2 #20297

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Kicbase/ISO: Update containerd from v1.7.23 to v2.0.2 #20297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6379d
Kicbase/ISO: Update containerd from v1.7.23 to v2.0.2
minikube-bot Jan 20, 2025
dede3ee
Updating kicbase image to v0.0.46-1737368189-20297
minikube-bot Jan 20, 2025
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
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
View file
Open in desktop
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 472747a7a6b360a0864bab0ee00a8a6f51da5795171e6a60ab17aa80cbd850a2 v2.0.2.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
View file
Open in desktop
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.2
CONTAINERD_BIN_AARCH64_COMMIT = c507a0257ea6462fbd6f5ba4f5c74facb04021f4
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
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash
View file
Open in desktop
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 472747a7a6b360a0864bab0ee00a8a6f51da5795171e6a60ab17aa80cbd850a2 v2.0.2.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
View file
Open in desktop
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.2
CONTAINERD_BIN_COMMIT = c507a0257ea6462fbd6f5ba4f5c74facb04021f4
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
8 changes: 4 additions & 4 deletions hack/kicbase_version/os-package-list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.24-1 amd64 An open and reliable container runtime
ii containerd.io 1.7.25-1 amd64 An open and reliable container runtime
ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.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.
Expand All @@ -32,8 +32,8 @@ ii diffutils 1:3.8-0ubuntu2 amd6
ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service
ii dnsutils 1:9.18.30-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.19.3-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii docker-ce 5:27.5.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.5.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system
ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration
Expand Down Expand Up @@ -217,7 +217,7 @@ ii python3.10 3.10.12-1~22.04.7 amd6
ii python3.10-minimal 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10)
ii readline-common 8.1.2-1 all GNU readline and history libraries, common files
ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses
ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool
ii rsync 3.2.7-0ubuntu0.22.04.4 amd64 fast, versatile, remote (and local) file-copying tool
ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text
ii sensible-utils 0.0.17 all Utilities for sensible alternative selection
ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer
Expand Down
8 changes: 4 additions & 4 deletions pkg/drivers/kic/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.46"
Version = "v0.0.46-1737368189-20297"

// SHA of the kic base image
baseImageSHA = "fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279"
baseImageSHA = "d617f4b65f4fa247728d86f428133128beeccc6f5294650a1f94044f508c7e23"
// 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 (
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
View file
Open in desktop
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:v0.0.46@sha256:fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279")
--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-1737368189-20297@sha256:d617f4b65f4fa247728d86f428133128beeccc6f5294650a1f94044f508c7e23")
--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