From 7048755c0ef64d2555112854c98ed0c5522938c9 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 7 Feb 2020 06:54:46 +0200 Subject: [PATCH] Add support for containerd v1.3.3 --- nodeup/pkg/model/containerd.go | 10 ++++++++++ pkg/model/components/containerd.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go index 5941ad84ae65c..ee1125df12e3b 100644 --- a/nodeup/pkg/model/containerd.go +++ b/nodeup/pkg/model/containerd.go @@ -135,6 +135,16 @@ var containerdVersions = []packageVersion{ Hash: "f451d46280104588f236bee277bca1da8babc0e8", }, + // 1.3.3 - Linux Generic + { + PackageVersion: "1.3.3", + PlainBinary: true, + Architectures: []Architecture{ArchitectureAmd64}, + Version: "1.3.3", + Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.3.3.linux-amd64.tar.gz", + Hash: "921b74e84da366ec3eaa72ff97fa8d6ae56834c6", + }, + // TIP: When adding the next version, copy the previous version, string replace the version and run: // VERIFY_HASHES=1 go test ./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 564fa05881c7c..49c6601d5687e 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -54,7 +54,7 @@ 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.2") + containerd.Version = fi.String("1.3.3") } else if b.IsKubernetesGTE("1.11") { return fmt.Errorf("containerd version is required") }