github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42322 from madhusudancs/fed-unbound-e2ezone

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42128, 42064, 42253, 42309, 42322)

Default E2E_ZONES to empty string.

Also print an error message and exit if host cluster context cannot be derived.

I don't think we should do any of this magic. This is a stop gap solution to get all our tests to stable state. I will actively get rid of all this defaulting magic once our main tests are stable.

cc @kubernetes/sig-federation-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-03-02 05:01:00 -08:00 committed by GitHub
commit f12db38d5c
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. # limitations under the License.
# required: # 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}" : "${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 # If $HOST_CLUSTER_ZONE isn't specified, arbitrarily choose
# last zone as the host cluster zone. # last zone as the host cluster zone.
if [[ -z "${HOST_CLUSTER_ZONE}" ]]; then if [[ -z "${HOST_CLUSTER_ZONE}" ]]; then
E2E_ZONES_ARR=($E2E_ZONES) E2E_ZONES_ARR=(${E2E_ZONES:-})
HOST_CLUSTER_ZONE=${E2E_ZONES_ARR[-1]} if [[ ${#E2E_ZONES_ARR[@]} > 0 ]]; then
HOST_CLUSTER_ZONE=${E2E_ZONES_ARR[-1]}
fi
fi fi
HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-}" HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-}"
if [[ -z "${HOST_CLUSTER_CONTEXT}" ]]; then if [[ -z "${HOST_CLUSTER_CONTEXT}" ]]; then
# Sets ${CLUSTER_CONTEXT} # 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:-}" kubeconfig-federation-context "${HOST_CLUSTER_ZONE:-}"
HOST_CLUSTER_CONTEXT="${CLUSTER_CONTEXT}" HOST_CLUSTER_CONTEXT="${CLUSTER_CONTEXT}"
fi fi