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

Use Docker 19.03.11 for Kubernetes 1.18+

This commit is contained in:
Ciprian Hacman 2020-06-03 11:57:59 +03:00
parent 6d33b83567
commit a7c9ef9ff0
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/releases/1.18-NOTES.md
View File

@ -4,7 +4,7 @@
# Significant changes # Significant changes
* The default Docker version has been changed to 19.03.8. * The default Docker version has been changed to 19.03.11.
* Support for [RHEL 8](../operations/images.md#rhel-8) and [CentOS 8](../operations/images.md#centos-8) has been added. * Support for [RHEL 8](../operations/images.md#rhel-8) and [CentOS 8](../operations/images.md#centos-8) has been added.

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

@ -552,6 +552,15 @@ var dockerVersions = []packageVersion{
Hash: "7f4115dc6a3c19c917f8b9664d7b51c904def1c984e082c4600097433323cf6f", Hash: "7f4115dc6a3c19c917f8b9664d7b51c904def1c984e082c4600097433323cf6f",
}, },
// 19.03.11 - Linux Generic
{
PackageVersion: "19.03.11",
PlainBinary: true,
Architectures: []Architecture{ArchitectureAmd64},
Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.11.tgz",
Hash: "0f4336378f61ed73ed55a356ac19e46699a995f2aff34323ba5874d131548b9e",
},
// TIP: When adding the next version, copy the previous version, string replace the version and run: // TIP: When adding the next version, copy the previous version, string replace the version and run:
// VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestDockerPackageHashes // VERIFY_HASHES=1 go test -v ./nodeup/pkg/model -run TestDockerPackageHashes
// (you might want to temporarily comment out older versions on a slower connection and then validate) // (you might want to temporarily comment out older versions on a slower connection and then validate)

2
pkg/apis/kops/validation/validation.go
View File

@ -719,7 +719,7 @@ func validateDockerConfig(config *kops.DockerConfig, fldPath *field.Path) field.
allErrs = append(allErrs, field.Invalid(fldPath.Child("version"), config.Version, allErrs = append(allErrs, field.Invalid(fldPath.Child("version"), config.Version,
"version is no longer available: https://www.docker.com/blog/changes-dockerproject-org-apt-yum-repositories/")) "version is no longer available: https://www.docker.com/blog/changes-dockerproject-org-apt-yum-repositories/"))
} else { } else {
valid := []string{"17.03.2", "17.09.0", "18.03.1", "18.06.1", "18.06.2", "18.06.3", "18.09.3", "18.09.9", "19.03.4", "19.03.8"} valid := []string{"17.03.2", "17.09.0", "18.03.1", "18.06.1", "18.06.2", "18.06.3", "18.09.3", "18.09.9", "19.03.4", "19.03.8", "19.03.11"}
allErrs = append(allErrs, IsValidValue(fldPath.Child("version"), config.Version, valid)...) allErrs = append(allErrs, IsValidValue(fldPath.Child("version"), config.Version, valid)...)
} }
} }

2
pkg/model/components/containerd.go
View File

@ -90,7 +90,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
// Set the containerd version for known Docker versions // Set the containerd version for known Docker versions
switch fi.StringValue(clusterSpec.Docker.Version) { switch fi.StringValue(clusterSpec.Docker.Version) {
case "19.03.8": case "19.03.8", "19.03.11":
containerd.Version = fi.String("1.2.13") containerd.Version = fi.String("1.2.13")
case "19.03.4": case "19.03.4":
containerd.Version = fi.String("1.2.10") containerd.Version = fi.String("1.2.10")

2
pkg/model/components/docker.go
View File

@ -48,7 +48,7 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
// Set the Docker version for known Kubernetes versions // Set the Docker version for known Kubernetes versions
if fi.StringValue(clusterSpec.Docker.Version) == "" { if fi.StringValue(clusterSpec.Docker.Version) == "" {
if b.IsKubernetesGTE("1.18") { if b.IsKubernetesGTE("1.18") {
docker.Version = fi.String("19.03.8") docker.Version = fi.String("19.03.11")
} else if b.IsKubernetesGTE("1.17") { } else if b.IsKubernetesGTE("1.17") {
docker.Version = fi.String("19.03.4") docker.Version = fi.String("19.03.4")
} else if b.IsKubernetesGTE("1.16") { } else if b.IsKubernetesGTE("1.16") {