kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ubuntu focal: Use generic docker & container packages 

download.docker.com doesn't have packages for ubuntu 20.04 (focal),
use the generic tar.gz versions instead.
This commit is contained in:
Justin SB 2020-05-02 11:22:09 -04:00
parent d29253a025
commit 06c20ea223
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodeup/pkg/model/containerd.go
View File

@ -117,12 +117,12 @@ var containerdVersions = []packageVersion{
// 1.2.10 - Linux Generic // 1.2.10 - Linux Generic
// //
// Used only on AmazonLinux2: the Centos7 package pulls in // * AmazonLinux2: the Centos7 package depends on container-selinux, but selinux isn't used on amazonlinux2
// container-selinux, but selinux isn't used on amazonlinux2 // * UbuntuFocal: no focal version available at download.docker.com
{ {
PackageVersion: "1.2.10", PackageVersion: "1.2.10",
PlainBinary: true, PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2}, Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []Architecture{ArchitectureAmd64}, Architectures: []Architecture{ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.10.linux-amd64.tar.gz", Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.10.linux-amd64.tar.gz",
Hash: "c84c29dcd1867a6ee9899d2106ab4f28854945f6", Hash: "c84c29dcd1867a6ee9899d2106ab4f28854945f6",

13
nodeup/pkg/model/docker.go
View File

@ -477,12 +477,12 @@ var dockerVersions = []packageVersion{
// 18.09.9 - Linux Generic // 18.09.9 - Linux Generic
// //
// Used only on AmazonLinux2: the Centos7 package pulls in // * AmazonLinux2: the Centos7 package depends on container-selinux, but selinux isn't used on amazonlinux2
// container-selinux, but selinux isn't used on amazonlinux2 // * UbuntuFocal: no focal version available at download.docker.com
{ {
PackageVersion: "18.09.9", PackageVersion: "18.09.9",
PlainBinary: true, PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2}, Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []Architecture{ArchitectureAmd64}, Architectures: []Architecture{ArchitectureAmd64},
Source: "https://download.docker.com/linux/static/stable/x86_64/docker-18.09.9.tgz", Source: "https://download.docker.com/linux/static/stable/x86_64/docker-18.09.9.tgz",
Hash: "1b1516253aa876f77193deb901e53977b3c84476", Hash: "1b1516253aa876f77193deb901e53977b3c84476",
@ -490,11 +490,14 @@ var dockerVersions = []packageVersion{
// 19.03.4 - k8s 1.17 - https://github.com/kubernetes/kubernetes/pull/84476 // 19.03.4 - k8s 1.17 - https://github.com/kubernetes/kubernetes/pull/84476
// 19.03.4 - Linux Generic used only for Amazon Linux 2 // 19.03.4 - Linux Generic
//
// * AmazonLinux2: the Centos7 package depends on container-selinux, but selinux isn't used on amazonlinux2
// * UbuntuFocal: no focal version available at download.docker.com
{ {
PackageVersion: "19.03.4", PackageVersion: "19.03.4",
PlainBinary: true, PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2}, Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []Architecture{ArchitectureAmd64}, Architectures: []Architecture{ArchitectureAmd64},
Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.4.tgz", Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.4.tgz",
Hash: "5b9aa113916cfdde3eaf2bd25d2b8c3da49e0268", Hash: "5b9aa113916cfdde3eaf2bd25d2b8c3da49e0268",