From 1c543979cf40dde4a25ce48e38e9b46118522ade Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sat, 7 Oct 2023 18:43:48 +0200
Subject: [PATCH] Move other apps to subdirs

---
 apps/apps.yaml                                | 17 -----------
 apps/flux/app.yaml                            |  8 ++---
 apps/longhorn/app.yaml                        |  8 +++++
 .../{ => app}/longhorn-sealedsecret.yaml      |  0
 apps/longhorn/{ => app}/route.yaml            |  0
 apps/plantwiki/app.yaml                       |  7 +++++
 apps/plantwiki/{ => app}/deploy.yaml          |  0
 cluster/apps.yaml                             | 30 +++++++++++++++++++
 8 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 apps/longhorn/app.yaml
 rename apps/longhorn/{ => app}/longhorn-sealedsecret.yaml (100%)
 rename apps/longhorn/{ => app}/route.yaml (100%)
 create mode 100644 apps/plantwiki/app.yaml
 rename apps/plantwiki/{ => app}/deploy.yaml (100%)

diff --git a/apps/apps.yaml b/apps/apps.yaml
index 941b294..6ef2978 100644
--- a/apps/apps.yaml
+++ b/apps/apps.yaml
@@ -2,15 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kube-system
-metadata:
-  name: longhorn
-resources:
-  - longhorn/longhorn-sealedsecret.yaml
-  - longhorn/route.yaml
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: kube-system
 metadata:
   name: traefik
 resources:
@@ -18,14 +9,6 @@ resources:
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: plantwiki
-metadata:
-  name: plantwiki
-resources:
-  - plantwiki/deploy.yaml
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
 namespace: searxng
 metadata:
   name: searxng
diff --git a/apps/flux/app.yaml b/apps/flux/app.yaml
index f522aba..bd260f8 100644
--- a/apps/flux/app.yaml
+++ b/apps/flux/app.yaml
@@ -4,7 +4,7 @@ namespace: kube-system
 metadata:
   name: flux-webhook
 resources:
-  - flux/webhook-service.yaml
-  - flux/webhook-route.yaml
-  - flux/webhook-sealedsecret.yaml
-  - flux/webhook-receiver.yaml
+  - app/webhook-service.yaml
+  - app/webhook-route.yaml
+  - app/webhook-sealedsecret.yaml
+  - app/webhook-receiver.yaml
diff --git a/apps/longhorn/app.yaml b/apps/longhorn/app.yaml
new file mode 100644
index 0000000..61fd2b6
--- /dev/null
+++ b/apps/longhorn/app.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kube-system
+metadata:
+  name: longhorn
+resources:
+  - app/longhorn-sealedsecret.yaml
+  - app/route.yaml
diff --git a/apps/longhorn/longhorn-sealedsecret.yaml b/apps/longhorn/app/longhorn-sealedsecret.yaml
similarity index 100%
rename from apps/longhorn/longhorn-sealedsecret.yaml
rename to apps/longhorn/app/longhorn-sealedsecret.yaml
diff --git a/apps/longhorn/route.yaml b/apps/longhorn/app/route.yaml
similarity index 100%
rename from apps/longhorn/route.yaml
rename to apps/longhorn/app/route.yaml
diff --git a/apps/plantwiki/app.yaml b/apps/plantwiki/app.yaml
new file mode 100644
index 0000000..7939de1
--- /dev/null
+++ b/apps/plantwiki/app.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: plantwiki
+metadata:
+  name: plantwiki
+resources:
+  - app/deploy.yaml
diff --git a/apps/plantwiki/deploy.yaml b/apps/plantwiki/app/deploy.yaml
similarity index 100%
rename from apps/plantwiki/deploy.yaml
rename to apps/plantwiki/app/deploy.yaml
diff --git a/cluster/apps.yaml b/cluster/apps.yaml
index e5a589d..50d2e72 100644
--- a/cluster/apps.yaml
+++ b/cluster/apps.yaml
@@ -27,3 +27,33 @@ spec:
   prune: true
   wait: true
   timeout: 5m0s
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: apps-longhorn
+  namespace: flux-system
+spec:
+  interval: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./apps/longhorn
+  prune: true
+  wait: true
+  timeout: 5m0s
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: apps-plantwiki
+  namespace: flux-system
+spec:
+  interval: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./apps/plantwiki
+  prune: true
+  wait: true
+  timeout: 5m0s