Add support for containerd v1.3.9 for older k8s versions

kubernetes · Dec 13, 2020 · bd1b91d · bd1b91d
1 parent 73b1b39
commit bd1b91d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -54,10 +54,8 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 		if fi.StringValue(containerd.Version) == "" {
 			if b.IsKubernetesGTE("1.19") {
 				containerd.Version = fi.String("1.4.3")
-			} else if b.IsKubernetesGTE("1.18") {
-				containerd.Version = fi.String("1.3.4")
 			} else {
-				return fmt.Errorf("containerd version is required")
+				containerd.Version = fi.String("1.3.9")
 			}
 		}
 

diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go
@@ -153,6 +153,7 @@ func findContainerdVersionHash(arch architectures.Architecture, version string)
 func findAllContainerdHashesAmd64() map[string]string {
 	hashes := map[string]string{
 		"1.3.4": "4616971c3ad21c24f2f2320fa1c085577a91032a068dd56a41c7c4b71a458087",
+		"1.3.9": "96663699e0f888fbf232ae6629a367aa7421f6b95044e7ee5d4d4e02841fac75",
 		"1.4.0": "b379f29417efd583f77e095173d4d0bd6bb001f0081b2a63d152ee7aef653ce1",
 		"1.4.1": "757efb93a4f3161efc447a943317503d8a7ded5cb4cc0cba3f3318d7ce1542ed",
 		"1.4.2": "9d0fd5f4d2bc58b345728432b7daac75fc99c1da91afa4f41e6103f618e74012",