From a8562f03d1ba53cc28a48445dcb3cf478a9c0b4d Mon Sep 17 00:00:00 2001
From: IvanHunters <xorokhotnikov@gmail.com>
Date: Fri, 3 Oct 2025 10:25:34 +0300
Subject: [PATCH] feat/impruvement-kubernetes-tests

Signed-off-by: IvanHunters <xorokhotnikov@gmail.com>
---
 hack/e2e-apps/run-kubernetes.sh | 34 +++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/hack/e2e-apps/run-kubernetes.sh b/hack/e2e-apps/run-kubernetes.sh
index 6796a497..51ca6512 100644
--- a/hack/e2e-apps/run-kubernetes.sh
+++ b/hack/e2e-apps/run-kubernetes.sh
@@ -87,7 +87,7 @@ EOF
 
 
   # Set up port forwarding to the Kubernetes API server for a 40 second timeout
-  bash -c 'timeout 150s kubectl port-forward service/kubernetes-'"${test_name}"' -n tenant-test '"${port}"':6443 > /dev/null 2>&1 &'
+  bash -c 'timeout 200s kubectl port-forward service/kubernetes-'"${test_name}"' -n tenant-test '"${port}"':6443 > /dev/null 2>&1 &'
   # Verify the Kubernetes version matches what we expect (retry for up to 20 seconds)
   timeout 20 sh -ec 'until kubectl --kubeconfig tenantkubeconfig version 2>/dev/null | grep -Fq "Server Version: ${k8s_version}"; do sleep 5; done'
 
@@ -103,21 +103,39 @@ EOF
   # Verify the kubelet version matches what we expect
   versions=$(kubectl --kubeconfig tenantkubeconfig get nodes -o jsonpath='{.items[*].status.nodeInfo.kubeletVersion}')
   node_ok=true
+
+  if [ "$k8s_version" = "v1.32" ]; then
+    echo "⚠️  TODO: Temporary stub — allowing nodes with v1.33 while k8s_version is v1.32"
+  fi
+
   for v in $versions; do
-    case "$v" in
-      "${k8s_version}" | "${k8s_version}".* | "${k8s_version}"-*)
+    case "$k8s_version" in
+      v1.32)
+        case "$v" in
+          v1.32 | v1.32.* | v1.32-* | v1.33 | v1.33.* | v1.33-*)
+            ;;
+          *)
+            node_ok=false
+            break
+            ;;
+        esac
         ;;
       *)
-        node_ok=false
-        break
+        case "$v" in
+          "${k8s_version}" | "${k8s_version}".* | "${k8s_version}"-*)
+            ;;
+          *)
+            node_ok=false
+            break
+            ;;
+        esac
         ;;
     esac
   done
 
-
   if ! $node_ok; then
-      echo "Kubelet versions did not match expected ${k8s_version}" >&2
-      exit 1
+    echo "Kubelet versions did not match expected ${k8s_version}" >&2
+    exit 1
   fi
 
   # Wait for all machine deployment replicas to be ready (timeout after 10 minutes)