From dc081ad3a3657f8ef38b422a1eabaae5d78bd779 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 10 Feb 2021 13:15:58 -0800 Subject: [PATCH] increase tolerance to 95% disk full, exit if error --- parts/k8s/cloud-init/artifacts/cse_install.sh | 4 ++-- vhd/packer/install-dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh index 8c07d596f07..d6c5de48906 100755 --- a/parts/k8s/cloud-init/artifacts/cse_install.sh +++ b/parts/k8s/cloud-init/artifacts/cse_install.sh @@ -233,8 +233,8 @@ pullContainerImage() { retrycmd 60 1 1200 $cli_tool pull $url || exit 35 } loadContainerImage() { - docker pull $1 - docker save $1 | ctr -n=k8s.io images import - + docker pull $1 || exit 35 + docker save $1 | ctr -n=k8s.io images import - || exit 35 } overrideNetworkConfig() { diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index a631765b4bf..3f955e2e7dd 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -503,7 +503,7 @@ df -h # warn at 75% space taken [ -s $(df -P | grep '/dev/sda1' | awk '0+$5 >= 75 {print}') ] || echo "WARNING: 75% of /dev/sda1 is used" >> ${VHD_LOGS_FILEPATH} # error at 90% space taken -[ -s $(df -P | grep '/dev/sda1' | awk '0+$5 >= 90 {print}') ] || exit 1 +[ -s $(df -P | grep '/dev/sda1' | awk '0+$5 >= 95 {print}') ] || exit 1 echo "Using kernel:" >> ${VHD_LOGS_FILEPATH} tee -a ${VHD_LOGS_FILEPATH} < /proc/version