feat: flatten core directory

README.md

@@ -165,7 +165,7 @@ envsubst < ./.sops.yaml
 envsubst < ./cluster/cluster-secrets.yaml
 envsubst < ./cluster/cluster-settings.yaml
 envsubst < ./cluster/base/flux-system/gotk-sync.yaml
-envsubst < ./cluster/core/infrastructure/cert-manager/secret.enc.yaml
+envsubst < ./cluster/core/cert-manager/secret.enc.yaml
 ```
 
 4. **Verify** all the above files have the correct information present

cluster/core/cert-manager/helm-release.yaml

@@ -5,7 +5,6 @@ metadata:
   name: cert-manager
   namespace: cert-manager
 spec:
-  interval: 5m
   chart:
     spec:
       # renovate: registryUrl=https://charts.jetstack.io/
@@ -15,7 +14,6 @@ spec:
         kind: HelmRepository
         name: jetstack-charts
         namespace: flux-system
-      interval: 5m
   values:
     installCRDs: false
     webhook:
@@ -34,4 +32,3 @@ spec:
       enabled: false
       servicemonitor:
         enabled: false
-        prometheusInstance: monitoring

cluster/core/cert-manager/kustomization.yaml

@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- crd
+- helm-release.yaml
 - letsencrypt-production.yaml
 - letsencrypt-staging.yaml
 - secret.enc.yaml

cluster/core/crds/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager

cluster/core/infrastructure/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager
-- metallb

cluster/core/kustomization.yaml

@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- crds
-- infrastructure
 - namespaces
-- operators
+- metallb-system
+- cert-manager

cluster/core/metallb-system/helm-release.yaml

@@ -3,9 +3,8 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: metallb
-  namespace: networking
+  namespace: metallb-system
 spec:
-  interval: 5m
   chart:
     spec:
       chart: metallb
@@ -14,7 +13,6 @@ spec:
         kind: HelmRepository
         name: bitnami-charts
         namespace: flux-system
-      interval: 10m
   values:
     controller:
       image:

cluster/core/namespaces/kustomization.yaml

@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - cert-manager.yaml
-- networking.yaml
+- metallb-system.yaml

cluster/core/namespaces/metallb-system.yaml

@@ -2,4 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: networking
+  name: metallb-system

cluster/core/operators/cert-manager/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- helm-release.yaml

cluster/core/operators/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager