From 16f060b151b9afd360a7176b416e172860eacb0e Mon Sep 17 00:00:00 2001
From: CTO Agent <cto@basicstack.de>
Date: Sun, 12 Jul 2026 09:41:38 +0000
Subject: [PATCH] fix(argocd): merge duplicate data: keys in argocd-cm
 ConfigMap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The argocd-cm document had two separate data: sections — one at the top
with resource customizations and one at the bottom with url/oidc.config.
This is invalid YAML and caused kustomize build to fail with
"mapping key data already defined". Merged url and oidc.config into the
single data: block to fix the argocd Application sync error.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 apps/argocd/argocd-install.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/argocd/argocd-install.yaml b/apps/argocd/argocd-install.yaml
index f588816..d4c5347 100644
--- a/apps/argocd/argocd-install.yaml
+++ b/apps/argocd/argocd-install.yaml
@@ -31217,13 +31217,6 @@ data:
       - BackgroundScanReport
       - ClusterBackgroundScanReport
       - UpdateRequest
-kind: ConfigMap
-metadata:
-  name: argocd-cm
-  labels:
-    app.kubernetes.io/name: argocd-cm
-    app.kubernetes.io/part-of: argocd
-data:
   url: https://argo.basicstack.de
   oidc.config: |
     name: Pocket ID
@@ -31238,6 +31231,12 @@ data:
     requestedIDTokenClaims:
       groups:
         essential: true
+kind: ConfigMap
+metadata:
+  name: argocd-cm
+  labels:
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
 ---
 apiVersion: v1
 kind: ConfigMap