Add support for containerd v1.4.3 ARM64

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

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go
@@ -35,7 +35,7 @@ const (
 	// containerd legacy packages URLs for v1.2.x and v1.3.x
 	containerdLegacyUrlAmd64 = "https://storage.googleapis.com/cri-containerd-release/cri-containerd-%s.linux-amd64.tar.gz"
 	// containerd version that is available for both AMD64 and ARM64, used in case the selected version is not available for ARM64
-	containerdFallbackVersion = "1.2.13"
+	containerdFallbackVersion = "1.4.3"
 )
 
 func findContainerdAsset(c *kops.Cluster, assetBuilder *assets.AssetBuilder, arch architectures.Architecture) (*url.URL, *hashing.Hash, error) {
@@ -106,7 +106,7 @@ func findContainerdVersionUrl(arch architectures.Architecture, version string) (
 			u = fmt.Sprintf(containerdLegacyUrlAmd64, version)
 		}
 	case architectures.ArchitectureArm64:
-		// For now there are only official AMD64 builds, using Default Docker version instead
+		// For now there are only official AMD64 builds, always using fallback Docker version instead
 		if findAllContainerdHashesAmd64()[version] != "" {
 			u = fmt.Sprintf(dockerVersionUrlArm64, findAllContainerdDockerMappings()[containerdFallbackVersion])
 		}
@@ -135,7 +135,7 @@ func findContainerdVersionHash(arch architectures.Architecture, version string)
 	case architectures.ArchitectureAmd64:
 		h = findAllContainerdHashesAmd64()[version]
 	case architectures.ArchitectureArm64:
-		// For now there are only official AMD64 builds, using Default Docker version instead
+		// For now there are only official AMD64 builds, always using fallback Docker version instead
 		if findAllContainerdHashesAmd64()[version] != "" {
 			h = findAllDockerHashesArm64()[findAllContainerdDockerMappings()[containerdFallbackVersion]]
 		}
@@ -172,6 +172,7 @@ func findAllContainerdDockerMappings() map[string]string {
 		"1.2.13": "19.03.11",
 		"1.3.7":  "19.03.13",
 		"1.3.9":  "19.03.14",
+		"1.4.3":  "20.10.0",
 	}
 
 	return versions

diff --git a/upup/pkg/fi/cloudup/docker.go b/upup/pkg/fi/cloudup/docker.go
@@ -174,6 +174,7 @@ func findAllDockerHashesAmd64() map[string]string {
 		"19.03.12": "88de1b87b8a2582fe827154899475a72fb707c5793cfb39d2a24813ba1f31197",
 		"19.03.13": "ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8",
 		"19.03.14": "9f1ec28e357a8f18e9561129239caf9c0807d74756e21cc63637c7fdeaafe847",
+		"20.10.0":  "02936a3585f12f13b21b95e02ae722d74eaf1870b536997e914659ee307b2ac4",
 	}
 
 	return hashes
@@ -216,6 +217,7 @@ func findAllDockerHashesArm64() map[string]string {
 		"19.03.12": "bc7810d58e32360652abfddc9cb43405feee4ed9592aedc1132fb35eede9fa9e",
 		"19.03.13": "bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec",
 		"19.03.14": "8350eaa0c0965bb8eb9d45a014f4b6728c985715f56466077dfe6feb271d9518",
+		"20.10.0":  "6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c",
 	}
 
 	return hashes