From 0c669fe6cc48208ebcdd43fa2ff425fce3c359a0 Mon Sep 17 00:00:00 2001 From: Jerzy Szczepkowski Date: Mon, 19 Dec 2016 13:39:17 +0100 Subject: [PATCH] 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 clusters. --- hack/e2e-internal/e2e-remove-master.sh | 3 +++ test/e2e/ha_master.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hack/e2e-internal/e2e-remove-master.sh b/hack/e2e-internal/e2e-remove-master.sh index cb3310f30e8..95242d1388a 100755 --- a/hack/e2e-internal/e2e-remove-master.sh +++ b/hack/e2e-internal/e2e-remove-master.sh @@ -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" diff --git a/test/e2e/ha_master.go b/test/e2e/ha_master.go index 44b5016661d..fe81d520b23 100644 --- a/test/e2e/ha_master.go +++ b/test/e2e/ha_master.go @@ -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