From 4e054c01cca922608d3c5a767c50ee98c9cdf4b4 Mon Sep 17 00:00:00 2001
From: Giovanni Ferri <giovanni@syscode.uk>
Date: Sun, 30 Aug 2026 11:15:08 +0100
Subject: [PATCH] fix(argocd): avoid OCI Application name collisions

---
 appset.yaml                                    | 4 +++-
 clusters/unraid-lab/omni/inline-manifests.yaml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/appset.yaml b/appset.yaml
index e7a9cb4..5758bbc 100644
--- a/appset.yaml
+++ b/appset.yaml
@@ -77,7 +77,9 @@ spec:
                 - path: clusters/{{.clusterName}}/apps/*/app.yaml
   template:
     metadata:
-      name: "{{.path.basename}}"                # app name = its directory name
+      # Keep existing unraid-lab Application names stable. OCI shares many app
+      # paths, so it needs a prefix to avoid a name collision.
+      name: '{{ if eq .clusterName "oci-lab" }}oci-lab-{{ .path.basename }}{{ else }}{{ .path.basename }}{{ end }}'
     spec:
       project: default
       sources:
diff --git a/clusters/unraid-lab/omni/inline-manifests.yaml b/clusters/unraid-lab/omni/inline-manifests.yaml
index 2ed45ed..9cdee0e 100644
--- a/clusters/unraid-lab/omni/inline-manifests.yaml
+++ b/clusters/unraid-lab/omni/inline-manifests.yaml
@@ -34263,7 +34263,9 @@ cluster:
                         - path: clusters/{{.clusterName}}/apps/*/app.yaml
           template:
             metadata:
-              name: "{{.path.basename}}"                # app name = its directory name
+              # Keep existing unraid-lab Application names stable. OCI shares many app
+              # paths, so it needs a prefix to avoid a name collision.
+              name: '{{ if eq .clusterName "oci-lab" }}oci-lab-{{ .path.basename }}{{ else }}{{ .path.basename }}{{ end }}'
             spec:
               project: default
               sources: