diff --git a/scripts/shared/deploy.sh b/scripts/shared/deploy.sh index a658db138..ed401f23c 100755 --- a/scripts/shared/deploy.sh +++ b/scripts/shared/deploy.sh @@ -51,7 +51,7 @@ import_image quay.io/submariner/submariner-route-agent ${image_tag} load_deploytool $deploytool deploytool_prereqs -run_subm_clusters prepare_cluster "$SUBM_NS" +run_subm_clusters prepare_cluster with_context $broker setup_broker install_subm_all_clusters diff --git a/scripts/shared/lib/deploy_funcs b/scripts/shared/lib/deploy_funcs index 52885f599..7b6cd5022 100644 --- a/scripts/shared/lib/deploy_funcs +++ b/scripts/shared/lib/deploy_funcs @@ -112,14 +112,7 @@ function del_subm_gateway_label() { } function prepare_cluster() { - local namespace=$1 [[ ${cluster_subm[$cluster]} = "true" ]] || return 0 - for app in submariner-engine submariner-routeagent submariner-globalnet; do - if kubectl wait --for=condition=Ready pods -l "app=$app" -n "$namespace" --timeout="${timeout}" > /dev/null 2>&1; then - echo "Removing $app pods..." - kubectl delete pods -n "$namespace" -l "app=$app" - fi - done add_subm_gateway_label }