Skip to content

Commit 431e022

Browse files
committed
feat: update Linux 6.12.24, containerd 2.0.5
Update to the latest versions. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit a471eb3)
1 parent bece551 commit 431e022

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

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.10.0
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.10.0
30+
PKGS ?= v1.10.0-5-g48dba3e
3131

3232
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
3333
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ require (
6464
github.com/cenkalti/backoff/v4 v4.3.0
6565
github.com/containerd/cgroups/v3 v3.0.5
6666
github.com/containerd/containerd/api v1.8.0
67-
github.com/containerd/containerd/v2 v2.0.4
67+
github.com/containerd/containerd/v2 v2.0.5
6868
github.com/containerd/errdefs v1.0.0
6969
github.com/containerd/log v0.1.0
7070
github.com/containerd/platforms v1.0.0-rc.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJ
128128
github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
129129
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
130130
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
131-
github.com/containerd/containerd/v2 v2.0.4 h1:+r7yJMwhTfMm3CDyiBjMBQO8a9CTBxL2Bg/JtqtIwB8=
132-
github.com/containerd/containerd/v2 v2.0.4/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY=
131+
github.com/containerd/containerd/v2 v2.0.5 h1:2vg/TjUXnaohAxiHnthQg8K06L9I4gdYEMcOLiMc8BQ=
132+
github.com/containerd/containerd/v2 v2.0.5/go.mod h1:Qqo0UN43i2fX1FLkrSTCg6zcHNfjN7gEnx3NPRZI+N0=
133133
github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=
134134
github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
135135
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=

hack/release.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ preface = """
1818
[notes.updates]
1919
title = "Component Updates"
2020
description = """\
21-
* Linux: 6.12.23
21+
* Linux: 6.12.24
2222
* CNI plugins: 1.6.2
2323
* runc: 1.2.6
24-
* containerd: 2.0.4
24+
* containerd: 2.0.5
2525
* etcd: 3.5.20
2626
* Flannel: 0.26.7
2727
* Kubernetes: 1.33.0-rc.1

pkg/machinery/constants/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
const (
1616
// DefaultKernelVersion is the default Linux kernel version.
17-
DefaultKernelVersion = "6.12.23-talos"
17+
DefaultKernelVersion = "6.12.24-talos"
1818

1919
// KernelParamConfig is the kernel parameter name for specifying the URL.
2020
// to the config.
@@ -543,7 +543,7 @@ const (
543543
TrustdUserID = 51
544544

545545
// DefaultContainerdVersion is the default container runtime version.
546-
DefaultContainerdVersion = "2.0.4"
546+
DefaultContainerdVersion = "2.0.5"
547547

548548
// SystemContainerdNamespace is the Containerd namespace for Talos services.
549549
SystemContainerdNamespace = "system"

pkg/machinery/gendata/data/pkgs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.10.0
1+
v1.10.0-5-g48dba3e

0 commit comments

Comments
 (0)