diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go index 6fb22e2df9..db524ea15c 100644 --- a/pkg/model/components/docker.go +++ b/pkg/model/components/docker.go @@ -47,10 +47,8 @@ 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.19") { + if b.IsKubernetesGTE("1.17") { 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") } else if b.IsKubernetesGTE("1.12") { diff --git a/upup/pkg/fi/cloudup/populatecluster_test.go b/upup/pkg/fi/cloudup/populatecluster_test.go index 1ae64d7416..e169c17f4c 100644 --- a/upup/pkg/fi/cloudup/populatecluster_test.go +++ b/upup/pkg/fi/cloudup/populatecluster_test.go @@ -394,7 +394,7 @@ func TestPopulateCluster_DockerVersion(t *testing.T) { }, { KubernetesVersion: "1.17.0", - DockerVersion: "19.03.11", + DockerVersion: "19.03.13", }, }