From 24a3a0a0682c4ba9293fd856ded88aa9888929d6 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Wed, 7 Feb 2018 17:09:01 -0600 Subject: [PATCH] change crictl sandboxes to pods; other references to sandboxes Signed-off-by: Mike Brown --- contrib/health-monitor.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/health-monitor.sh b/contrib/health-monitor.sh index f0e1ce873..b9a690f42 100755 --- a/contrib/health-monitor.sh +++ b/contrib/health-monitor.sh @@ -28,10 +28,10 @@ CHECK_PERIOD=${CHECK_PERIOD:-10} SLEEP_SECONDS=${SLEEP_SECONDS:-120} while true; do - # Use crictl sandboxes because it requires both containerd and + # Use crictl pods because it requires both containerd and # cri-containerd to be working. - if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} sandboxes > /dev/null; then - echo "crictl sandboxes timeout!" + if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} pods > /dev/null; then + echo "crictl pods timeout!" pkill containerd pkill cri-containerd # Wait for a while, as we don't want to kill it again before it is really up.