Skip to content

Commit

Permalink
feat: linux 5.15.86, containerd 1.6.15
Browse files Browse the repository at this point in the history
See https://github.com/containerd/containerd/releases/tag/v1.6.15

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Jan 11, 2023
1 parent 4469ad1 commit 9fc9372
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ NAME = Talos

ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.3.0-1-g712379c
PKGS ?= v1.3.0-7-g9931288
PKGS ?= v1.3.0-9-g9543590
EXTRAS ?= v1.3.0-1-g3773d71
GO_VERSION ?= 1.19
GOIMPORTS_VERSION ?= v0.1.11
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
github.com/beevik/ntp v0.3.0
github.com/cenkalti/backoff/v4 v4.2.0
github.com/containerd/cgroups v1.0.4
github.com/containerd/containerd v1.6.14
github.com/containerd/containerd v1.6.15
github.com/containerd/typeurl v1.0.2
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq
github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
github.com/containerd/containerd v1.6.14 h1:W+d0AJKVG3ioTZZyQwcw1Y3vvo6ZDYzAcjDcY4tkgGI=
github.com/containerd/containerd v1.6.14/go.mod h1:U2NnBPIhzJDm59xF7xB2MMHnKtggpZ+phKg8o2TKj2c=
github.com/containerd/containerd v1.6.15 h1:4wWexxzLNHNE46aIETc6ge4TofO550v+BlLoANrbses=
github.com/containerd/containerd v1.6.15/go.mod h1:U2NnBPIhzJDm59xF7xB2MMHnKtggpZ+phKg8o2TKj2c=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
Expand Down
6 changes: 3 additions & 3 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.3.0"
previous = "v1.3.1"

pre_release = false

Expand All @@ -18,8 +18,8 @@ preface = """\
[notes.updates]
title = "Component Updates"
description="""\
* Linux: 5.15.85
* containerd: v1.6.14
* Linux: 5.15.86
* containerd: v1.6.15
"""

[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 @@ -13,7 +13,7 @@ import (

const (
// DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "5.15.85-talos"
DefaultKernelVersion = "5.15.86-talos"

// KernelParamConfig is the kernel parameter name for specifying the URL.
// to the config.
Expand Down Expand Up @@ -423,7 +423,7 @@ const (
TrustdUserID = 51

// DefaultContainerdVersion is the default container runtime version.
DefaultContainerdVersion = "1.6.14"
DefaultContainerdVersion = "1.6.15"

// 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.3.0-7-g9931288
v1.3.0-9-g9543590

0 comments on commit 9fc9372

Please sign in to comment.