github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/e2e-internal/e2e-up.sh
View File

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