From 54dac5ed40698b8886096c620ac19ed55a4b99a1 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrey.smirnov@siderolabs.com>
Date: Thu, 11 Apr 2024 16:23:42 +0400
Subject: [PATCH] feat: update Linux 6.6.24, containerd 1.7.15

Updates to match 1.7.0-beta.1 release.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
---
 Makefile                             | 6 +++---
 hack/release.toml                    | 4 ++--
 pkg/machinery/constants/constants.go | 4 ++--
 pkg/machinery/gendata/data/extras    | 2 +-
 pkg/machinery/gendata/data/pkgs      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 20141833b3..ef1d9ca4cf 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,11 @@ NAME = Talos
 CLOUD_IMAGES_EXTRA_ARGS ?= ""
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-1-g10b2a69
+TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0
 
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.7.0-2-g6101299
-EXTRAS ?= v1.7.0-1-gbb76755
+PKGS ?= v1.8.0-alpha.0-3-g010913b
+EXTRAS ?= v1.8.0-alpha.0
 
 PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS)
 PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS)
diff --git a/hack/release.toml b/hack/release.toml
index f806f34a7c..6a12350d5f 100644
--- a/hack/release.toml
+++ b/hack/release.toml
@@ -17,10 +17,10 @@ preface = """\
     [notes.updates]
         title = "Component Updates"
         description = """\
-Linux: 6.6.24
+Linux: 6.6.26
 etcd: 3.5.11
 Kubernetes: 1.30.0-rc.1
-containerd: 1.7.14
+containerd: 1.7.15
 runc: 1.1.12
 Flannel: 0.24.4
 
diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go
index a33e3c728a..6c8349ed1f 100644
--- a/pkg/machinery/constants/constants.go
+++ b/pkg/machinery/constants/constants.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	// DefaultKernelVersion is the default Linux kernel version.
-	DefaultKernelVersion = "6.6.24-talos"
+	DefaultKernelVersion = "6.6.26-talos"
 
 	// KernelModulesPath is the default path to the kernel modules without the kernel version.
 	KernelModulesPath = "/lib/modules"
@@ -477,7 +477,7 @@ const (
 	TrustdUserID = 51
 
 	// DefaultContainerdVersion is the default container runtime version.
-	DefaultContainerdVersion = "1.7.14"
+	DefaultContainerdVersion = "1.7.15"
 
 	// SystemContainerdNamespace is the Containerd namespace for Talos services.
 	SystemContainerdNamespace = "system"
diff --git a/pkg/machinery/gendata/data/extras b/pkg/machinery/gendata/data/extras
index 613982274b..f9560ddd48 100644
--- a/pkg/machinery/gendata/data/extras
+++ b/pkg/machinery/gendata/data/extras
@@ -1 +1 @@
-v1.7.0-1-gbb76755
\ No newline at end of file
+v1.8.0-alpha.0
\ No newline at end of file
diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs
index dd12ac5ac8..b964e40e02 100644
--- a/pkg/machinery/gendata/data/pkgs
+++ b/pkg/machinery/gendata/data/pkgs
@@ -1 +1 @@
-v1.7.0-2-g6101299
\ No newline at end of file
+v1.8.0-alpha.0-3-g010913b
\ No newline at end of file