From 3de48dad8b3753b4fbbc761635a69f0f4cfbe64c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 20 Apr 2020 06:10:25 +0300 Subject: [PATCH] Add support for containerd v1.3.4 --- nodeup/pkg/model/containerd.go | 9 +++++++++ pkg/model/components/containerd.go | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go index dbc7638246..7865287e3d 100644 --- a/nodeup/pkg/model/containerd.go +++ b/nodeup/pkg/model/containerd.go @@ -160,6 +160,15 @@ var containerdVersions = []packageVersion{ Hash: "921b74e84da366ec3eaa72ff97fa8d6ae56834c6", }, + // 1.3.4 - Linux Generic + { + PackageVersion: "1.3.4", + PlainBinary: true, + Architectures: []Architecture{ArchitectureAmd64}, + Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.3.4.linux-amd64.tar.gz", + Hash: "ce518d8091ffdd40caa7f386c742d9b1d03e01b5", + }, + // TIP: When adding the next version, copy the previous version, string replace the version and run: // VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestContainerdPackageHashes // (you might want to temporarily comment out older versions on a slower connection and then validate) diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index cede832430..2123ab52a1 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -53,8 +53,8 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error { // Set containerd based on Kubernetes version if fi.StringValue(containerd.Version) == "" { - if b.IsKubernetesGTE("1.17") { - containerd.Version = fi.String("1.3.3") + if b.IsKubernetesGTE("1.18") { + containerd.Version = fi.String("1.3.4") } else if b.IsKubernetesGTE("1.11") { return fmt.Errorf("containerd version is required") }