From a28ce7889dc948af0fb273d420d5ac4d4f44fd7f Mon Sep 17 00:00:00 2001 From: Mario-F Date: Fri, 24 Dec 2021 10:04:25 +0100 Subject: [PATCH] feat(provisioning): moved helm repos to sub helmfiles --- provisioning/helmfile.yaml | 1 - provisioning/infra/helmfile.yaml | 8 ++++++++ provisioning/monitoring/helmfile.yaml | 5 +++++ provisioning/repositories.yaml | 20 -------------------- provisioning/services/helmfile.yaml | 5 +++++ 5 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 provisioning/repositories.yaml diff --git a/provisioning/helmfile.yaml b/provisioning/helmfile.yaml index 8c72951..3d9d763 100644 --- a/provisioning/helmfile.yaml +++ b/provisioning/helmfile.yaml @@ -1,6 +1,5 @@ --- bases: - - ./repositories.yaml - ./clusters/init.yaml --- diff --git a/provisioning/infra/helmfile.yaml b/provisioning/infra/helmfile.yaml index 3afd734..6e6aa5f 100644 --- a/provisioning/infra/helmfile.yaml +++ b/provisioning/infra/helmfile.yaml @@ -1,6 +1,14 @@ --- {{ readFile "../common/templates.yaml" }} +repositories: + + - name: bitnami + url: https://charts.bitnami.com/bitnami + + - name: ingress-nginx + url: https://kubernetes.github.io/ingress-nginx + releases: - name: metrics-server diff --git a/provisioning/monitoring/helmfile.yaml b/provisioning/monitoring/helmfile.yaml index 2270692..6596af7 100644 --- a/provisioning/monitoring/helmfile.yaml +++ b/provisioning/monitoring/helmfile.yaml @@ -2,6 +2,11 @@ {{ readFile "../common/templates.yaml" }} {{- $globalPrometheus := .Values | get "global-config.prometheus" dict }} +repositories: + + - name: prometheus-community + url: https://prometheus-community.github.io/helm-charts + releases: {{- if $globalPrometheus.enabled }} diff --git a/provisioning/repositories.yaml b/provisioning/repositories.yaml deleted file mode 100644 index 2626c39..0000000 --- a/provisioning/repositories.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -repositories: - - - name: mariof-charts - url: https://mario-f.github.io/helm-charts/ - - - name: bitnami - url: https://charts.bitnami.com/bitnami - - - name: ingress-nginx - url: https://kubernetes.github.io/ingress-nginx - - - name: jetstack - url: https://charts.jetstack.io - - - name: prometheus-community - url: https://prometheus-community.github.io/helm-charts - - - name: grafana - url: https://grafana.github.io/helm-charts diff --git a/provisioning/services/helmfile.yaml b/provisioning/services/helmfile.yaml index 79e0fa5..2974e66 100644 --- a/provisioning/services/helmfile.yaml +++ b/provisioning/services/helmfile.yaml @@ -2,6 +2,11 @@ {{ readFile "../common/templates.yaml" }} {{- $globalPrometheus := .Values | get "global-config.prometheus" dict }} +repositories: + + - name: jetstack + url: https://charts.jetstack.io + releases: - name: cert-manager