Merge pull request #27892 from madhusudancs/fed-cluster-ip-range-shortcut

Automatic merge from submit-queue

Dumbed down version of providing a separate IP range for each cluster in the federation.

cc @kubernetes/sig-cluster-federation @colhom 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-22 15:14:46 -07:00 committed by GitHub
commit 70e9f77adc

View File

@ -29,16 +29,19 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then
#TODO(colhom): the last cluster that was created in the loop above is the current context.
if [[ "${FEDERATION:-}" == "true" ]]; then
cur_ip_octet2=180
# TODO(colhom): the last cluster that was created in the loop above is the current context.
# Hence, it will be the cluster that hosts the federated components.
# In the future, we will want to loop through the all the federated contexts,
# select each one and call federated-up
for zone in ${E2E_ZONES};do
(
set-federation-zone-vars "$zone"
test-setup
)
(
export CLUSTER_IP_RANGE="10.${cur_ip_octet2}.0.0/16"
set-federation-zone-vars "$zone"
test-setup
)
cur_ip_octet2="$((cur_ip_octet2 + 1))"
done
tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag"
if [[ ! -f "$tagfile" ]]; then