Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Linux to 6.6.36 #8960

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-5-gd2746e5

PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.8.0-alpha.0-29-g84bad89
PKGS ?= v1.8.0-alpha.0-32-g8d6b19a
EXTRAS ?= v1.8.0-alpha.0-2-g0efb05f

KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
Expand Down
6 changes: 3 additions & 3 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ preface = """\
title = "Component Updates"
description = """\
Kubernetes: 1.30.2
Linux: 6.6.32
containerd: 2.0.0-rc.2
runc: 1.2.0-rc.1
Linux: 6.6.36
containerd: 2.0.0-rc.3
runc: 1.2.0-rc.2
etcd: 3.5.14
Flannel: 0.25.3

Expand Down
4 changes: 2 additions & 2 deletions pkg/machinery/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

const (
// DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "6.6.33-talos"
DefaultKernelVersion = "6.6.36-talos"

// KernelModulesPath is the default path to the kernel modules without the kernel version.
KernelModulesPath = "/lib/modules"
Expand Down Expand Up @@ -477,7 +477,7 @@ const (
TrustdUserID = 51

// DefaultContainerdVersion is the default container runtime version.
DefaultContainerdVersion = "2.0.0-rc.2"
DefaultContainerdVersion = "2.0.0-rc.3"

// SystemContainerdNamespace is the Containerd namespace for Talos services.
SystemContainerdNamespace = "system"
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/pkgs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.8.0-alpha.0-29-g84bad89
v1.8.0-alpha.0-32-g8d6b19a
Loading