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

Decrease docker dependency (#7172)

Browse Source
This commit is contained in:
Florian Ruynat
2021-01-18 10:41:44 +01:00
committed by GitHub
parent e3caff833c
commit 91ee4aa542
7 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/network_plugin/calico/handlers/main.yml
View File

@@ -4,22 +4,22 @@
when: calico_cni_config is defined
notify:
- delete 10-calico.conflist
- docker | delete calico-node containers
- containerd | delete calico-node containers
- Calico | delete calico-node docker containers
- Calico | delete calico-node crio/containerd containers
- name: delete 10-calico.conflist
file:
path: /etc/cni/net.d/10-calico.conflist
state: absent
- name: docker | delete calico-node containers
- name: Calico | delete calico-node docker containers
shell: "{{ docker_bin_dir }}/docker ps -af name=k8s_POD_calico-node* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f"
register: docker_calico_node_remove
until: docker_calico_node_remove is succeeded
retries: 5
when: container_manager in ["docker"]
- name: containerd | delete calico-node containers
- name: Calico | delete calico-node crio/containerd containers
shell: '{{ bin_dir }}/crictl pods --name calico-node-* -q | xargs -I% --no-run-if-empty bash -c "{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %"'
register: crictl_calico_node_remove
until: crictl_calico_node_remove is succeeded

8
roles/network_plugin/kube-router/handlers/main.yml
View File

@@ -2,17 +2,17 @@
- name: reset_kube_router
command: /bin/true
notify:
- docker | delete kube-router containers
- containerd | delete kube-router containers
- Kube-router | delete kube-router docker containers
- Kube-router | delete kube-router crio/containerd containers
- name: docker | delete kube-router containers
- name: Kube-router | delete kube-router docker containers
shell: "{{ docker_bin_dir }}/docker ps -af name=k8s_POD_kube-router* -q | xargs --no-run-if-empty docker rm -f"
register: docker_kube_router_remove
until: docker_kube_router_remove is succeeded
retries: 5
when: container_manager in ["docker"]
- name: containerd | delete kube-router containers
- name: Kube-router | delete kube-router crio/containerd containers
shell: '{{ bin_dir }}/crictl pods --name kube-router* -q | xargs -I% --no-run-if-empty bash -c "{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %"'
register: crictl_kube_router_remove
until: crictl_kube_router_remove is succeeded