feat!: Remove charts and config fluxtomizations and include them in the cluster/flux/ dir

cluster/charts/kustomization.yaml

@@ -1,16 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - bitnami-charts.yaml
-  - bjw-s-charts.yaml
-  - dysnix-charts.yaml
-  - external-dns-charts.yaml
-  - hajimari-charts.yaml
-  - ingress-nginx-charts.yaml
-  - jetstack-charts.yaml
-  - kubereboot-charts.yaml
-  - k8s-gateway-charts.yaml
-  - metallb-charts.yaml
-  - metrics-server-charts.yaml
-  - stakater-charts.yaml

cluster/flux/apps.yaml

@@ -12,8 +12,8 @@ spec:
     kind: GitRepository
     name: flux-cluster
   dependsOn:
-    - name: config
-    - name: charts
+    - name: flux-installation
+    - name: flux-cluster
   decryption:
     provider: sops
     secretRef:

cluster/flux/charts.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: charts
-  namespace: flux-system
-spec:
-  interval: 30m
-  path: ./cluster/charts
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-cluster

cluster/flux/config.yaml

@@ -1,17 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: config
-  namespace: flux-system
-spec:
-  interval: 30m
-  path: ./cluster/config
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-cluster
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age

cluster/flux/config/crds/kube-prometheus-stack.yaml

@@ -0,0 +1,30 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: GitRepository
+metadata:
+  name: kube-prometheus-stack
+  namespace: flux-system
+spec:
+  interval: 12h
+  url: https://github.com/prometheus-community/helm-charts.git
+  ref:
+    # renovate: registryUrl=https://prometheus-community.github.io/helm-charts chart=kube-prometheus-stack
+    tag: kube-prometheus-stack-42.1.0
+  ignore: |
+    # exclude all
+    /*
+    # include crd directory
+    !/charts/kube-prometheus-stack/crds
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: kube-prometheus-stack-crds
+  namespace: flux-system
+spec:
+  interval: 30m
+  prune: false
+  wait: true
+  sourceRef:
+    kind: GitRepository
+    name: kube-prometheus-stack

cluster/flux/config/crds/kustomization.yaml

@@ -1,5 +1,6 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: flux-system
 resources:
-  - cluster-settings.yaml
-  - cluster-secrets.sops.yaml
+  - ./kube-prometheus-stack.yaml

cluster/flux/config/flux-installation.yaml

@@ -7,8 +7,7 @@ metadata:
 spec:
   interval: 10m
   ref:
-    # renovate: datasource=github-releases depName=fluxcd/flux2
-    tag: "v0.37.0"
+    tag: v0.37.0
   url: https://github.com/fluxcd/flux2
   ignore: |
     # exclude all

cluster/flux/config/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./flux-installation.yaml
+  - ./flux-cluster.yaml
+  - ./crds

cluster/flux/repositories/helm/kustomization.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./bitnami-charts.yaml
+  - ./bjw-s-charts.yaml
+  - ./dysnix-charts.yaml
+  - ./external-dns-charts.yaml
+  - ./hajimari-charts.yaml
+  - ./ingress-nginx-charts.yaml
+  - ./jetstack-charts.yaml
+  - ./kubereboot-charts.yaml
+  - ./k8s-gateway-charts.yaml
+  - ./metallb-charts.yaml
+  - ./metrics-server-charts.yaml
+  - ./stakater-charts.yaml

cluster/flux/repositories/kustomization.yaml

@@ -2,5 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - flux-installation.yaml
-  - flux-cluster.yaml
+  # - ./git
+  - ./helm
+  # - ./oci

cluster/flux/vars/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./cluster-settings.yaml
+  - ./cluster-secrets.sops.yaml