mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-28 09:39:12 +03:00
[docker] use cri-dockerd instead of dockershim for any kubernetes version deployed with docker as the container_manager
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
ec01b40e85
commit
fad296616c
@@ -4,7 +4,6 @@
|
||||
become: true
|
||||
vars:
|
||||
container_manager: docker
|
||||
cri_dockerd_enabled: true
|
||||
roles:
|
||||
- role: kubespray-defaults
|
||||
- role: container-engine/cri-dockerd
|
||||
|
||||
@@ -50,16 +50,8 @@ dependencies:
|
||||
- container-engine
|
||||
- containerd
|
||||
|
||||
- role: container-engine/docker
|
||||
when:
|
||||
- container_manager == 'docker'
|
||||
tags:
|
||||
- container-engine
|
||||
- docker
|
||||
|
||||
- role: container-engine/cri-dockerd
|
||||
when:
|
||||
- cri_dockerd_enabled
|
||||
- container_manager == 'docker'
|
||||
tags:
|
||||
- container-engine
|
||||
|
||||
Reference in New Issue
Block a user