From 3f124cebc35fa4af8187de943e59b17ac339a33f Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sun, 19 Jun 2022 07:33:18 -0400
Subject: [PATCH] feat(cluster)!: move cert-manager into kube-system namespace

---
 cluster/apps/cert-manager/namespace.yaml                   | 7 -------
 .../apps/{ => kube-system}/cert-manager/helm-release.yaml  | 2 +-
 .../apps/{ => kube-system}/cert-manager/kustomization.yaml | 0
 cluster/apps/kube-system/kustomization.yaml                | 1 +
 cluster/apps/kustomization.yaml                            | 1 -
 cluster/apps/networking/traefik/helm-release.yaml          | 2 +-
 tmpl/cluster/cert-manager-secret.sops.yaml                 | 2 +-
 7 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 cluster/apps/cert-manager/namespace.yaml
 rename cluster/apps/{ => kube-system}/cert-manager/helm-release.yaml (96%)
 rename cluster/apps/{ => kube-system}/cert-manager/kustomization.yaml (100%)

diff --git a/cluster/apps/cert-manager/namespace.yaml b/cluster/apps/cert-manager/namespace.yaml
deleted file mode 100644
index ed788350..00000000
--- a/cluster/apps/cert-manager/namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager
-  labels:
-    kustomize.toolkit.fluxcd.io/prune: disabled
diff --git a/cluster/apps/cert-manager/helm-release.yaml b/cluster/apps/kube-system/cert-manager/helm-release.yaml
similarity index 96%
rename from cluster/apps/cert-manager/helm-release.yaml
rename to cluster/apps/kube-system/cert-manager/helm-release.yaml
index 54215d6f..7912bb4b 100644
--- a/cluster/apps/cert-manager/helm-release.yaml
+++ b/cluster/apps/kube-system/cert-manager/helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: cert-manager
-  namespace: cert-manager
+  namespace: kube-system
 spec:
   interval: 15m
   chart:
diff --git a/cluster/apps/cert-manager/kustomization.yaml b/cluster/apps/kube-system/cert-manager/kustomization.yaml
similarity index 100%
rename from cluster/apps/cert-manager/kustomization.yaml
rename to cluster/apps/kube-system/cert-manager/kustomization.yaml
diff --git a/cluster/apps/kube-system/kustomization.yaml b/cluster/apps/kube-system/kustomization.yaml
index 44511d4e..a20d8936 100644
--- a/cluster/apps/kube-system/kustomization.yaml
+++ b/cluster/apps/kube-system/kustomization.yaml
@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
+  - cert-manager
   - kube-vip
   # - kured
   - metrics-server
diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml
index ab449c6f..8d4e84ec 100644
--- a/cluster/apps/kustomization.yaml
+++ b/cluster/apps/kustomization.yaml
@@ -2,7 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - cert-manager
   - default
   - flux-system
   - kube-system
diff --git a/cluster/apps/networking/traefik/helm-release.yaml b/cluster/apps/networking/traefik/helm-release.yaml
index d1c26723..2be3147d 100644
--- a/cluster/apps/networking/traefik/helm-release.yaml
+++ b/cluster/apps/networking/traefik/helm-release.yaml
@@ -24,7 +24,7 @@ spec:
       retries: 5
   dependsOn:
     - name: cert-manager
-      namespace: cert-manager
+      namespace: kube-system
     - name: metallb
       namespace: networking
   values:
diff --git a/tmpl/cluster/cert-manager-secret.sops.yaml b/tmpl/cluster/cert-manager-secret.sops.yaml
index 0c4de075..38c38c85 100644
--- a/tmpl/cluster/cert-manager-secret.sops.yaml
+++ b/tmpl/cluster/cert-manager-secret.sops.yaml
@@ -3,6 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: cloudflare-api-key
-  namespace: cert-manager
+  namespace: kube-system
 stringData:
     api-key: ${BOOTSTRAP_CLOUDFLARE_APIKEY}