From c30ff48b13a415ff2bc6e634952d4da92766c4cc Mon Sep 17 00:00:00 2001 From: Karan Parashar Date: Tue, 18 Aug 2026 00:43:37 +0530 Subject: [PATCH] refactor: Restructure into argocd-apps, apps and infra --- applications/add-ons/cnpg.yaml | 40 ------------------- applications/kustomization.yaml | 20 ---------- .../jellyfin/httproute-local.yaml | 0 .../services => apps}/jellyfin/httproute.yaml | 0 .../seaweedfs/httproute-filer.yaml | 0 .../seaweedfs/httproute-master.yaml | 0 .../stirling-pdf/anubis-key-sealedsecret.yaml | 0 .../stirling-pdf/anubis-proxy.yaml | 2 + .../stirling-pdf/httproute.yaml | 2 +- .../add-ons/anubis-operator.yaml | 0 .../add-ons/argocd-repos.yaml | 2 +- .../add-ons/cert-manager.yaml | 2 +- argocd-apps/add-ons/cnpg.yaml | 28 +++++++++++++ .../add-ons/gateway-api.yaml | 0 .../add-ons/sealed-secrets.yaml | 0 .../add-ons/traefik.yaml | 2 +- argocd-apps/kustomization.yaml | 20 ++++++++++ .../services/autoregexbot.yaml | 0 .../services/betterslcm.yaml | 0 .../services/jellyfin.yaml | 2 +- .../services/legislative-summarization.yaml | 0 .../services/qbit.yaml | 0 .../services/scriptscribe.yaml | 0 .../services/seaweedfs.yaml | 2 +- .../services/stirling-pdf.yaml | 2 +- bootstrap/argocd-root-app/root-app.yaml | 2 +- .../argocd-repos/repo-sealed-secret.yaml | 0 .../cloudflare-api-token-sealed-secret.yaml | 0 .../cert-manager/cluster-issuer.yaml | 0 .../traefik/wildcard-whyredfire-dev.yaml | 0 30 files changed, 58 insertions(+), 68 deletions(-) delete mode 100644 applications/add-ons/cnpg.yaml delete mode 100644 applications/kustomization.yaml rename {extras/services => apps}/jellyfin/httproute-local.yaml (100%) rename {extras/services => apps}/jellyfin/httproute.yaml (100%) rename {extras/services => apps}/seaweedfs/httproute-filer.yaml (100%) rename {extras/services => apps}/seaweedfs/httproute-master.yaml (100%) rename {extras/services => apps}/stirling-pdf/anubis-key-sealedsecret.yaml (100%) rename {extras/services => apps}/stirling-pdf/anubis-proxy.yaml (95%) rename {extras/services => apps}/stirling-pdf/httproute.yaml (92%) rename {applications => argocd-apps}/add-ons/anubis-operator.yaml (100%) rename applications/services/app-argocd-repos.yaml => argocd-apps/add-ons/argocd-repos.yaml (92%) rename {applications => argocd-apps}/add-ons/cert-manager.yaml (95%) create mode 100644 argocd-apps/add-ons/cnpg.yaml rename {applications => argocd-apps}/add-ons/gateway-api.yaml (100%) rename {applications => argocd-apps}/add-ons/sealed-secrets.yaml (100%) rename {applications => argocd-apps}/add-ons/traefik.yaml (97%) create mode 100644 argocd-apps/kustomization.yaml rename applications/services/app-autoregexbot.yaml => argocd-apps/services/autoregexbot.yaml (100%) rename applications/services/app-betterslcm.yaml => argocd-apps/services/betterslcm.yaml (100%) rename applications/services/app-jellyfin.yaml => argocd-apps/services/jellyfin.yaml (96%) rename applications/services/app-legislative-summarization.yaml => argocd-apps/services/legislative-summarization.yaml (100%) rename applications/services/app-qbit.yaml => argocd-apps/services/qbit.yaml (100%) rename applications/services/app-scriptscribe.yaml => argocd-apps/services/scriptscribe.yaml (100%) rename applications/services/app-seaweedfs.yaml => argocd-apps/services/seaweedfs.yaml (95%) rename applications/services/app-stirling-pdf.yaml => argocd-apps/services/stirling-pdf.yaml (96%) rename {extras/add-ons => infra}/argocd-repos/repo-sealed-secret.yaml (100%) rename {extras/add-ons => infra}/cert-manager/cloudflare-api-token-sealed-secret.yaml (100%) rename {extras/add-ons => infra}/cert-manager/cluster-issuer.yaml (100%) rename {extras/add-ons => infra}/traefik/wildcard-whyredfire-dev.yaml (100%) diff --git a/applications/add-ons/cnpg.yaml b/applications/add-ons/cnpg.yaml deleted file mode 100644 index d69c14b..0000000 --- a/applications/add-ons/cnpg.yaml +++ /dev/null @@ -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 diff --git a/applications/kustomization.yaml b/applications/kustomization.yaml deleted file mode 100644 index 8bd92a6..0000000 --- a/applications/kustomization.yaml +++ /dev/null @@ -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 diff --git a/extras/services/jellyfin/httproute-local.yaml b/apps/jellyfin/httproute-local.yaml similarity index 100% rename from extras/services/jellyfin/httproute-local.yaml rename to apps/jellyfin/httproute-local.yaml diff --git a/extras/services/jellyfin/httproute.yaml b/apps/jellyfin/httproute.yaml similarity index 100% rename from extras/services/jellyfin/httproute.yaml rename to apps/jellyfin/httproute.yaml diff --git a/extras/services/seaweedfs/httproute-filer.yaml b/apps/seaweedfs/httproute-filer.yaml similarity index 100% rename from extras/services/seaweedfs/httproute-filer.yaml rename to apps/seaweedfs/httproute-filer.yaml diff --git a/extras/services/seaweedfs/httproute-master.yaml b/apps/seaweedfs/httproute-master.yaml similarity index 100% rename from extras/services/seaweedfs/httproute-master.yaml rename to apps/seaweedfs/httproute-master.yaml diff --git a/extras/services/stirling-pdf/anubis-key-sealedsecret.yaml b/apps/stirling-pdf/anubis-key-sealedsecret.yaml similarity index 100% rename from extras/services/stirling-pdf/anubis-key-sealedsecret.yaml rename to apps/stirling-pdf/anubis-key-sealedsecret.yaml diff --git a/extras/services/stirling-pdf/anubis-proxy.yaml b/apps/stirling-pdf/anubis-proxy.yaml similarity index 95% rename from extras/services/stirling-pdf/anubis-proxy.yaml rename to apps/stirling-pdf/anubis-proxy.yaml index bbdb399..1fbdfb2 100644 --- a/extras/services/stirling-pdf/anubis-proxy.yaml +++ b/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: diff --git a/extras/services/stirling-pdf/httproute.yaml b/apps/stirling-pdf/httproute.yaml similarity index 92% rename from extras/services/stirling-pdf/httproute.yaml rename to apps/stirling-pdf/httproute.yaml index f9f0d0e..9c447bd 100644 --- a/extras/services/stirling-pdf/httproute.yaml +++ b/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 diff --git a/applications/add-ons/anubis-operator.yaml b/argocd-apps/add-ons/anubis-operator.yaml similarity index 100% rename from applications/add-ons/anubis-operator.yaml rename to argocd-apps/add-ons/anubis-operator.yaml diff --git a/applications/services/app-argocd-repos.yaml b/argocd-apps/add-ons/argocd-repos.yaml similarity index 92% rename from applications/services/app-argocd-repos.yaml rename to argocd-apps/add-ons/argocd-repos.yaml index 6fdf2fe..22cc859 100644 --- a/applications/services/app-argocd-repos.yaml +++ b/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 diff --git a/applications/add-ons/cert-manager.yaml b/argocd-apps/add-ons/cert-manager.yaml similarity index 95% rename from applications/add-ons/cert-manager.yaml rename to argocd-apps/add-ons/cert-manager.yaml index e88f794..8357e94 100644 --- a/applications/add-ons/cert-manager.yaml +++ b/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 diff --git a/argocd-apps/add-ons/cnpg.yaml b/argocd-apps/add-ons/cnpg.yaml new file mode 100644 index 0000000..1357439 --- /dev/null +++ b/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 diff --git a/applications/add-ons/gateway-api.yaml b/argocd-apps/add-ons/gateway-api.yaml similarity index 100% rename from applications/add-ons/gateway-api.yaml rename to argocd-apps/add-ons/gateway-api.yaml diff --git a/applications/add-ons/sealed-secrets.yaml b/argocd-apps/add-ons/sealed-secrets.yaml similarity index 100% rename from applications/add-ons/sealed-secrets.yaml rename to argocd-apps/add-ons/sealed-secrets.yaml diff --git a/applications/add-ons/traefik.yaml b/argocd-apps/add-ons/traefik.yaml similarity index 97% rename from applications/add-ons/traefik.yaml rename to argocd-apps/add-ons/traefik.yaml index 1658b2a..b6fd18e 100644 --- a/applications/add-ons/traefik.yaml +++ b/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 diff --git a/argocd-apps/kustomization.yaml b/argocd-apps/kustomization.yaml new file mode 100644 index 0000000..daa01ff --- /dev/null +++ b/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 diff --git a/applications/services/app-autoregexbot.yaml b/argocd-apps/services/autoregexbot.yaml similarity index 100% rename from applications/services/app-autoregexbot.yaml rename to argocd-apps/services/autoregexbot.yaml diff --git a/applications/services/app-betterslcm.yaml b/argocd-apps/services/betterslcm.yaml similarity index 100% rename from applications/services/app-betterslcm.yaml rename to argocd-apps/services/betterslcm.yaml diff --git a/applications/services/app-jellyfin.yaml b/argocd-apps/services/jellyfin.yaml similarity index 96% rename from applications/services/app-jellyfin.yaml rename to argocd-apps/services/jellyfin.yaml index e9115f0..c519766 100644 --- a/applications/services/app-jellyfin.yaml +++ b/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 diff --git a/applications/services/app-legislative-summarization.yaml b/argocd-apps/services/legislative-summarization.yaml similarity index 100% rename from applications/services/app-legislative-summarization.yaml rename to argocd-apps/services/legislative-summarization.yaml diff --git a/applications/services/app-qbit.yaml b/argocd-apps/services/qbit.yaml similarity index 100% rename from applications/services/app-qbit.yaml rename to argocd-apps/services/qbit.yaml diff --git a/applications/services/app-scriptscribe.yaml b/argocd-apps/services/scriptscribe.yaml similarity index 100% rename from applications/services/app-scriptscribe.yaml rename to argocd-apps/services/scriptscribe.yaml diff --git a/applications/services/app-seaweedfs.yaml b/argocd-apps/services/seaweedfs.yaml similarity index 95% rename from applications/services/app-seaweedfs.yaml rename to argocd-apps/services/seaweedfs.yaml index 9ac0ad9..2538f53 100644 --- a/applications/services/app-seaweedfs.yaml +++ b/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 diff --git a/applications/services/app-stirling-pdf.yaml b/argocd-apps/services/stirling-pdf.yaml similarity index 96% rename from applications/services/app-stirling-pdf.yaml rename to argocd-apps/services/stirling-pdf.yaml index 4ae22f5..d3b893e 100644 --- a/applications/services/app-stirling-pdf.yaml +++ b/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 diff --git a/bootstrap/argocd-root-app/root-app.yaml b/bootstrap/argocd-root-app/root-app.yaml index 6e687bd..898097f 100644 --- a/bootstrap/argocd-root-app/root-app.yaml +++ b/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 diff --git a/extras/add-ons/argocd-repos/repo-sealed-secret.yaml b/infra/argocd-repos/repo-sealed-secret.yaml similarity index 100% rename from extras/add-ons/argocd-repos/repo-sealed-secret.yaml rename to infra/argocd-repos/repo-sealed-secret.yaml diff --git a/extras/add-ons/cert-manager/cloudflare-api-token-sealed-secret.yaml b/infra/cert-manager/cloudflare-api-token-sealed-secret.yaml similarity index 100% rename from extras/add-ons/cert-manager/cloudflare-api-token-sealed-secret.yaml rename to infra/cert-manager/cloudflare-api-token-sealed-secret.yaml diff --git a/extras/add-ons/cert-manager/cluster-issuer.yaml b/infra/cert-manager/cluster-issuer.yaml similarity index 100% rename from extras/add-ons/cert-manager/cluster-issuer.yaml rename to infra/cert-manager/cluster-issuer.yaml diff --git a/extras/add-ons/traefik/wildcard-whyredfire-dev.yaml b/infra/traefik/wildcard-whyredfire-dev.yaml similarity index 100% rename from extras/add-ons/traefik/wildcard-whyredfire-dev.yaml rename to infra/traefik/wildcard-whyredfire-dev.yaml