crictl allow setting grace period for stop containers upon reset (#10651

) * crictl allow setting different grace period for stop containers and pods * correct grace period location
kubernetes-sigs · Jan 22, 2024 · 3e7b568 · 3e7b568
1 parent a45a40a
commit 3e7b568
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/roles/reset/defaults/main.yml b/roles/reset/defaults/main.yml
@@ -16,3 +16,6 @@ reset_restart_network_service_name: >-
   {%- elif ansible_os_family == "Debian" -%}
   networking
   {%- endif %}
+
+# crictl stop container grace period
+cri_stop_containers_grace_period: 0
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
@@ -52,7 +52,7 @@
   register: crictl
 
 - name: Reset | stop all cri containers
-  shell: "set -o pipefail && {{ bin_dir }}/crictl ps -q | xargs -r {{ bin_dir }}/crictl -t 60s stop"
+  shell: "set -o pipefail && {{ bin_dir }}/crictl ps -q | xargs -r {{ bin_dir }}/crictl -t 60s stop -t {{ cri_stop_containers_grace_period }}"
   args:
     executable: /bin/bash
   register: remove_all_cri_containers