github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

change crictl sandboxes to pods; other references to sandboxes

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2018-02-07 17:09:01 -06:00 committed by Derek McGowan
parent 8bc30e7a2e
commit 24a3a0a068
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/health-monitor.sh
View File

@ -28,10 +28,10 @@ CHECK_PERIOD=${CHECK_PERIOD:-10}
SLEEP_SECONDS=${SLEEP_SECONDS:-120} SLEEP_SECONDS=${SLEEP_SECONDS:-120}
while true; do 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. # cri-containerd to be working.
if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} sandboxes > /dev/null; then if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} pods > /dev/null; then
echo "crictl sandboxes timeout!" echo "crictl pods timeout!"
pkill containerd pkill containerd
pkill cri-containerd pkill cri-containerd
# Wait for a while, as we don't want to kill it again before it is really up. # Wait for a while, as we don't want to kill it again before it is really up.