github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove EXIT_ON_WEAK_ERROR variable

Browse Source
This commit is contained in:
gmarek
2016-03-18 15:30:16 +01:00
parent d5316c21ef
commit db77843bf0
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/kube-up.sh
View File

@@ -25,7 +25,6 @@ set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
EXIT_ON_WEAK_ERROR="${EXIT_ON_WEAK_ERROR:-false}"
if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
source "${KUBE_ROOT}/cluster/env.sh"
@@ -58,15 +57,11 @@ echo "... calling validate-cluster" >&2
# We have two different failure modes from validate cluster:
# - 1: fatal error - cluster won't be working correctly
# - 2: weak error - something went wrong, but cluster probably will be working correctly
# We always exit in case 1), but if EXIT_ON_WEAK_ERROR != true, then we don't fail on 2).
# We just print an error message in case 2).
if [[ "${validate_result}" == "1" ]]; then
exit 1
elif [[ "${validate_result}" == "2" ]]; then
if [[ "${EXIT_ON_WEAK_ERROR}" == "true" ]]; then
exit 1;
else
echo "...ignoring non-fatal errors in validate-cluster" >&2
fi
echo "...ignoring non-fatal errors in validate-cluster" >&2
fi
echo -e "Done, listing cluster services:\n" >&2