fix make ci e2e recurring runs
@@ -115,6 +115,7 @@ function setup_broker() {
else
echo Installing broker on cluster1.
helm --kube-context cluster1 install submariner-latest/submariner-k8s-broker --name ${SUBMARINER_BROKER_NS} --namespace ${SUBMARINER_BROKER_NS}
+ helm_install_subm cluster1 10.244.0.0/16 100.94.0.0/16 false
fi
SUBMARINER_BROKER_URL=$(kubectl --context=cluster1 -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
@@ -148,17 +149,6 @@ function helm_install_subm() {
--set crd.create="${crd_create}"
}
-# Only install Submariner on broker cluster with 2 worker nodes but do not tag any worker nodes with gateway label
-function install_subm_in_cluster1() {
- if kubectl --context=cluster1 wait --for=condition=Ready pods -l app=submariner-engine -n submariner --timeout=60s > /dev/null 2>&1; then
- echo Submariner already installed, skipping submariner helm installation...
- update_subm_pods cluster1
- else
- echo Installing submariner on cluster1...
- helm_install_subm cluster1 10.244.0.0/16 100.94.0.0/16 false
- fi
-}
-
function setup_cluster2_gateway() {
if kubectl --context=cluster2 wait --for=condition=Ready pods -l app=submariner-engine -n submariner --timeout=60s > /dev/null 2>&1; then
echo Submariner already installed, skipping submariner helm installation...
@@ -215,7 +205,7 @@ function kind_import_images() {
docker tag $OPERATOR_IMAGE submariner-operator:local
fi
- for i in 2 3; do
+ for i in 1 2 3; do
echo "Loading submariner images in to cluster${i}..."
kind --name cluster${i} load docker-image submariner:local
kind --name cluster${i} load docker-image submariner-route-agent:local
@@ -466,7 +456,6 @@ if [ "$deploy_operator" = true ]; then
deploy_nginx_cluster3
elif [[ $5 = helm ]]; then
helm=true
- install_subm_in_cluster1
setup_cluster2_gateway
setup_cluster3_gateway
for i in 2 3; do
