From b196aff75834f2013cfc56f7e356a6ecbe50aa82 Mon Sep 17 00:00:00 2001
From: Ian Keane <ian@keane.sh>
Date: Wed, 19 Aug 2026 10:45:59 -0400
Subject: [PATCH] Restructure app-of-apps

---
 Makefile           |  1 +
 apps/apps.yaml     | 42 ++----------------------------------------
 apps/cluster.yaml  | 18 ++++++++++++++++++
 apps/data.yaml     | 18 ++++++++++++++++++
 apps/services.yaml | 18 ++++++++++++++++++
 5 files changed, 57 insertions(+), 40 deletions(-)
 create mode 100644 apps/cluster.yaml
 create mode 100644 apps/data.yaml
 create mode 100644 apps/services.yaml

diff --git a/Makefile b/Makefile
index cb77b2f..0eecfb4 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ clean:
 # Bootstrap ArgoCD app of apps (run once after cluster is up)
 bootstrap:
 	kubectl apply -f apps/apps.yaml
+	@echo "ArgoCD will now manage apps/ directory - future group changes are self-healing via git push"
 
 # Credentials
 talosconfig:
diff --git a/apps/apps.yaml b/apps/apps.yaml
index 0ccce61..ad102e3 100644
--- a/apps/apps.yaml
+++ b/apps/apps.yaml
@@ -1,52 +1,14 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster
+  name: apps
   namespace: argocd
 spec:
   project: default
   source:
     repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
     targetRevision: HEAD
-    path: manifests/cluster
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: argocd
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: data
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
-    targetRevision: HEAD
-    path: manifests/data
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: argocd
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: services
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
-    targetRevision: HEAD
-    path: manifests/services
+    path: apps
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd
diff --git a/apps/cluster.yaml b/apps/cluster.yaml
new file mode 100644
index 0000000..8382748
--- /dev/null
+++ b/apps/cluster.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cluster
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
+    targetRevision: HEAD
+    path: manifests/cluster
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/apps/data.yaml b/apps/data.yaml
new file mode 100644
index 0000000..ac54a7e
--- /dev/null
+++ b/apps/data.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: data
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
+    targetRevision: HEAD
+    path: manifests/data
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/apps/services.yaml b/apps/services.yaml
new file mode 100644
index 0000000..833e1f3
--- /dev/null
+++ b/apps/services.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: services
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://forge.keane.sh/ian/dumpnet-argo.git
+    targetRevision: HEAD
+    path: manifests/services
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true