Merge pull request #38958 from jszczepkowski/ha-validation-fix

Automatic merge from submit-queue (batch tested with PRs 38942, 38958)

Added MULTIZONE flag to e2e remove master script.

Added MULTIZONE flag to e2e remove master script. The script is used by HA tests which set-up multizone cluster.
This commit is contained in:
Kubernetes Submit Queue
2016-12-19 08:45:45 -08:00
committed by GitHub
2 changed files with 4 additions and 1 deletions

View File

@@ -19,6 +19,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
if [[ ! -z "${1:-}" ]]; then
export KUBE_GCE_ZONE="${1}"
fi
if [[ ! -z "${2:-}" ]]; then
export MULTIZONE="${2}"
fi
export KUBE_DELETE_NODES=false
source "${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh"

View File

@@ -42,7 +42,7 @@ func addMasterReplica(zone string) error {
func removeMasterReplica(zone string) error {
framework.Logf(fmt.Sprintf("Removing an existing master replica, zone: %s", zone))
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-remove-master.sh"), zone)
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-remove-master.sh"), zone, "true")
framework.Logf("%s", v)
if err != nil {
return err