github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Default E2E_ZONES to empty string. 

Also print an error message and exit if host cluster context
cannot be derived.
pull/6/head
Madhusudan.C.S 2017-02-28 23:27:34 -08:00
parent dba0af3675
commit 97fbc65897
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
federation/cluster/common.sh
View File

@ -13,7 +13,7 @@
# limitations under the License.
# required:
# KUBE_ROOT: path of the root of the Kubernetes reposiitory
# KUBE_ROOT: path of the root of the Kubernetes repository
: "${KUBE_ROOT?Must set KUBE_ROOT env var}"
@ -29,13 +29,19 @@ HOST_CLUSTER_ZONE="${FEDERATION_HOST_CLUSTER_ZONE:-}"
# If $HOST_CLUSTER_ZONE isn't specified, arbitrarily choose
# last zone as the host cluster zone.
if [[ -z "${HOST_CLUSTER_ZONE}" ]]; then
E2E_ZONES_ARR=($E2E_ZONES)
HOST_CLUSTER_ZONE=${E2E_ZONES_ARR[-1]}
E2E_ZONES_ARR=(${E2E_ZONES:-})
if [[ ${#E2E_ZONES_ARR[@]} > 0 ]]; then
HOST_CLUSTER_ZONE=${E2E_ZONES_ARR[-1]}
fi
fi
HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-}"
if [[ -z "${HOST_CLUSTER_CONTEXT}" ]]; then
# Sets ${CLUSTER_CONTEXT}
if [[ -z "${HOST_CLUSTER_ZONE:-}" ]]; then
echo "At least one of FEDERATION_HOST_CLUSTER_CONTEXT, FEDERATION_HOST_CLUSTER_ZONE or E2E_ZONES is required."
exit 1
fi
kubeconfig-federation-context "${HOST_CLUSTER_ZONE:-}"
HOST_CLUSTER_CONTEXT="${CLUSTER_CONTEXT}"
fi