scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split federation-{up,down} from e2e-{up,down}.

Browse Source
This commit is contained in:
Madhusudan.C.S
2017-02-19 02:21:21 -08:00
parent ee88325f81
commit edef3af34f
5 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/kube-util.sh
View File

@@ -49,7 +49,6 @@ function kubeconfig-federation-context() {
CLUSTER_CONTEXT="federation-e2e-${KUBERNETES_PROVIDER}-${1}" CLUSTER_CONTEXT="federation-e2e-${KUBERNETES_PROVIDER}-${1}"
} }
# Should NOT be called within the global scope, unless setting the desired global zone vars # Should NOT be called within the global scope, unless setting the desired global zone vars
# This function is currently NOT USED in the global scope # This function is currently NOT USED in the global scope
function set-federation-zone-vars { function set-federation-zone-vars {

28
federation/cluster/federation-down.sh
View File

@@ -49,17 +49,17 @@ function unjoin_clusters() {
unjoin_clusters unjoin_clusters
cleanup-federation-api-objects || echo "Couldn't cleanup federation api objects" if cleanup-federation-api-objects; then
# TODO(madhusudancs): This is an arbitrary amount of sleep to give
"${KUBE_ROOT}/cluster/kubectl.sh" delete namespace \ # Kubernetes clusters enough time to delete the underlying cloud
--context="${HOST_CLUSTER_CONTEXT}" \ # provider resources corresponding to the Kubernetes resources we
"${FEDERATION_NAMESPACE}" # deleted as part of the test tear downs. It is shameful that we
# are doing this, but this is just a bandage to stop the bleeding.
# TODO(madhusudancs): This is an arbitrary amount of sleep to give Kubernetes # Please don't use this pattern anywhere. Remove this when proper
# clusters enough time to delete the underlying cloud provider resources # cloud provider cleanups are implemented in the individual test
# corresponding to the Kubernetes resources we deleted as part of the test # `AfterEach` blocks.
# teardowns. It is shameful that we are doing this, but this is just a bandage # Also, we wait only if the cleanup succeeds.
# to stop the bleeding. Please don't use this pattern anywhere. Remove this sleep 2m
# when proper cloud provider cleanups are implemented in the individual test else
# `AfterEach` blocks. echo "Couldn't cleanup federation api objects"
sleep 2m fi

1
federation/cluster/federation-up.sh
View File

@@ -97,7 +97,6 @@ function join_clusters() {
--context="${FEDERATION_NAME}" \ --context="${FEDERATION_NAME}" \
--secret-name="${context//_/-}" # Replace "_" by "-" --secret-name="${context//_/-}" # Replace "_" by "-"
# Create kube-dns configmap in each cluster for kube-dns to accept # Create kube-dns configmap in each cluster for kube-dns to accept
# federation queries. # federation queries.
# TODO: This shouldn't be required after # TODO: This shouldn't be required after

19
hack/e2e-internal/e2e-down.sh
View File

@@ -29,25 +29,10 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
prepare-e2e prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then if [[ "${FEDERATION:-}" == "true" ]]; then
source "${KUBE_ROOT}/federation/cluster/common.sh" source "${KUBE_ROOT}/federation/cluster/common.sh"
if cleanup-federation-api-objects; then for zone in ${E2E_ZONES};do
# TODO(madhusudancs): This is an arbitrary amount of sleep to give
# Kubernetes clusters enough time to delete the underlying cloud
# provider resources corresponding to the Kubernetes resources we
# deleted as part of the test tear downs. It is shameful that we
# are doing this, but this is just a bandage to stop the bleeding.
# Please don't use this pattern anywhere. Remove this when proper
# cloud provider cleanups are implemented in the individual test
# `AfterEach` blocks.
# Also, we wait only if the cleanup succeeds.
sleep 2m
else
echo "Couldn't cleanup federation api objects"
fi
for zone in ${E2E_ZONES}; do
# bring down an e2e cluster # bring down an e2e cluster
( (
set-federation-zone-vars "$zone" set-federation-zone-vars "$zone"

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

@@ -30,24 +30,15 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
prepare-e2e prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]]; then if [[ "${FEDERATION:-}" == "true" ]]; then
cur_ip_octet2=180 cur_ip_octet2=180
# TODO(colhom): the last cluster that was created in the loop above is the current context. for zone in ${E2E_ZONES};do
# 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, export CLUSTER_IP_RANGE="10.${cur_ip_octet2}.0.0/16"
# select each one and call federated-up set-federation-zone-vars "$zone"
for zone in ${E2E_ZONES};do test-setup
( )
export CLUSTER_IP_RANGE="10.${cur_ip_octet2}.0.0/16" cur_ip_octet2="$((cur_ip_octet2 + 1))"
set-federation-zone-vars "$zone" done
test-setup
)
cur_ip_octet2="$((cur_ip_octet2 + 1))"
done
# Sets ${CLUSTER_CONTEXT}
kubeconfig-federation-context "${zone}"
"${KUBE_ROOT}/federation/cluster/federation-up.sh" "${CLUSTER_CONTEXT}"
else else
test-setup test-setup
fi fi