github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Add a flag to allow non-fatal errors in validate-cluster

Browse Source
This commit is contained in:
gmarek 2016-02-01 14:26:31 +01:00
parent 6aaabc6f46
commit efacc0435e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/kube-up.sh
View File

@ -25,6 +25,7 @@ set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
EXIT_ON_WEAK_ERROR="${EXIT_ON_WEAK_ERROR:-true}"
if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
source "${KUBE_ROOT}/cluster/env.sh" source "${KUBE_ROOT}/cluster/env.sh"
@ -47,7 +48,18 @@ echo "... calling kube-up" >&2
kube-up kube-up
echo "... calling validate-cluster" >&2 echo "... calling validate-cluster" >&2
if [[ "${EXIT_ON_WEAK_ERROR}" == "true" ]]; then
validate-cluster validate-cluster
else
if ! validate-cluster; then
local validate_result="$?"
if [[ "${validate_result}" == "1" ]]; then
exit 1
elif [[ "${validate_result}" == "2" ]]; then
echo "...ignoring non-fatal errors in validate-cluster" >&2
fi
fi
fi
echo -e "Done, listing cluster services:\n" >&2 echo -e "Done, listing cluster services:\n" >&2
"${KUBE_ROOT}/cluster/kubectl.sh" cluster-info "${KUBE_ROOT}/cluster/kubectl.sh" cluster-info

2
hack/jenkins/e2e.sh
View File

@ -528,6 +528,7 @@ case ${JOB_NAME} in
NODE_DISK_SIZE="50GB" NODE_DISK_SIZE="50GB"
NUM_NODES="1000" NUM_NODES="1000"
ALLOWED_NOTREADY_NODES="2" ALLOWED_NOTREADY_NODES="2"
EXIT_ON_WEAK_ERROR="false"
# Reduce logs verbosity # Reduce logs verbosity
TEST_CLUSTER_LOG_LEVEL="--v=1" TEST_CLUSTER_LOG_LEVEL="--v=1"
# Increase resync period to simulate production # Increase resync period to simulate production
@ -928,6 +929,7 @@ export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-}
export GCE_SERVICE_ACCOUNT=$(gcloud auth list 2> /dev/null | grep active | cut -f3 -d' ') export GCE_SERVICE_ACCOUNT=$(gcloud auth list 2> /dev/null | grep active | cut -f3 -d' ')
export FAIL_ON_GCP_RESOURCE_LEAK="${FAIL_ON_GCP_RESOURCE_LEAK:-false}" export FAIL_ON_GCP_RESOURCE_LEAK="${FAIL_ON_GCP_RESOURCE_LEAK:-false}"
export ALLOWED_NOTREADY_NODES=${ALLOWED_NOTREADY_NODES:-} export ALLOWED_NOTREADY_NODES=${ALLOWED_NOTREADY_NODES:-}
export EXIT_ON_WEAK_ERROR=${EXIT_ON_WEAK_ERROR:-}
# GKE variables # GKE variables
export CLUSTER_NAME=${E2E_CLUSTER_NAME} export CLUSTER_NAME=${E2E_CLUSTER_NAME}