From 5bcfad8d7736eb58a83afda9f8ec07848c9cb296 Mon Sep 17 00:00:00 2001
From: Jethro <jethro.cotton3@gmail.com>
Date: Sat, 21 Mar 2026 09:42:28 +1300
Subject: [PATCH] refactored infrastructure folder to have a kustomization of
 its own, added infrastructure and secret manifests to flux system

---
 ...ructuresources.yaml => infrastructure.yaml} |  4 ++--
 .../flux-system/infrastructurebitwarden.yaml   | 18 ------------------
 clusters/default/flux-system/secrets.yaml      | 12 ++++++++++++
 infrastructure/kustomization.yaml              |  6 ++++++
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename clusters/default/flux-system/{infrastructuresources.yaml => infrastructure.yaml} (79%)
 delete mode 100644 clusters/default/flux-system/infrastructurebitwarden.yaml
 create mode 100644 clusters/default/flux-system/secrets.yaml
 create mode 100644 infrastructure/kustomization.yaml

diff --git a/clusters/default/flux-system/infrastructuresources.yaml b/clusters/default/flux-system/infrastructure.yaml
similarity index 79%
rename from clusters/default/flux-system/infrastructuresources.yaml
rename to clusters/default/flux-system/infrastructure.yaml
index 9d99eb1..46242b8 100644
--- a/clusters/default/flux-system/infrastructuresources.yaml
+++ b/clusters/default/flux-system/infrastructure.yaml
@@ -6,8 +6,8 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
-  path: ../../infrastructure/sources
+  path: ../../infrastructure/
   prune: true
   sourceRef:
     kind: GitRepository
-    name: flux-system
\ No newline at end of file
+    name: flux-system
diff --git a/clusters/default/flux-system/infrastructurebitwarden.yaml b/clusters/default/flux-system/infrastructurebitwarden.yaml
deleted file mode 100644
index 9cf50a8..0000000
--- a/clusters/default/flux-system/infrastructurebitwarden.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: bitwarden
-  namespace: flux-system
-spec:
-  interval: 15m
-  path: ../../infrastructure/bitwarden
-  prune: true
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age-key
-  dependsOn:
-    - name: sources
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
\ No newline at end of file
diff --git a/clusters/default/flux-system/secrets.yaml b/clusters/default/flux-system/secrets.yaml
new file mode 100644
index 0000000..ef5cacc
--- /dev/null
+++ b/clusters/default/flux-system/secrets.yaml
@@ -0,0 +1,12 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: sources
+  namespace: flux-system
+spec:
+  interval: 1h
+  path: ../../secrets/
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
new file mode 100644
index 0000000..fa4b839
--- /dev/null
+++ b/infrastructure/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- bitwarden
+- sources
+- velero