diff --git a/roles/etcdctl/tasks/main.yml b/roles/etcdctl/tasks/main.yml index cd65cb4c5..47aa04004 100644 --- a/roles/etcdctl/tasks/main.yml +++ b/roles/etcdctl/tasks/main.yml @@ -32,11 +32,11 @@ - block: - name: Copy etcdctl script to host - shell: "docker exec \"$(docker ps -qf ancestor={{ etcd_image_repo }}:{{ etcd_image_tag }})\" cp /usr/local/bin/etcdctl {{ etcd_data_dir }}" + shell: "{{ docker_bin_dir }}/docker exec \"$({{ docker_bin_dir }}/docker ps -qf ancestor={{ etcd_image_repo }}:{{ etcd_image_tag }})\" cp /usr/local/bin/etcdctl {{ etcd_data_dir }}" when: container_manager == "docker" - name: Copy etcdctl script to host - shell: "crictl exec \"$(crictl ps -q --image {{ etcd_image_repo }}:{{ etcd_image_tag }})\" cp /usr/local/bin/etcdctl {{ etcd_data_dir }}" + shell: "{{ bin_dir }}/crictl exec \"$({{ bin_dir }}/crictl ps -q --image {{ etcd_image_repo }}:{{ etcd_image_tag }})\" cp /usr/local/bin/etcdctl {{ etcd_data_dir }}" when: container_manager in ['crio', 'containerd'] - name: Copy etcdctl to {{ bin_dir }} diff --git a/roles/kubernetes/master/handlers/main.yml b/roles/kubernetes/master/handlers/main.yml index 0c4b2a9dd..b9920edb9 100644 --- a/roles/kubernetes/master/handlers/main.yml +++ b/roles/kubernetes/master/handlers/main.yml @@ -52,7 +52,7 @@ when: container_manager == "docker" - name: Master | Remove apiserver container containerd/crio - shell: crictl pods --name kube-apiserver* -q | xargs -I% --no-run-if-empty bash -c 'crictl stopp % && crictl rmp %' + shell: "{{ bin_dir }}/crictl pods --name kube-apiserver* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'" register: remove_apiserver_container retries: 10 until: remove_apiserver_container.rc == 0 @@ -60,7 +60,7 @@ when: container_manager in ['containerd', 'crio'] - name: Master | Remove scheduler container docker - shell: "docker ps -af name=k8s_kube-scheduler* -q | xargs --no-run-if-empty docker rm -f" + shell: "{{ docker_bin_dir }}/docker ps -af name=k8s_kube-scheduler* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f" register: remove_scheduler_container retries: 10 until: remove_scheduler_container.rc == 0 @@ -68,7 +68,7 @@ when: container_manager == "docker" - name: Master | Remove scheduler container containerd/crio - shell: crictl pods --name kube-scheduler* -q | xargs -I% --no-run-if-empty bash -c 'crictl stopp % && crictl rmp %' + shell: "{{ bin_dir }}/crictl pods --name kube-scheduler* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'" register: remove_scheduler_container retries: 10 until: remove_scheduler_container.rc == 0 @@ -76,7 +76,7 @@ when: container_manager in ['containerd', 'crio'] - name: Master | Remove controller manager container docker - shell: "docker ps -af name=k8s_kube-controller-manager* -q | xargs --no-run-if-empty docker rm -f" + shell: "{{ docker_bin_dir }}/docker ps -af name=k8s_kube-controller-manager* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f" register: remove_cm_container retries: 10 until: remove_cm_container.rc == 0 @@ -84,7 +84,7 @@ when: container_manager == "docker" - name: Master | Remove controller manager container containerd/crio - shell: crictl pods --name kube-controller-manager* -q | xargs -I% --no-run-if-empty bash -c 'crictl stopp % && crictl rmp %' + shell: "{{ bin_dir }}/crictl pods --name kube-controller-manager* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'" register: remove_cm_container retries: 10 until: remove_cm_container.rc == 0 diff --git a/roles/kubernetes/node/tasks/pre_upgrade.yml b/roles/kubernetes/node/tasks/pre_upgrade.yml index 38ecbf43d..72100373e 100644 --- a/roles/kubernetes/node/tasks/pre_upgrade.yml +++ b/roles/kubernetes/node/tasks/pre_upgrade.yml @@ -3,9 +3,9 @@ shell: >- set -o pipefail && {% if container_manager in ['crio', 'docker'] %} - docker ps -af name=kubelet | grep kubelet + {{ docker_bin_dir }}/docker ps -af name=kubelet | grep kubelet {% elif container_manager == 'containerd' %} - crictl ps --all --name kubelet | grep kubelet + {{ bin_dir }}/crictl ps --all --name kubelet | grep kubelet {% endif %} args: executable: /bin/bash @@ -34,9 +34,9 @@ - name: "Pre-upgrade | ensure kubelet container is removed if using host deployment" shell: >- {% if container_manager in ['crio', 'docker'] %} - docker rm -fv kubelet + {{ docker_bin_dir }}/docker rm -fv kubelet {% elif container_manager == 'containerd' %} - crictl stop kubelet && crictl rm kubelet + {{ bin_dir }}/crictl stop kubelet && {{ bin_dir }}/crictl rm kubelet {% endif %} failed_when: false changed_when: false diff --git a/roles/kubernetes/preinstall/handlers/main.yml b/roles/kubernetes/preinstall/handlers/main.yml index f9c4c6c23..6818de27a 100644 --- a/roles/kubernetes/preinstall/handlers/main.yml +++ b/roles/kubernetes/preinstall/handlers/main.yml @@ -61,7 +61,7 @@ when: inventory_hostname in groups['kube-master'] and dns_mode != 'none' and resolvconf_mode == 'host_resolvconf' - name: Preinstall | restart kube-controller-manager docker - shell: "docker ps -f name=k8s_POD_kube-controller-manager* -q | xargs --no-run-if-empty docker rm -f" + shell: "{{ docker_bin_dir }}/docker ps -f name=k8s_POD_kube-controller-manager* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f" when: - container_manager == "docker" - inventory_hostname in groups['kube-master'] @@ -70,7 +70,7 @@ - kube_controller_set.stat.exists - name: Preinstall | restart kube-controller-manager crio/containerd - shell: crictl pods --name kube-controller-manager* -q | xargs -I% --no-run-if-empty bash -c 'crictl stopp % && crictl rmp %' + shell: "{{ bin_dir }}/crictl pods --name kube-controller-manager* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'" when: - container_manager in ['crio', 'containerd'] - inventory_hostname in groups['kube-master'] @@ -79,7 +79,7 @@ - kube_controller_set.stat.exists - name: Preinstall | restart kube-apiserver docker - shell: "docker ps -f name=k8s_POD_kube-apiserver* -q | xargs --no-run-if-empty docker rm -f" + shell: "{{ docker_bin_dir }}/docker ps -f name=k8s_POD_kube-apiserver* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f" when: - container_manager == "docker" - inventory_hostname in groups['kube-master'] @@ -87,7 +87,7 @@ - resolvconf_mode == 'host_resolvconf' - name: Preinstall | restart kube-apiserver crio/containerd - shell: crictl pods --name kube-apiserver* -q | xargs -I% --no-run-if-empty bash -c 'crictl stopp % && crictl rmp %' + shell: "{{ bin_dir }}/crictl pods --name kube-apiserver* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'" when: - container_manager in ['crio', 'containerd'] - inventory_hostname in groups['kube-master'] diff --git a/roles/network_plugin/kube-router/handlers/main.yml b/roles/network_plugin/kube-router/handlers/main.yml index 363c3490b..073c89765 100644 --- a/roles/network_plugin/kube-router/handlers/main.yml +++ b/roles/network_plugin/kube-router/handlers/main.yml @@ -6,14 +6,14 @@ - containerd | delete kube-router containers - name: docker | delete kube-router containers - shell: "docker ps -af name=k8s_POD_kube-router* -q | xargs --no-run-if-empty docker rm -f" + 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 - shell: 'crictl pods --name kube-router* -q | xargs -I% --no-run-if-empty bash -c "crictl stopp % && crictl rmp %"' + 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 retries: 5 diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 48a7b8d8c..3852202af 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -67,7 +67,7 @@ - docker - name: reset | stop all cri containers - shell: "set -o pipefail && crictl ps -aq | xargs -r crictl -t 60s stop" + shell: "set -o pipefail && {{ bin_dir }}/crictl ps -aq | xargs -r {{ bin_dir }}/crictl -t 60s stop" args: executable: /bin/bash register: remove_all_cri_containers @@ -80,7 +80,7 @@ when: container_manager in ["crio", "containerd"] - name: reset | remove all cri containers - shell: "set -o pipefail && crictl ps -aq | xargs -r crictl -t 60s rm" + shell: "set -o pipefail && {{ bin_dir }}/crictl ps -aq | xargs -r {{ bin_dir }}/crictl -t 60s rm" args: executable: /bin/bash register: remove_all_cri_containers @@ -108,7 +108,7 @@ when: container_manager == "crio" - name: reset | stop all cri pods - shell: "set -o pipefail && crictl pods -q | xargs -r crictl -t 60s stopp" + shell: "set -o pipefail && {{ bin_dir }}/crictl pods -q | xargs -r {{ bin_dir }}/crictl -t 60s stopp" args: executable: /bin/bash register: remove_all_cri_containers @@ -119,7 +119,7 @@ when: container_manager == "containerd" - name: reset | remove all cri pods - shell: "set -o pipefail && crictl pods -q | xargs -r crictl -t 60s rmp" + shell: "set -o pipefail && {{ bin_dir }}/crictl pods -q | xargs -r {{ bin_dir }}/crictl -t 60s rmp" args: executable: /bin/bash register: remove_all_cri_containers