refactor: Restructure into argocd-apps, apps and infra

applications/add-ons/cnpg.yaml

@@ -1,40 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cnpg
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "0"
-spec:
-  project: default
-  sources:
-    - repoURL: https://cloudnative-pg.github.io/charts
-      chart: cloudnative-pg
-      targetRevision: 0.29.0
-      helm:
-        values: |
-          replicaCount: 1
-          config:
-            clusterWide: true
-    - repoURL: https://cloudnative-pg.github.io/charts
-      chart: cluster
-      targetRevision: 0.8.1
-      helm:
-        values: |
-          cluster:
-            instances: 1
-            enablePDB: false
-            storage:
-              size: 500Mi
-          backups:
-            enabled: false
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-      - ServerSideApply=true

applications/kustomization.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  # add-ons
-  - add-ons/gateway-api.yaml
-  - add-ons/traefik.yaml
-  - add-ons/cert-manager.yaml
-  - add-ons/anubis-operator.yaml
-  - add-ons/sealed-secrets.yaml
-  - add-ons/cnpg.yaml
-  # services
-  - services/app-argocd-repos.yaml
-  - services/app-autoregexbot.yaml
-  - services/app-betterslcm.yaml
-  - services/app-jellyfin.yaml
-  - services/app-legislative-summarization.yaml
-  - services/app-scriptscribe.yaml
-  - services/app-seaweedfs.yaml
-  - services/app-qbit.yaml
-  - services/app-stirling-pdf.yaml

apps/stirling-pdf/anubis-proxy.yaml

@@ -3,6 +3,8 @@ kind: AnubisProxy
 metadata:
   name: anubis
   namespace: stirling-pdf
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   target:
     service:

apps/stirling-pdf/httproute.yaml

@@ -4,7 +4,7 @@ metadata:
   name: stirling-pdf
   namespace: stirling-pdf
   annotations:
-    argocd.argoproj.io/sync-wave: "1"
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   parentRefs:
     - name: traefik-gateway

argocd-apps/add-ons/argocd-repos.yaml

@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
     targetRevision: main
-    path: extras/add-ons/argocd-repos
+    path: infra/argocd-repos
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd

argocd-apps/add-ons/cert-manager.yaml

@@ -22,7 +22,7 @@ spec:
               ExperimentalGatewayAPISupport: true
     - repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
-      path: extras/add-ons/cert-manager
+      path: infra/cert-manager
   destination:
     server: https://kubernetes.default.svc
     namespace: cert-manager

argocd-apps/add-ons/cnpg.yaml

@@ -0,0 +1,28 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cnpg
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  project: default
+  source:
+    repoURL: https://cloudnative-pg.github.io/charts
+    chart: cloudnative-pg
+    targetRevision: 0.29.0
+    helm:
+      values: |
+        replicaCount: 1
+        config:
+          clusterWide: true
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: cnpg-system
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true

argocd-apps/add-ons/traefik.yaml

@@ -41,7 +41,7 @@ spec:
                     group: ""
     - repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
-      path: extras/add-ons/traefik
+      path: infra/traefik
   destination:
     server: https://kubernetes.default.svc
     namespace: traefik

argocd-apps/kustomization.yaml

@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  # add-ons
+  - add-ons/gateway-api.yaml
+  - add-ons/traefik.yaml
+  - add-ons/cert-manager.yaml
+  - add-ons/anubis-operator.yaml
+  - add-ons/sealed-secrets.yaml
+  - add-ons/cnpg.yaml
+  - add-ons/argocd-repos.yaml
+  # services
+  - services/autoregexbot.yaml
+  - services/betterslcm.yaml
+  - services/jellyfin.yaml
+  - services/legislative-summarization.yaml
+  - services/scriptscribe.yaml
+  - services/seaweedfs.yaml
+  - services/qbit.yaml
+  - services/stirling-pdf.yaml

argocd-apps/services/jellyfin.yaml

@@ -28,7 +28,7 @@ spec:
               hostPath: /srv/media
     - repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
-      path: extras/services/jellyfin
+      path: apps/jellyfin
   destination:
     server: https://kubernetes.default.svc
     namespace: jellyfin

argocd-apps/services/seaweedfs.yaml

@@ -23,7 +23,7 @@ spec:
             enabled: false
     - repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
-      path: extras/services/seaweedfs
+      path: apps/seaweedfs
   destination:
     server: https://kubernetes.default.svc
     namespace: seaweedfs

argocd-apps/services/stirling-pdf.yaml

@@ -28,7 +28,7 @@ spec:
               initialDelaySeconds: 60
     - repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
-      path: extras/services/stirling-pdf
+      path: apps/stirling-pdf
   destination:
     server: https://kubernetes.default.svc
     namespace: stirling-pdf

bootstrap/argocd-root-app/root-app.yaml

@@ -8,7 +8,7 @@ spec:
   source:
     repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
     targetRevision: main
-    path: applications
+    path: argocd-apps
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd