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

Update Docker version defaults for older k8s versions

This commit is contained in:
Ciprian Hacman 2020-10-09 13:23:38 +03:00
parent cc41bba0cf
commit 95f9228e54
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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") {

2
upup/pkg/fi/cloudup/populatecluster_test.go
View File

@ -394,7 +394,7 @@ func TestPopulateCluster_DockerVersion(t *testing.T) {
},
{
KubernetesVersion: "1.17.0",
DockerVersion: "19.03.11",
DockerVersion: "19.03.13",
},
}