up

Author: mitchross

README.md

@@ -33,65 +33,31 @@ A GitOps-driven Kubernetes cluster using **Talos OS** (secure, immutable Linux f
 
 ```mermaid
 graph TD;
-    subgraph "Git Repository"
-        Bootstrap["argocd-app.yaml<br/>(Bootstrap Application)"]
-        
-        InfraAppSet["infrastructure/root-appset.yaml<br/>(Infrastructure ApplicationSet)"]
-        MonAppSet["monitoring/monitoring-components-appset.yaml<br/>(Monitoring ApplicationSet)"]
-        AppsAppSet["my-apps/myapplications-appset.yaml<br/>(Applications ApplicationSet)"]
-        
-        InfraDirs["infrastructure/*/*<br/>(e.g., controllers/argocd)"]
-        MonDirs["monitoring/*/*<br/>(e.g., prometheus-stack)"]
-        AppDirs["my-apps/*/*<br/>(e.g., media/plex)"]
-
-        InfraAppSet -- "scans" --> InfraDirs
-        MonAppSet -- "scans" --> MonDirs
-        AppsAppSet -- "scans" --> AppDirs
+    subgraph "Bootstrap Process (Manual)"
+        User(["👨‍💻 User"]) -- "kubectl apply -k" --> Kustomization["infrastructure/controllers/argocd/kustomization.yaml"];
+        Kustomization -- "Deploys" --> ArgoCD["ArgoCD<br/>(from Helm Chart)"];
+        Kustomization -- "Deploys" --> RootApp["Root Application<br/>(root.yaml)"];
     end
 
-    subgraph "ArgoCD Self-Management"
-        ArgoCD["ArgoCD Controller"] -- "Deploys itself via" --> Bootstrap
-        
-        subgraph "Self-Managed ApplicationSets"
-            InfraAS["Infrastructure ApplicationSet"]
-            MonAS["Monitoring ApplicationSet"] 
-            AppsAS["Applications ApplicationSet"]
-        end
-
-        Bootstrap -- "Creates & Manages" --> InfraAS
-        Bootstrap -- "Creates & Manages" --> MonAS
-        Bootstrap -- "Creates & Manages" --> AppsAS
-        
-        subgraph "Generated Applications"
-            InfraApps["infra-argocd<br/>infra-cilium<br/>infra-longhorn<br/>..."]
-            MonApps["monitoring-prometheus-stack<br/>monitoring-loki-stack<br/>..."]
-            UserApps["media-plex<br/>ai-ollama<br/>home-frigate<br/>..."]
-        end
-
-        InfraAS -- "Generates" --> InfraApps
-        MonAS -- "Generates" --> MonApps
-        AppsAS -- "Generates" --> UserApps
+    subgraph "GitOps Self-Management Loop (Automatic)"
+        ArgoCD -- "1. Syncs" --> RootApp;
+        RootApp -- "2. Points to<br/>.../argocd/apps/" --> ArgoConfigDir["ArgoCD Config<br/>(Projects & AppSets)"];
+        ArgoCD -- "3. Deploys" --> AppSets["ApplicationSets"];
+        AppSets -- "4. Scan Repo for<br/>argo-app.yaml" --> AppManifests["Application Manifests<br/>(e.g., my-apps/nginx/*)"];
+        ArgoCD -- "5. Deploys" --> ClusterResources["Cluster Resources<br/>(Nginx, Prometheus, etc.)"];
     end
-    
-    subgraph "Kubernetes Cluster"
-        InfraRes["Infrastructure Resources<br/>(ArgoCD, Cilium, Storage)"]
-        MonRes["Monitoring Resources<br/>(Prometheus, Grafana, Loki)"]
-        AppRes["Application Resources<br/>(Plex, Ollama, Frigate)"]
-    end
-
-    InfraApps -- "deploys" --> InfraRes
-    MonApps -- "deploys" --> MonRes
-    UserApps -- "deploys" --> AppRes
 
-    style Bootstrap fill:#f9f,stroke:#333,stroke-width:2px
-    style ArgoCD fill:#9cf,stroke:#333,stroke-width:2px
+    style User fill:#a2d5c6,stroke:#333
+    style Kustomization fill:#5bc0de,stroke:#333
+    style RootApp fill:#f0ad4e,stroke:#333
+    style ArgoCD fill:#d9534f,stroke:#333
 ```
 
 ### Key Features
-- **Enterprise GitOps Pattern**: Three separate ApplicationSets for clear separation of concerns
-- **Self-Managing ArgoCD**: ArgoCD manages its own installation, upgrades, and ApplicationSets
-- **Simple Directory Discovery**: No complex patterns - easy to understand and maintain
-- **Production Ready**: Proper error handling, retries, and monitoring integration
+- **Enterprise GitOps Pattern**: ApplicationSets provide clean separation of concerns.
+- **Self-Managing ArgoCD**: ArgoCD manages its own installation, upgrades, and ApplicationSets from a co-located `apps` directory.
+- **Simple Metadata Discovery**: Applications are discovered via a simple `argo-app.yaml` marker file. No complex pathing needed.
+- **Production Ready**: Proper error handling, retries, and monitoring integration.
 - **GPU Integration**: Full NVIDIA GPU support via Talos system extensions and GPU Operator
 - **Zero SSH**: All node management via Talosctl API
 
@@ -180,30 +146,27 @@ This cluster uses [1Password Connect](https://developer.1password.com/docs/conne
     ```
 
 ### 6. Bootstrap ArgoCD & Deploy The Stack
-This final step uses a carefully ordered process to install ArgoCD and then deploy every other component.
+This final step uses our "App of Apps" pattern to bootstrap the entire cluster from a single command.
 
 ```bash
-# 1. Install ArgoCD Components & CRDs
-# This uses kustomize to build the official Helm chart and apply the manifests.
+# 1. Apply the ArgoCD Bootstrap Manifests
+# This single command does everything:
+#  - Deploys the ArgoCD Helm chart, including its CRDs.
+#  - Deploys the 'root' Application, which points to our self-managing configuration.
 kustomize build infrastructure/controllers/argocd --enable-helm | kubectl apply -f -
 
 # 2. Wait for ArgoCD to be ready (2-5 minutes)
+# This ensures the ArgoCD server is running before you try to access its UI or API.
 kubectl wait --for=condition=Available deployment/argocd-server -n argocd --timeout=300s
-
-# 3. Bootstrap ArgoCD to Manage Itself and Create Projects
-# Now that ArgoCD is running, we apply the Application resource that tells
-# ArgoCD to manage its own installation from Git. We also apply the projects.
-kubectl apply -f infrastructure/controllers/argocd/projects.yaml
-kubectl apply -f infrastructure/argocd-app.yaml
-
-# 4. Deploy the ApplicationSets
-# With ArgoCD managing itself, we can now deploy the ApplicationSets,
-# which will discover and sync all other applications.
-kubectl apply -f infrastructure/infrastructure-components-appset.yaml
-kubectl apply -f monitoring/monitoring-components-appset.yaml
-kubectl apply -f my-apps/myapplications-appset.yaml
 ```
-**That's it!** ArgoCD will now build the entire cluster state from the Git repository.
+**That's it!** You have successfully bootstrapped the cluster.
+
+### What Happens Next Automatically?
+
+1.  **ArgoCD Syncs Itself**: The `root` Application tells ArgoCD to sync the contents of `infrastructure/controllers/argocd/apps/`.
+2.  **Projects & AppSets Created**: ArgoCD creates the `AppProject`s and the three `ApplicationSet`s (`infrastructure`, `monitoring`, `my-apps`).
+3.  **Applications Discovered**: The `ApplicationSet`s scan the repository for any directory containing an `argo-app.yaml` file and create the corresponding ArgoCD `Application` resources.
+4.  **Cluster Reconciliation**: ArgoCD syncs all discovered applications, building the entire cluster state declaratively from Git.
 
 ## 🔍 Verification
 After the final step, you can monitor the deployment and verify that everything is working correctly.
@@ -404,7 +367,7 @@ kubectl get applicationsets -n argocd -o name | xargs -I{} kubectl patch {} -n a
 kubectl delete applicationsets --all -n argocd
 
 # Bootstrap with the new enterprise pattern
-kubectl apply -f infrastructure/argocd-app.yaml
+kustomize build infrastructure/controllers/argocd --enable-helm | kubectl apply -f -
 ```
 
 ## 🚀 Taking to Production

infrastructure/argocd-app.yaml

@@ -0,0 +1,37 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: infrastructure
+  namespace: argocd
+spec:
+  preserveResourcesOnDeletion: true
+  generators:
+    - git:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        revision: HEAD
+        # Discover any 'argo-app.yaml' file within the infrastructure directory.
+        files:
+          - path: "infrastructure/**/argo-app.yaml"
+  template:
+    metadata:
+      name: '{{name}}'
+      namespace: argocd
+      finalizers:
+        - resources-finalizer.argocd.argoproj.io
+    spec:
+      project: infrastructure
+      source:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        targetRevision: HEAD
+        # The path points directly to the directory containing the argo-app.yaml file.
+        path: '{{path.directory}}'
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: '{{namespace}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+          - RespectIgnoreDifferences=true

infrastructure/controllers/argocd/apps/appsets/infrastructure-appset.yaml

@@ -0,0 +1,37 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: monitoring
+  namespace: argocd
+spec:
+  preserveResourcesOnDeletion: true
+  generators:
+    - git:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        revision: HEAD
+        # Discover any 'argo-app.yaml' file within the monitoring directory.
+        files:
+          - path: "monitoring/**/argo-app.yaml"
+  template:
+    metadata:
+      name: '{{name}}'
+      namespace: argocd
+      finalizers:
+        - resources-finalizer.argocd.argoproj.io
+    spec:
+      project: monitoring
+      source:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        targetRevision: HEAD
+        # The path points directly to the directory containing the argo-app.yaml file.
+        path: '{{path.directory}}'
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: '{{namespace}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+          - RespectIgnoreDifferences=true

infrastructure/controllers/argocd/apps/appsets/monitoring-appset.yaml

@@ -0,0 +1,39 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: my-apps
+  namespace: argocd
+spec:
+  preserveResourcesOnDeletion: true
+  generators:
+    - git:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        revision: HEAD
+        # Discover any 'argo-app.yaml' file within the my-apps directory.
+        files:
+          - path: "my-apps/**/argo-app.yaml"
+  template:
+    metadata:
+      # The name is dynamically set from the 'name' field in each argo-app.yaml
+      name: '{{name}}'
+      namespace: argocd
+      finalizers:
+        - resources-finalizer.argocd.argoproj.io
+    spec:
+      project: my-apps
+      source:
+        repoURL: https://github.com/mitchross/k3s-argocd-proxmox.git # TODO: Replace with your repo URL
+        targetRevision: HEAD
+        # The path points directly to the directory containing the argo-app.yaml file.
+        path: '{{path.directory}}'
+      destination:
+        server: https://kubernetes.default.svc
+        # The namespace is dynamically set from the 'namespace' field in each argo-app.yaml
+        namespace: '{{namespace}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+          - RespectIgnoreDifferences=true

infrastructure/controllers/argocd/apps/appsets/my-apps-appset.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - projects.yaml
+  - appsets/infrastructure-appset.yaml
+  - appsets/my-apps-appset.yaml
+  - appsets/monitoring-appset.yaml

infrastructure/controllers/argocd/apps/kustomization.yaml

@@ -0,0 +1,54 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: infrastructure
+  namespace: argocd
+  # Add a finalizer to ensure that the project is deleted from ArgoCD if this file is ever removed.
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  description: "Infrastructure components like controllers, networking, and storage."
+  sourceRepos:
+    - '*' # For simplicity, but in production, you should lock this down to your specific Git repository URL.
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: my-apps
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  description: "User-facing applications."
+  sourceRepos:
+    - '*'
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: monitoring
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  description: "Monitoring and observability stack (Prometheus, Grafana, Loki)."
+  sourceRepos:
+    - '*'
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'

infrastructure/controllers/argocd/apps/projects.yaml

@@ -0,0 +1,4 @@
+# This file provides the metadata for the ApplicationSet generator.
+# It tells ArgoCD how to create the Application for this component.
+name: infra-argocd
+namespace: argocd

infrastructure/controllers/argocd/argo-app.yaml

@@ -1,12 +1,18 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: argocd
 resources:
   - ns.yaml
   - http-route.yaml
+  # This is the root application that manages our AppProjects and ApplicationSets.
+  # By including it here, the ArgoCD installation will immediately start managing
+  # the rest of the applications in the repository.
+  - root.yaml
 helmCharts:
   - name: argo-cd
     repo: https://argoproj.github.io/argo-helm
-    version: 8.1.2
-    releaseName: "argocd"
+    version: "6.7.13" # It's good practice to pin the chart version
+    releaseName: argocd
     namespace: argocd
     valuesFile: values.yaml
+    includeCRDs: true