Skip to content

Commit

Permalink
Remove metallb ip-address pool from edge and regional cluster (#253)
Browse files Browse the repository at this point in the history
* remove metallb ip-address pool from edge and regional cluster

* Removing clusters declaration and replacing with only core cluster

* Adding additional tests for node readiness
  • Loading branch information
arora-sagar committed Mar 13, 2024
1 parent c1e520d commit 036f087
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
5 changes: 5 additions & 0 deletions e2e/tests/oai/001a-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ for cluster in $(kubectl get cl -o jsonpath='{range .items[*]}{.metadata.name}{"
capi_cluster_ready "$cluster"
done

# Wait for node readiness as an additional check
for node in $(kubectl get node -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig="$kubeconfig"); do
k8s_wait_ready "node" "$node" "$kubeconfig"
done

# Inter-connect worker nodes
"$E2EDIR/provision/hacks/inter-connect_workers.sh"

Expand Down
12 changes: 1 addition & 11 deletions e2e/tests/oai/001b-infra-metal-lb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,4 @@ function _define_ip_address_pool {
kubectl wait --for jsonpath='{.spec.lifecycle}'=Published packagerevisions "$pkg_rev" --timeout="600s"
}

declare -A clusters
clusters=(
["core"]="172.18.16.0/20"
["regional"]="172.18.32.0/20"
["edge"]="172.18.48.0/20"
)

# Define MetalLB IP ranges
for cluster in "${!clusters[@]}"; do
_define_ip_address_pool "$cluster" "${clusters[$cluster]}"
done
_define_ip_address_pool "core" "172.18.16.0/20"

0 comments on commit 036f087

Please sign in to comment.