Skip to content

Commit c931847

Browse files
committed
feat: update containerd to v2.1.6
See * siderolabs/pkgs#1413 * siderolabs/pkgs#1414 Also drops the cgroup patch. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent a2a7700 commit c931847

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EMBED_TARGET ?= embed
2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
2828
TOOLS ?= v1.12.0-2-g7d57df0
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.12.0-16-g34f3186
30+
PKGS ?= v1.12.0-18-g8b594c4
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

hack/release.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ etcd: 3.6.6
3030
Flannel: 0.27.4
3131
Flannel CNI plugin: v1.8.0-flannel2
3232
runc: 1.3.4
33-
containerd: 2.1.5
33+
containerd: 2.1.6
3434
zfs: 2.4.0-rc.5
3535
3636
Talos is built with Go 1.25.5.

pkg/machinery/constants/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ const (
561561
TrustdUserID = 51
562562

563563
// DefaultContainerdVersion is the default container runtime version.
564-
DefaultContainerdVersion = "2.1.5"
564+
DefaultContainerdVersion = "2.1.6"
565565

566566
// RuncVersion is the runc version.
567567
RuncVersion = "1.3.4"

pkg/machinery/gendata/data/pkgs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0-16-g34f3186
1+
v1.12.0-18-g8b594c4

0 commit comments

Comments
 (0)