refactor all apps

bootstrap/apps/kustomization-baikal.yaml

@@ -1,15 +1,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: letsencrypt-wildcard-cert
+  name: baikal
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./letsencrypt-wildcard-cert
+  path: ./apps/baikal
-  dependsOn:
-  - name: cert-manager
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
+  dependsOn:
+    - name: infra-configs

bootstrap/apps/kustomization-calibre-web.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./calibre-web
+  path: ./apps/calibre-web
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: calibre-web
-      namespace: calibre-web

bootstrap/apps/kustomization-gitea.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./gitea
+  path: ./apps/gitea
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
+    - name: infra-configs
-      kind: HelmRelease
-      name: gitea
-      namespace: gitea

bootstrap/apps/kustomization-hoarder.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./hoarder
+  path: ./apps/hoarder
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: web
-      namespace: hoarder

bootstrap/apps/kustomization-homeassistant.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./homeassistant
+  path: ./apps/homeassistant
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: homeassistant
-      namespace: homeassistant

bootstrap/apps/kustomization-immich.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./immich
+  path: ./apps/immich
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
+    - name: infra-configs
-      kind: HelmRelease
-      name: immich
-      namespace: immich

bootstrap/apps/kustomization-kube-prometheus-stack.yaml

@@ -1,18 +1,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: baikal
+  name: kube-prometheus-stack
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./baikal
+  path: ./apps/kube-prometheus-stack
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: baikal
-      namespace: baikal

bootstrap/apps/kustomization-media.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./media
+  path: ./apps/media
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: qbittorrent
-      namespace: media

bootstrap/apps/kustomization-michaelthomson.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./michaelthomson
+  path: ./apps/michaelthomson
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: michaelthomson
-      namespace: michaelthomson

bootstrap/apps/kustomization-nextcloud.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: nextcloud
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./apps/nextcloud
+  prune: false # remove any elements later removed from the above path
+  wait: true
+  timeout: 2m # if not set, this defaults to interval duration, which is 1h
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  dependsOn:
+    - name: infra-configs

bootstrap/apps/kustomization-pihole.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./pihole
+  path: ./apps/pihole
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
+    - name: infra-configs
-      kind: HelmRelease
-      name: pihole
-      namespace: pihole

bootstrap/apps/kustomization-plane.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./plane
+  path: ./apps/plane
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
+    - name: infra-configs
-      kind: HelmRelease
-      name: plane
-      namespace: plane

bootstrap/apps/kustomization-roundcube.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: roundcube
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./apps/roundcube
+  prune: false # remove any elements later removed from the above path
+  wait: true
+  timeout: 2m # if not set, this defaults to interval duration, which is 1h
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  dependsOn:
+    - name: infra-configs

bootstrap/apps/kustomization-syncthing.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./syncthing
+  path: ./apps/syncthing
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: syncthing
-      namespace: syncthing

bootstrap/apps/kustomization-uptime-kuma.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./uptime-kuma
+  path: ./apps/uptime-kuma
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: uptime-kuma
-      namespace: uptime-kuma

bootstrap/apps/kustomization-vaultwarden.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vaultwarden
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./apps/vaultwarden
+  prune: false # remove any elements later removed from the above path
+  wait: true
+  timeout: 2m # if not set, this defaults to interval duration, which is 1h
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  dependsOn:
+    - name: infra-configs

bootstrap/apps/kustomization-wg-easy.yaml

@@ -5,14 +5,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 15m
-  path: ./wg-easy
+  path: ./apps/wg-easy
   prune: false # remove any elements later removed from the above path
+  wait: true
   timeout: 2m # if not set, this defaults to interval duration, which is 1h
   sourceRef:
     kind: GitRepository
     name: flux-system
-  healthChecks:
+  dependsOn:
-    - apiVersion: apps/v1
+    - name: infra-configs
-      kind: Deployment
-      name: wg-easy
-      namespace: wg-easy

bootstrap/apps/kustomization-woodpecker.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: woodpecker
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./apps/woodpecker
+  prune: false # remove any elements later removed from the above path
+  wait: true
+  timeout: 2m # if not set, this defaults to interval duration, which is 1h
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  dependsOn:
+    - name: infra-configs

bootstrap/infrastructure/infra-configs.yaml

@@ -1,20 +1,3 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: infra-controllers
-  namespace: flux-system
-spec:
-  interval: 1h
-  retryInterval: 1m
-  timeout: 5m
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  path: ./infrastructure/controllers
-  prune: true
-  wait: true
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:

bootstrap/infrastructure/infra-controllers.yaml

@@ -1,16 +1,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps
+  name: infra-controllers
   namespace: flux-system
 spec:
-  interval: 10m0s
+  interval: 1h
-  dependsOn:
+  retryInterval: 1m
-    - name: infra-configs
+  timeout: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/production
+  path: ./infrastructure/controllers
   prune: true
   wait: true
-  timeout: 5m0s

bootstrap/kustomizations/kustomization-cert-manager.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: cert-manager
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./cert-manager
-  dependsOn:
-  - name: external-dns
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: cert-manager
-      namespace: cert-manager

bootstrap/kustomizations/kustomization-cnpg.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: cnpg
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./cnpg
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: cnpg
-      namespace: cnpg

bootstrap/kustomizations/kustomization-external-dns.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: external-dns
-  namespace: flux-system
-spec:
-  interval: 30m
-  path: ./external-dns
-  dependsOn:
-  - name: sealed-secrets
-  prune: false # remove any elements later removed from the above path
-  timeout: 10m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: external-dns
-      namespace: external-dns

bootstrap/kustomizations/kustomization-kube-prometheus-stack.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: kube-prometheus-stack
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./kube-prometheus-stack
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: kube-prometheus-stack
-      namespace: kube-prometheus-stack

bootstrap/kustomizations/kustomization-longhorn.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: longhorn
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./longhorn
-  dependsOn:
-  - name: nfs-subdir-external-provisioner
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: longhorn
-      namespace: longhorn-system

bootstrap/kustomizations/kustomization-metallb-config.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: metallb-config
-  namespace: flux-system
-spec:
-  interval: 15m
-  dependsOn:
-  - name: metallb-system
-  path: ./metallb-config
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: metallb-controller
-      namespace: metallb-system

bootstrap/kustomizations/kustomization-metallb-system.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: metallb-system
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./metallb-system
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: metallb-controller
-      namespace: metallb-system

bootstrap/kustomizations/kustomization-nextcloud.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: nextcloud
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./nextcloud
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: nextcloud
-      namespace: nextcloud

bootstrap/kustomizations/kustomization-nfs-subdir-external-provisioner.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: nfs-subdir-external-provisioner
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./nfs-subdir-external-provisioner
-  dependsOn:
-  - name: traefik
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: nfs-subdir-external-provisioner
-      namespace: nfs-subdir-external-provisioner

bootstrap/kustomizations/kustomization-nvidia-device-plugin.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: nvidia-device-plugin
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./nvidia-device-plugin
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: nvidia-device-plugin
-      namespace: nvidia-device-plugin

bootstrap/kustomizations/kustomization-reflector.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: reflector
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./reflector
-  dependsOn:
-  - name: letsencrypt-wildcard-cert
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: reflector
-      namespace: reflector

bootstrap/kustomizations/kustomization-roundcube.yaml

@@ -1,22 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: roundcube
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./roundcube
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: roundcubemail
-      namespace: roundcube
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: roundcubedb
-      namespace: roundcube

bootstrap/kustomizations/kustomization-sealed-secrets.yaml

@@ -1,21 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: sealed-secrets
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./sealed-secrets
-  dependsOn:
-  - name: metallb-system
-  - name: metallb-config
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: sealed-secrets
-      namespace: sealed-secrets

bootstrap/kustomizations/kustomization-traefik.yaml

@@ -1,20 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: traefik
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./traefik
-  dependsOn:
-  - name: reflector
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: traefik
-      namespace: traefik

bootstrap/kustomizations/kustomization-vaultwarden.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: vaultwarden
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./vaultwarden
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: vaultwarden
-      namespace: vaultwarden

bootstrap/kustomizations/kustomization-woodpecker.yaml

@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: woodpecker
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ./woodpecker
-  prune: false # remove any elements later removed from the above path
-  timeout: 2m # if not set, this defaults to interval duration, which is 1h
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: woodpecker
-      namespace: woodpecker

infrastructure/configs/cert-manager/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: letsencrypt-wildcard-cert