Skip to content

Commit 021bbfe

Browse files
committed
feat: update Go 1.25.4, containerd 2.1.5
See https://github.com/containerd/containerd/releases/tag/v2.1.5 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent e25db48 commit 021bbfe

File tree

7 files changed

+56
-10
lines changed

7 files changed

+56
-10
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ DEBUG_TOOLS_SOURCE := scratch
2525
EMBED_TARGET ?= embed
2626

2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
28-
TOOLS ?= v1.12.0-alpha.0-16-ga08cc1f
28+
TOOLS ?= v1.12.0-alpha.0-18-g44932c0
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.12.0-alpha.0-48-g70404aa
30+
PKGS ?= v1.12.0-alpha.0-50-g4ae050a
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ require (
5858
github.com/cenkalti/backoff/v4 v4.3.0
5959
github.com/containerd/cgroups/v3 v3.0.5
6060
github.com/containerd/containerd/api v1.9.0
61-
github.com/containerd/containerd/v2 v2.1.4
61+
github.com/containerd/containerd/v2 v2.1.5
6262
github.com/containerd/errdefs v1.0.0
6363
github.com/containerd/log v0.1.0
6464
github.com/containerd/platforms v1.0.0-rc.1

hack/release.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ etcd: 3.6.5
3030
Flannel: 0.27.4
3131
Flannel CNI plugin: v1.8.0-flannel2
3232
runc: 1.3.3
33+
containerd: 2.1.5
3334
34-
Talos is built with Go 1.25.3.
35+
Talos is built with Go 1.25.4.
3536
"""
3637

3738
[notes.luks2]

internal/app/machined/pkg/controllers/secrets/data/ca-certificates

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
## Bundle of CA Root Certificates
33
##
4-
## Certificate data from Mozilla as of: Tue Sep 9 03:12:01 2025 GMT
4+
## Certificate data from Mozilla as of: Tue Nov 4 04:12:02 2025 GMT
55
##
66
## Find updated versions here: https://curl.se/docs/caextract.html
77
##
@@ -16,7 +16,7 @@
1616
## Just configure this file as the SSLCACertificateFile.
1717
##
1818
## Conversion done with mk-ca-bundle.pl version 1.29.
19-
## SHA256: 0078e6bdd280fd89e1b883174387aae84b3eae2ee263416a5f8a14ee7f179ae9
19+
## SHA256: 039132bff5179ce57cec5803ba59fe37abe6d0297aeb538c5af27847f0702517
2020
##
2121

2222

@@ -3554,3 +3554,48 @@ KIqlIgyKhPBZLtU30WHlQnNYKoH3dtvi4k0NX/a3vgW0rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0n
35543554
hzck5npgL7XTgwSqT0N1osGDsieYK7EOgLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rw
35553555
tnu64ZzZ
35563556
-----END CERTIFICATE-----
3557+
3558+
OISTE Server Root ECC G1
3559+
========================
3560+
-----BEGIN CERTIFICATE-----
3561+
MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQswCQYDVQQGEwJD
3562+
SDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwYT0lTVEUgU2VydmVyIFJvb3Qg
3563+
RUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUyNDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAX
3564+
BgNVBAoMEE9JU1RFIEZvdW5kYXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBH
3565+
MTB2MBAGByqGSM49AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOuj
3566+
vqQycvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N2xml4z+c
3567+
KrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3TYhlz/w9itWj8UnATgwQ
3568+
b0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9CtJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqG
3569+
SM49BAMDA2kAMGYCMQCpKjAd0MKfkFFRQD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxg
3570+
ZzFDJe0CMQCSia7pXGKDYmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
3571+
-----END CERTIFICATE-----
3572+
3573+
OISTE Server Root RSA G1
3574+
=========================
3575+
-----BEGIN CERTIFICATE-----
3576+
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
3601+
-----END CERTIFICATE-----

pkg/machinery/constants/constants.go

Lines changed: 2 additions & 2 deletions
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.4"
564+
DefaultContainerdVersion = "2.1.5"
565565

566566
// RuncVersion is the runc version.
567567
RuncVersion = "1.3.3"
@@ -1125,7 +1125,7 @@ const (
11251125
DBusClientSocketLabel = "system_u:object_r:dbus_client_socket_t:s0"
11261126

11271127
// GoVersion is the version of Go compiler this release was built with.
1128-
GoVersion = "go1.25.3"
1128+
GoVersion = "go1.25.4"
11291129

11301130
// KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API.
11311131
KubernetesTalosAPIServiceName = "talos"

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-alpha.0-48-g70404aa
1+
v1.12.0-alpha.0-50-g4ae050a

pkg/machinery/gendata/data/tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0-alpha.0-16-ga08cc1f
1+
v1.12.0-alpha.0-18-g44932c0

0 commit comments

Comments
 (0)