From 855e783651b0b08cef1e46a2c2590653479bb4e1 Mon Sep 17 00:00:00 2001
From: Ahmed Nour <ahmed.nour@freiheit.com>
Date: Tue, 27 Aug 2024 09:31:19 +0200
Subject: [PATCH] databse portforward to the end

---
 .../cluster-setup/argocd-kuberpult.sh            |  2 ++
 .../cluster-setup/setup-postgres.sh              | 16 ----------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/tests/integration-tests/cluster-setup/argocd-kuberpult.sh b/tests/integration-tests/cluster-setup/argocd-kuberpult.sh
index 3d8dbd0325..dd1796a2f8 100755
--- a/tests/integration-tests/cluster-setup/argocd-kuberpult.sh
+++ b/tests/integration-tests/cluster-setup/argocd-kuberpult.sh
@@ -224,6 +224,8 @@ print "connection to frontend service successful"
 waitForDeployment "default" "app=kuberpult-rollout-service"
 waitForDeployment "default" "app=kuberpult-manifest-repo-export-service"
 
+portForwardAndWait "default" deploy/postgres "5432" "5432"
+
 kubectl get deployment
 kubectl get pods
 
diff --git a/tests/integration-tests/cluster-setup/setup-postgres.sh b/tests/integration-tests/cluster-setup/setup-postgres.sh
index de02aa7a7c..00573ec1df 100755
--- a/tests/integration-tests/cluster-setup/setup-postgres.sh
+++ b/tests/integration-tests/cluster-setup/setup-postgres.sh
@@ -22,21 +22,6 @@ function waitForDeployment() {
   done
 }
 
-function portForwardAndWait() {
-  ns="$1"
-  deployment="$2"
-  portHere="$3"
-  portThere="$4"
-  ports="$portHere:$portThere"
-  print "portForwardAndWait for $ns/$deployment $ports"
-  kubectl -n "$ns" port-forward "$deployment" "$ports" &
-  print "portForwardAndWait: waiting until the port forward works..."
-  until nc -vz localhost "$portHere"
-  do
-    sleep 1s
-  done
-}
-
 kubectl apply -f - <<EOF
 ---
 apiVersion: v1
@@ -87,5 +72,4 @@ spec:
 EOF
 
 waitForDeployment default "app=postgres"
-portForwardAndWait "default" deploy/postgres "5432" "5432"
 echo "done setting up postgres"