From f072d17e47b24e6a55d677af501f705a3e46a29d Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Sat, 15 Feb 2025 22:06:49 +0100
Subject: [PATCH] Reorganized velero

---
 .../titan.lan.huizinga.dev/infra/velero.yaml   | 18 ++++++++++++++++++
 .../velero/helm-release.yaml                   |  0
 .../velero/helm-repository.yaml                |  0
 .../velero/namespace.yaml                      |  0
 .../velero/secret-s3-credentials.yaml          |  0
 .../velero/secret-velero-repo-credentials.yaml |  0
 infrastructure/controllers/kustomization.yaml  |  1 -
 .../controllers/velero/kustomization.yaml      |  9 ---------
 8 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 clusters/titan.lan.huizinga.dev/infra/velero.yaml
 rename infrastructure/controllers/velero/helm_release.yaml => infra/velero/helm-release.yaml (100%)
 rename infrastructure/controllers/velero/helm_repository.yaml => infra/velero/helm-repository.yaml (100%)
 rename {infrastructure/controllers => infra}/velero/namespace.yaml (100%)
 rename infrastructure/controllers/velero/s3-credentials.yaml => infra/velero/secret-s3-credentials.yaml (100%)
 rename infrastructure/controllers/velero/repo-credentials.yaml => infra/velero/secret-velero-repo-credentials.yaml (100%)
 delete mode 100644 infrastructure/controllers/velero/kustomization.yaml

diff --git a/clusters/titan.lan.huizinga.dev/infra/velero.yaml b/clusters/titan.lan.huizinga.dev/infra/velero.yaml
new file mode 100644
index 0000000..ce5d4c1
--- /dev/null
+++ b/clusters/titan.lan.huizinga.dev/infra/velero.yaml
@@ -0,0 +1,18 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: velero
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./infra/velero
+  targetNamespace: velero
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  decryption:
+    provider: sops
+    secretRef:
+      name: sops-gpg
diff --git a/infrastructure/controllers/velero/helm_release.yaml b/infra/velero/helm-release.yaml
similarity index 100%
rename from infrastructure/controllers/velero/helm_release.yaml
rename to infra/velero/helm-release.yaml
diff --git a/infrastructure/controllers/velero/helm_repository.yaml b/infra/velero/helm-repository.yaml
similarity index 100%
rename from infrastructure/controllers/velero/helm_repository.yaml
rename to infra/velero/helm-repository.yaml
diff --git a/infrastructure/controllers/velero/namespace.yaml b/infra/velero/namespace.yaml
similarity index 100%
rename from infrastructure/controllers/velero/namespace.yaml
rename to infra/velero/namespace.yaml
diff --git a/infrastructure/controllers/velero/s3-credentials.yaml b/infra/velero/secret-s3-credentials.yaml
similarity index 100%
rename from infrastructure/controllers/velero/s3-credentials.yaml
rename to infra/velero/secret-s3-credentials.yaml
diff --git a/infrastructure/controllers/velero/repo-credentials.yaml b/infra/velero/secret-velero-repo-credentials.yaml
similarity index 100%
rename from infrastructure/controllers/velero/repo-credentials.yaml
rename to infra/velero/secret-velero-repo-credentials.yaml
diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml
index 06fad8d..fe8cbef 100644
--- a/infrastructure/controllers/kustomization.yaml
+++ b/infrastructure/controllers/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
   - ./rook
   - ./topolvm
   - ./node-feature-discovery
-  - ./velero
   - https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/refs/tags/v1.1.8/manifests/dragonfly-operator.yaml
   - https://github.com/kubernetes-csi/external-snapshotter//client/config/crd?ref=v8.2.0
   - https://github.com/kubernetes-csi/external-snapshotter//deploy/kubernetes/snapshot-controller?ref=v8.2.0
diff --git a/infrastructure/controllers/velero/kustomization.yaml b/infrastructure/controllers/velero/kustomization.yaml
deleted file mode 100644
index 51ba90e..0000000
--- a/infrastructure/controllers/velero/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: velero
-resources:
-  - ./namespace.yaml
-  - ./helm_repository.yaml
-  - ./s3-credentials.yaml
-  - ./repo-credentials.yaml
-  - ./helm_release.yaml