diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go index adbca52dff918..6c280aa87962a 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.14") + docker.Version = fi.String("19.03.15") } else if b.IsKubernetesGTE("1.16") { docker.Version = fi.String("18.09.9") } else { diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index db49ecf08ea46..61f678efdea68 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -160,7 +160,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L urlAmd64: https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz urlArm64: https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz storage: overlay2,overlay,aufs - version: 19.03.14 + version: 19.03.15 encryptionConfig: null etcdClusters: events: @@ -500,7 +500,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat urlAmd64: https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz urlArm64: https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz storage: overlay2,overlay,aufs - version: 19.03.14 + version: 19.03.15 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m diff --git a/upup/pkg/fi/cloudup/docker.go b/upup/pkg/fi/cloudup/docker.go index e86e874cd1d8d..67b9d3322ce16 100644 --- a/upup/pkg/fi/cloudup/docker.go +++ b/upup/pkg/fi/cloudup/docker.go @@ -190,7 +190,11 @@ func findAllDockerHashesAmd64() map[string]string { "19.03.12": "88de1b87b8a2582fe827154899475a72fb707c5793cfb39d2a24813ba1f31197", "19.03.13": "ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8", "19.03.14": "9f1ec28e357a8f18e9561129239caf9c0807d74756e21cc63637c7fdeaafe847", + "19.03.15": "5504d190eef37355231325c176686d51ade6e0cabe2da526d561a38d8611506f", "20.10.0": "02936a3585f12f13b21b95e02ae722d74eaf1870b536997e914659ee307b2ac4", + "20.10.1": "8790f3b94ee07ca69a9fdbd1310cbffc729af0a07e5bf9f34a79df1e13d2e50e", + "20.10.2": "97017e32a8ecbdd1826bb3c7b1424303ee0dea3f900d33591b1df5e394ed4eed", + "20.10.3": "47065a47f0692cd5af03073c7386fe090d9ef5ac88a7d8455a884d8e15809be5", } return hashes @@ -233,7 +237,11 @@ func findAllDockerHashesArm64() map[string]string { "19.03.12": "bc7810d58e32360652abfddc9cb43405feee4ed9592aedc1132fb35eede9fa9e", "19.03.13": "bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec", "19.03.14": "8350eaa0c0965bb8eb9d45a014f4b6728c985715f56466077dfe6feb271d9518", + "19.03.15": "264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566", "20.10.0": "6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c", + "20.10.1": "ec2a42e52614e835b373f3f5c090e2f6a8a333ea52fa02ab9d8f4ac74a2f90d5", + "20.10.2": "9ea59f249ae92bbaa9831a22f2affa2edc9e824f9daaba831ca51d6d22ef2df5", + "20.10.3": "4dcd105f721297f314bb53622e67dd981a743d72f4b2bfe4f42a8790e0892c82", } return hashes diff --git a/upup/pkg/fi/cloudup/populatecluster_test.go b/upup/pkg/fi/cloudup/populatecluster_test.go index 431f346003213..a114480e77143 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.14", + DockerVersion: "19.03.15", }, }