Merge pull request #23190 from gmarek/master

cluster/kube-up.sh

@@ -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

hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml

@@ -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"