Skip to content

Commit

Permalink
feat: update Linux 6.6.24, containerd 1.7.15
Browse files Browse the repository at this point in the history
Updates to match 1.7.0-beta.1 release.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Apr 11, 2024
1 parent c51f146 commit 54dac5e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.24-talos"
DefaultKernelVersion = "6.6.26-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 = "1.7.14"
DefaultContainerdVersion = "1.7.15"

// SystemContainerdNamespace is the Containerd namespace for Talos services.
SystemContainerdNamespace = "system"
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/extras
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.0-1-gbb76755
v1.8.0-alpha.0
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/pkgs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.0-2-g6101299
v1.8.0-alpha.0-3-g010913b

0 comments on commit 54dac5e

Please sign in to comment.