From e11156135b3281342a38ccdb8041836855905591 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 2 Dec 2020 09:54:32 +0200 Subject: [PATCH] Update Docker to v19.03.14 --- pkg/model/components/docker.go | 2 +- upup/pkg/fi/cloudup/containerd.go | 1 + upup/pkg/fi/cloudup/docker.go | 2 ++ upup/pkg/fi/cloudup/populatecluster_test.go | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go index 70e57280afd7c..cb9101c35f4f0 100644 --- a/pkg/model/components/docker.go +++ b/pkg/model/components/docker.go @@ -48,7 +48,7 @@ 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") { - docker.Version = fi.String("19.03.13") + docker.Version = fi.String("19.03.14") } else if b.IsKubernetesGTE("1.16") { docker.Version = fi.String("18.09.9") } else { diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go index b5dcc6f68435d..6e3adb2f22012 100644 --- a/upup/pkg/fi/cloudup/containerd.go +++ b/upup/pkg/fi/cloudup/containerd.go @@ -171,6 +171,7 @@ func findAllContainerdDockerMappings() map[string]string { "1.2.12": "19.03.6", "1.2.13": "19.03.11", "1.3.7": "19.03.13", + "1.3.9": "19.03.14", } return versions diff --git a/upup/pkg/fi/cloudup/docker.go b/upup/pkg/fi/cloudup/docker.go index a5f55e5f414d6..5cbb35b9d39c9 100644 --- a/upup/pkg/fi/cloudup/docker.go +++ b/upup/pkg/fi/cloudup/docker.go @@ -173,6 +173,7 @@ func findAllDockerHashesAmd64() map[string]string { "19.03.11": "0f4336378f61ed73ed55a356ac19e46699a995f2aff34323ba5874d131548b9e", "19.03.12": "88de1b87b8a2582fe827154899475a72fb707c5793cfb39d2a24813ba1f31197", "19.03.13": "ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8", + "19.03.14": "9f1ec28e357a8f18e9561129239caf9c0807d74756e21cc63637c7fdeaafe847", } return hashes @@ -214,6 +215,7 @@ func findAllDockerHashesArm64() map[string]string { "19.03.11": "9cd49fe82f6b7ec413b04daef35bc0c87b01d6da67611e5beef36291538d3145", "19.03.12": "bc7810d58e32360652abfddc9cb43405feee4ed9592aedc1132fb35eede9fa9e", "19.03.13": "bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec", + "19.03.14": "8350eaa0c0965bb8eb9d45a014f4b6728c985715f56466077dfe6feb271d9518", } return hashes diff --git a/upup/pkg/fi/cloudup/populatecluster_test.go b/upup/pkg/fi/cloudup/populatecluster_test.go index 771d3fd2979b2..431f346003213 100644 --- a/upup/pkg/fi/cloudup/populatecluster_test.go +++ b/upup/pkg/fi/cloudup/populatecluster_test.go @@ -390,7 +390,7 @@ func TestPopulateCluster_DockerVersion(t *testing.T) { }, { KubernetesVersion: "1.17.0", - DockerVersion: "19.03.13", + DockerVersion: "19.03.14", }, }