From fa99a5c4a6a16f0bb08ba6b21cd07826f568e5ce Mon Sep 17 00:00:00 2001
From: Vitalii Valkov <vitalii@agyn.io>
Date: Sat, 1 Aug 2026 23:28:57 +0200
Subject: [PATCH 1/2] fix(devspace): find the pod by name, not by release

The selector paired app.kubernetes.io/name with
app.kubernetes.io/instance=<service>. That held when each service was its
own Helm release; the platform umbrella makes the instance label its own
release name, so it matches nothing:

  DevSpace still couldn't find any Pods that match the selector

The pod comes up and waits for a binary the sync never delivers, and the
deploy times out having patched a Deployment it then cannot reach.

The name label alone is unique in the namespace and holds either way.
---
 devspace.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/devspace.yaml b/devspace.yaml
index a0eae2f..c89a035 100644
--- a/devspace.yaml
+++ b/devspace.yaml
@@ -162,7 +162,6 @@ dev:
     namespace: ${APPS_NAMESPACE}
     labelSelector:
       app.kubernetes.io/name: apps
-      app.kubernetes.io/instance: apps
     containers:
       apps:
         container: apps

From 53b1b3adbe84f6e1f75029374488b39e3804f51e Mon Sep 17 00:00:00 2001
From: Vitalii Valkov <vitalii@agyn.io>
Date: Sun, 2 Aug 2026 02:55:04 +0200
Subject: [PATCH 2/2] chore: remove the ArgoCD sync dance

ArgoCD is gone with bootstrap. Disabling its auto-sync before a source
deploy and restoring it after has had nothing to disable or restore since
the platform moved to the VM -- every run of it printed "Application not
found" and carried on.
---
 devspace.yaml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/devspace.yaml b/devspace.yaml
index c89a035..df4c5cd 100644
--- a/devspace.yaml
+++ b/devspace.yaml
@@ -4,26 +4,6 @@ vars:
   APPS_NAMESPACE: platform
 
 functions:
-  disable_argocd_sync: |-
-    if kubectl get application apps -n argocd >/dev/null 2>&1; then
-      echo "Disabling ArgoCD auto-sync for apps..."
-      kubectl patch application apps -n argocd \
-        --type merge \
-        -p '{"spec":{"syncPolicy":{"automated":null}}}'
-      echo "ArgoCD auto-sync disabled."
-    else
-      echo "WARNING: ArgoCD Application 'apps' not found in argocd namespace."
-    fi
-  restore_argocd_sync: &restore_argocd_sync |-
-    if kubectl get application apps -n argocd >/dev/null 2>&1; then
-      echo "Re-enabling ArgoCD auto-sync for apps..."
-      kubectl patch application apps -n argocd \
-        --type merge \
-        -p '{"spec":{"syncPolicy":{"automated":{"prune":true,"selfHeal":true}}}}'
-      echo "ArgoCD auto-sync restored."
-    else
-      echo "WARNING: ArgoCD Application 'apps' not found in argocd namespace."
-    fi
   patch_deployment: |-
     echo "Patching apps deployment for DevSpace..."
     kubectl patch deployment apps -n ${APPS_NAMESPACE} --type strategic --patch "$(cat <<'EOF'
@@ -97,7 +77,6 @@ pipelines:
         short: w
         description: "Keep DevSpace running and stream logs"
     run: |-
-      disable_argocd_sync
       patch_deployment
       if [ "$(get_flag "watch")" == "true" ]; then
         start_dev --disable-pod-replace apps
@@ -149,13 +128,6 @@ pipelines:
       fi
 
 hooks:
-  - name: restore-argocd-auto-sync
-    events:
-      - after:dev:apps
-    command: bash
-    args:
-      - -c
-      - *restore_argocd_sync
 
 dev:
   apps: