♻️ Refactor Flux kustomizations for apps

Move apps from the central Flux kustomization to dedicated resources. Follow the template repo [flux2-kustomize-helm-example](https://github.com/fluxcd/flux2-kustomize-helm-example)
ffddorf · Feb 24, 2024 · 037004c · 037004c
1 parent 413ec7a
commit 037004c
Show file tree

Hide file tree

Showing 40 changed files with 131 additions and 30 deletions.
diff --git a/base/cryptpad/helm-release.yaml → apps/base/cryptpad/helm-release.yaml b/base/cryptpad/helm-release.yaml → apps/base/cryptpad/helm-release.yaml
diff --git a/base/cryptpad/helm-repository.yaml → apps/base/cryptpad/helm-repository.yaml b/base/cryptpad/helm-repository.yaml → apps/base/cryptpad/helm-repository.yaml
diff --git a/base/cryptpad/kustomization.yaml → apps/base/cryptpad/kustomization.yaml b/base/cryptpad/kustomization.yaml → apps/base/cryptpad/kustomization.yaml
diff --git a/base/cryptpad/namespace.yaml → apps/base/cryptpad/namespace.yaml b/base/cryptpad/namespace.yaml → apps/base/cryptpad/namespace.yaml
diff --git a/base/dendrite/helm-release.yaml → apps/base/dendrite/helm-release.yaml b/base/dendrite/helm-release.yaml → apps/base/dendrite/helm-release.yaml
diff --git a/base/dendrite/helm-repository.yaml → apps/base/dendrite/helm-repository.yaml b/base/dendrite/helm-repository.yaml → apps/base/dendrite/helm-repository.yaml
diff --git a/base/dendrite/kustomization.yaml → apps/base/dendrite/kustomization.yaml b/base/dendrite/kustomization.yaml → apps/base/dendrite/kustomization.yaml
diff --git a/base/dendrite/namespace.yaml → apps/base/dendrite/namespace.yaml b/base/dendrite/namespace.yaml → apps/base/dendrite/namespace.yaml
diff --git a/base/grafana/dashboards.yaml → apps/base/grafana/dashboards.yaml b/base/grafana/dashboards.yaml → apps/base/grafana/dashboards.yaml
diff --git a/base/grafana/helm-release.yaml → apps/base/grafana/helm-release.yaml b/base/grafana/helm-release.yaml → apps/base/grafana/helm-release.yaml
diff --git a/base/grafana/helm-repository.yaml → apps/base/grafana/helm-repository.yaml b/base/grafana/helm-repository.yaml → apps/base/grafana/helm-repository.yaml
diff --git a/base/grafana/kustomization.yaml → apps/base/grafana/kustomization.yaml b/base/grafana/kustomization.yaml → apps/base/grafana/kustomization.yaml
diff --git a/base/grafana/namespace.yaml → apps/base/grafana/namespace.yaml b/base/grafana/namespace.yaml → apps/base/grafana/namespace.yaml
diff --git a/base/jitsi/grafana-dashboard.json → apps/base/jitsi/grafana-dashboard.json b/base/jitsi/grafana-dashboard.json → apps/base/jitsi/grafana-dashboard.json
diff --git a/base/jitsi/grafana-datasource.yaml → apps/base/jitsi/grafana-datasource.yaml b/base/jitsi/grafana-datasource.yaml → apps/base/jitsi/grafana-datasource.yaml
diff --git a/base/jitsi/kustomization.yaml → apps/base/jitsi/kustomization.yaml b/base/jitsi/kustomization.yaml → apps/base/jitsi/kustomization.yaml
diff --git a/base/jitsi/namespace.yaml → apps/base/jitsi/namespace.yaml b/base/jitsi/namespace.yaml → apps/base/jitsi/namespace.yaml
diff --git a/base/prometheus/grafana-datasource.yaml → apps/base/prometheus/grafana-datasource.yaml b/base/prometheus/grafana-datasource.yaml → apps/base/prometheus/grafana-datasource.yaml
diff --git a/base/prometheus/helm-release.yaml → apps/base/prometheus/helm-release.yaml b/base/prometheus/helm-release.yaml → apps/base/prometheus/helm-release.yaml
diff --git a/base/prometheus/helm-repository.yaml → apps/base/prometheus/helm-repository.yaml b/base/prometheus/helm-repository.yaml → apps/base/prometheus/helm-repository.yaml
diff --git a/base/prometheus/kustomization.yaml → apps/base/prometheus/kustomization.yaml b/base/prometheus/kustomization.yaml → apps/base/prometheus/kustomization.yaml
diff --git a/base/prometheus/namespace.yaml → apps/base/prometheus/namespace.yaml b/base/prometheus/namespace.yaml → apps/base/prometheus/namespace.yaml
diff --git a/base/vault/helm-release.yaml → apps/base/vault/helm-release.yaml b/base/vault/helm-release.yaml → apps/base/vault/helm-release.yaml
diff --git a/base/vault/helm-repository.yaml → apps/base/vault/helm-repository.yaml b/base/vault/helm-repository.yaml → apps/base/vault/helm-repository.yaml
diff --git a/base/vault/kustomization.yaml → apps/base/vault/kustomization.yaml b/base/vault/kustomization.yaml → apps/base/vault/kustomization.yaml
diff --git a/base/vault/namespace.yaml → apps/base/vault/namespace.yaml b/base/vault/namespace.yaml → apps/base/vault/namespace.yaml
diff --git a/clusters/k3s1/dendrite-helm-release.yaml → apps/prod/dendrite-values.yaml b/clusters/k3s1/dendrite-helm-release.yaml → apps/prod/dendrite-values.yaml
@@ -16,7 +16,6 @@ spec:
       annotations:
         cert-manager.io/cluster-issuer: letsencrypt-prod
       hostName: dendrite.ffddorf.net
-      tls: 
+      tls:
       - hosts: [ dendrite.ffddorf.net ]
         secretName: dendrite-tls
-
diff --git a/clusters/k3s1/grafana-helm-release.yaml → apps/prod/grafana-values.yaml b/clusters/k3s1/grafana-helm-release.yaml → apps/prod/grafana-values.yaml
diff --git a/apps/prod/kustomization.yaml b/apps/prod/kustomization.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../base/cert-manager
+- ../base/dendrite
+- ../base/cryptpad
+- ../base/external-dns
+- ../base/grafana
+- ../base/prometheus
+- traefik-config.yaml
+patches:
+- path: dendrite-values.yaml
+  target:
+    kind: HelmRelease
+- path: grafana-values.yaml
+  target:
+    kind: HelmRelease
diff --git a/clusters/k3s1/traefik-config.yaml → apps/prod/traefik-config.yaml b/clusters/k3s1/traefik-config.yaml → apps/prod/traefik-config.yaml
diff --git a/base/external-dns/helm-repository.yaml b/base/external-dns/helm-repository.yaml
diff --git a/base/external-dns/kustomization.yaml b/base/external-dns/kustomization.yaml
diff --git a/base/external-dns/namespace.yaml b/base/external-dns/namespace.yaml
diff --git a/clusters/k3s1/apps.yaml b/clusters/k3s1/apps.yaml
@@ -2,14 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: metallb
+  name: apps
   namespace: flux-system
 spec:
-  interval: 1h
-  retryInterval: 1m
-  timeout: 5m
+  interval: 10m0s
+  dependsOn:
+  - name: infra-configs
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./base/metallb
-  prune: false
+  path: ./base/production
+  prune: true
+  waitr: true
+  timeout: 5m
diff --git a/clusters/k3s1/infrastructure.yaml b/clusters/k3s1/infrastructure.yaml
@@ -0,0 +1,34 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: infra-controllers
+  namespace: flux-system
+spec:
+  interval: 1h
+  retryInterval: 1m
+  timeout: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./infrastructure/controllers
+  prune: true
+  wait: true
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: infra-configs
+  namespace: flux-system
+spec:
+  dependsOn:
+  - name: infra-controllers
+  interval: 1h
+  retryInterval: 1m
+  timeout: 5m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./infrastructure/configs
+  prune: true
+  wait: true
diff --git a/...ager/cluster-issuer-letsencrypt-prod.yaml → infrastructure/configs/cluster-issuers.yaml b/...ager/cluster-issuer-letsencrypt-prod.yaml → infrastructure/configs/cluster-issuers.yaml
diff --git a/infrastructure/controllers/cert-manager.yaml b/infrastructure/controllers/cert-manager.yaml
@@ -0,0 +1,35 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+  labels:
+    toolkit.fluxcd.io/tenant: sre-team
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: cert-manager
+  namespace: cert-manager
+spec:
+  interval: 24h
+  url: https://charts.jetstack.io
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: cert-manager
+  namespace: cert-manager
+spec:
+  interval: 30m
+  chart:
+    spec:
+      chart: cert-manager
+      version: "1.x"
+      sourceRef:
+        kind: HelmRepository
+        name: cert-manager
+        namespace: cert-manager
+      interval: 12h
+  values:
+    installCRDs: true
diff --git a/base/external-dns/helm-release.yaml → infrastructure/controllers/external-dns.yaml b/base/external-dns/helm-release.yaml → infrastructure/controllers/external-dns.yaml
@@ -1,8 +1,23 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: external-dns
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: external-dns
+  namespace: external-dns
+spec:
+  interval: 24h
+  url: https://kubernetes-sigs.github.io/external-dns/
+---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: external-dns
+  namespace: external-dns
 spec:
   chart:
     spec:

diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- cert-manager.yaml
diff --git a/base/metallb/helm-release.yaml → infrastructure/controllers/metallb.yaml b/base/metallb/helm-release.yaml → infrastructure/controllers/metallb.yaml
@@ -1,15 +1,29 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metallb-system
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: metallb
+spec:
+  url: https://metallb.github.io/metallb
+  interval: 1h
+---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: metallb
 spec:
-  interval: 1h
+  interval: 24h
   install:
     createNamespace: false
   chart:
     spec:
       chart: metallb
+      version: "0.x"
       sourceRef:
         kind: HelmRepository
         name: metallb