scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 03:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21860 from gmarek/kube-up

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-29 13:14:27 -08:00
parent cbf2b269ad d959ccd87c
commit b1e29b765b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/kube-up.sh
View File

@@ -53,19 +53,20 @@ echo "... calling kube-up" >&2
kube-up
echo "... calling validate-cluster" >&2
if [[ "${EXIT_ON_WEAK_ERROR}" == "true" ]]; then
validate-cluster
else
validate-cluster
validate_result="$?"
if [[ ${validate_result} != "0" ]]; then
if [[ "${validate_result}" == "1" ]]; then
exit 1
elif [[ "${validate_result}" == "2" ]]; then
echo "...ignoring non-fatal errors in validate-cluster" >&2
else
echo "Got unknown validate result: ${validate_result}"
fi
# Override errexit
(validate-cluster) && validate_result="$?" || validate_result="$?"
# 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).
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
fi