Docker default version is now 20.10

pull/7657/head
Florian Ruynat 2021-05-26 22:09:32 +02:00 committed by Kubernetes Prow Robot
parent 79fdee3979
commit fd8ae54fa7
4 changed files with 6 additions and 6 deletions

View File

@ -132,7 +132,7 @@ Note: Upstart/SysV init based OS types are not supported.
- Core - Core
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1 - [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1
- [etcd](https://github.com/coreos/etcd) v3.4.13 - [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 - [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) - [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 - Network Plugin
@ -156,7 +156,7 @@ Note: Upstart/SysV init based OS types are not supported.
## Container Runtime Notes ## 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) - The cri-o version should be aligned with the respective kubernetes version (i.e. kube_version=1.20.x, crio_version=1.20)
## Requirements ## Requirements

View File

@ -1,5 +1,5 @@
--- ---
docker_version: '19.03' docker_version: '20.10'
docker_cli_version: "{{ docker_version }}" docker_cli_version: "{{ docker_version }}"
docker_package_info: docker_package_info:

View File

@ -7,3 +7,6 @@ mode: default
kube_network_plugin: calico kube_network_plugin: calico
deploy_netchecker: true deploy_netchecker: true
dns_min_replicas: 1 dns_min_replicas: 1
# Only docker package 19.03 for Debian9
docker_version: '19.03'

View File

@ -8,7 +8,4 @@ deploy_netchecker: true
dns_min_replicas: 1 dns_min_replicas: 1
kube_network_plugin: calico kube_network_plugin: calico
# Only docker package 20.10 for Fedora33
docker_version: '20.10'
auto_renew_certificates: true auto_renew_certificates: true