From cb969aa9f8d641056bb7ee360023eb5ec88fb91c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 24 Apr 2026 21:36:46 +0400 Subject: [PATCH] feat: update Linux to 6.18.24 Sync pkgs/tools, also updates Flannel CNI plugin. Signed-off-by: Andrey Smirnov --- Makefile | 4 ++-- hack/release.toml | 6 +++--- pkg/machinery/constants/constants.go | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- pkg/machinery/gendata/data/tools | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 55b2a9085..5d8d3dc06 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,9 @@ DEBUG_TOOLS_SOURCE := scratch EMBED_TARGET ?= embed TOOLS_PREFIX ?= ghcr.io/siderolabs/tools -TOOLS ?= v1.13.0-beta.0-3-gc192d81 +TOOLS ?= v1.13.0 PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.13.0-beta.0-14-gb121566 +PKGS ?= v1.13.0 GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex GENERATE_VEX ?= latest diff --git a/hack/release.toml b/hack/release.toml index 3421b337f..efa297939 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -18,13 +18,13 @@ preface = """ [notes.updates] title = "Component Updates" description = """\ -Linux: 6.18.22 +Linux: 6.18.24 containerd: 2.2.3 etcd: 3.6.9 CoreDNS: 1.14.2 -Kubernetes: 1.36.0-rc.1 +Kubernetes: 1.36.0 CNI: 1.9.1 -Flannel CNI plugin: v1.9.0-flannel1 +Flannel CNI plugin: v1.9.1-flannel1 Flannel: 0.28.2 LVM2: 2_03_38 runc: 1.4.2 diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 2dca6c2a8..525fdfc4e 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -13,7 +13,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.18.22-talos" + DefaultKernelVersion = "6.18.24-talos" // KernelParamConfig is the kernel parameter name for specifying the URL. // to the config. diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index 0c86b5622..e58d236a7 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.13.0-beta.0-14-gb121566 \ No newline at end of file +v1.13.0 \ No newline at end of file diff --git a/pkg/machinery/gendata/data/tools b/pkg/machinery/gendata/data/tools index 75c747c38..e58d236a7 100644 --- a/pkg/machinery/gendata/data/tools +++ b/pkg/machinery/gendata/data/tools @@ -1 +1 @@ -v1.13.0-beta.0-3-gc192d81 \ No newline at end of file +v1.13.0 \ No newline at end of file