chore: Allow setting up e2e environment in-cluster (#518)

Signed-off-by: jannfis <[email protected]>

Author: jannfis

Makefile

@@ -48,8 +48,14 @@ build: argocd-agent cli
 .PHONY: setup-e2e
 setup-e2e: cli
 	./hack/dev-env/setup-vcluster-env.sh create
+ifneq (${ARGOCD_AGENT_IN_CLUSTER},)
+	./hack/dev-env/deploy.sh deploy
+endif
 	./hack/dev-env/gen-creds.sh
 	./hack/dev-env/create-agent-config.sh
+ifneq (${ARGOCD_AGENT_IN_CLUSTER},)
+	./hack/dev-env/restart-all.sh
+endif
 
 .PHONY: teardown-e2e
 teardown-e2e:

hack/dev-env/deploy.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2025 The argocd-agent Authors
 #

hack/dev-env/restart-all.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eo pipefail
 

hack/dev-env/setup-vcluster-env.sh

@@ -69,41 +69,25 @@ check_for_openshift() {
 
 # wait_for_pods looks all Pods running in k8s context $1, and keeps waiting until running count == $2. 
 wait_for_pods() {
-
-    set +e
-
-    count=0
-    while [ true ]
-    do
-
-        echo "  -> Waiting for $1 pods to be running. Expecting $2 running pods."
-
-        kubectl get pods --context="$1" -A
-        RUNNING_PODS=`kubectl get pods --context="$1" -A | grep "Running" | wc -l | tr -d '[:space:]'`
-
-        if [[ "$RUNNING_PODS" == "$2" ]]; then
-            break
-        fi
-
-        count=$((count+1))
-        if [[ $count -eq 60 ]]; then
-            echo "  -> Timed out waiting for pods to be running."
-            echo "    -> Pods:"
-            kubectl describe pods --context="$1" -n argocd
-            echo "    -> Deployments:"
-            kubectl describe deployments --context="$1" -n argocd
-            echo "    -> Stateful Sets:"
-            kubectl describe statefulsets --context="$1" -n argocd
-            echo "  -> Exiting due to timeout waiting for pods to be running."
-            exit 1
-        fi
-
-        sleep 10
-    done
-
-    echo "  -> Done waiting for $1 pods."
-
-    set -e
+    context="$1"
+    component="$2"
+    case "$component" in
+    "principal")
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-server
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-repo-server
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-dex-server
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-redis
+        ;;
+    "agent")
+        kubectl --context $context -n argocd rollout status --watch statefulsets argocd-application-controller
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-repo-server
+        kubectl --context $context -n argocd rollout status --watch deployments argocd-redis
+        ;;
+     *)
+        echo "Unknown component: $component"
+        exit 1
+        ;;
+     esac
 }
 
 
@@ -245,9 +229,9 @@ apply() {
     kubectl --context vcluster-agent-managed create ns agent-managed || true
 
     echo "-> Waiting for all the Argo CD/vCluster pods to be running on vclusters"
-    wait_for_pods vcluster-control-plane 5
-    wait_for_pods vcluster-agent-autonomous 4
-    wait_for_pods vcluster-agent-managed 4
+    wait_for_pods vcluster-control-plane principal
+    wait_for_pods vcluster-agent-autonomous agent
+    wait_for_pods vcluster-agent-managed agent
 
     echo "-> Service configuration on control plane"
     kubectl --context vcluster-control-plane -n argocd get services