From 856beb21cc3505c10d17e030d2ce0487e019c7ab Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 5 Aug 2022 19:36:40 +0400 Subject: [PATCH] feat: containerd 1.6.7, Flannel 1.19.1 See * https://github.com/flannel-io/flannel/releases/tag/v0.19.1 * https://github.com/containerd/containerd/releases/tag/v1.6.7 Signed-off-by: Andrey Smirnov --- Makefile | 2 +- hack/release.toml | 2 ++ pkg/images/list.go | 2 +- pkg/machinery/constants/constants.go | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1194f09df..5f113f208 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ NAME = Talos ARTIFACTS := _out TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0-alpha.0-6-gcd35510 -PKGS ?= v1.2.0-alpha.0-25-g6feece4 +PKGS ?= v1.2.0-alpha.0-26-g360d596 EXTRAS ?= v1.2.0-alpha.0-2-gda35a63 GO_VERSION ?= 1.19 GOIMPORTS_VERSION ?= v0.1.11 diff --git a/hack/release.toml b/hack/release.toml index 374c052e1..568a352e9 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -92,6 +92,8 @@ vlan=eth1.5:eth1 ip=172.20.0.2::172.20.0.1:255.255.255.0::eth1.5::::: title = "Component Updates" description="""\ * Linux: 5.15.58 +* Flannel 0.19.1 +* containerd 1.16.7 Talos is built with Go 1.19. """ diff --git a/pkg/images/list.go b/pkg/images/list.go index 4c6d76160..95b866069 100644 --- a/pkg/images/list.go +++ b/pkg/images/list.go @@ -37,7 +37,7 @@ func List(config config.Provider) Versions { images.Etcd = config.Cluster().Etcd().Image() images.CoreDNS = config.Cluster().CoreDNS().Image() - images.Flannel = "ghcr.io/siderolabs/flannel:v0.18.1" // mirrored from docker.io/flannelcni/flannel + images.Flannel = "ghcr.io/siderolabs/flannel:v0.19.1" // mirrored from docker.io/flannelcni/flannel images.FlannelCNI = fmt.Sprintf("ghcr.io/siderolabs/install-cni:%s", version.ExtrasVersion) images.Kubelet = config.Machine().Kubelet().Image() images.KubeAPIServer = config.Cluster().APIServer().Image() diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 70afe075b..08594eabd 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -410,7 +410,7 @@ const ( TrustdUserID = 51 // DefaultContainerdVersion is the default container runtime version. - DefaultContainerdVersion = "1.6.6" + DefaultContainerdVersion = "1.6.7" // SystemContainerdNamespace is the Containerd namespace for Talos services. SystemContainerdNamespace = "system" diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index a9c5d9322..137105af0 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.2.0-alpha.0-25-g6feece4 \ No newline at end of file +v1.2.0-alpha.0-26-g360d596 \ No newline at end of file