From 95eb2c563952c95047783026de5f3cc6e5ec2dfd Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 9 Jun 2022 09:55:26 -0400 Subject: [PATCH] feat(cluster)!: move charts into their own fluxtomization Signed-off-by: Devin Buhl --- cluster/base/apps.yaml | 3 +-- cluster/base/charts.yaml | 13 +++++++++ cluster/base/core.yaml | 4 +-- cluster/base/crds.yaml | 2 +- .../charts/helm/authentik-charts.yaml | 10 ------- .../charts/helm/deliveryhero-charts.yaml | 10 ------- .../charts/helm/descheduler-charts.yaml | 10 ------- .../charts/helm/grafana-charts.yaml | 10 ------- .../charts/helm/infracloudio-charts.yaml | 10 ------- .../charts/helm/kustomization.yaml | 27 ------------------- .../charts/helm/minecraft-server-charts.yaml | 10 ------- .../flux-system/charts/helm/minio-charts.yaml | 10 ------- ...fs-subdir-external-provisioner-charts.yaml | 10 ------- .../helm/node-feature-discovery-charts.yaml | 10 ------- .../helm/prometheus-community-charts.yaml | 10 ------- .../charts/helm/rook-ceph-charts.yaml | 10 ------- .../flux-system/charts/kustomization.yaml | 5 ---- .../bitnami.yaml} | 0 .../ealenn-charts.yaml => charts/ealenn.yaml} | 0 .../emberstack.yaml} | 0 .../external-dns.yaml} | 0 .../hajimari.yaml} | 0 .../jetstack.yaml} | 0 .../k8s-at-home.yaml} | 0 .../k8s-gateway.yaml} | 0 cluster/charts/kustomization.yaml | 16 +++++++++++ .../metallb.yaml} | 0 .../metrics-server.yaml} | 0 .../stakater.yaml} | 0 .../traefik.yaml} | 0 .../weaveworks-kured.yaml} | 0 31 files changed, 33 insertions(+), 147 deletions(-) create mode 100644 cluster/base/charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/authentik-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/deliveryhero-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/descheduler-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/grafana-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/infracloudio-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/kustomization.yaml delete mode 100644 cluster/base/flux-system/charts/helm/minecraft-server-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/minio-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/node-feature-discovery-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/prometheus-community-charts.yaml delete mode 100644 cluster/base/flux-system/charts/helm/rook-ceph-charts.yaml delete mode 100644 cluster/base/flux-system/charts/kustomization.yaml rename cluster/{base/flux-system/charts/helm/bitnami-charts.yaml => charts/bitnami.yaml} (100%) rename cluster/{base/flux-system/charts/helm/ealenn-charts.yaml => charts/ealenn.yaml} (100%) rename cluster/{base/flux-system/charts/helm/emberstack-charts.yaml => charts/emberstack.yaml} (100%) rename cluster/{base/flux-system/charts/helm/external-dns-charts.yaml => charts/external-dns.yaml} (100%) rename cluster/{base/flux-system/charts/helm/hajimari-charts.yaml => charts/hajimari.yaml} (100%) rename cluster/{base/flux-system/charts/helm/jetstack-charts.yaml => charts/jetstack.yaml} (100%) rename cluster/{base/flux-system/charts/helm/k8s-at-home-charts.yaml => charts/k8s-at-home.yaml} (100%) rename cluster/{base/flux-system/charts/helm/k8s-gateway-charts.yaml => charts/k8s-gateway.yaml} (100%) create mode 100644 cluster/charts/kustomization.yaml rename cluster/{base/flux-system/charts/helm/metallb-charts.yaml => charts/metallb.yaml} (100%) rename cluster/{base/flux-system/charts/helm/metrics-server-charts.yaml => charts/metrics-server.yaml} (100%) rename cluster/{base/flux-system/charts/helm/stakater-charts.yaml => charts/stakater.yaml} (100%) rename cluster/{base/flux-system/charts/helm/traefik-charts.yaml => charts/traefik.yaml} (100%) rename cluster/{base/flux-system/charts/helm/weaveworks-kured-charts.yaml => charts/weaveworks-kured.yaml} (100%) diff --git a/cluster/base/apps.yaml b/cluster/base/apps.yaml index cd9fef18..72532771 100644 --- a/cluster/base/apps.yaml +++ b/cluster/base/apps.yaml @@ -5,7 +5,7 @@ metadata: name: apps namespace: flux-system spec: - interval: 10m0s + interval: 10m dependsOn: - name: core path: ./cluster/apps @@ -18,7 +18,6 @@ spec: secretRef: name: sops-age postBuild: - substitute: {} substituteFrom: - kind: ConfigMap name: cluster-settings diff --git a/cluster/base/charts.yaml b/cluster/base/charts.yaml new file mode 100644 index 00000000..dac79d5e --- /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: 10m + path: ./cluster/charts + prune: true + sourceRef: + kind: GitRepository + name: flux-system diff --git a/cluster/base/core.yaml b/cluster/base/core.yaml index 41938faa..e08660c0 100644 --- a/cluster/base/core.yaml +++ b/cluster/base/core.yaml @@ -5,8 +5,9 @@ metadata: name: core namespace: flux-system spec: - interval: 10m0s + interval: 10m dependsOn: + - name: charts - name: crds path: ./cluster/core prune: false @@ -18,7 +19,6 @@ spec: secretRef: name: sops-age postBuild: - substitute: {} substituteFrom: - kind: ConfigMap name: cluster-settings diff --git a/cluster/base/crds.yaml b/cluster/base/crds.yaml index c938c9b5..d222dd01 100644 --- a/cluster/base/crds.yaml +++ b/cluster/base/crds.yaml @@ -5,7 +5,7 @@ metadata: name: crds namespace: flux-system spec: - interval: 10m0s + interval: 10m path: ./cluster/crds prune: false sourceRef: diff --git a/cluster/base/flux-system/charts/helm/authentik-charts.yaml b/cluster/base/flux-system/charts/helm/authentik-charts.yaml deleted file mode 100644 index cd380870..00000000 --- a/cluster/base/flux-system/charts/helm/authentik-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: authentik-charts - namespace: flux-system -spec: - interval: 30m - url: https://charts.goauthentik.io/ - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/deliveryhero-charts.yaml b/cluster/base/flux-system/charts/helm/deliveryhero-charts.yaml deleted file mode 100644 index 7bc8df72..00000000 --- a/cluster/base/flux-system/charts/helm/deliveryhero-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: deliveryhero-charts - namespace: flux-system -spec: - interval: 30m - url: https://charts.deliveryhero.io/ - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/descheduler-charts.yaml b/cluster/base/flux-system/charts/helm/descheduler-charts.yaml deleted file mode 100644 index d3ea071c..00000000 --- a/cluster/base/flux-system/charts/helm/descheduler-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: descheduler-charts - namespace: flux-system -spec: - interval: 30m - url: https://kubernetes-sigs.github.io/descheduler - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/grafana-charts.yaml b/cluster/base/flux-system/charts/helm/grafana-charts.yaml deleted file mode 100644 index fe5b152b..00000000 --- a/cluster/base/flux-system/charts/helm/grafana-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: grafana-charts - namespace: flux-system -spec: - interval: 30m - url: https://grafana.github.io/helm-charts - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/infracloudio-charts.yaml b/cluster/base/flux-system/charts/helm/infracloudio-charts.yaml deleted file mode 100644 index 453a3793..00000000 --- a/cluster/base/flux-system/charts/helm/infracloudio-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: infracloudio-charts - namespace: flux-system -spec: - interval: 30m - url: https://infracloudio.github.io/charts - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml deleted file mode 100644 index 32af60f7..00000000 --- a/cluster/base/flux-system/charts/helm/kustomization.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - authentik-charts.yaml - - bitnami-charts.yaml - - deliveryhero-charts.yaml - - descheduler-charts.yaml - - ealenn-charts.yaml - - emberstack-charts.yaml - - external-dns-charts.yaml - - grafana-charts.yaml - - hajimari-charts.yaml - - infracloudio-charts.yaml - - jetstack-charts.yaml - - k8s-at-home-charts.yaml - - k8s-gateway-charts.yaml - - metallb-charts.yaml - - metrics-server-charts.yaml - - minecraft-server-charts.yaml - - minio-charts.yaml - - nfs-subdir-external-provisioner-charts.yaml - - node-feature-discovery-charts.yaml - - prometheus-community-charts.yaml - - rook-ceph-charts.yaml - - stakater-charts.yaml - - traefik-charts.yaml - - weaveworks-kured-charts.yaml diff --git a/cluster/base/flux-system/charts/helm/minecraft-server-charts.yaml b/cluster/base/flux-system/charts/helm/minecraft-server-charts.yaml deleted file mode 100644 index dc3fa7ce..00000000 --- a/cluster/base/flux-system/charts/helm/minecraft-server-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: minecraft-server-charts - namespace: flux-system -spec: - interval: 30m - url: https://itzg.github.io/minecraft-server-charts/ - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/minio-charts.yaml b/cluster/base/flux-system/charts/helm/minio-charts.yaml deleted file mode 100644 index 09bc0a33..00000000 --- a/cluster/base/flux-system/charts/helm/minio-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: minio-charts - namespace: flux-system -spec: - interval: 30m - url: https://operator.min.io - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml b/cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml deleted file mode 100644 index c6360b48..00000000 --- a/cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: nfs-subdir-external-provisioner-charts - namespace: flux-system -spec: - interval: 30m - url: https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/ - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/node-feature-discovery-charts.yaml b/cluster/base/flux-system/charts/helm/node-feature-discovery-charts.yaml deleted file mode 100644 index 654a5c5d..00000000 --- a/cluster/base/flux-system/charts/helm/node-feature-discovery-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: node-feature-discovery-charts - namespace: flux-system -spec: - interval: 30m - url: https://kubernetes-sigs.github.io/node-feature-discovery/charts - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/prometheus-community-charts.yaml b/cluster/base/flux-system/charts/helm/prometheus-community-charts.yaml deleted file mode 100644 index 9f79fee8..00000000 --- a/cluster/base/flux-system/charts/helm/prometheus-community-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: prometheus-community-charts - namespace: flux-system -spec: - interval: 30m - url: https://prometheus-community.github.io/helm-charts - timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/rook-ceph-charts.yaml b/cluster/base/flux-system/charts/helm/rook-ceph-charts.yaml deleted file mode 100644 index 60afc4c3..00000000 --- a/cluster/base/flux-system/charts/helm/rook-ceph-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: rook-ceph-charts - namespace: flux-system -spec: - interval: 30m - url: https://charts.rook.io/release - timeout: 3m diff --git a/cluster/base/flux-system/charts/kustomization.yaml b/cluster/base/flux-system/charts/kustomization.yaml deleted file mode 100644 index 96b157b7..00000000 --- a/cluster/base/flux-system/charts/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helm diff --git a/cluster/base/flux-system/charts/helm/bitnami-charts.yaml b/cluster/charts/bitnami.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/bitnami-charts.yaml rename to cluster/charts/bitnami.yaml diff --git a/cluster/base/flux-system/charts/helm/ealenn-charts.yaml b/cluster/charts/ealenn.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/ealenn-charts.yaml rename to cluster/charts/ealenn.yaml diff --git a/cluster/base/flux-system/charts/helm/emberstack-charts.yaml b/cluster/charts/emberstack.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/emberstack-charts.yaml rename to cluster/charts/emberstack.yaml diff --git a/cluster/base/flux-system/charts/helm/external-dns-charts.yaml b/cluster/charts/external-dns.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/external-dns-charts.yaml rename to cluster/charts/external-dns.yaml diff --git a/cluster/base/flux-system/charts/helm/hajimari-charts.yaml b/cluster/charts/hajimari.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/hajimari-charts.yaml rename to cluster/charts/hajimari.yaml diff --git a/cluster/base/flux-system/charts/helm/jetstack-charts.yaml b/cluster/charts/jetstack.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/jetstack-charts.yaml rename to cluster/charts/jetstack.yaml diff --git a/cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml b/cluster/charts/k8s-at-home.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml rename to cluster/charts/k8s-at-home.yaml diff --git a/cluster/base/flux-system/charts/helm/k8s-gateway-charts.yaml b/cluster/charts/k8s-gateway.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/k8s-gateway-charts.yaml rename to cluster/charts/k8s-gateway.yaml diff --git a/cluster/charts/kustomization.yaml b/cluster/charts/kustomization.yaml new file mode 100644 index 00000000..63bae34b --- /dev/null +++ b/cluster/charts/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - bitnami.yaml + - ealenn.yaml + - emberstack.yaml + - external-dns.yaml + - hajimari.yaml + - jetstack.yaml + - k8s-at-home.yaml + - k8s-gateway.yaml + - metallb.yaml + - metrics-server.yaml + - stakater.yaml + - traefik.yaml + - weaveworks-kured.yaml diff --git a/cluster/base/flux-system/charts/helm/metallb-charts.yaml b/cluster/charts/metallb.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/metallb-charts.yaml rename to cluster/charts/metallb.yaml diff --git a/cluster/base/flux-system/charts/helm/metrics-server-charts.yaml b/cluster/charts/metrics-server.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/metrics-server-charts.yaml rename to cluster/charts/metrics-server.yaml diff --git a/cluster/base/flux-system/charts/helm/stakater-charts.yaml b/cluster/charts/stakater.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/stakater-charts.yaml rename to cluster/charts/stakater.yaml diff --git a/cluster/base/flux-system/charts/helm/traefik-charts.yaml b/cluster/charts/traefik.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/traefik-charts.yaml rename to cluster/charts/traefik.yaml diff --git a/cluster/base/flux-system/charts/helm/weaveworks-kured-charts.yaml b/cluster/charts/weaveworks-kured.yaml similarity index 100% rename from cluster/base/flux-system/charts/helm/weaveworks-kured-charts.yaml rename to cluster/charts/weaveworks-kured.yaml