Skip to content

Commit

Permalink
feat: update Linux to 6.1.80, Go to 1.21.8
Browse files Browse the repository at this point in the history
Go update addresses several CVEs.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Mar 6, 2024
1 parent 22803bc commit 2df2586
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 22 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ NAME = Talos
CLOUD_IMAGES_EXTRA_ARGS ?= ""

ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-2-g5e034ec
PKGS ?= v1.6.0-25-g6868f38
TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-3-gae30965
PKGS ?= v1.6.0-26-g2961472
PKG_KERNEL ?= ghcr.io/siderolabs/kernel:$(PKGS)
EXTRAS ?= v1.6.0-1-g113887a
EXTRAS ?= v1.6.0-2-g9234398
# renovate: datasource=github-tags depName=golang/go
GO_VERSION ?= 1.21
# renovate: datasource=go depName=golang.org/x/tools
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/talos

go 1.21.6
go 1.21.8

replace (
// Use nested module.
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.21.6
go 1.21.8

use (
.
Expand Down
15 changes: 3 additions & 12 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ github_repo = "siderolabs/talos"
match_deps = "^github.com/((talos-systems|siderolabs)/[a-zA-Z0-9-]+)$"

# previous release
previous = "v1.6.4"
previous = "v1.6.5"

pre_release = false

Expand All @@ -17,18 +17,9 @@ preface = """\
[notes.updates]
title = "Component Updates"
description = """\
Kubernetes: 1.29.2
Linux: 6.1.78
Linux: 6.1.80
Talos is built with Go 1.21.6.
"""


[notes.k8supgrade]
title = "Kubernetes Upgrade"
description = """\
The command `talosctl upgrade-k8s` now supports specifying custom image references for Kubernetes components via `--*-image` flags.
The default behavior is unchanged, and the flags are optional.
Talos is built with Go 1.21.8.
"""

[make_deps]
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 @@ -16,7 +16,7 @@ import (

const (
// DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "6.1.78-talos"
DefaultKernelVersion = "6.1.80-talos"

// KernelModulesPath is the default path to the kernel modules without the kernel version.
KernelModulesPath = "/lib/modules"
Expand Down Expand Up @@ -868,7 +868,7 @@ const (
DBusClientSocketPath = "/run/dbus/system_bus_socket"

// GoVersion is the version of Go compiler this release was built with.
GoVersion = "go1.21.6 X:loopvar"
GoVersion = "go1.21.8 X:loopvar"

// KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API.
KubernetesTalosAPIServiceName = "talos"
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.6.0-1-g113887a
v1.6.0-2-g9234398
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/pkgs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.6.0-25-g6868f38
v1.6.0-26-g2961472
2 changes: 1 addition & 1 deletion pkg/machinery/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/talos/pkg/machinery

go 1.21.6
go 1.21.8

// forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
// which are then encoded as a valid YAML blocks with proper indentiation
Expand Down

0 comments on commit 2df2586

Please sign in to comment.