From 4c72f6105dbd86e43dee8c77e1c52e22204ee9d3 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Fri, 17 Jun 2022 13:32:54 -0400
Subject: [PATCH] feat: only store cluster-issuers in core kustomization

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 cluster/{core => apps}/cert-manager/helm-release.yaml       | 0
 cluster/apps/cert-manager/kustomization.yaml                | 6 ++++++
 cluster/{core => apps}/cert-manager/namespace.yaml          | 0
 cluster/apps/kustomization.yaml                             | 1 +
 .../{cert-manager => cluster-issuers}/kustomization.yaml    | 2 --
 .../letsencrypt-production.yaml                             | 0
 .../letsencrypt-staging.yaml                                | 0
 cluster/core/kustomization.yaml                             | 2 +-
 configure                                                   | 2 +-
 9 files changed, 9 insertions(+), 4 deletions(-)
 rename cluster/{core => apps}/cert-manager/helm-release.yaml (100%)
 create mode 100644 cluster/apps/cert-manager/kustomization.yaml
 rename cluster/{core => apps}/cert-manager/namespace.yaml (100%)
 rename cluster/core/{cert-manager => cluster-issuers}/kustomization.yaml (79%)
 rename cluster/core/{cert-manager => cluster-issuers}/letsencrypt-production.yaml (100%)
 rename cluster/core/{cert-manager => cluster-issuers}/letsencrypt-staging.yaml (100%)

diff --git a/cluster/core/cert-manager/helm-release.yaml b/cluster/apps/cert-manager/helm-release.yaml
similarity index 100%
rename from cluster/core/cert-manager/helm-release.yaml
rename to cluster/apps/cert-manager/helm-release.yaml
diff --git a/cluster/apps/cert-manager/kustomization.yaml b/cluster/apps/cert-manager/kustomization.yaml
new file mode 100644
index 00000000..ee776e42
--- /dev/null
+++ b/cluster/apps/cert-manager/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.yaml
+  - helm-release.yaml
+  - secret.sops.yaml
diff --git a/cluster/core/cert-manager/namespace.yaml b/cluster/apps/cert-manager/namespace.yaml
similarity index 100%
rename from cluster/core/cert-manager/namespace.yaml
rename to cluster/apps/cert-manager/namespace.yaml
diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml
index 8d4e84ec..ab449c6f 100644
--- a/cluster/apps/kustomization.yaml
+++ b/cluster/apps/kustomization.yaml
@@ -2,6 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - cert-manager
   - default
   - flux-system
   - kube-system
diff --git a/cluster/core/cert-manager/kustomization.yaml b/cluster/core/cluster-issuers/kustomization.yaml
similarity index 79%
rename from cluster/core/cert-manager/kustomization.yaml
rename to cluster/core/cluster-issuers/kustomization.yaml
index bbb126c5..c6491fd6 100644
--- a/cluster/core/cert-manager/kustomization.yaml
+++ b/cluster/core/cluster-issuers/kustomization.yaml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - namespace.yaml
-  - helm-release.yaml
   - letsencrypt-production.yaml
   - letsencrypt-staging.yaml
   - secret.sops.yaml
diff --git a/cluster/core/cert-manager/letsencrypt-production.yaml b/cluster/core/cluster-issuers/letsencrypt-production.yaml
similarity index 100%
rename from cluster/core/cert-manager/letsencrypt-production.yaml
rename to cluster/core/cluster-issuers/letsencrypt-production.yaml
diff --git a/cluster/core/cert-manager/letsencrypt-staging.yaml b/cluster/core/cluster-issuers/letsencrypt-staging.yaml
similarity index 100%
rename from cluster/core/cert-manager/letsencrypt-staging.yaml
rename to cluster/core/cluster-issuers/letsencrypt-staging.yaml
diff --git a/cluster/core/kustomization.yaml b/cluster/core/kustomization.yaml
index f77becc1..fac0ced4 100644
--- a/cluster/core/kustomization.yaml
+++ b/cluster/core/kustomization.yaml
@@ -2,4 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - cert-manager
+  - cluster-issuers
diff --git a/configure b/configure
index a0d04523..8c821fe8 100755
--- a/configure
+++ b/configure
@@ -51,7 +51,7 @@ main() {
         envsubst < "${PROJECT_DIR}/tmpl/cluster/cluster-secrets.sops.yaml" \
             > "${PROJECT_DIR}/cluster/config/cluster-secrets.sops.yaml"
         envsubst < "${PROJECT_DIR}/tmpl/cluster/cert-manager-secret.sops.yaml" \
-            > "${PROJECT_DIR}/cluster/core/cert-manager/secret.sops.yaml"
+            > "${PROJECT_DIR}/cluster/core/cluster-issuers/secret.sops.yaml"
         envsubst < "${PROJECT_DIR}/tmpl/cluster/cloudflare-ddns-secret.sops.yaml" \
             > "${PROJECT_DIR}/cluster/apps/networking/cloudflare-ddns/secret.sops.yaml"
         envsubst < "${PROJECT_DIR}/tmpl/cluster/external-dns-secret.sops.yaml" \