From 5b49418d2b76504446291843007074edfa70e85c Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Mon, 10 Jun 2024 13:56:47 +1000
Subject: [PATCH] restructure repositories

---
 kubernetes/apps/capacitor/capacitor.yaml      | 12 ----------
 kubernetes/apps/podinfo/podinfo.yaml          |  2 ++
 kubernetes/apps/podinfo/repository.yaml       |  8 -------
 .../repositories/repositories.yaml            | 22 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 kubernetes/apps/podinfo/repository.yaml

diff --git a/kubernetes/apps/capacitor/capacitor.yaml b/kubernetes/apps/capacitor/capacitor.yaml
index f61e1fa..82eb80b 100644
--- a/kubernetes/apps/capacitor/capacitor.yaml
+++ b/kubernetes/apps/capacitor/capacitor.yaml
@@ -1,15 +1,3 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: OCIRepository
-metadata:
-  name: capacitor
-  namespace: flux-system
-spec:
-  interval: 12h
-  url: oci://ghcr.io/gimlet-io/capacitor-manifests
-  ref:
-    semver: ">=0.1.0"
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index dff00e5..7df084a 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -11,4 +11,6 @@ spec:
     kind: GitRepository
     namespace: flux-system
     name: home-cluster-ops
+  dependsOn:
+    - name: repositories
 
diff --git a/kubernetes/apps/podinfo/repository.yaml b/kubernetes/apps/podinfo/repository.yaml
deleted file mode 100644
index b3b0730..0000000
--- a/kubernetes/apps/podinfo/repository.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: podinfo
-  namespace: podinfo
-spec:
-  interval: 5m
-  url: https://stefanprodan.github.io/podinfo
\ No newline at end of file
diff --git a/kubernetes/infrastructure/repositories/repositories.yaml b/kubernetes/infrastructure/repositories/repositories.yaml
index 24718c9..a770a37 100644
--- a/kubernetes/infrastructure/repositories/repositories.yaml
+++ b/kubernetes/infrastructure/repositories/repositories.yaml
@@ -13,11 +13,31 @@ spec:
   timeout: 60s
   url: https://github.com/3dwardch3ng/home-cluster-ops.git
 ---
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  interval: 5m
+  url: https://stefanprodan.github.io/podinfo
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: capacitor
+  namespace: flux-system
+spec:
+  interval: 12h
+  url: oci://ghcr.io/gimlet-io/capacitor-manifests
+  ref:
+    semver: ">=0.1.0"
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: home-cluster-ops-repo
+  name: repositories
   namespace: flux-system
 spec:
   interval: 5m