Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Docker 19.03.11 for Kubernetes 1.17+ #9317

Merged
merged 5 commits into from
Jun 10, 2020
Merged

Use Docker 19.03.11 for Kubernetes 1.17+ #9317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc79e31
Use Docker 19.03.11 for Kubernetes 1.17+
Jun 9, 2020
2a632e6
Optimize package install for newer Docker versions
Jun 9, 2020
9c13e7f
Update tests
Jun 9, 2020
73526d2
Optimize package install for newer Containerd versions
Jun 9, 2020
619af9e
Update tests
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions nodeup/pkg/model/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,103 +51,15 @@ var containerdVersions = []packageVersion{
Hash: "5d4eeec093bc6f0b35921b88c3939b480acc619c790f4eab001a66efb957e6c1",
},

// 1.2.10 - Debian Stretch
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionDebian9},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10-3",
Source: "https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/containerd.io_1.2.10-3_amd64.deb",
Hash: "786a625f773ec5ac5dc4ebd9463ba7deb6926da890fa57a9ac79be7a6839865c",
},

// 1.2.10 - Debian Buster
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionDebian10},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10-3",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/containerd.io_1.2.10-3_amd64.deb",
Hash: "355973b23d3d172b5cfb05bc605f2b0cd7145f2fcc572264225d8910701c650d",
},

// 1.2.10 - Ubuntu Xenial
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionXenial},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10-3",
Source: "https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/containerd.io_1.2.10-3_amd64.deb",
Hash: "ec7f4698df82c4dc683a8835ef5a3ecce4df1e41c5d65b4e17558cdccf44952b",
},

// 1.2.10 - Ubuntu Bionic
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionBionic},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10-3",
Source: "https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/containerd.io_1.2.10-3_amd64.deb",
Hash: "ffa99f3f4b3a76c66f04ad327b8eb6b437e311887e3e0330447fbf5ea2ddd827",
},

// 1.2.10 - CentOS7 / Rhel 7
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionRhel7, distros.DistributionCentos7},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.10-3.2.el7.x86_64.rpm",
Hash: "8f29304480a197343fb6fb0fd28e8753aed4e177545568cb4ea3b0f0c02ebf82",
},

// 1.2.10 - CentOS8 / Rhel 8
{
PackageVersion: "1.2.10",
Name: "containerd.io",
Distros: []distros.Distribution{distros.DistributionRhel8, distros.DistributionCentos8},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "1.2.10",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.10-3.2.el7.x86_64.rpm",
Hash: "8f29304480a197343fb6fb0fd28e8753aed4e177545568cb4ea3b0f0c02ebf82",
},

// 1.2.10 - 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: "1.2.10",
PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.10.linux-amd64.tar.gz",
Hash: "9125a6ae5a89dfe9403fea7d03a8d8ba9fa97b6863ee8698c4e6c258fb14f1fd",
},

// 1.2.11 - Linux Generic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I presume you're planning on removing support for these four versions from 1.18 as well.

I notice we don't have API validation for the containerd version.

Copy link
Member Author

@hakman hakman Jun 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, will cherry-pick to 1.18 also. These were only used during development and current versions will be the final ones for 1.18 (unless some big issue comes up).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version validation for Docker was a bit rushed up when 1.x support was removed.
Thanks for the reminder to add validation for containerd also.

{
PackageVersion: "1.2.11",
PlainBinary: true,
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.11.linux-amd64.tar.gz",
Hash: "df89b00e927115f1f21eec139e55668a6284abb2f378512677c99a3751579e51",
},

// 1.2.12 - Linux Generic
{
PackageVersion: "1.2.12",
PlainBinary: true,
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.12.linux-amd64.tar.gz",
Hash: "291c26f97546ad92ce51e1584c002b286a82a64f1138cf11f78ef7c91adf5c80",
},

// 1.2.13 - Linux Generic
{
PackageVersion: "1.2.13",
Expand All @@ -157,24 +69,6 @@ var containerdVersions = []packageVersion{
Hash: "92d6ae6c60f6b068652b31811ce23d650ec0f6cc1e618ec9ae23db9321956258",
},

// 1.3.2 - Linux Generic
{
PackageVersion: "1.3.2",
PlainBinary: true,
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.3.2.linux-amd64.tar.gz",
Hash: "95cf4d2cfa23c7a586980c51f8c283a9f0717e09d1a3cc54fc6ed7984923b7aa",
},

// 1.3.3 - Linux Generic
{
PackageVersion: "1.3.3",
PlainBinary: true,
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.3.3.linux-amd64.tar.gz",
Hash: "24ce7ad6b489fb25d07d2a3bb50e443fcce1ac3318f8cc0831e00668c2c9fd86",
},

// 1.3.4 - Linux Generic
{
PackageVersion: "1.3.4",
Expand Down
228 changes: 0 additions & 228 deletions nodeup/pkg/model/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,252 +298,24 @@ var dockerVersions = []packageVersion{
Hash: "f3703698cab918ab41b1244f699c8718a5e3bf4070fdf4894b5b6e8d92545a62",
},

// 18.09.9 - k8s 1.14 - https://github.com/kubernetes/kubernetes/pull/72823

// 18.09.9 - Debian Stretch
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionDebian9},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:18.09.9~3-0~debian-stretch",
Source: "https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.09.9~3-0~debian-stretch_amd64.deb",
Hash: "53d9d25bb7d55c05a6c5829606122257ada8863ccb222ff0293fcf1d75990058",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:18.09.9~3-0~debian-stretch",
Source: "https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce-cli_18.09.9~3-0~debian-stretch_amd64.deb",
Hash: "1cc46c8634704e192f402844747a82b986b2461beb3da748f4ca6a36918e6442",
},
},
},

// 18.09.9 - Debian Buster
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionDebian10},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:18.09.9~3-0~debian-buster",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/docker-ce_18.09.9~3-0~debian-buster_amd64.deb",
Hash: "b0f4ce24089593ef6335e53e4c78d619a58539492121340da963c1a88687a059",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:18.09.9~3-0~debian-buster",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/docker-ce-cli_18.09.9~3-0~debian-buster_amd64.deb",
Hash: "e2b0543de09206072691c0c09fc2ad64acea988eb56e31e3bd02889f1435befd",
},
},
},

// 18.09.9 - Xenial
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionXenial},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:18.09.9~3-0~ubuntu-xenial",
Source: "https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.09.9~3-0~ubuntu-xenial_amd64.deb",
Hash: "30885e58747eff619dc22b074307e21bc176c71396c5d54a32764ffcc359beaf",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:18.09.9~3-0~ubuntu-xenial",
Source: "https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce-cli_18.09.9~3-0~ubuntu-xenial_amd64.deb",
Hash: "927c6df4fd2bc380be4f315169114cfd34d53856df004eeac3de35360f3eca9f",
},
},
},

// 18.09.9 - Bionic
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionBionic},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:18.09.9~3-0~ubuntu-bionic",
Source: "https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/docker-ce_18.09.9~3-0~ubuntu-bionic_amd64.deb",
Hash: "95160362599c506375c36f324f00404ad066ab4d94c840336781b5930d893467",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:18.09.9~3-0~ubuntu-bionic",
Source: "https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/docker-ce-cli_18.09.9~3-0~ubuntu-bionic_amd64.deb",
Hash: "10abf1e3c25882d5a099ffda2a5a54168f600eb3e056b67c4fa4e20ecf5a03df",
},
},
},

// 18.09.9 - CentOS7 / Rhel7
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionRhel7, distros.DistributionCentos7},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "18.09.9",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-18.09.9-3.el7.x86_64.rpm",
Hash: "f4be41bf8093c076462a9a2d7669d1b3158e4c3799759dbf9689b77de49385a8",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "18.09.9",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-cli-18.09.9-3.el7.x86_64.rpm",
Hash: "b1658ece6b8524a9c23a8623a7485b361c61a49ba887b51d9cc4ef58cfeb878a",
},
},
},

// 18.09.9 - CentOS / Rhel8
{
PackageVersion: "18.09.9",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionRhel8, distros.DistributionCentos8},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "18.09.9",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-18.09.9-3.el7.x86_64.rpm",
Hash: "f4be41bf8093c076462a9a2d7669d1b3158e4c3799759dbf9689b77de49385a8",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "18.09.9",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-cli-18.09.9-3.el7.x86_64.rpm",
Hash: "b1658ece6b8524a9c23a8623a7485b361c61a49ba887b51d9cc4ef58cfeb878a",
},
},
},

// 18.09.9 - 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: "18.09.9",
PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://download.docker.com/linux/static/stable/x86_64/docker-18.09.9.tgz",
Hash: "82a362af7689038c51573e0fd0554da8703f0d06f4dfe95dd5bda5acf0ae45fb",
},

// 19.03.4 - k8s 1.17 - https://github.com/kubernetes/kubernetes/pull/84476

// 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",
PlainBinary: true,
Distros: []distros.Distribution{distros.DistributionAmazonLinux2, distros.DistributionFocal},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.4.tgz",
Hash: "efef2ad32d262674501e712351be0df9dd31d6034b175d0020c8f5d5c9c3fd10",
},

// 19.03.4 - Debian Stretch
{
PackageVersion: "19.03.4",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionDebian9},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:19.03.4~3-0~debian-stretch",
Source: "https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_19.03.4~3-0~debian-stretch_amd64.deb",
Hash: "a5fedef212914c443ed71c9ba2fbe0cdf39e0a6e2da8dfcc29881c6c536877ce",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:19.03.4~3-0~debian-stretch",
Source: "https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce-cli_19.03.4~3-0~debian-stretch_amd64.deb",
Hash: "f0f3c9c91a9482b0fe120cd9e404c3ade342ce01d0d98a7f6bce3e16b7c57a11",
},
},
},

// 19.03.4 - Debian Buster
{
PackageVersion: "19.03.4",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should be removing these, since 19.03.4 is still a supported option in validation.go

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't remove it, it remains as static package for all distros.

Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionDebian10},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:19.03.4~3-0~debian-buster",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/docker-ce_19.03.4~3-0~debian-buster_amd64.deb",
Hash: "cdd9d2147a6f6c9c38a6addfdd56d7d65d688a83f44ff3a289de7e15c796b87c",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:19.03.4~3-0~debian-buster",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/docker-ce-cli_19.03.4~3-0~debian-buster_amd64.deb",
Hash: "92c681c324f3d24517dc25daf9f4cd52034a24a72bb98827a4bcf4f6b56e6088",
},
},
},

// 19.03.4 - Xenial
{
PackageVersion: "19.03.4",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionXenial},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:19.03.4~3-0~ubuntu-xenial",
Source: "https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_19.03.4~3-0~ubuntu-xenial_amd64.deb",
Hash: "7bf9d7c3127dc910b8364c5799c667ff8a45e4c8bd859f908ea4a66944312ff3",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:19.03.4~3-0~ubuntu-xenial",
Source: "https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce-cli_19.03.4~3-0~ubuntu-xenial_amd64.deb",
Hash: "00622505c8f47e0b711ba7f7582473d55b38dd8d7bae20d286aa473595c5f6cf",
},
},
},

// 19.03.4 - Bionic
{
PackageVersion: "19.03.4",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionBionic},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "5:19.03.4~3-0~ubuntu-bionic",
Source: "https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb",
Hash: "31ee4b40cc6b76966318e007a1c7cedd64c6a3dd957de1de40734eb06320b8d3",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "5:19.03.4~3-0~ubuntu-bionic",
Source: "https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64/docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb",
Hash: "d364ba24b3756c5e1f7b860cef5361ce717a99bb982aa76dbd6d8a928a2de056",
},
},
},

// 19.03.4 - CentOS / Rhel7
{
PackageVersion: "19.03.4",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionRhel7, distros.DistributionCentos7},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "19.03.4",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-19.03.4-3.el7.x86_64.rpm",
Hash: "46ebc08b3740bfb532f686a143e144a4c73ddcd600e83104ae4617b301b83f42",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "19.03.4",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-cli-19.03.4-3.el7.x86_64.rpm",
Hash: "1b34e1dd1ec5af7e0e37e80bb1ddf0e36006639e8964cf8fc308683f90d38b7a",
},
},
},

// 19.03.4 - CentOS / Rhel8
{
PackageVersion: "19.03.4",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionRhel8, distros.DistributionCentos8},
Architectures: []architectures.Architecture{architectures.ArchitectureAmd64},
Version: "19.03.4",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-19.03.4-3.el7.x86_64.rpm",
Hash: "46ebc08b3740bfb532f686a143e144a4c73ddcd600e83104ae4617b301b83f42",
ExtraPackages: map[string]packageInfo{
"docker-ce-cli": {
Version: "19.03.4",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-cli-19.03.4-3.el7.x86_64.rpm",
Hash: "1b34e1dd1ec5af7e0e37e80bb1ddf0e36006639e8964cf8fc308683f90d38b7a",
},
},
},

// 19.03.8 - Linux Generic
{
PackageVersion: "19.03.8",
Expand Down
Loading