diff --git a/README.md b/README.md index 08d60a392..036e356bc 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ Note: Upstart/SysV init based OS types are not supported. - Core - [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1 - [etcd](https://github.com/coreos/etcd) v3.4.13 - - [docker](https://www.docker.com/) v19.03 (see note) + - [docker](https://www.docker.com/) v20.10 (see note) - [containerd](https://containerd.io/) v1.4.4 - [cri-o](http://cri-o.io/) v1.21 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) - Network Plugin @@ -156,7 +156,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Container Runtime Notes -- The list of available docker version is 18.09, 19.03 and 20.10. The recommended docker version is 19.03. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin). +- The list of available docker version is 18.09, 19.03 and 20.10. The recommended docker version is 20.10. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin). - The cri-o version should be aligned with the respective kubernetes version (i.e. kube_version=1.20.x, crio_version=1.20) ## Requirements diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index aa9da53e1..09cdbb6a8 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -1,5 +1,5 @@ --- -docker_version: '19.03' +docker_version: '20.10' docker_cli_version: "{{ docker_version }}" docker_package_info: diff --git a/tests/files/packet_debian9-calico-upgrade.yml b/tests/files/packet_debian9-calico-upgrade.yml index ca5ef1216..90dd472c1 100644 --- a/tests/files/packet_debian9-calico-upgrade.yml +++ b/tests/files/packet_debian9-calico-upgrade.yml @@ -7,3 +7,6 @@ mode: default kube_network_plugin: calico deploy_netchecker: true dns_min_replicas: 1 + +# Only docker package 19.03 for Debian9 +docker_version: '19.03' diff --git a/tests/files/packet_fedora33-calico.yml b/tests/files/packet_fedora33-calico.yml index 0721734de..42904d824 100644 --- a/tests/files/packet_fedora33-calico.yml +++ b/tests/files/packet_fedora33-calico.yml @@ -8,7 +8,4 @@ deploy_netchecker: true dns_min_replicas: 1 kube_network_plugin: calico -# Only docker package 20.10 for Fedora33 -docker_version: '20.10' - auto_renew_certificates: true