Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove EXIT_ON_WEAK_ERROR variable #23190

Merged
merged 1 commit into from
Mar 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions cluster/kube-up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@
export NODE_DISK_SIZE="50GB"
export NUM_NODES="1000"
export ALLOWED_NOTREADY_NODES="2"
export EXIT_ON_WEAK_ERROR="false"
# Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=1"
export MAX_INSTANCES_PER_MIG="1000"
Expand Down