From 8d0a4fbfd401410fff7469e06fa64d2be5b34536 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 28 Jul 2022 11:56:48 +0200
Subject: Create seperate directory for all namespaces

---
 .../clusters/edephas.tyil.net/infrastructure.yaml          |  3 +++
 .../manifests/clusters/edephas.tyil.net/namespaces.yaml    | 14 ++++++++++++++
 .../share/manifests/infrastructure/kustomization.yaml      |  1 -
 .../share/manifests/infrastructure/namespace.yaml          |  6 ------
 .../k3s-master/share/manifests/namespaces/base-system.yaml |  6 ++++++
 .../share/manifests/namespaces/kustomization.yaml          |  7 +++++++
 .../k3s-master/share/manifests/namespaces/liberation.yaml  |  6 ++++++
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/namespaces.yaml
 delete mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml
 create mode 100644 playbooks.d/k3s-master/share/manifests/namespaces/base-system.yaml
 create mode 100644 playbooks.d/k3s-master/share/manifests/namespaces/kustomization.yaml
 create mode 100644 playbooks.d/k3s-master/share/manifests/namespaces/liberation.yaml

diff --git a/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/infrastructure.yaml b/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/infrastructure.yaml
index 3f4cde0..b377b69 100644
--- a/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/infrastructure.yaml
+++ b/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/infrastructure.yaml
@@ -6,9 +6,12 @@ metadata:
   namespace: flux-system
 spec:
   interval: 10m0s
+  dependsOn:
+  - namespaces
   sourceRef:
     kind: GitRepository
     name: flux-system
   path: ./playbooks.d/k3s-master/share/manifests/infrastructure
   prune: true
+  wait: true
 ...
diff --git a/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/namespaces.yaml b/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/namespaces.yaml
new file mode 100644
index 0000000..4fc4292
--- /dev/null
+++ b/playbooks.d/k3s-master/share/manifests/clusters/edephas.tyil.net/namespaces.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: namespaces
+  namespace: flux-system
+spec:
+  interval: 10m0s
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./playbooks.d/k3s-master/share/manifests/namespaces
+  prune: true
+...
diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml
index 17c2f31..a8b15d8 100644
--- a/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml
+++ b/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml
@@ -2,7 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- namespace.yaml
 - sources
 - releases
 ...
diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml
deleted file mode 100644
index 78d7ab7..0000000
--- a/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: base-system
-...
diff --git a/playbooks.d/k3s-master/share/manifests/namespaces/base-system.yaml b/playbooks.d/k3s-master/share/manifests/namespaces/base-system.yaml
new file mode 100644
index 0000000..78d7ab7
--- /dev/null
+++ b/playbooks.d/k3s-master/share/manifests/namespaces/base-system.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: base-system
+...
diff --git a/playbooks.d/k3s-master/share/manifests/namespaces/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/namespaces/kustomization.yaml
new file mode 100644
index 0000000..e5ea56c
--- /dev/null
+++ b/playbooks.d/k3s-master/share/manifests/namespaces/kustomization.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- base-system.yaml
+- liberation.yaml
+...
diff --git a/playbooks.d/k3s-master/share/manifests/namespaces/liberation.yaml b/playbooks.d/k3s-master/share/manifests/namespaces/liberation.yaml
new file mode 100644
index 0000000..8c1e0d5
--- /dev/null
+++ b/playbooks.d/k3s-master/share/manifests/namespaces/liberation.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: liberation
+...
-- 
cgit v1.1