deployments/kustomization.yaml

@@ -3,5 +3,6 @@ kind:       Kustomization
 
 resources:
   - manifests/00-namespaces.yaml
-  - manifests/10-dev.yaml
-  - manifests/10-prod.yaml
+  - manifests/10-repository.yaml
+  - manifests/20-dev.yaml
+  - manifests/20-prod.yaml

deployments/manifests/10-prod.yaml

@@ -1,28 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: GitRepository
-metadata:
-  name: home-server
-  namespace: flux-system
-spec:
-  interval: 1m
-  url: ssh://git@repobase.net/j/home-server.git
-  secretRef:
-    name: flux-ssh
-  ref:
-    branch: main
-
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: home-server
-  namespace: flux-system
-spec:
-  interval: 1m
-  path: ./deployments
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-server
-  targetNamespace: home-server

deployments/manifests/10-repository.yaml

@@ -1,3 +1,17 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: GitRepository
+metadata:
+  name: home-server-prod
+  namespace: flux-system
+spec:
+  interval: 1m
+  url: ssh://git@repobase.net/j/home-server.git
+  secretRef:
+    name: flux-ssh
+  ref:
+    branch: main
+
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: GitRepository
@@ -11,18 +25,3 @@ spec:
     name: flux-ssh
   ref:
     branch: dev
-
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: home-server-dev
-  namespace: flux-system
-spec:
-  interval: 1m
-  path: ./deployments
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-server-dev
-  targetNamespace: home-server-dev

deployments/manifests/20-dev.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: home-server-dev
+  namespace: flux-system
+spec:
+  interval: 1m
+  path: ./deployments
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-server-dev
+  targetNamespace: home-server-dev

deployments/manifests/20-prod.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: home-server-prod
+  namespace: flux-system
+spec:
+  interval: 1m
+  path: ./deployments
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-server-prod
+  targetNamespace: home-server