From 9b69e7f004303299fb9a60c51028620d985ca8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sierant?= <lukasz.sierant@mongodb.com>
Date: Mon, 13 Oct 2025 09:42:08 +0200
Subject: [PATCH] Fixed failing recreate-kind-clusters

---
 scripts/dev/contexts/root-context |  1 -
 scripts/dev/evg_host.sh           |  4 ++--
 scripts/dev/setup_evg_host.sh     | 11 ++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/dev/contexts/root-context b/scripts/dev/contexts/root-context
index 9869b277f..0c1a44649 100644
--- a/scripts/dev/contexts/root-context
+++ b/scripts/dev/contexts/root-context
@@ -47,7 +47,6 @@ export OPS_MANAGER_NAMESPACE="operator-testing-50-current"
 export LOCAL_RUN=true
 
 if [[ "${OVERRIDE_VERSION_ID:-}" != "" ]]; then
-  echo "Overriding operator related versions with ${OVERRIDE_VERSION_ID}"
   OPERATOR_VERSION="${OVERRIDE_VERSION_ID}"
   READINESS_PROBE_VERSION="${OVERRIDE_VERSION_ID}"
   VERSION_UPGRADE_HOOK_VERSION="${OVERRIDE_VERSION_ID}"
diff --git a/scripts/dev/evg_host.sh b/scripts/dev/evg_host.sh
index 8fb0795fc..ff7b46051 100755
--- a/scripts/dev/evg_host.sh
+++ b/scripts/dev/evg_host.sh
@@ -38,7 +38,7 @@ fi
 kubeconfig_path="${HOME}/.operator-dev/evg-host.kubeconfig"
 
 configure() {
-  shift 1
+  shift || true
   auto_recreate="false"
 
   # Parse arguments
@@ -64,7 +64,7 @@ configure() {
     jq '. | with_entries(select(.key == "auths"))' "${HOME}/.docker/config.json" | ssh -T -q "${host_url}" 'cat > /home/ubuntu/.docker/config.json'
   fi
 
-  sync
+  sync | prepend "sync"
 
   ssh -T -q "${host_url}" "cd ~/mongodb-kubernetes; scripts/dev/switch_context.sh root-context; scripts/dev/setup_evg_host.sh ${auto_recreate}"
 }
diff --git a/scripts/dev/setup_evg_host.sh b/scripts/dev/setup_evg_host.sh
index af394837d..aaf3d2247 100755
--- a/scripts/dev/setup_evg_host.sh
+++ b/scripts/dev/setup_evg_host.sh
@@ -5,6 +5,7 @@
 set -Eeou pipefail
 
 source scripts/funcs/install
+source scripts/funcs/printing
 
 set_limits() {
   echo "Increasing fs.inotify.max_user_instances"
@@ -61,14 +62,14 @@ download_helm() {
   rm -rf linux-"${ARCH}/"
 }
 
-set_limits
-download_kind &
-download_kubectl &
-download_helm &
+set_limits | prepend "set_limits"
+download_kind | prepend "download_kind" &
+download_kubectl | prepend "download_kubectl" &
+download_helm | prepend "download_helm" &
 
 AUTO_RECREATE=${1:-false}
 if [[ "${AUTO_RECREATE}" == "true" ]]; then
-  set_auto_recreate &
+  set_auto_recreate | prepend "set_auto_recreate" &
 fi
 
 wait