Target explicitly to AmazonLinux2 distro, add 19.03.4

Co-authored-by: Ciprian Hacman <ciprianhacman@gmail.com>
kubernetes · May 1, 2020 · 6e3ef6d · 6e3ef6d
1 parent 7bf966e
commit 6e3ef6d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
@@ -120,6 +120,7 @@ var containerdVersions = []packageVersion{
 	{
 		PackageVersion: "1.2.10",
 		PlainBinary:    true,
+		Distros:        []distros.Distribution{distros.DistributionAmazonLinux2},
 		Architectures:  []Architecture{ArchitectureAmd64},
 		Source:         "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.10.linux-amd64.tar.gz",
 		Hash:           "c84c29dcd1867a6ee9899d2106ab4f28854945f6",

diff --git a/nodeup/pkg/model/docker.go b/nodeup/pkg/model/docker.go
@@ -476,17 +476,28 @@ var dockerVersions = []packageVersion{
 		},
 	},
 
-	// 18.09.9 - Linux Generic
+	// 18.09.9 - Linux Generic used only for Amazon Linux 2
 	{
 		PackageVersion: "18.09.9",
 		PlainBinary:    true,
+		Distros:        []distros.Distribution{distros.DistributionAmazonLinux2},
 		Architectures:  []Architecture{ArchitectureAmd64},
 		Source:         "https://download.docker.com/linux/static/stable/x86_64/docker-18.09.9.tgz",
 		Hash:           "1b1516253aa876f77193deb901e53977b3c84476",
 	},
 
 	// 19.03.4 - k8s 1.17 - https://github.com/kubernetes/kubernetes/pull/84476
 
+	// 19.03.4 - Linux Generic used only for Amazon Linux 2
+	{
+		PackageVersion: "19.03.4",
+		PlainBinary:    true,
+		Distros:        []distros.Distribution{distros.DistributionAmazonLinux2},
+		Architectures:  []Architecture{ArchitectureAmd64},
+		Source:         "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.4.tgz",
+		Hash:           "5b9aa113916cfdde3eaf2bd25d2b8c3da49e0268",
+	},
+
 	// 19.03.4 - Debian Stretch
 	{
 		PackageVersion: "19.03.4",