diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go index d2b3a1dab882d..2ff867d21d37c 100644 --- a/nodeup/pkg/model/containerd.go +++ b/nodeup/pkg/model/containerd.go @@ -103,6 +103,32 @@ var containerdVersions = []packageVersion{ }, }, + // 1.3.7 - Linux Generic AMD64 + { + PackageVersion: "1.3.7", + PlainBinary: true, + Architectures: []architectures.Architecture{architectures.ArchitectureAmd64}, + Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz", + Hash: "ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8", + MapFiles: map[string]string{ + "docker/c*": "/usr/bin", + "docker/runc": "/usr/bin", + }, + }, + + // 1.3.7 - Linux Generic ARM64 + { + PackageVersion: "1.3.7", + PlainBinary: true, + Architectures: []architectures.Architecture{architectures.ArchitectureArm64}, + Source: "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz", + Hash: "bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec", + MapFiles: map[string]string{ + "docker/c*": "/usr/bin", + "docker/runc": "/usr/bin", + }, + }, + // 1.4.1 - Linux Generic AMD64 { PackageVersion: "1.4.1", diff --git a/nodeup/pkg/model/docker.go b/nodeup/pkg/model/docker.go index f676fac6bf39e..01316b17e9896 100644 --- a/nodeup/pkg/model/docker.go +++ b/nodeup/pkg/model/docker.go @@ -356,6 +356,30 @@ var dockerVersions = []packageVersion{ }, }, + // 19.03.13 - Linux Generic AMD64 - Kubernetes 1.19+ + { + PackageVersion: "19.03.13", + PlainBinary: true, + Architectures: []architectures.Architecture{architectures.ArchitectureAmd64}, + Source: "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz", + Hash: "ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8", + MapFiles: map[string]string{ + "docker/docker*": "/usr/bin", + }, + }, + + // 19.03.13 - Linux Generic ARM64 - Kubernetes 1.19+ + { + PackageVersion: "19.03.13", + PlainBinary: true, + Architectures: []architectures.Architecture{architectures.ArchitectureArm64}, + Source: "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz", + Hash: "bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec", + MapFiles: map[string]string{ + "docker/docker*": "/usr/bin", + }, + }, + // 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 // (you might want to temporarily comment out older versions on a slower connection and then validate) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 20ce13adade66..7272e642747b0 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -1054,7 +1054,7 @@ func validateDockerConfig(config *kops.DockerConfig, fldPath *field.Path) field. 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/")) } 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", "19.03.11"} + 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", "19.03.13"} allErrs = append(allErrs, IsValidValue(fldPath.Child("version"), config.Version, valid)...) } } diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index 3563e05d402be..114144931a8ea 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -88,6 +88,8 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error { // Set the containerd version for known Docker versions switch fi.StringValue(clusterSpec.Docker.Version) { + case "19.03.13": + containerd.Version = fi.String("1.3.7") case "19.03.8", "19.03.11": containerd.Version = fi.String("1.2.13") case "19.03.4": diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go index 666bdafdaf658..6fb22e2df93b0 100644 --- a/pkg/model/components/docker.go +++ b/pkg/model/components/docker.go @@ -47,7 +47,9 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error { // Set the Docker version for known Kubernetes versions if fi.StringValue(clusterSpec.Docker.Version) == "" { - if b.IsKubernetesGTE("1.17") { + if b.IsKubernetesGTE("1.19") { + docker.Version = fi.String("19.03.13") + } else if b.IsKubernetesGTE("1.17") { docker.Version = fi.String("19.03.11") } else if b.IsKubernetesGTE("1.16") { docker.Version = fi.String("18.09.9")