External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Docker: replace the use of containerd_version with docker_containerd_version to avoid causing conflicts when bumping containerd_version (#8130)

Browse Source
This commit is contained in:
Cristian Calin
2021-11-09 01:56:49 +02:00
committed by GitHub
parent 65540c5771
commit 4a8757161e
19 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/upgrades.md
View File

@@ -7,7 +7,8 @@ You can also individually control versions of components by explicitly defining
versions. Here are all version vars for each component:
* docker_version
* containerd_version
* docker_containerd_version (relevant when `container_manager` == `docker`)
* containerd_version (relevant when `container_manager` == `containerd`)
* kube_version
* etcd_version
* calico_version

3
docs/vars.md
View File

@@ -18,7 +18,8 @@ Some variables of note include:
* *docker_version* - Specify version of Docker to used (should be quoted
string). Must match one of the keys defined for *docker_versioned_pkg*
in `roles/container-engine/docker/vars/*.yml`.
* *containerd_version* - Specify version of Containerd to use
* *containerd_version* - Specify version of containerd to use when setting `container_manager` to `containerd`
* *docker_containerd_version* - Specify which version of containerd to use when setting `container_manager` to `docker`
* *etcd_version* - Specify version of ETCD to use
* *ipip* - Enables Calico ipip encapsulation by default
* *kube_network_plugin* - Sets k8s network plugin (default Calico)