github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 02:37:36 +00:00
Code Issues Projects Releases Wiki Activity

Fixed e2e tests for HA master.

Browse Source 
Set of fixes that allows HA master e2e tests to pass for removal/addition of master replicas.
This commit is contained in:
Jerzy Szczepkowski
2016-10-11 14:52:51 +02:00
parent ab184e1b1f
commit d01998f5fa
7 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/validate-cluster.sh
View File

@@ -52,7 +52,12 @@ CLUSTER_READY_ADDITIONAL_TIME_SECONDS="${CLUSTER_READY_ADDITIONAL_TIME_SECONDS:-
EXPECTED_NUM_NODES="${NUM_NODES}"
if [[ "${REGISTER_MASTER_KUBELET:-}" == "true" ]]; then
EXPECTED_NUM_NODES=$((EXPECTED_NUM_NODES+1))
if [[ "${KUBERNETES_PROVIDER:-}" == "gce" ]]; then
NUM_MASTERS=$(get-master-replicas-count)
else
NUM_MASTERS=1
fi
EXPECTED_NUM_NODES=$((EXPECTED_NUM_NODES+NUM_MASTERS))
fi
REQUIRED_NUM_NODES=$((EXPECTED_NUM_NODES - ALLOWED_NOTREADY_NODES))
# Make several attempts to deal with slow cluster birth.