Skip to content

K
k3s
Commit ce67a03b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents ac36b0ea 0c669fe6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
hack/e2e-internal/e2e-remove-master.sh
View file @ ce67a03b
...@@ -19,6 +19,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. ...@@ -19,6 +19,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
if [[ ! -z "${1:-}" ]]; then if [[ ! -z "${1:-}" ]]; then
export KUBE_GCE_ZONE="${1}" export KUBE_GCE_ZONE="${1}"
fi fi
if [[ ! -z "${2:-}" ]]; then
export MULTIZONE="${2}"
fi
export KUBE_DELETE_NODES=false export KUBE_DELETE_NODES=false
source "${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh" source "${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh"
......
test/e2e/ha_master.go
View file @ ce67a03b
...@@ -42,7 +42,7 @@ func addMasterReplica(zone string) error { ...@@ -42,7 +42,7 @@ func addMasterReplica(zone string) error {
func removeMasterReplica(zone string) error { func removeMasterReplica(zone string) error {
framework.Logf(fmt.Sprintf("Removing an existing master replica, zone: %s", zone)) 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) framework.Logf("%s", v)
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment