diff --git a/cluster/base/charts.yaml b/cluster/base/charts.yaml new file mode 100644 index 000000000..2f415f3a7 --- /dev/null +++ b/cluster/base/charts.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: charts + namespace: flux-system +spec: + interval: 10m0s + path: ./cluster/charts + prune: true + sourceRef: + kind: GitRepository + name: flux-system diff --git a/cluster/base/configuration.yaml b/cluster/base/configuration.yaml index 2ded6d874..fcd74f29f 100644 --- a/cluster/base/configuration.yaml +++ b/cluster/base/configuration.yaml @@ -7,7 +7,7 @@ metadata: spec: interval: 10m0s path: ./cluster/configuration - prune: false + prune: true sourceRef: kind: GitRepository name: flux-system diff --git a/cluster/base/core.yaml b/cluster/base/core.yaml index 1faab13f4..018595634 100644 --- a/cluster/base/core.yaml +++ b/cluster/base/core.yaml @@ -7,7 +7,9 @@ metadata: spec: interval: 10m0s dependsOn: + - name: charts - name: configuration + - name: crds path: ./cluster/core prune: false sourceRef: diff --git a/cluster/base/crds.yaml b/cluster/base/crds.yaml new file mode 100644 index 000000000..c938c9b50 --- /dev/null +++ b/cluster/base/crds.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: crds + namespace: flux-system +spec: + interval: 10m0s + path: ./cluster/crds + prune: false + sourceRef: + kind: GitRepository + name: flux-system diff --git a/cluster/configuration/charts/authelia-charts.yaml b/cluster/charts/authelia-charts.yaml similarity index 100% rename from cluster/configuration/charts/authelia-charts.yaml rename to cluster/charts/authelia-charts.yaml diff --git a/cluster/configuration/charts/authentik-charts.yaml b/cluster/charts/authentik-charts.yaml similarity index 100% rename from cluster/configuration/charts/authentik-charts.yaml rename to cluster/charts/authentik-charts.yaml diff --git a/cluster/configuration/charts/benji-charts.yaml b/cluster/charts/benji-charts.yaml similarity index 100% rename from cluster/configuration/charts/benji-charts.yaml rename to cluster/charts/benji-charts.yaml diff --git a/cluster/configuration/charts/bitnami-charts.yaml b/cluster/charts/bitnami-charts.yaml similarity index 100% rename from cluster/configuration/charts/bitnami-charts.yaml rename to cluster/charts/bitnami-charts.yaml diff --git a/cluster/configuration/charts/cert-manager-webhook-ovh.yaml b/cluster/charts/cert-manager-webhook-ovh.yaml similarity index 100% rename from cluster/configuration/charts/cert-manager-webhook-ovh.yaml rename to cluster/charts/cert-manager-webhook-ovh.yaml diff --git a/cluster/configuration/charts/emxq-charts.yaml b/cluster/charts/emxq-charts.yaml similarity index 100% rename from cluster/configuration/charts/emxq-charts.yaml rename to cluster/charts/emxq-charts.yaml diff --git a/cluster/configuration/charts/external-dns-charts.yaml b/cluster/charts/external-dns-charts.yaml similarity index 100% rename from cluster/configuration/charts/external-dns-charts.yaml rename to cluster/charts/external-dns-charts.yaml diff --git a/cluster/configuration/charts/gitea-charts.yaml b/cluster/charts/gitea-charts.yaml similarity index 100% rename from cluster/configuration/charts/gitea-charts.yaml rename to cluster/charts/gitea-charts.yaml diff --git a/cluster/configuration/charts/grafana-charts.yaml b/cluster/charts/grafana-charts.yaml similarity index 100% rename from cluster/configuration/charts/grafana-charts.yaml rename to cluster/charts/grafana-charts.yaml diff --git a/cluster/configuration/charts/hajimari-charts.yaml b/cluster/charts/hajimari-charts.yaml similarity index 100% rename from cluster/configuration/charts/hajimari-charts.yaml rename to cluster/charts/hajimari-charts.yaml diff --git a/cluster/configuration/charts/influxdata-charts.yaml b/cluster/charts/influxdata-charts.yaml similarity index 100% rename from cluster/configuration/charts/influxdata-charts.yaml rename to cluster/charts/influxdata-charts.yaml diff --git a/cluster/configuration/charts/infracloudio-charts.yaml b/cluster/charts/infracloudio-charts.yaml similarity index 100% rename from cluster/configuration/charts/infracloudio-charts.yaml rename to cluster/charts/infracloudio-charts.yaml diff --git a/cluster/configuration/charts/ingress-nginx-charts.yaml b/cluster/charts/ingress-nginx-charts.yaml similarity index 100% rename from cluster/configuration/charts/ingress-nginx-charts.yaml rename to cluster/charts/ingress-nginx-charts.yaml diff --git a/cluster/configuration/charts/jetstack-charts.yaml b/cluster/charts/jetstack-charts.yaml similarity index 100% rename from cluster/configuration/charts/jetstack-charts.yaml rename to cluster/charts/jetstack-charts.yaml diff --git a/cluster/configuration/charts/k8s-at-home.yaml b/cluster/charts/k8s-at-home.yaml similarity index 100% rename from cluster/configuration/charts/k8s-at-home.yaml rename to cluster/charts/k8s-at-home.yaml diff --git a/cluster/configuration/charts/k8s-gateway-charts.yaml b/cluster/charts/k8s-gateway-charts.yaml similarity index 100% rename from cluster/configuration/charts/k8s-gateway-charts.yaml rename to cluster/charts/k8s-gateway-charts.yaml diff --git a/cluster/configuration/charts/kasten-charts.yaml b/cluster/charts/kasten-charts.yaml similarity index 100% rename from cluster/configuration/charts/kasten-charts.yaml rename to cluster/charts/kasten-charts.yaml diff --git a/cluster/configuration/charts/kubernetes-sigs-descheduler-charts.yaml b/cluster/charts/kubernetes-sigs-descheduler-charts.yaml similarity index 100% rename from cluster/configuration/charts/kubernetes-sigs-descheduler-charts.yaml rename to cluster/charts/kubernetes-sigs-descheduler-charts.yaml diff --git a/cluster/configuration/charts/kustomization.yaml b/cluster/charts/kustomization.yaml similarity index 100% rename from cluster/configuration/charts/kustomization.yaml rename to cluster/charts/kustomization.yaml diff --git a/cluster/configuration/charts/node-feature-discovery.yaml b/cluster/charts/node-feature-discovery.yaml similarity index 100% rename from cluster/configuration/charts/node-feature-discovery.yaml rename to cluster/charts/node-feature-discovery.yaml diff --git a/cluster/configuration/charts/prometheus-community-charts.yaml b/cluster/charts/prometheus-community-charts.yaml similarity index 100% rename from cluster/configuration/charts/prometheus-community-charts.yaml rename to cluster/charts/prometheus-community-charts.yaml diff --git a/cluster/configuration/charts/rook-ceph-charts.yaml b/cluster/charts/rook-ceph-charts.yaml similarity index 100% rename from cluster/configuration/charts/rook-ceph-charts.yaml rename to cluster/charts/rook-ceph-charts.yaml diff --git a/cluster/configuration/charts/runix-charts.yaml b/cluster/charts/runix-charts.yaml similarity index 100% rename from cluster/configuration/charts/runix-charts.yaml rename to cluster/charts/runix-charts.yaml diff --git a/cluster/configuration/charts/stakater-charts.yaml b/cluster/charts/stakater-charts.yaml similarity index 100% rename from cluster/configuration/charts/stakater-charts.yaml rename to cluster/charts/stakater-charts.yaml diff --git a/cluster/configuration/charts/traefik-charts.yaml b/cluster/charts/traefik-charts.yaml similarity index 100% rename from cluster/configuration/charts/traefik-charts.yaml rename to cluster/charts/traefik-charts.yaml diff --git a/cluster/configuration/charts/weaveworks-kured-charts.yaml b/cluster/charts/weaveworks-kured-charts.yaml similarity index 100% rename from cluster/configuration/charts/weaveworks-kured-charts.yaml rename to cluster/charts/weaveworks-kured-charts.yaml diff --git a/cluster/configuration/kustomization.yaml b/cluster/configuration/kustomization.yaml index 03b2104f9..5d10f3421 100644 --- a/cluster/configuration/kustomization.yaml +++ b/cluster/configuration/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - charts - - crds - secrets - settings diff --git a/cluster/configuration/crds/cert-manager/kustomization.yaml b/cluster/crds/cert-manager/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/cert-manager/kustomization.yaml rename to cluster/crds/cert-manager/kustomization.yaml diff --git a/cluster/configuration/crds/external-snapshotter/crds.yaml b/cluster/crds/external-snapshotter/crds.yaml similarity index 100% rename from cluster/configuration/crds/external-snapshotter/crds.yaml rename to cluster/crds/external-snapshotter/crds.yaml diff --git a/cluster/configuration/crds/external-snapshotter/kustomization.yaml b/cluster/crds/external-snapshotter/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/external-snapshotter/kustomization.yaml rename to cluster/crds/external-snapshotter/kustomization.yaml diff --git a/cluster/configuration/crds/kube-prometheus-stack/crds.yaml b/cluster/crds/kube-prometheus-stack/crds.yaml similarity index 100% rename from cluster/configuration/crds/kube-prometheus-stack/crds.yaml rename to cluster/crds/kube-prometheus-stack/crds.yaml diff --git a/cluster/configuration/crds/kube-prometheus-stack/kustomization.yaml b/cluster/crds/kube-prometheus-stack/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/kube-prometheus-stack/kustomization.yaml rename to cluster/crds/kube-prometheus-stack/kustomization.yaml diff --git a/cluster/configuration/crds/kustomization.yaml b/cluster/crds/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/kustomization.yaml rename to cluster/crds/kustomization.yaml diff --git a/cluster/configuration/crds/node-feature-discovery/kustomization.yaml b/cluster/crds/node-feature-discovery/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/node-feature-discovery/kustomization.yaml rename to cluster/crds/node-feature-discovery/kustomization.yaml diff --git a/cluster/configuration/crds/rook-ceph/crds.yaml b/cluster/crds/rook-ceph/crds.yaml similarity index 100% rename from cluster/configuration/crds/rook-ceph/crds.yaml rename to cluster/crds/rook-ceph/crds.yaml diff --git a/cluster/configuration/crds/rook-ceph/kustomization.yaml b/cluster/crds/rook-ceph/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/rook-ceph/kustomization.yaml rename to cluster/crds/rook-ceph/kustomization.yaml diff --git a/cluster/configuration/crds/system-upgrade-controller/kustomization.yaml b/cluster/crds/system-upgrade-controller/kustomization.yaml similarity index 100% rename from cluster/configuration/crds/system-upgrade-controller/kustomization.yaml rename to cluster/crds/system-upgrade-controller/kustomization.yaml