-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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.
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
Use Docker 19.03.11 for Kubernetes 1.17+ #9317
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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", | ||
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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).
There was a problem hiding this comment.
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.