Merge pull request #42851 from madhusudancs/fed-down-improvements

Automatic merge from submit-queue

[Federation] Unjoin only the joined clusters while bringing down the federation control plane.

A few other minor improvements.

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-03-12 16:29:37 -07:00
committed by GitHub
4 changed files with 32 additions and 8 deletions

View File

@@ -22,13 +22,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-util.sh"
#A little hack to get the last zone. we always deploy federated cluster to the last zone.
#TODO(colhom): deploy federated control plane to multiple underlying clusters in robust way
lastZone=""
for zone in ${E2E_ZONES};do
lastZone="$zone"
done
: "${FEDERATION_HOST_CLUSTER_ZONE?Must set FEDERATION_HOST_CLUSTER_ZONE env var}"
(
set-federation-zone-vars "$zone"
set-federation-zone-vars "${FEDERATION_HOST_CLUSTER_ZONE}"
"${KUBE_ROOT}/hack/ginkgo-e2e.sh" $@
)