diff --git a/baikal/baikal-deployment.yaml b/apps/baikal/deployment.yaml similarity index 100% rename from baikal/baikal-deployment.yaml rename to apps/baikal/deployment.yaml diff --git a/baikal/baikal-dns-endpoint.yaml b/apps/baikal/dns-endpoint.yaml similarity index 100% rename from baikal/baikal-dns-endpoint.yaml rename to apps/baikal/dns-endpoint.yaml diff --git a/baikal/baikal-ingress.yaml b/apps/baikal/ingress.yaml similarity index 100% rename from baikal/baikal-ingress.yaml rename to apps/baikal/ingress.yaml diff --git a/bootstrap/namespaces/namespace-baikal.yaml b/apps/baikal/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-baikal.yaml rename to apps/baikal/namespace.yaml diff --git a/baikal/baikal-pvc-config.yaml b/apps/baikal/pvc-config.yaml similarity index 100% rename from baikal/baikal-pvc-config.yaml rename to apps/baikal/pvc-config.yaml diff --git a/baikal/baikal-pvc-data.yaml b/apps/baikal/pvc-data.yaml similarity index 100% rename from baikal/baikal-pvc-data.yaml rename to apps/baikal/pvc-data.yaml diff --git a/baikal/baikal-service.yaml b/apps/baikal/service.yaml similarity index 100% rename from baikal/baikal-service.yaml rename to apps/baikal/service.yaml diff --git a/calibre-web/config.yaml b/apps/calibre-web/config.yaml similarity index 100% rename from calibre-web/config.yaml rename to apps/calibre-web/config.yaml diff --git a/calibre-web/deployment.yaml b/apps/calibre-web/deployment.yaml similarity index 100% rename from calibre-web/deployment.yaml rename to apps/calibre-web/deployment.yaml diff --git a/calibre-web/dns-endpoint.yaml b/apps/calibre-web/dns-endpoint.yaml similarity index 100% rename from calibre-web/dns-endpoint.yaml rename to apps/calibre-web/dns-endpoint.yaml diff --git a/calibre-web/ingress.yaml b/apps/calibre-web/ingress.yaml similarity index 100% rename from calibre-web/ingress.yaml rename to apps/calibre-web/ingress.yaml diff --git a/bootstrap/namespaces/namespace-calibre-web.yaml b/apps/calibre-web/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-calibre-web.yaml rename to apps/calibre-web/namespace.yaml diff --git a/calibre-web/pvc-config.yaml b/apps/calibre-web/pvc-config.yaml similarity index 100% rename from calibre-web/pvc-config.yaml rename to apps/calibre-web/pvc-config.yaml diff --git a/calibre-web/pvc-data.yaml b/apps/calibre-web/pvc-data.yaml similarity index 100% rename from calibre-web/pvc-data.yaml rename to apps/calibre-web/pvc-data.yaml diff --git a/calibre-web/service.yaml b/apps/calibre-web/service.yaml similarity index 100% rename from calibre-web/service.yaml rename to apps/calibre-web/service.yaml diff --git a/gitea/gitea-admin-secret.yaml b/apps/gitea/admin-secret.yaml similarity index 100% rename from gitea/gitea-admin-secret.yaml rename to apps/gitea/admin-secret.yaml diff --git a/gitea/dns-endpoint.yaml b/apps/gitea/dns-endpoint.yaml similarity index 100% rename from gitea/dns-endpoint.yaml rename to apps/gitea/dns-endpoint.yaml diff --git a/gitea/gitea-mailer-config-secret.yaml b/apps/gitea/mailer-config-secret.yaml similarity index 100% rename from gitea/gitea-mailer-config-secret.yaml rename to apps/gitea/mailer-config-secret.yaml diff --git a/bootstrap/namespaces/namespace-gitea.yaml b/apps/gitea/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-gitea.yaml rename to apps/gitea/namespace.yaml diff --git a/gitea/helmrelease-gitea.yaml b/apps/gitea/release.yaml similarity index 98% rename from gitea/helmrelease-gitea.yaml rename to apps/gitea/release.yaml index 2ef8be3..3e903f5 100644 --- a/gitea/helmrelease-gitea.yaml +++ b/apps/gitea/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: gitea - namespace: flux-system interval: 15m timeout: 5m releaseName: gitea diff --git a/bootstrap/helmrepositories/helmrepository-gitea.yaml b/apps/gitea/repository.yaml similarity index 84% rename from bootstrap/helmrepositories/helmrepository-gitea.yaml rename to apps/gitea/repository.yaml index 51bdb5f..85bf06e 100644 --- a/bootstrap/helmrepositories/helmrepository-gitea.yaml +++ b/apps/gitea/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: gitea - namespace: flux-system + namespace: gitea spec: interval: 15m url: https://dl.gitea.io/charts diff --git a/hoarder/chrome-deployment.yaml b/apps/hoarder/chrome-deployment.yaml similarity index 100% rename from hoarder/chrome-deployment.yaml rename to apps/hoarder/chrome-deployment.yaml diff --git a/hoarder/chrome-service.yaml b/apps/hoarder/chrome-service.yaml similarity index 100% rename from hoarder/chrome-service.yaml rename to apps/hoarder/chrome-service.yaml diff --git a/hoarder/data-pvc.yaml b/apps/hoarder/data-pvc.yaml similarity index 100% rename from hoarder/data-pvc.yaml rename to apps/hoarder/data-pvc.yaml diff --git a/hoarder/dns-endpoint.yaml b/apps/hoarder/dns-endpoint.yaml similarity index 100% rename from hoarder/dns-endpoint.yaml rename to apps/hoarder/dns-endpoint.yaml diff --git a/hoarder/hoarder-secrets.yaml b/apps/hoarder/hoarder-secrets.yaml similarity index 100% rename from hoarder/hoarder-secrets.yaml rename to apps/hoarder/hoarder-secrets.yaml diff --git a/hoarder/ingress.yaml b/apps/hoarder/ingress.yaml similarity index 100% rename from hoarder/ingress.yaml rename to apps/hoarder/ingress.yaml diff --git a/hoarder/meilisearch-deployment.yaml b/apps/hoarder/meilisearch-deployment.yaml similarity index 100% rename from hoarder/meilisearch-deployment.yaml rename to apps/hoarder/meilisearch-deployment.yaml diff --git a/hoarder/meilisearch-pvc.yaml b/apps/hoarder/meilisearch-pvc.yaml similarity index 100% rename from hoarder/meilisearch-pvc.yaml rename to apps/hoarder/meilisearch-pvc.yaml diff --git a/hoarder/meilisearch-service.yaml b/apps/hoarder/meilisearch-service.yaml similarity index 100% rename from hoarder/meilisearch-service.yaml rename to apps/hoarder/meilisearch-service.yaml diff --git a/bootstrap/namespaces/namespace-hoarder.yaml b/apps/hoarder/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-hoarder.yaml rename to apps/hoarder/namespace.yaml diff --git a/hoarder/web-deployment.yaml b/apps/hoarder/web-deployment.yaml similarity index 100% rename from hoarder/web-deployment.yaml rename to apps/hoarder/web-deployment.yaml diff --git a/hoarder/web-service.yaml b/apps/hoarder/web-service.yaml similarity index 100% rename from hoarder/web-service.yaml rename to apps/hoarder/web-service.yaml diff --git a/homeassistant/deployment.yaml b/apps/homeassistant/deployment.yaml similarity index 100% rename from homeassistant/deployment.yaml rename to apps/homeassistant/deployment.yaml diff --git a/homeassistant/dns-endpoint.yaml b/apps/homeassistant/dns-endpoint.yaml similarity index 100% rename from homeassistant/dns-endpoint.yaml rename to apps/homeassistant/dns-endpoint.yaml diff --git a/homeassistant/homeassistant-config.yaml b/apps/homeassistant/homeassistant-config.yaml similarity index 100% rename from homeassistant/homeassistant-config.yaml rename to apps/homeassistant/homeassistant-config.yaml diff --git a/homeassistant/ingress.yaml b/apps/homeassistant/ingress.yaml similarity index 100% rename from homeassistant/ingress.yaml rename to apps/homeassistant/ingress.yaml diff --git a/bootstrap/namespaces/namespace-homeassistant.yaml b/apps/homeassistant/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-homeassistant.yaml rename to apps/homeassistant/namespace.yaml diff --git a/homeassistant/piper-config.yaml b/apps/homeassistant/piper-config.yaml similarity index 100% rename from homeassistant/piper-config.yaml rename to apps/homeassistant/piper-config.yaml diff --git a/homeassistant/pvc-config.yaml b/apps/homeassistant/pvc-config.yaml similarity index 100% rename from homeassistant/pvc-config.yaml rename to apps/homeassistant/pvc-config.yaml diff --git a/homeassistant/service.yaml b/apps/homeassistant/service.yaml similarity index 100% rename from homeassistant/service.yaml rename to apps/homeassistant/service.yaml diff --git a/homeassistant/whisper-config.yaml b/apps/homeassistant/whisper-config.yaml similarity index 100% rename from homeassistant/whisper-config.yaml rename to apps/homeassistant/whisper-config.yaml diff --git a/immich/cluster.yaml b/apps/immich/cluster.yaml similarity index 100% rename from immich/cluster.yaml rename to apps/immich/cluster.yaml diff --git a/immich/dns-endpoint.yaml b/apps/immich/dns-endpoint.yaml similarity index 100% rename from immich/dns-endpoint.yaml rename to apps/immich/dns-endpoint.yaml diff --git a/immich/immich-postgres-secret.yaml b/apps/immich/immich-postgres-secret.yaml similarity index 100% rename from immich/immich-postgres-secret.yaml rename to apps/immich/immich-postgres-secret.yaml diff --git a/bootstrap/namespaces/namespace-immich.yaml b/apps/immich/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-immich.yaml rename to apps/immich/namespace.yaml diff --git a/immich/pvc-data.yaml b/apps/immich/pvc-data.yaml similarity index 100% rename from immich/pvc-data.yaml rename to apps/immich/pvc-data.yaml diff --git a/immich/helmrelease-immich.yaml b/apps/immich/release.yaml similarity index 97% rename from immich/helmrelease-immich.yaml rename to apps/immich/release.yaml index c9dfc17..abef8bd 100644 --- a/immich/helmrelease-immich.yaml +++ b/apps/immich/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: immich - namespace: flux-system interval: 15m timeout: 5m releaseName: immich diff --git a/bootstrap/helmrepositories/helmrepository-immich.yaml b/apps/immich/repository.yaml similarity index 86% rename from bootstrap/helmrepositories/helmrepository-immich.yaml rename to apps/immich/repository.yaml index cb4924a..4e45903 100644 --- a/bootstrap/helmrepositories/helmrepository-immich.yaml +++ b/apps/immich/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: immich - namespace: flux-system + namespace: immich spec: interval: 15m url: https://immich-app.github.io/immich-charts diff --git a/kube-prometheus-stack/dns-endpoint-grafana.yaml b/apps/kube-prometheus-stack/dns-endpoint-grafana.yaml similarity index 100% rename from kube-prometheus-stack/dns-endpoint-grafana.yaml rename to apps/kube-prometheus-stack/dns-endpoint-grafana.yaml diff --git a/kube-prometheus-stack/dns-endpoint-prometheus.yaml b/apps/kube-prometheus-stack/dns-endpoint-prometheus.yaml similarity index 100% rename from kube-prometheus-stack/dns-endpoint-prometheus.yaml rename to apps/kube-prometheus-stack/dns-endpoint-prometheus.yaml diff --git a/bootstrap/namespaces/namespace-kube-prometheus-stack.yaml b/apps/kube-prometheus-stack/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-kube-prometheus-stack.yaml rename to apps/kube-prometheus-stack/namespace.yaml diff --git a/kube-prometheus-stack/helmrelease-kube-prometheus-stack.yaml b/apps/kube-prometheus-stack/release.yaml similarity index 97% rename from kube-prometheus-stack/helmrelease-kube-prometheus-stack.yaml rename to apps/kube-prometheus-stack/release.yaml index fc8feca..1c08405 100644 --- a/kube-prometheus-stack/helmrelease-kube-prometheus-stack.yaml +++ b/apps/kube-prometheus-stack/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: prometheus-community - namespace: flux-system interval: 15m timeout: 5m releaseName: kube-prometheus-stack diff --git a/bootstrap/helmrepositories/helmrepository-prometheus-community.yaml b/apps/kube-prometheus-stack/repository.yaml similarity index 83% rename from bootstrap/helmrepositories/helmrepository-prometheus-community.yaml rename to apps/kube-prometheus-stack/repository.yaml index 5d8eb0e..727fb24 100644 --- a/bootstrap/helmrepositories/helmrepository-prometheus-community.yaml +++ b/apps/kube-prometheus-stack/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: prometheus-community - namespace: flux-system + namespace: kube-prometheus-stack spec: interval: 15m url: https://prometheus-community.github.io/helm-charts diff --git a/media/bazarr/config.yaml b/apps/media/bazarr/config.yaml similarity index 100% rename from media/bazarr/config.yaml rename to apps/media/bazarr/config.yaml diff --git a/media/bazarr/deployment.yaml b/apps/media/bazarr/deployment.yaml similarity index 100% rename from media/bazarr/deployment.yaml rename to apps/media/bazarr/deployment.yaml diff --git a/media/bazarr/dns-endpoint.yaml b/apps/media/bazarr/dns-endpoint.yaml similarity index 100% rename from media/bazarr/dns-endpoint.yaml rename to apps/media/bazarr/dns-endpoint.yaml diff --git a/media/bazarr/ingress.yaml b/apps/media/bazarr/ingress.yaml similarity index 100% rename from media/bazarr/ingress.yaml rename to apps/media/bazarr/ingress.yaml diff --git a/media/bazarr/pvc-config.yaml b/apps/media/bazarr/pvc-config.yaml similarity index 100% rename from media/bazarr/pvc-config.yaml rename to apps/media/bazarr/pvc-config.yaml diff --git a/media/bazarr/service.yaml b/apps/media/bazarr/service.yaml similarity index 100% rename from media/bazarr/service.yaml rename to apps/media/bazarr/service.yaml diff --git a/media/jellyfin/config.yaml b/apps/media/jellyfin/config.yaml similarity index 100% rename from media/jellyfin/config.yaml rename to apps/media/jellyfin/config.yaml diff --git a/media/jellyfin/deployment.yaml b/apps/media/jellyfin/deployment.yaml similarity index 100% rename from media/jellyfin/deployment.yaml rename to apps/media/jellyfin/deployment.yaml diff --git a/media/jellyfin/dns-endpoint-public.yaml b/apps/media/jellyfin/dns-endpoint-public.yaml similarity index 100% rename from media/jellyfin/dns-endpoint-public.yaml rename to apps/media/jellyfin/dns-endpoint-public.yaml diff --git a/media/jellyfin/ingress.yaml b/apps/media/jellyfin/ingress.yaml similarity index 100% rename from media/jellyfin/ingress.yaml rename to apps/media/jellyfin/ingress.yaml diff --git a/media/jellyfin/pvc-config.yaml b/apps/media/jellyfin/pvc-config.yaml similarity index 100% rename from media/jellyfin/pvc-config.yaml rename to apps/media/jellyfin/pvc-config.yaml diff --git a/media/jellyfin/service.yaml b/apps/media/jellyfin/service.yaml similarity index 100% rename from media/jellyfin/service.yaml rename to apps/media/jellyfin/service.yaml diff --git a/media/jellyseerr/config.yaml b/apps/media/jellyseerr/config.yaml similarity index 100% rename from media/jellyseerr/config.yaml rename to apps/media/jellyseerr/config.yaml diff --git a/media/jellyseerr/deployment.yaml b/apps/media/jellyseerr/deployment.yaml similarity index 100% rename from media/jellyseerr/deployment.yaml rename to apps/media/jellyseerr/deployment.yaml diff --git a/media/jellyseerr/dns-endpoint.yaml b/apps/media/jellyseerr/dns-endpoint.yaml similarity index 100% rename from media/jellyseerr/dns-endpoint.yaml rename to apps/media/jellyseerr/dns-endpoint.yaml diff --git a/media/jellyseerr/ingress.yaml b/apps/media/jellyseerr/ingress.yaml similarity index 100% rename from media/jellyseerr/ingress.yaml rename to apps/media/jellyseerr/ingress.yaml diff --git a/media/jellyseerr/pvc-config.yaml b/apps/media/jellyseerr/pvc-config.yaml similarity index 100% rename from media/jellyseerr/pvc-config.yaml rename to apps/media/jellyseerr/pvc-config.yaml diff --git a/media/jellyseerr/service.yaml b/apps/media/jellyseerr/service.yaml similarity index 100% rename from media/jellyseerr/service.yaml rename to apps/media/jellyseerr/service.yaml diff --git a/bootstrap/namespaces/namespace-media.yaml b/apps/media/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-media.yaml rename to apps/media/namespace.yaml diff --git a/media/prowlarr/deployment.yaml b/apps/media/prowlarr/deployment.yaml similarity index 100% rename from media/prowlarr/deployment.yaml rename to apps/media/prowlarr/deployment.yaml diff --git a/media/prowlarr/dns-endpoint.yaml b/apps/media/prowlarr/dns-endpoint.yaml similarity index 100% rename from media/prowlarr/dns-endpoint.yaml rename to apps/media/prowlarr/dns-endpoint.yaml diff --git a/media/prowlarr/ingress.yaml b/apps/media/prowlarr/ingress.yaml similarity index 100% rename from media/prowlarr/ingress.yaml rename to apps/media/prowlarr/ingress.yaml diff --git a/media/prowlarr/pvc-config.yaml b/apps/media/prowlarr/pvc-config.yaml similarity index 100% rename from media/prowlarr/pvc-config.yaml rename to apps/media/prowlarr/pvc-config.yaml diff --git a/media/prowlarr/service.yaml b/apps/media/prowlarr/service.yaml similarity index 100% rename from media/prowlarr/service.yaml rename to apps/media/prowlarr/service.yaml diff --git a/media/pvc-data.yaml b/apps/media/pvc-data.yaml similarity index 100% rename from media/pvc-data.yaml rename to apps/media/pvc-data.yaml diff --git a/media/qbittorrent/deployment.yaml b/apps/media/qbittorrent/deployment.yaml similarity index 100% rename from media/qbittorrent/deployment.yaml rename to apps/media/qbittorrent/deployment.yaml diff --git a/media/qbittorrent/dns-endpoint.yaml b/apps/media/qbittorrent/dns-endpoint.yaml similarity index 100% rename from media/qbittorrent/dns-endpoint.yaml rename to apps/media/qbittorrent/dns-endpoint.yaml diff --git a/media/qbittorrent/ingress.yaml b/apps/media/qbittorrent/ingress.yaml similarity index 100% rename from media/qbittorrent/ingress.yaml rename to apps/media/qbittorrent/ingress.yaml diff --git a/media/qbittorrent/natpmp-script.yaml b/apps/media/qbittorrent/natpmp-script.yaml similarity index 100% rename from media/qbittorrent/natpmp-script.yaml rename to apps/media/qbittorrent/natpmp-script.yaml diff --git a/media/qbittorrent/pvc-qbittorrent-config.yaml b/apps/media/qbittorrent/pvc-qbittorrent-config.yaml similarity index 100% rename from media/qbittorrent/pvc-qbittorrent-config.yaml rename to apps/media/qbittorrent/pvc-qbittorrent-config.yaml diff --git a/media/qbittorrent/pvc-wireguard-config.yaml b/apps/media/qbittorrent/pvc-wireguard-config.yaml similarity index 100% rename from media/qbittorrent/pvc-wireguard-config.yaml rename to apps/media/qbittorrent/pvc-wireguard-config.yaml diff --git a/media/qbittorrent/qbittorrent-config.yaml b/apps/media/qbittorrent/qbittorrent-config.yaml similarity index 100% rename from media/qbittorrent/qbittorrent-config.yaml rename to apps/media/qbittorrent/qbittorrent-config.yaml diff --git a/media/qbittorrent/service.yaml b/apps/media/qbittorrent/service.yaml similarity index 100% rename from media/qbittorrent/service.yaml rename to apps/media/qbittorrent/service.yaml diff --git a/media/qbittorrent/wireguard-config-secret.yaml b/apps/media/qbittorrent/wireguard-config-secret.yaml similarity index 100% rename from media/qbittorrent/wireguard-config-secret.yaml rename to apps/media/qbittorrent/wireguard-config-secret.yaml diff --git a/media/qbittorrent/wireguard-config.yaml b/apps/media/qbittorrent/wireguard-config.yaml similarity index 100% rename from media/qbittorrent/wireguard-config.yaml rename to apps/media/qbittorrent/wireguard-config.yaml diff --git a/media/radarr/config.yaml b/apps/media/radarr/config.yaml similarity index 100% rename from media/radarr/config.yaml rename to apps/media/radarr/config.yaml diff --git a/media/radarr/deployment.yaml b/apps/media/radarr/deployment.yaml similarity index 100% rename from media/radarr/deployment.yaml rename to apps/media/radarr/deployment.yaml diff --git a/media/radarr/dns-endpoint.yaml b/apps/media/radarr/dns-endpoint.yaml similarity index 100% rename from media/radarr/dns-endpoint.yaml rename to apps/media/radarr/dns-endpoint.yaml diff --git a/media/radarr/ingress.yaml b/apps/media/radarr/ingress.yaml similarity index 100% rename from media/radarr/ingress.yaml rename to apps/media/radarr/ingress.yaml diff --git a/media/radarr/pvc-config.yaml b/apps/media/radarr/pvc-config.yaml similarity index 100% rename from media/radarr/pvc-config.yaml rename to apps/media/radarr/pvc-config.yaml diff --git a/media/radarr/service.yaml b/apps/media/radarr/service.yaml similarity index 100% rename from media/radarr/service.yaml rename to apps/media/radarr/service.yaml diff --git a/media/readarr/config.yaml b/apps/media/readarr/config.yaml similarity index 100% rename from media/readarr/config.yaml rename to apps/media/readarr/config.yaml diff --git a/media/readarr/deployment.yaml b/apps/media/readarr/deployment.yaml similarity index 100% rename from media/readarr/deployment.yaml rename to apps/media/readarr/deployment.yaml diff --git a/media/readarr/dns-endpoint.yaml b/apps/media/readarr/dns-endpoint.yaml similarity index 100% rename from media/readarr/dns-endpoint.yaml rename to apps/media/readarr/dns-endpoint.yaml diff --git a/media/readarr/ingress.yaml b/apps/media/readarr/ingress.yaml similarity index 100% rename from media/readarr/ingress.yaml rename to apps/media/readarr/ingress.yaml diff --git a/media/readarr/pvc-config.yaml b/apps/media/readarr/pvc-config.yaml similarity index 100% rename from media/readarr/pvc-config.yaml rename to apps/media/readarr/pvc-config.yaml diff --git a/media/readarr/service.yaml b/apps/media/readarr/service.yaml similarity index 100% rename from media/readarr/service.yaml rename to apps/media/readarr/service.yaml diff --git a/media/recyclarr/deployment.yaml b/apps/media/recyclarr/deployment.yaml similarity index 100% rename from media/recyclarr/deployment.yaml rename to apps/media/recyclarr/deployment.yaml diff --git a/media/recyclarr/pvc-config.yaml b/apps/media/recyclarr/pvc-config.yaml similarity index 100% rename from media/recyclarr/pvc-config.yaml rename to apps/media/recyclarr/pvc-config.yaml diff --git a/media/sabnzbd/deployment.yaml b/apps/media/sabnzbd/deployment.yaml similarity index 100% rename from media/sabnzbd/deployment.yaml rename to apps/media/sabnzbd/deployment.yaml diff --git a/media/sabnzbd/dns-endpoint.yaml b/apps/media/sabnzbd/dns-endpoint.yaml similarity index 100% rename from media/sabnzbd/dns-endpoint.yaml rename to apps/media/sabnzbd/dns-endpoint.yaml diff --git a/media/sabnzbd/ingress.yaml b/apps/media/sabnzbd/ingress.yaml similarity index 100% rename from media/sabnzbd/ingress.yaml rename to apps/media/sabnzbd/ingress.yaml diff --git a/media/sabnzbd/pvc-sabnzbd-config.yaml b/apps/media/sabnzbd/pvc-sabnzbd-config.yaml similarity index 100% rename from media/sabnzbd/pvc-sabnzbd-config.yaml rename to apps/media/sabnzbd/pvc-sabnzbd-config.yaml diff --git a/media/sabnzbd/sabnzbd-config.yaml b/apps/media/sabnzbd/sabnzbd-config.yaml similarity index 100% rename from media/sabnzbd/sabnzbd-config.yaml rename to apps/media/sabnzbd/sabnzbd-config.yaml diff --git a/media/sabnzbd/service.yaml b/apps/media/sabnzbd/service.yaml similarity index 100% rename from media/sabnzbd/service.yaml rename to apps/media/sabnzbd/service.yaml diff --git a/media/sonarr/config.yaml b/apps/media/sonarr/config.yaml similarity index 100% rename from media/sonarr/config.yaml rename to apps/media/sonarr/config.yaml diff --git a/media/sonarr/deployment.yaml b/apps/media/sonarr/deployment.yaml similarity index 100% rename from media/sonarr/deployment.yaml rename to apps/media/sonarr/deployment.yaml diff --git a/media/sonarr/dns-endpoint.yaml b/apps/media/sonarr/dns-endpoint.yaml similarity index 100% rename from media/sonarr/dns-endpoint.yaml rename to apps/media/sonarr/dns-endpoint.yaml diff --git a/media/sonarr/ingress.yaml b/apps/media/sonarr/ingress.yaml similarity index 100% rename from media/sonarr/ingress.yaml rename to apps/media/sonarr/ingress.yaml diff --git a/media/sonarr/pvc-config.yaml b/apps/media/sonarr/pvc-config.yaml similarity index 100% rename from media/sonarr/pvc-config.yaml rename to apps/media/sonarr/pvc-config.yaml diff --git a/media/sonarr/service.yaml b/apps/media/sonarr/service.yaml similarity index 100% rename from media/sonarr/service.yaml rename to apps/media/sonarr/service.yaml diff --git a/media/unpackerr/config.yaml b/apps/media/unpackerr/config.yaml similarity index 100% rename from media/unpackerr/config.yaml rename to apps/media/unpackerr/config.yaml diff --git a/media/unpackerr/deployment.yaml b/apps/media/unpackerr/deployment.yaml similarity index 100% rename from media/unpackerr/deployment.yaml rename to apps/media/unpackerr/deployment.yaml diff --git a/michaelthomson/deployment.yaml b/apps/michaelthomson/deployment.yaml similarity index 100% rename from michaelthomson/deployment.yaml rename to apps/michaelthomson/deployment.yaml diff --git a/michaelthomson/dns-endpoint.yaml b/apps/michaelthomson/dns-endpoint.yaml similarity index 100% rename from michaelthomson/dns-endpoint.yaml rename to apps/michaelthomson/dns-endpoint.yaml diff --git a/michaelthomson/ingress.yaml b/apps/michaelthomson/ingress.yaml similarity index 100% rename from michaelthomson/ingress.yaml rename to apps/michaelthomson/ingress.yaml diff --git a/bootstrap/namespaces/namespace-michaelthomson.yaml b/apps/michaelthomson/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-michaelthomson.yaml rename to apps/michaelthomson/namespace.yaml diff --git a/michaelthomson/service.yaml b/apps/michaelthomson/service.yaml similarity index 100% rename from michaelthomson/service.yaml rename to apps/michaelthomson/service.yaml diff --git a/nextcloud/collabora-secret.yaml b/apps/nextcloud/collabora-secret.yaml similarity index 100% rename from nextcloud/collabora-secret.yaml rename to apps/nextcloud/collabora-secret.yaml diff --git a/nextcloud/dns-endpoint-collabora.yaml b/apps/nextcloud/dns-endpoint-collabora.yaml similarity index 100% rename from nextcloud/dns-endpoint-collabora.yaml rename to apps/nextcloud/dns-endpoint-collabora.yaml diff --git a/nextcloud/dns-endpoint-nextcloud.yaml b/apps/nextcloud/dns-endpoint-nextcloud.yaml similarity index 100% rename from nextcloud/dns-endpoint-nextcloud.yaml rename to apps/nextcloud/dns-endpoint-nextcloud.yaml diff --git a/bootstrap/namespaces/namespace-nextcloud.yaml b/apps/nextcloud/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-nextcloud.yaml rename to apps/nextcloud/namespace.yaml diff --git a/nextcloud/nextcloud-redis-secret.yaml b/apps/nextcloud/nextcloud-redis-secret.yaml similarity index 100% rename from nextcloud/nextcloud-redis-secret.yaml rename to apps/nextcloud/nextcloud-redis-secret.yaml diff --git a/nextcloud/postgres-secret.yaml b/apps/nextcloud/postgres-secret.yaml similarity index 100% rename from nextcloud/postgres-secret.yaml rename to apps/nextcloud/postgres-secret.yaml diff --git a/nextcloud/pvc-postgres.yaml b/apps/nextcloud/pvc-postgres.yaml similarity index 100% rename from nextcloud/pvc-postgres.yaml rename to apps/nextcloud/pvc-postgres.yaml diff --git a/nextcloud/helmrelease-nextcloud.yaml b/apps/nextcloud/release.yaml similarity index 99% rename from nextcloud/helmrelease-nextcloud.yaml rename to apps/nextcloud/release.yaml index f6ae3e8..5544b6d 100644 --- a/nextcloud/helmrelease-nextcloud.yaml +++ b/apps/nextcloud/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: nextcloud - namespace: flux-system interval: 15m timeout: 5m releaseName: nextcloud diff --git a/bootstrap/helmrepositories/helmrepository-nextcloud.yaml b/apps/nextcloud/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-nextcloud.yaml rename to apps/nextcloud/repository.yaml index 46c33ce..4381567 100644 --- a/bootstrap/helmrepositories/helmrepository-nextcloud.yaml +++ b/apps/nextcloud/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: nextcloud - namespace: flux-system + namespace: nextcloud spec: interval: 15m url: https://nextcloud.github.io/helm/ diff --git a/pihole/dns-endpoint.yaml b/apps/pihole/dns-endpoint.yaml similarity index 100% rename from pihole/dns-endpoint.yaml rename to apps/pihole/dns-endpoint.yaml diff --git a/bootstrap/namespaces/namespace-pihole.yaml b/apps/pihole/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-pihole.yaml rename to apps/pihole/namespace.yaml diff --git a/pihole/helmrelease-pihole.yaml b/apps/pihole/release.yaml similarity index 98% rename from pihole/helmrelease-pihole.yaml rename to apps/pihole/release.yaml index 21e15c3..decfaba 100644 --- a/pihole/helmrelease-pihole.yaml +++ b/apps/pihole/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: mojo2600 - namespace: flux-system interval: 15m timeout: 5m releaseName: pihole diff --git a/bootstrap/helmrepositories/helmrepository-mojo2600.yaml b/apps/pihole/repository.yaml similarity index 86% rename from bootstrap/helmrepositories/helmrepository-mojo2600.yaml rename to apps/pihole/repository.yaml index 3102ff2..2a6e0a3 100644 --- a/bootstrap/helmrepositories/helmrepository-mojo2600.yaml +++ b/apps/pihole/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: mojo2600 - namespace: flux-system + namespace: pihole spec: interval: 15m url: https://mojo2600.github.io/pihole-kubernetes/ diff --git a/plane/app-env-secret.yaml b/apps/plane/app-env-secret.yaml similarity index 100% rename from plane/app-env-secret.yaml rename to apps/plane/app-env-secret.yaml diff --git a/plane/dns-endpoint.yaml b/apps/plane/dns-endpoint.yaml similarity index 100% rename from plane/dns-endpoint.yaml rename to apps/plane/dns-endpoint.yaml diff --git a/plane/doc-store-secret.yaml b/apps/plane/doc-store-secret.yaml similarity index 100% rename from plane/doc-store-secret.yaml rename to apps/plane/doc-store-secret.yaml diff --git a/plane/live-env-secret.yaml b/apps/plane/live-env-secret.yaml similarity index 100% rename from plane/live-env-secret.yaml rename to apps/plane/live-env-secret.yaml diff --git a/bootstrap/namespaces/namespace-plane.yaml b/apps/plane/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-plane.yaml rename to apps/plane/namespace.yaml diff --git a/plane/pgd-secret.yaml b/apps/plane/pgd-secret.yaml similarity index 100% rename from plane/pgd-secret.yaml rename to apps/plane/pgd-secret.yaml diff --git a/plane/rabbitmq-secret.yaml b/apps/plane/rabbitmq-secret.yaml similarity index 100% rename from plane/rabbitmq-secret.yaml rename to apps/plane/rabbitmq-secret.yaml diff --git a/plane/helmrelease-plane.yaml b/apps/plane/release.yaml similarity index 98% rename from plane/helmrelease-plane.yaml rename to apps/plane/release.yaml index e197a24..323bef6 100644 --- a/plane/helmrelease-plane.yaml +++ b/apps/plane/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: plane - namespace: flux-system interval: 15m timeout: 5m releaseName: plane diff --git a/bootstrap/helmrepositories/helmrepository-plane.yaml b/apps/plane/repository.yaml similarity index 84% rename from bootstrap/helmrepositories/helmrepository-plane.yaml rename to apps/plane/repository.yaml index b105f49..ca7b2a8 100644 --- a/bootstrap/helmrepositories/helmrepository-plane.yaml +++ b/apps/plane/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: plane - namespace: flux-system + namespace: plane spec: interval: 15m url: https://helm.plane.so/ diff --git a/bootstrap/namespaces/namespace-roundcube.yaml b/apps/roundcube/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-roundcube.yaml rename to apps/roundcube/namespace.yaml diff --git a/roundcube/roundcubedb-deployment.yaml b/apps/roundcube/roundcubedb-deployment.yaml similarity index 100% rename from roundcube/roundcubedb-deployment.yaml rename to apps/roundcube/roundcubedb-deployment.yaml diff --git a/roundcube/roundcubedb-pvc.yaml b/apps/roundcube/roundcubedb-pvc.yaml similarity index 100% rename from roundcube/roundcubedb-pvc.yaml rename to apps/roundcube/roundcubedb-pvc.yaml diff --git a/roundcube/roundcubedb-service.yaml b/apps/roundcube/roundcubedb-service.yaml similarity index 100% rename from roundcube/roundcubedb-service.yaml rename to apps/roundcube/roundcubedb-service.yaml diff --git a/roundcube/roundcubemail-cronjob-cleandb.yaml b/apps/roundcube/roundcubemail-cronjob-cleandb.yaml similarity index 100% rename from roundcube/roundcubemail-cronjob-cleandb.yaml rename to apps/roundcube/roundcubemail-cronjob-cleandb.yaml diff --git a/roundcube/roundcubemail-deployment.yaml b/apps/roundcube/roundcubemail-deployment.yaml similarity index 100% rename from roundcube/roundcubemail-deployment.yaml rename to apps/roundcube/roundcubemail-deployment.yaml diff --git a/roundcube/roundcubemail-dns-endpoint.yaml b/apps/roundcube/roundcubemail-dns-endpoint.yaml similarity index 100% rename from roundcube/roundcubemail-dns-endpoint.yaml rename to apps/roundcube/roundcubemail-dns-endpoint.yaml diff --git a/roundcube/roundcubemail-service.yaml b/apps/roundcube/roundcubemail-service.yaml similarity index 100% rename from roundcube/roundcubemail-service.yaml rename to apps/roundcube/roundcubemail-service.yaml diff --git a/roundcube/roundcubemail-shared-secret-sealed.yaml b/apps/roundcube/roundcubemail-shared-secret-sealed.yaml similarity index 100% rename from roundcube/roundcubemail-shared-secret-sealed.yaml rename to apps/roundcube/roundcubemail-shared-secret-sealed.yaml diff --git a/roundcube/roundcubemail-temp-pvc.yaml b/apps/roundcube/roundcubemail-temp-pvc.yaml similarity index 100% rename from roundcube/roundcubemail-temp-pvc.yaml rename to apps/roundcube/roundcubemail-temp-pvc.yaml diff --git a/roundcube/roundcubemail-www-pvc.yaml b/apps/roundcube/roundcubemail-www-pvc.yaml similarity index 100% rename from roundcube/roundcubemail-www-pvc.yaml rename to apps/roundcube/roundcubemail-www-pvc.yaml diff --git a/roundcube/roundcubenginx-config.yaml b/apps/roundcube/roundcubenginx-config.yaml similarity index 100% rename from roundcube/roundcubenginx-config.yaml rename to apps/roundcube/roundcubenginx-config.yaml diff --git a/roundcube/roundcubenginx-deployment.yaml b/apps/roundcube/roundcubenginx-deployment.yaml similarity index 100% rename from roundcube/roundcubenginx-deployment.yaml rename to apps/roundcube/roundcubenginx-deployment.yaml diff --git a/roundcube/roundcubenginx-ingress.yaml b/apps/roundcube/roundcubenginx-ingress.yaml similarity index 100% rename from roundcube/roundcubenginx-ingress.yaml rename to apps/roundcube/roundcubenginx-ingress.yaml diff --git a/roundcube/roundcubenginx-service.yaml b/apps/roundcube/roundcubenginx-service.yaml similarity index 100% rename from roundcube/roundcubenginx-service.yaml rename to apps/roundcube/roundcubenginx-service.yaml diff --git a/syncthing/deployment.yaml b/apps/syncthing/deployment.yaml similarity index 100% rename from syncthing/deployment.yaml rename to apps/syncthing/deployment.yaml diff --git a/syncthing/dns-endpoint.yaml b/apps/syncthing/dns-endpoint.yaml similarity index 100% rename from syncthing/dns-endpoint.yaml rename to apps/syncthing/dns-endpoint.yaml diff --git a/syncthing/ingress.yaml b/apps/syncthing/ingress.yaml similarity index 100% rename from syncthing/ingress.yaml rename to apps/syncthing/ingress.yaml diff --git a/bootstrap/namespaces/namespace-syncthing.yaml b/apps/syncthing/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-syncthing.yaml rename to apps/syncthing/namespace.yaml diff --git a/syncthing/pvc-data.yaml b/apps/syncthing/pvc-data.yaml similarity index 100% rename from syncthing/pvc-data.yaml rename to apps/syncthing/pvc-data.yaml diff --git a/syncthing/service-lb.yaml b/apps/syncthing/service-lb.yaml similarity index 100% rename from syncthing/service-lb.yaml rename to apps/syncthing/service-lb.yaml diff --git a/syncthing/service.yaml b/apps/syncthing/service.yaml similarity index 100% rename from syncthing/service.yaml rename to apps/syncthing/service.yaml diff --git a/bootstrap/namespaces/namespace-uptime-kuma.yaml b/apps/uptime-kuma/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-uptime-kuma.yaml rename to apps/uptime-kuma/namespace.yaml diff --git a/uptime-kuma/uptime-kuma-deployment.yaml b/apps/uptime-kuma/uptime-kuma-deployment.yaml similarity index 100% rename from uptime-kuma/uptime-kuma-deployment.yaml rename to apps/uptime-kuma/uptime-kuma-deployment.yaml diff --git a/uptime-kuma/uptime-kuma-dns-endpoint.yaml b/apps/uptime-kuma/uptime-kuma-dns-endpoint.yaml similarity index 100% rename from uptime-kuma/uptime-kuma-dns-endpoint.yaml rename to apps/uptime-kuma/uptime-kuma-dns-endpoint.yaml diff --git a/uptime-kuma/uptime-kuma-ingress.yaml b/apps/uptime-kuma/uptime-kuma-ingress.yaml similarity index 100% rename from uptime-kuma/uptime-kuma-ingress.yaml rename to apps/uptime-kuma/uptime-kuma-ingress.yaml diff --git a/uptime-kuma/uptime-kuma-pvc.yaml b/apps/uptime-kuma/uptime-kuma-pvc.yaml similarity index 100% rename from uptime-kuma/uptime-kuma-pvc.yaml rename to apps/uptime-kuma/uptime-kuma-pvc.yaml diff --git a/uptime-kuma/uptime-kuma-service.yaml b/apps/uptime-kuma/uptime-kuma-service.yaml similarity index 100% rename from uptime-kuma/uptime-kuma-service.yaml rename to apps/uptime-kuma/uptime-kuma-service.yaml diff --git a/vaultwarden/admincreds-secret.yaml b/apps/vaultwarden/admincreds-secret.yaml similarity index 100% rename from vaultwarden/admincreds-secret.yaml rename to apps/vaultwarden/admincreds-secret.yaml diff --git a/vaultwarden/dns-endpoint.yaml b/apps/vaultwarden/dns-endpoint.yaml similarity index 100% rename from vaultwarden/dns-endpoint.yaml rename to apps/vaultwarden/dns-endpoint.yaml diff --git a/bootstrap/namespaces/namespace-vaultwarden.yaml b/apps/vaultwarden/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-vaultwarden.yaml rename to apps/vaultwarden/namespace.yaml diff --git a/vaultwarden/helmrelease-vaultwarden.yaml b/apps/vaultwarden/release.yaml similarity index 97% rename from vaultwarden/helmrelease-vaultwarden.yaml rename to apps/vaultwarden/release.yaml index d0b74d1..cdcc469 100644 --- a/vaultwarden/helmrelease-vaultwarden.yaml +++ b/apps/vaultwarden/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: vaultwarden - namespace: flux-system interval: 15m timeout: 5m releaseName: vaultwarden diff --git a/bootstrap/helmrepositories/helmrepository-vaultwarden.yaml b/apps/vaultwarden/repository.yaml similarity index 86% rename from bootstrap/helmrepositories/helmrepository-vaultwarden.yaml rename to apps/vaultwarden/repository.yaml index 492bc54..f05d310 100644 --- a/bootstrap/helmrepositories/helmrepository-vaultwarden.yaml +++ b/apps/vaultwarden/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: vaultwarden - namespace: flux-system + namespace: vaultwarden spec: interval: 15m url: https://guerzon.github.io/vaultwarden diff --git a/vaultwarden/smtpcreds-secret.yaml b/apps/vaultwarden/smtpcreds-secret.yaml similarity index 100% rename from vaultwarden/smtpcreds-secret.yaml rename to apps/vaultwarden/smtpcreds-secret.yaml diff --git a/wg-easy/config.yaml b/apps/wg-easy/config.yaml similarity index 100% rename from wg-easy/config.yaml rename to apps/wg-easy/config.yaml diff --git a/wg-easy/deployment.yaml b/apps/wg-easy/deployment.yaml similarity index 100% rename from wg-easy/deployment.yaml rename to apps/wg-easy/deployment.yaml diff --git a/wg-easy/dns-endpoint.yaml b/apps/wg-easy/dns-endpoint.yaml similarity index 100% rename from wg-easy/dns-endpoint.yaml rename to apps/wg-easy/dns-endpoint.yaml diff --git a/wg-easy/ingress.yaml b/apps/wg-easy/ingress.yaml similarity index 100% rename from wg-easy/ingress.yaml rename to apps/wg-easy/ingress.yaml diff --git a/bootstrap/namespaces/namespace-wg-easy.yaml b/apps/wg-easy/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-wg-easy.yaml rename to apps/wg-easy/namespace.yaml diff --git a/wg-easy/pvc-config.yaml b/apps/wg-easy/pvc-config.yaml similarity index 100% rename from wg-easy/pvc-config.yaml rename to apps/wg-easy/pvc-config.yaml diff --git a/wg-easy/service-dns.yaml b/apps/wg-easy/service-dns.yaml similarity index 100% rename from wg-easy/service-dns.yaml rename to apps/wg-easy/service-dns.yaml diff --git a/wg-easy/service.yaml b/apps/wg-easy/service.yaml similarity index 100% rename from wg-easy/service.yaml rename to apps/wg-easy/service.yaml diff --git a/woodpecker/dns-endpoint.yaml b/apps/woodpecker/dns-endpoint.yaml similarity index 100% rename from woodpecker/dns-endpoint.yaml rename to apps/woodpecker/dns-endpoint.yaml diff --git a/woodpecker/kubedock-deployment.yaml b/apps/woodpecker/kubedock-deployment.yaml similarity index 100% rename from woodpecker/kubedock-deployment.yaml rename to apps/woodpecker/kubedock-deployment.yaml diff --git a/woodpecker/kubedock-role.yaml b/apps/woodpecker/kubedock-role.yaml similarity index 100% rename from woodpecker/kubedock-role.yaml rename to apps/woodpecker/kubedock-role.yaml diff --git a/woodpecker/kubedock-rolebinding.yaml b/apps/woodpecker/kubedock-rolebinding.yaml similarity index 100% rename from woodpecker/kubedock-rolebinding.yaml rename to apps/woodpecker/kubedock-rolebinding.yaml diff --git a/woodpecker/kubedock-service.yaml b/apps/woodpecker/kubedock-service.yaml similarity index 100% rename from woodpecker/kubedock-service.yaml rename to apps/woodpecker/kubedock-service.yaml diff --git a/woodpecker/kubedock-serviceaccount.yaml b/apps/woodpecker/kubedock-serviceaccount.yaml similarity index 100% rename from woodpecker/kubedock-serviceaccount.yaml rename to apps/woodpecker/kubedock-serviceaccount.yaml diff --git a/bootstrap/namespaces/namespace-woodpecker.yaml b/apps/woodpecker/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-woodpecker.yaml rename to apps/woodpecker/namespace.yaml diff --git a/woodpecker/pvc.yaml b/apps/woodpecker/pvc.yaml similarity index 100% rename from woodpecker/pvc.yaml rename to apps/woodpecker/pvc.yaml diff --git a/woodpecker/helmrelease-woodpecker.yaml b/apps/woodpecker/release.yaml similarity index 98% rename from woodpecker/helmrelease-woodpecker.yaml rename to apps/woodpecker/release.yaml index c0ec9c6..ca68382 100644 --- a/woodpecker/helmrelease-woodpecker.yaml +++ b/apps/woodpecker/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: woodpecker - namespace: flux-system interval: 15m timeout: 5m releaseName: woodpecker diff --git a/bootstrap/helmrepositories/helmrepository-woodpecker.yaml b/apps/woodpecker/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-woodpecker.yaml rename to apps/woodpecker/repository.yaml index d498074..6f3ca35 100644 --- a/bootstrap/helmrepositories/helmrepository-woodpecker.yaml +++ b/apps/woodpecker/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: woodpecker - namespace: flux-system + namespace: woodpecker spec: interval: 15m url: https://woodpecker-ci.org/ diff --git a/woodpecker/sealedsecret-woodpecker-secret.yaml b/apps/woodpecker/sealedsecret-woodpecker-secret.yaml similarity index 100% rename from woodpecker/sealedsecret-woodpecker-secret.yaml rename to apps/woodpecker/sealedsecret-woodpecker-secret.yaml diff --git a/bootstrap/kustomizations/kustomization-letsencrypt-wildcard-cert.yaml b/bootstrap/apps/kustomization-baikal.yaml similarity index 78% rename from bootstrap/kustomizations/kustomization-letsencrypt-wildcard-cert.yaml rename to bootstrap/apps/kustomization-baikal.yaml index 84b642e..53a5fb6 100644 --- a/bootstrap/kustomizations/kustomization-letsencrypt-wildcard-cert.yaml +++ b/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 - dependsOn: - - name: cert-manager + path: ./apps/baikal 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 diff --git a/bootstrap/kustomizations/kustomization-calibre-web.yaml b/bootstrap/apps/kustomization-calibre-web.yaml similarity index 71% rename from bootstrap/kustomizations/kustomization-calibre-web.yaml rename to bootstrap/apps/kustomization-calibre-web.yaml index c083e43..385f847 100644 --- a/bootstrap/kustomizations/kustomization-calibre-web.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: calibre-web - namespace: calibre-web + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-gitea.yaml b/bootstrap/apps/kustomization-gitea.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-gitea.yaml rename to bootstrap/apps/kustomization-gitea.yaml index 44b31bd..227475e 100644 --- a/bootstrap/kustomizations/kustomization-gitea.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2 - kind: HelmRelease - name: gitea - namespace: gitea + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-hoarder.yaml b/bootstrap/apps/kustomization-hoarder.yaml similarity index 73% rename from bootstrap/kustomizations/kustomization-hoarder.yaml rename to bootstrap/apps/kustomization-hoarder.yaml index 880eb31..3c52062 100644 --- a/bootstrap/kustomizations/kustomization-hoarder.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: web - namespace: hoarder + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-homeassistant.yaml b/bootstrap/apps/kustomization-homeassistant.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-homeassistant.yaml rename to bootstrap/apps/kustomization-homeassistant.yaml index c7b3856..645d93c 100644 --- a/bootstrap/kustomizations/kustomization-homeassistant.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: homeassistant - namespace: homeassistant + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-immich.yaml b/bootstrap/apps/kustomization-immich.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-immich.yaml rename to bootstrap/apps/kustomization-immich.yaml index d8b2ddc..56f0bf9 100644 --- a/bootstrap/kustomizations/kustomization-immich.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2 - kind: HelmRelease - name: immich - namespace: immich + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-baikal.yaml b/bootstrap/apps/kustomization-kube-prometheus-stack.yaml similarity index 69% rename from bootstrap/kustomizations/kustomization-baikal.yaml rename to bootstrap/apps/kustomization-kube-prometheus-stack.yaml index e8ba874..b29bbdf 100644 --- a/bootstrap/kustomizations/kustomization-baikal.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: baikal - namespace: baikal + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-media.yaml b/bootstrap/apps/kustomization-media.yaml similarity index 72% rename from bootstrap/kustomizations/kustomization-media.yaml rename to bootstrap/apps/kustomization-media.yaml index 6ce6c2e..3fea944 100644 --- a/bootstrap/kustomizations/kustomization-media.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: qbittorrent - namespace: media + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-michaelthomson.yaml b/bootstrap/apps/kustomization-michaelthomson.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-michaelthomson.yaml rename to bootstrap/apps/kustomization-michaelthomson.yaml index c561727..d76d899 100644 --- a/bootstrap/kustomizations/kustomization-michaelthomson.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: michaelthomson - namespace: michaelthomson + dependsOn: + - name: infra-configs diff --git a/bootstrap/apps/kustomization-nextcloud.yaml b/bootstrap/apps/kustomization-nextcloud.yaml new file mode 100644 index 0000000..bf8e55a --- /dev/null +++ b/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 diff --git a/bootstrap/kustomizations/kustomization-pihole.yaml b/bootstrap/apps/kustomization-pihole.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-pihole.yaml rename to bootstrap/apps/kustomization-pihole.yaml index 00711be..6c20ee6 100644 --- a/bootstrap/kustomizations/kustomization-pihole.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2 - kind: HelmRelease - name: pihole - namespace: pihole + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-plane.yaml b/bootstrap/apps/kustomization-plane.yaml similarity index 70% rename from bootstrap/kustomizations/kustomization-plane.yaml rename to bootstrap/apps/kustomization-plane.yaml index d456e67..583eb66 100644 --- a/bootstrap/kustomizations/kustomization-plane.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2 - kind: HelmRelease - name: plane - namespace: plane + dependsOn: + - name: infra-configs diff --git a/bootstrap/apps/kustomization-roundcube.yaml b/bootstrap/apps/kustomization-roundcube.yaml new file mode 100644 index 0000000..2d33d71 --- /dev/null +++ b/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 diff --git a/bootstrap/kustomizations/kustomization-syncthing.yaml b/bootstrap/apps/kustomization-syncthing.yaml similarity index 71% rename from bootstrap/kustomizations/kustomization-syncthing.yaml rename to bootstrap/apps/kustomization-syncthing.yaml index 87fcd77..ae47971 100644 --- a/bootstrap/kustomizations/kustomization-syncthing.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: syncthing - namespace: syncthing + dependsOn: + - name: infra-configs diff --git a/bootstrap/kustomizations/kustomization-uptime-kuma.yaml b/bootstrap/apps/kustomization-uptime-kuma.yaml similarity index 71% rename from bootstrap/kustomizations/kustomization-uptime-kuma.yaml rename to bootstrap/apps/kustomization-uptime-kuma.yaml index d14c03a..391e200 100644 --- a/bootstrap/kustomizations/kustomization-uptime-kuma.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: uptime-kuma - namespace: uptime-kuma + dependsOn: + - name: infra-configs diff --git a/bootstrap/apps/kustomization-vaultwarden.yaml b/bootstrap/apps/kustomization-vaultwarden.yaml new file mode 100644 index 0000000..5df1023 --- /dev/null +++ b/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 diff --git a/bootstrap/kustomizations/kustomization-wg-easy.yaml b/bootstrap/apps/kustomization-wg-easy.yaml similarity index 72% rename from bootstrap/kustomizations/kustomization-wg-easy.yaml rename to bootstrap/apps/kustomization-wg-easy.yaml index 728b3ae..ba8c6eb 100644 --- a/bootstrap/kustomizations/kustomization-wg-easy.yaml +++ b/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: - - apiVersion: apps/v1 - kind: Deployment - name: wg-easy - namespace: wg-easy + dependsOn: + - name: infra-configs diff --git a/bootstrap/apps/kustomization-woodpecker.yaml b/bootstrap/apps/kustomization-woodpecker.yaml new file mode 100644 index 0000000..595f6bd --- /dev/null +++ b/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 diff --git a/bootstrap/helmrepositories/helmrepository-piraeus-charts.yaml b/bootstrap/helmrepositories/helmrepository-piraeus-charts.yaml deleted file mode 100644 index c6e0a38..0000000 --- a/bootstrap/helmrepositories/helmrepository-piraeus-charts.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: piraeus-charts - namespace: flux-system -spec: - interval: 15m - url: https://piraeus.io/helm-charts/ diff --git a/bootstrap/infrastructure/infra-configs.yaml b/bootstrap/infrastructure/infra-configs.yaml new file mode 100644 index 0000000..abd9ede --- /dev/null +++ b/bootstrap/infrastructure/infra-configs.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: infra-configs + namespace: flux-system +spec: + dependsOn: + - name: infra-controllers + interval: 1h + retryInterval: 1m + timeout: 5m + sourceRef: + kind: GitRepository + name: flux-system + path: ./infrastructure/configs + prune: true diff --git a/bootstrap/infrastructure/infra-controllers.yaml b/bootstrap/infrastructure/infra-controllers.yaml new file mode 100644 index 0000000..19f22e8 --- /dev/null +++ b/bootstrap/infrastructure/infra-controllers.yaml @@ -0,0 +1,15 @@ +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 diff --git a/bootstrap/kustomizations/kustomization-cert-manager.yaml b/bootstrap/kustomizations/kustomization-cert-manager.yaml deleted file mode 100644 index a6526e4..0000000 --- a/bootstrap/kustomizations/kustomization-cert-manager.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-cnpg.yaml b/bootstrap/kustomizations/kustomization-cnpg.yaml deleted file mode 100644 index 98a17f1..0000000 --- a/bootstrap/kustomizations/kustomization-cnpg.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-external-dns.yaml b/bootstrap/kustomizations/kustomization-external-dns.yaml deleted file mode 100644 index 3bda427..0000000 --- a/bootstrap/kustomizations/kustomization-external-dns.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-kube-prometheus-stack.yaml b/bootstrap/kustomizations/kustomization-kube-prometheus-stack.yaml deleted file mode 100644 index 4df6f5f..0000000 --- a/bootstrap/kustomizations/kustomization-kube-prometheus-stack.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-longhorn.yaml b/bootstrap/kustomizations/kustomization-longhorn.yaml deleted file mode 100644 index b57ae12..0000000 --- a/bootstrap/kustomizations/kustomization-longhorn.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-metallb-config.yaml b/bootstrap/kustomizations/kustomization-metallb-config.yaml deleted file mode 100644 index 9b7b9ec..0000000 --- a/bootstrap/kustomizations/kustomization-metallb-config.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-metallb-system.yaml b/bootstrap/kustomizations/kustomization-metallb-system.yaml deleted file mode 100644 index a2f390f..0000000 --- a/bootstrap/kustomizations/kustomization-metallb-system.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-nextcloud.yaml b/bootstrap/kustomizations/kustomization-nextcloud.yaml deleted file mode 100644 index 0421f6a..0000000 --- a/bootstrap/kustomizations/kustomization-nextcloud.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-nfs-subdir-external-provisioner.yaml b/bootstrap/kustomizations/kustomization-nfs-subdir-external-provisioner.yaml deleted file mode 100644 index 36fe774..0000000 --- a/bootstrap/kustomizations/kustomization-nfs-subdir-external-provisioner.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-nvidia-device-plugin.yaml b/bootstrap/kustomizations/kustomization-nvidia-device-plugin.yaml deleted file mode 100644 index a5bdc02..0000000 --- a/bootstrap/kustomizations/kustomization-nvidia-device-plugin.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-reflector.yaml b/bootstrap/kustomizations/kustomization-reflector.yaml deleted file mode 100644 index f07b8ea..0000000 --- a/bootstrap/kustomizations/kustomization-reflector.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-roundcube.yaml b/bootstrap/kustomizations/kustomization-roundcube.yaml deleted file mode 100644 index c38aee5..0000000 --- a/bootstrap/kustomizations/kustomization-roundcube.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-sealed-secrets.yaml b/bootstrap/kustomizations/kustomization-sealed-secrets.yaml deleted file mode 100644 index 0b8191b..0000000 --- a/bootstrap/kustomizations/kustomization-sealed-secrets.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-traefik.yaml b/bootstrap/kustomizations/kustomization-traefik.yaml deleted file mode 100644 index 555c7d5..0000000 --- a/bootstrap/kustomizations/kustomization-traefik.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-vaultwarden.yaml b/bootstrap/kustomizations/kustomization-vaultwarden.yaml deleted file mode 100644 index 979ed90..0000000 --- a/bootstrap/kustomizations/kustomization-vaultwarden.yaml +++ /dev/null @@ -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 diff --git a/bootstrap/kustomizations/kustomization-woodpecker.yaml b/bootstrap/kustomizations/kustomization-woodpecker.yaml deleted file mode 100644 index fd911e9..0000000 --- a/bootstrap/kustomizations/kustomization-woodpecker.yaml +++ /dev/null @@ -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 diff --git a/letsencrypt-wildcard-cert/certificate-wildcard-cert-letsencrypt-prod.yaml b/infrastructure/configs/cert-manager/certificate-wildcard-cert-letsencrypt-prod.yaml similarity index 100% rename from letsencrypt-wildcard-cert/certificate-wildcard-cert-letsencrypt-prod.yaml rename to infrastructure/configs/cert-manager/certificate-wildcard-cert-letsencrypt-prod.yaml diff --git a/letsencrypt-wildcard-cert/cluster-issuer-letsencrypt-prod.yaml b/infrastructure/configs/cert-manager/cluster-issuer-letsencrypt-prod.yaml similarity index 100% rename from letsencrypt-wildcard-cert/cluster-issuer-letsencrypt-prod.yaml rename to infrastructure/configs/cert-manager/cluster-issuer-letsencrypt-prod.yaml diff --git a/bootstrap/namespaces/namespace-letsencrypt-wildcard-cert.yaml b/infrastructure/configs/cert-manager/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-letsencrypt-wildcard-cert.yaml rename to infrastructure/configs/cert-manager/namespace.yaml diff --git a/metallb-config/ipaddresspool.yaml b/infrastructure/configs/metallb/ipaddresspool.yaml similarity index 100% rename from metallb-config/ipaddresspool.yaml rename to infrastructure/configs/metallb/ipaddresspool.yaml diff --git a/metallb-config/l2advertisement.yaml b/infrastructure/configs/metallb/l2advertisement.yaml similarity index 100% rename from metallb-config/l2advertisement.yaml rename to infrastructure/configs/metallb/l2advertisement.yaml diff --git a/bootstrap/namespaces/namespace-cert-manager.yaml b/infrastructure/controllers/cert-manager/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-cert-manager.yaml rename to infrastructure/controllers/cert-manager/namespace.yaml diff --git a/cert-manager/helmrelease-cert-manager.yaml b/infrastructure/controllers/cert-manager/release.yaml similarity index 85% rename from cert-manager/helmrelease-cert-manager.yaml rename to infrastructure/controllers/cert-manager/release.yaml index a23b3e5..d75d678 100644 --- a/cert-manager/helmrelease-cert-manager.yaml +++ b/infrastructure/controllers/cert-manager/release.yaml @@ -10,8 +10,7 @@ spec: version: v1.17.x sourceRef: kind: HelmRepository - name: jetstack - namespace: flux-system + name: cert-manager interval: 15m timeout: 5m releaseName: cert-manager diff --git a/bootstrap/helmrepositories/helmrepository-jetstack.yaml b/infrastructure/controllers/cert-manager/repository.yaml similarity index 72% rename from bootstrap/helmrepositories/helmrepository-jetstack.yaml rename to infrastructure/controllers/cert-manager/repository.yaml index a9ea6a8..5c8b0f5 100644 --- a/bootstrap/helmrepositories/helmrepository-jetstack.yaml +++ b/infrastructure/controllers/cert-manager/repository.yaml @@ -1,8 +1,8 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: jetstack - namespace: flux-system + name: cert-manager + namespace: cert-manager spec: interval: 15m url: https://charts.jetstack.io diff --git a/cert-manager/sealedsecret-cloudflare-api-key.yaml b/infrastructure/controllers/cert-manager/secret-cloudflare-api-key.yaml similarity index 100% rename from cert-manager/sealedsecret-cloudflare-api-key.yaml rename to infrastructure/controllers/cert-manager/secret-cloudflare-api-key.yaml diff --git a/bootstrap/namespaces/namespace-cnpg.yaml b/infrastructure/controllers/cnpg/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-cnpg.yaml rename to infrastructure/controllers/cnpg/namespace.yaml diff --git a/cnpg/helmrelease-cnpg.yaml b/infrastructure/controllers/cnpg/release.yaml similarity index 90% rename from cnpg/helmrelease-cnpg.yaml rename to infrastructure/controllers/cnpg/release.yaml index 58dfe71..df9d47c 100644 --- a/cnpg/helmrelease-cnpg.yaml +++ b/infrastructure/controllers/cnpg/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: cnpg - namespace: flux-system interval: 15m timeout: 5m releaseName: cnpg diff --git a/bootstrap/helmrepositories/helmrepository-cnpg.yaml b/infrastructure/controllers/cnpg/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-cnpg.yaml rename to infrastructure/controllers/cnpg/repository.yaml index 6a72105..2a801a5 100644 --- a/bootstrap/helmrepositories/helmrepository-cnpg.yaml +++ b/infrastructure/controllers/cnpg/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: cnpg - namespace: flux-system + namespace: cnpg spec: interval: 15m url: https://cloudnative-pg.github.io/charts diff --git a/bootstrap/namespaces/namespace-external-dns.yaml b/infrastructure/controllers/external-dns/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-external-dns.yaml rename to infrastructure/controllers/external-dns/namespace.yaml diff --git a/external-dns/helmrelease-external-dns.yaml b/infrastructure/controllers/external-dns/release.yaml similarity index 98% rename from external-dns/helmrelease-external-dns.yaml rename to infrastructure/controllers/external-dns/release.yaml index 59bd134..f72b1f7 100644 --- a/external-dns/helmrelease-external-dns.yaml +++ b/infrastructure/controllers/external-dns/release.yaml @@ -7,7 +7,6 @@ spec: chartRef: kind: OCIRepository name: external-dns - namespace: flux-system interval: 15m timeout: 5m releaseName: external-dns diff --git a/bootstrap/ocirepositories/ocirepository-external-dns.yaml b/infrastructure/controllers/external-dns/repository.yaml similarity index 69% rename from bootstrap/ocirepositories/ocirepository-external-dns.yaml rename to infrastructure/controllers/external-dns/repository.yaml index bc2cf5b..f09c1d0 100644 --- a/bootstrap/ocirepositories/ocirepository-external-dns.yaml +++ b/infrastructure/controllers/external-dns/repository.yaml @@ -1,8 +1,8 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: external-dns - namespace: flux-system + namespace: external-dns spec: interval: 15m url: oci://registry-1.docker.io/bitnamicharts/external-dns diff --git a/external-dns/sealedsecret-cloudflare-api-key.yaml b/infrastructure/controllers/external-dns/sealedsecret-cloudflare-api-key.yaml similarity index 100% rename from external-dns/sealedsecret-cloudflare-api-key.yaml rename to infrastructure/controllers/external-dns/sealedsecret-cloudflare-api-key.yaml diff --git a/longhorn/dns-endpoint-longhorn.yaml b/infrastructure/controllers/longhorn/dns-endpoint.yaml similarity index 100% rename from longhorn/dns-endpoint-longhorn.yaml rename to infrastructure/controllers/longhorn/dns-endpoint.yaml diff --git a/bootstrap/namespaces/namespace-longhorn.yaml b/infrastructure/controllers/longhorn/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-longhorn.yaml rename to infrastructure/controllers/longhorn/namespace.yaml diff --git a/longhorn/helmrelease-longhorn.yaml b/infrastructure/controllers/longhorn/release.yaml similarity index 94% rename from longhorn/helmrelease-longhorn.yaml rename to infrastructure/controllers/longhorn/release.yaml index 47fe62e..616d6f9 100644 --- a/longhorn/helmrelease-longhorn.yaml +++ b/infrastructure/controllers/longhorn/release.yaml @@ -11,13 +11,12 @@ spec: sourceRef: kind: HelmRepository name: longhorn - namespace: flux-system interval: 15m timeout: 5m releaseName: longhorn values: persistence: - defaultClassReplicaCount: 2 + defaultClassReplicaCount: 3 defaultSettings: backupTarget: s3://mthomson-longhorn-backups@us-west-004/ diff --git a/bootstrap/helmrepositories/helmrepository-longhorn.yaml b/infrastructure/controllers/longhorn/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-longhorn.yaml rename to infrastructure/controllers/longhorn/repository.yaml index 8a995da..5ce3d95 100644 --- a/bootstrap/helmrepositories/helmrepository-longhorn.yaml +++ b/infrastructure/controllers/longhorn/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: longhorn - namespace: flux-system + namespace: longhorn spec: interval: 15m url: https://charts.longhorn.io diff --git a/infrastructure/controllers/longhorn/secret-backblaze.yaml b/infrastructure/controllers/longhorn/secret-backblaze.yaml new file mode 100644 index 0000000..2e01cee --- /dev/null +++ b/infrastructure/controllers/longhorn/secret-backblaze.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: longhorn-backblaze-secret + namespace: longhorn-system +spec: + encryptedData: + AWS_ACCESS_KEY_ID: AgA4e8KX9NC36Zd8qld+HuLcVCi3ucHBlHbu1HCK/EB74vH0xKfsqo0MtjQpyGEcmZzNiGrmV2w5ujxu5oY0Bv93Usy/CsYIpqOauw614G3K97/GnllrMWpcHWMY0OnZpmkMYG9v1nmPu5lBgHPQKwHa3k2rs1W+XRLoFSoWbh0TOs/5ZymmYoMfmlNP7WglD2UKf9WVCl3SOLj1xi+NDgUSD1X8qclPmUGuj9HvFvbVs3ehewTo7PjiKOnHyCWSpY2XT8k24ZzgkF+3ExTo9W2RgNBRNUxJ1loOWZmwPz5j2/bIS+5uRfmRyhgPwEUeu8XhF4UVzyFlIexNDzA1eY7E6viRvZfOX/72PAX6UxdofR7hOju6hc8kHrL260Pjs3sMC2s/Uy8jkva98BPQxAeH2Z8B2IVcZLDg8mfysy2Y6Ry7pHjilZZ0EgiiXWoJnVMhRpQG5txMm5Tnc4ux7IO01QjR61+JWN39S3aR+RH6+xOoTfuttGxEoyBsTjQonnVYJlJg0s5CosPvlfIFNZgrDejmx8RoBFnu1m0F6q9zvgbvJpV6oHqk34GioJcnZyvI69+FumDLsDYGiVuQClQOA+gNEZgyOVpeOdK+jYn+X9IGPCflJJZTzWYCrz6zuqqR2o92cDTNQV66XAo0BhkLM3esNnbZaqsbEeEEWg9FyQiA35/kxeDrvtCBogaHM2wMJtKGaQmduyT1l80G67SWkji8C0j/T3Ij + AWS_ENDPOINTS: AgBR6jbVgWY6jzzqcE6fNOAJMCPWQOKEvDfOCNWPOj8bn363hQIfYkj2aH4hYwj9ojUEAFD2DggLjyyn/gPcHiHHgi2AgX525myhpQ35HVk1AkGeTyxmH7oswSCoMac1mM0+FKN+G2PHLU3i5Yl+xzcl0QDFRmXpPo1qX6/PG8QbQlLp8L6C65hCQ5hv22UH1a1dpN2DTYqGG2W7uyEBki1b5ehQyz/EMGcwRWTC1WtLq+H9pYgyDpsz6D65enGK9Noq+Yv8c3gEf4BV3Yzk8nR9c5aQ0+L2VWICBhq6MbLhQybTnqDAyvtEqRl3bM1tr/2m94+ziKvzhFtcTJeDRIapU2CfuZqrbB6MYMjzT7UC0P15OTCL14SUH1Tm618/7P8sHwIFPgnNYgjR9H3oP+Y8HX5giJTDMKvCGtIfY1IeGhuT7XEs3Nq/CQgCjZjCogHMUIFnp05rKvNxBA9rBxzxguDRG86qetgsFE9vyBbsMho8qOCB62u5UHxLIshSVFf0tuCDrr27Py7mDBjkVJjf4JEqeXhEL+2l+ny4POt0OVJc6IoxwD0sCAYK4OgDFX8KrnwzgK4UWMlPcFNzLGcluRKB25NZgu8DlE3crzGHiDplNvKInndg7P8AA6pPyyDKJ54oXHEJ001wip60J/WE0QhEb31BeWozuZFRdKFoG0FZOdk+HRTpz4RJ2LObHSsXFXr1oWh3aKk6i5paVc1BXmZ0gvnIM0uSpPnMhIo= + AWS_SECRET_ACCESS_KEY: AgAJ5cGPleHuMllxdrcd0kSbIh5ygvVJpZxy7uUGeYkRjdHP8KhKsrt0NsP1H4rv9sbnLhwuTzTZSugRbiy+ZCXBqNZzeqgnHQy53qzE4X+4DuThmxqMYtsHT2rvJAcT8HWHjF89qagC4uIStEhnu+hw4xV7qn972SCi/wm6ncmk19yWkMU19Oywsl2RKtgxDASIORul7NCcvyA2+x3gbDcUpRmiYighY4t6dp8jqGyym4rYU9zA9KrWqdqDpg21YVaEE1OaVNH5oiojr1I2pd2BxBWoRRc/jA2AVoumnIbOqyU2Ad8ERcAhNRsEdyAOUku4P46KuIiBPQdS1qwoaRCTFXviXki9fGB5CKhg/711jXlKRhF2qhDp2/A9TWGLGlLtoJkAC5LG6Z/O8gzhC5VGAwjSlcFGXy1zaDx0nSUwyKfI1zkFWlssTaRBxDZ1NIZ5W/xGZApyZD1AIrcvmmXQ0Ythovg1/FYIvq+XrMvdVkZDLpjjM7tZdbjboS3Wbxx5kb6QOWn4k3aKKs5um/AAc2SfYrB/AhoMj9ZS8szuLf5RieFy2Gjw/aLuLAQ8xP97k44uakcsaiwfcacfVY9tGTLCzabYndR0jKwMvN2b/OMdlvPzdqgNqMFH9Pc6PYgl+kPDdNwxUi2Omz1KIXWln0zSJ6AI7IGhgRksavwnWy0GrqwajoQSvtt+RZsjvUUflzc0+yeHJjCGjaRf+iMrWTzBHmNq3y0B8eEh8UA1 + template: + metadata: + creationTimestamp: null + name: longhorn-backblaze-secret + namespace: longhorn-system diff --git a/bootstrap/namespaces/namespace-metallb-system.yaml b/infrastructure/controllers/metallb/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-metallb-system.yaml rename to infrastructure/controllers/metallb/namespace.yaml diff --git a/metallb-system/helmrelease-metallb.yaml b/infrastructure/controllers/metallb/release.yaml similarity index 84% rename from metallb-system/helmrelease-metallb.yaml rename to infrastructure/controllers/metallb/release.yaml index dbf5468..6b241a7 100644 --- a/metallb-system/helmrelease-metallb.yaml +++ b/infrastructure/controllers/metallb/release.yaml @@ -7,11 +7,10 @@ spec: chart: spec: chart: metallb - version: 0.14.9 + version: 0.15.x sourceRef: kind: HelmRepository name: metallb - namespace: flux-system interval: 15m timeout: 5m releaseName: metallb diff --git a/bootstrap/helmrepositories/helmrepository-metallb.yaml b/infrastructure/controllers/metallb/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-metallb.yaml rename to infrastructure/controllers/metallb/repository.yaml index eede1c1..f2fd42e 100644 --- a/bootstrap/helmrepositories/helmrepository-metallb.yaml +++ b/infrastructure/controllers/metallb/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: metallb - namespace: flux-system + namespace: metallb spec: interval: 15m url: https://metallb.github.io/metallb diff --git a/bootstrap/namespaces/namespace-nfs-subdir-external-provisioner.yaml b/infrastructure/controllers/nfs-subdir-external-provisioner/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-nfs-subdir-external-provisioner.yaml rename to infrastructure/controllers/nfs-subdir-external-provisioner/namespace.yaml diff --git a/nfs-subdir-external-provisioner/helmrelease-nfs-subdir-external-provisioner.yaml b/infrastructure/controllers/nfs-subdir-external-provisioner/release.yaml similarity index 99% rename from nfs-subdir-external-provisioner/helmrelease-nfs-subdir-external-provisioner.yaml rename to infrastructure/controllers/nfs-subdir-external-provisioner/release.yaml index fe2989c..6487545 100644 --- a/nfs-subdir-external-provisioner/helmrelease-nfs-subdir-external-provisioner.yaml +++ b/infrastructure/controllers/nfs-subdir-external-provisioner/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: nfs-subdir-external-provisioner - namespace: flux-system interval: 15m timeout: 5m releaseName: nfs-subdir-external-provisioner diff --git a/bootstrap/helmrepositories/helmrepository-nfs-subdir-external-provisioner.yaml b/infrastructure/controllers/nfs-subdir-external-provisioner/repository.yaml similarity index 82% rename from bootstrap/helmrepositories/helmrepository-nfs-subdir-external-provisioner.yaml rename to infrastructure/controllers/nfs-subdir-external-provisioner/repository.yaml index e5c7d39..c700b5a 100644 --- a/bootstrap/helmrepositories/helmrepository-nfs-subdir-external-provisioner.yaml +++ b/infrastructure/controllers/nfs-subdir-external-provisioner/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: nfs-subdir-external-provisioner - namespace: flux-system + namespace: nfs-subdir-external-provisioner spec: interval: 15m url: https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner diff --git a/bootstrap/namespaces/namespace-nvidia-device-plugin.yaml b/infrastructure/controllers/nvidia-device-plugin/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-nvidia-device-plugin.yaml rename to infrastructure/controllers/nvidia-device-plugin/namespace.yaml diff --git a/nvidia-device-plugin/helmrelease-nvidia-device-plugin.yaml b/infrastructure/controllers/nvidia-device-plugin/release.yaml similarity index 99% rename from nvidia-device-plugin/helmrelease-nvidia-device-plugin.yaml rename to infrastructure/controllers/nvidia-device-plugin/release.yaml index addcd82..d0e7ee1 100644 --- a/nvidia-device-plugin/helmrelease-nvidia-device-plugin.yaml +++ b/infrastructure/controllers/nvidia-device-plugin/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: nvidia-device-plugin - namespace: flux-system interval: 15m timeout: 5m releaseName: nvidia-device-plugin diff --git a/bootstrap/helmrepositories/helmrepository-nvidia-device-plugin.yaml b/infrastructure/controllers/nvidia-device-plugin/repository.yaml similarity index 83% rename from bootstrap/helmrepositories/helmrepository-nvidia-device-plugin.yaml rename to infrastructure/controllers/nvidia-device-plugin/repository.yaml index e0ef262..65b043e 100644 --- a/bootstrap/helmrepositories/helmrepository-nvidia-device-plugin.yaml +++ b/infrastructure/controllers/nvidia-device-plugin/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: nvidia-device-plugin - namespace: flux-system + namespace: nvidia-device-plugin spec: interval: 15m url: https://nvidia.github.io/k8s-device-plugin diff --git a/bootstrap/namespaces/namespace-reflector.yaml b/infrastructure/controllers/reflector/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-reflector.yaml rename to infrastructure/controllers/reflector/namespace.yaml diff --git a/reflector/helmrelease-reflector.yaml b/infrastructure/controllers/reflector/release.yaml similarity index 98% rename from reflector/helmrelease-reflector.yaml rename to infrastructure/controllers/reflector/release.yaml index 3ea83b9..bba12b7 100644 --- a/reflector/helmrelease-reflector.yaml +++ b/infrastructure/controllers/reflector/release.yaml @@ -10,8 +10,7 @@ spec: version: v7.x sourceRef: kind: HelmRepository - name: emberstack - namespace: flux-system + name: reflector interval: 15m timeout: 5m releaseName: reflector diff --git a/bootstrap/helmrepositories/helmrepository-emberstack.yaml b/infrastructure/controllers/reflector/repository.yaml similarity index 76% rename from bootstrap/helmrepositories/helmrepository-emberstack.yaml rename to infrastructure/controllers/reflector/repository.yaml index 6079495..410620b 100644 --- a/bootstrap/helmrepositories/helmrepository-emberstack.yaml +++ b/infrastructure/controllers/reflector/repository.yaml @@ -1,8 +1,8 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: emberstack - namespace: flux-system + name: reflector + namespace: reflector spec: interval: 15m url: https://emberstack.github.io/helm-charts diff --git a/bootstrap/namespaces/namespace-sealed-secrets.yaml b/infrastructure/controllers/sealed-secrets/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-sealed-secrets.yaml rename to infrastructure/controllers/sealed-secrets/namespace.yaml diff --git a/sealed-secrets/helmrelease-sealed-secrets.yaml b/infrastructure/controllers/sealed-secrets/release.yaml similarity index 91% rename from sealed-secrets/helmrelease-sealed-secrets.yaml rename to infrastructure/controllers/sealed-secrets/release.yaml index c7bfeea..0eebc24 100644 --- a/sealed-secrets/helmrelease-sealed-secrets.yaml +++ b/infrastructure/controllers/sealed-secrets/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: sealed-secrets - namespace: flux-system interval: 15m timeout: 5m releaseName: sealed-secrets diff --git a/bootstrap/helmrepositories/helmrepository-sealed-secrets.yaml b/infrastructure/controllers/sealed-secrets/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-sealed-secrets.yaml rename to infrastructure/controllers/sealed-secrets/repository.yaml index 76c8d5b..f5dfb57 100644 --- a/bootstrap/helmrepositories/helmrepository-sealed-secrets.yaml +++ b/infrastructure/controllers/sealed-secrets/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: sealed-secrets - namespace: flux-system + namespace: sealed-secrets spec: interval: 15m url: https://bitnami-labs.github.io/sealed-secrets diff --git a/traefik/dns-endpoint-traefik.yaml b/infrastructure/controllers/traefik/dns-endpoint.yaml similarity index 100% rename from traefik/dns-endpoint-traefik.yaml rename to infrastructure/controllers/traefik/dns-endpoint.yaml diff --git a/bootstrap/namespaces/namespace-traefik.yaml b/infrastructure/controllers/traefik/namespace.yaml similarity index 100% rename from bootstrap/namespaces/namespace-traefik.yaml rename to infrastructure/controllers/traefik/namespace.yaml diff --git a/traefik/helmrelease-traefik.yaml b/infrastructure/controllers/traefik/release.yaml similarity index 96% rename from traefik/helmrelease-traefik.yaml rename to infrastructure/controllers/traefik/release.yaml index 98569ba..05ce741 100644 --- a/traefik/helmrelease-traefik.yaml +++ b/infrastructure/controllers/traefik/release.yaml @@ -11,7 +11,6 @@ spec: sourceRef: kind: HelmRepository name: traefik - namespace: flux-system interval: 15m timeout: 5m releaseName: traefik diff --git a/bootstrap/helmrepositories/helmrepository-traefik.yaml b/infrastructure/controllers/traefik/repository.yaml similarity index 85% rename from bootstrap/helmrepositories/helmrepository-traefik.yaml rename to infrastructure/controllers/traefik/repository.yaml index 7789acd..f9161f6 100644 --- a/bootstrap/helmrepositories/helmrepository-traefik.yaml +++ b/infrastructure/controllers/traefik/repository.yaml @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: traefik - namespace: flux-system + namespace: traefik spec: interval: 15m url: https://helm.traefik.io/traefik diff --git a/letsencrypt-wildcard-cert/certificate-wildcard-cert-letsencrypt-staging.yaml b/letsencrypt-wildcard-cert/certificate-wildcard-cert-letsencrypt-staging.yaml deleted file mode 100644 index 5e4ea63..0000000 --- a/letsencrypt-wildcard-cert/certificate-wildcard-cert-letsencrypt-staging.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: letsencrypt-wildcard-cert-michaelthomson.dev-staging - namespace: letsencrypt-wildcard-cert -spec: - # secretName doesn't have to match the certificate name, but it may as well, for simplicity! - secretName: letsencrypt-wildcard-cert-michaelthomson.dev-staging - issuerRef: - name: letsencrypt-staging - kind: ClusterIssuer - dnsNames: - - "michaelthomson.dev" - - "*.michaelthomson.dev" diff --git a/letsencrypt-wildcard-cert/cluster-issuer-letsencrypt-staging.yaml b/letsencrypt-wildcard-cert/cluster-issuer-letsencrypt-staging.yaml deleted file mode 100644 index bcba413..0000000 --- a/letsencrypt-wildcard-cert/cluster-issuer-letsencrypt-staging.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: letsencrypt-staging -spec: - acme: - email: michael@michaelthomson.dev - server: https://acme-staging-v02.api.letsencrypt.org/directory - privateKeySecretRef: - name: letsencrypt-staging - solvers: - - selector: - dnsZones: - - "michaelthomson.dev" - dns01: - cloudflare: - email: michael@michaelthomson.dev - apiKeySecretRef: - name: cloudflare-api-key - key: cloudflare_api_key