From e8c72fc0e5cb4eca6a72f8c145461ec2c892776b Mon Sep 17 00:00:00 2001 From: auricom Date: Sun, 6 Dec 2020 00:08:47 +0100 Subject: [PATCH] split helm-chart repositories --- .../banzaicloud-charts.yaml | 10 ++ .../bitnami-charts.yaml | 10 ++ .../drone-charts.yaml | 10 ++ .../fairwinds-charts.yaml | 10 ++ .../falco-security-charts.yaml | 10 ++ .../grafana-loki-charts.yaml | 10 ++ .../influxdata-charts.yaml | 10 ++ .../infracloudio-charts.yaml | 10 ++ .../ingress-nginx-charts.yaml | 10 ++ .../_helm-chart-repositories/k8s-at-home.yaml | 10 ++ .../kubernetes-dashboard-charts.yaml | 10 ++ .../kubernetes-sigs-descheduler-charts.yaml | 10 ++ .../longhorn-charts.yaml | 10 ++ .../prometheus-community-charts.yaml | 10 ++ .../twuni-charts.yaml | 10 ++ .../flux-system/helm-chart-repositories.yaml | 150 ------------------ cluster/flux-system/kustomization.yaml | 1 - scripts/create-helmrelease-annotations.sh | 2 +- 18 files changed, 151 insertions(+), 152 deletions(-) create mode 100644 cluster/_helm-chart-repositories/banzaicloud-charts.yaml create mode 100644 cluster/_helm-chart-repositories/bitnami-charts.yaml create mode 100644 cluster/_helm-chart-repositories/drone-charts.yaml create mode 100644 cluster/_helm-chart-repositories/fairwinds-charts.yaml create mode 100644 cluster/_helm-chart-repositories/falco-security-charts.yaml create mode 100644 cluster/_helm-chart-repositories/grafana-loki-charts.yaml create mode 100644 cluster/_helm-chart-repositories/influxdata-charts.yaml create mode 100644 cluster/_helm-chart-repositories/infracloudio-charts.yaml create mode 100644 cluster/_helm-chart-repositories/ingress-nginx-charts.yaml create mode 100644 cluster/_helm-chart-repositories/k8s-at-home.yaml create mode 100644 cluster/_helm-chart-repositories/kubernetes-dashboard-charts.yaml create mode 100644 cluster/_helm-chart-repositories/kubernetes-sigs-descheduler-charts.yaml create mode 100644 cluster/_helm-chart-repositories/longhorn-charts.yaml create mode 100644 cluster/_helm-chart-repositories/prometheus-community-charts.yaml create mode 100644 cluster/_helm-chart-repositories/twuni-charts.yaml delete mode 100644 cluster/flux-system/helm-chart-repositories.yaml diff --git a/cluster/_helm-chart-repositories/banzaicloud-charts.yaml b/cluster/_helm-chart-repositories/banzaicloud-charts.yaml new file mode 100644 index 000000000..e7ba08786 --- /dev/null +++ b/cluster/_helm-chart-repositories/banzaicloud-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: banzaicloud-charts + namespace: flux-system +spec: + interval: 10m + url: https://kubernetes-charts.banzaicloud.com + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/bitnami-charts.yaml b/cluster/_helm-chart-repositories/bitnami-charts.yaml new file mode 100644 index 000000000..591dec523 --- /dev/null +++ b/cluster/_helm-chart-repositories/bitnami-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: bitnami-charts + namespace: flux-system +spec: + interval: 10m + url: https://charts.bitnami.com/bitnami + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/drone-charts.yaml b/cluster/_helm-chart-repositories/drone-charts.yaml new file mode 100644 index 000000000..6940537ff --- /dev/null +++ b/cluster/_helm-chart-repositories/drone-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: drone-charts + namespace: flux-system +spec: + interval: 10m + url: https://charts.drone.io + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/fairwinds-charts.yaml b/cluster/_helm-chart-repositories/fairwinds-charts.yaml new file mode 100644 index 000000000..3e82a3502 --- /dev/null +++ b/cluster/_helm-chart-repositories/fairwinds-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: fairwinds-charts + namespace: flux-system +spec: + interval: 10m + url: https://charts.fairwinds.com/stable + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/falco-security-charts.yaml b/cluster/_helm-chart-repositories/falco-security-charts.yaml new file mode 100644 index 000000000..8ca8c766d --- /dev/null +++ b/cluster/_helm-chart-repositories/falco-security-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: falco-security-charts + namespace: flux-system +spec: + interval: 10m + url: https://falcosecurity.github.io/charts + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/grafana-loki-charts.yaml b/cluster/_helm-chart-repositories/grafana-loki-charts.yaml new file mode 100644 index 000000000..7ea8973ec --- /dev/null +++ b/cluster/_helm-chart-repositories/grafana-loki-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: grafana-loki-charts + namespace: flux-system +spec: + interval: 10m + url: https://grafana.github.io/loki/charts + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/influxdata-charts.yaml b/cluster/_helm-chart-repositories/influxdata-charts.yaml new file mode 100644 index 000000000..dd33bd79c --- /dev/null +++ b/cluster/_helm-chart-repositories/influxdata-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: influxdata-charts + namespace: flux-system +spec: + interval: 10m + url: https://helm.influxdata.com/ + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/infracloudio-charts.yaml b/cluster/_helm-chart-repositories/infracloudio-charts.yaml new file mode 100644 index 000000000..fdf85620d --- /dev/null +++ b/cluster/_helm-chart-repositories/infracloudio-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: infracloudio-charts + namespace: flux-system +spec: + interval: 10m + url: https://infracloudio.github.io/charts + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/ingress-nginx-charts.yaml b/cluster/_helm-chart-repositories/ingress-nginx-charts.yaml new file mode 100644 index 000000000..31c83136e --- /dev/null +++ b/cluster/_helm-chart-repositories/ingress-nginx-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: ingress-nginx-charts + namespace: flux-system +spec: + interval: 10m + url: https://kubernetes.github.io/ingress-nginx + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/k8s-at-home.yaml b/cluster/_helm-chart-repositories/k8s-at-home.yaml new file mode 100644 index 000000000..5a8f7edf7 --- /dev/null +++ b/cluster/_helm-chart-repositories/k8s-at-home.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: k8s-at-home-charts + namespace: flux-system +spec: + interval: 10m + url: https://k8s-at-home.com/charts/ + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/kubernetes-dashboard-charts.yaml b/cluster/_helm-chart-repositories/kubernetes-dashboard-charts.yaml new file mode 100644 index 000000000..020ae427b --- /dev/null +++ b/cluster/_helm-chart-repositories/kubernetes-dashboard-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: kubernetes-dashboard-charts + namespace: flux-system +spec: + interval: 10m + url: https://kubernetes.github.io/dashboard/ + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/kubernetes-sigs-descheduler-charts.yaml b/cluster/_helm-chart-repositories/kubernetes-sigs-descheduler-charts.yaml new file mode 100644 index 000000000..f34c53088 --- /dev/null +++ b/cluster/_helm-chart-repositories/kubernetes-sigs-descheduler-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: kubernetes-sigs-descheduler-charts + namespace: flux-system +spec: + interval: 10m + url: https://kubernetes-sigs.github.io/descheduler + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/longhorn-charts.yaml b/cluster/_helm-chart-repositories/longhorn-charts.yaml new file mode 100644 index 000000000..21da9ff10 --- /dev/null +++ b/cluster/_helm-chart-repositories/longhorn-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: longhorn-charts + namespace: flux-system +spec: + interval: 10m + url: https://charts.longhorn.io + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/prometheus-community-charts.yaml b/cluster/_helm-chart-repositories/prometheus-community-charts.yaml new file mode 100644 index 000000000..e436e79db --- /dev/null +++ b/cluster/_helm-chart-repositories/prometheus-community-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: prometheus-community-charts + namespace: flux-system +spec: + interval: 10m + url: https://prometheus-community.github.io/helm-charts + timeout: 3m \ No newline at end of file diff --git a/cluster/_helm-chart-repositories/twuni-charts.yaml b/cluster/_helm-chart-repositories/twuni-charts.yaml new file mode 100644 index 000000000..28cbf72c4 --- /dev/null +++ b/cluster/_helm-chart-repositories/twuni-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: twuni-charts + namespace: flux-system +spec: + interval: 10m + url: https://helm.twun.io + timeout: 3m \ No newline at end of file diff --git a/cluster/flux-system/helm-chart-repositories.yaml b/cluster/flux-system/helm-chart-repositories.yaml deleted file mode 100644 index f485cddde..000000000 --- a/cluster/flux-system/helm-chart-repositories.yaml +++ /dev/null @@ -1,150 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: k8s-at-home-charts - namespace: flux-system -spec: - interval: 10m - url: https://k8s-at-home.com/charts/ - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: prometheus-community-charts - namespace: flux-system -spec: - interval: 10m - url: https://prometheus-community.github.io/helm-charts - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: falco-security-charts - namespace: flux-system -spec: - interval: 10m - url: https://falcosecurity.github.io/charts - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: ingress-nginx-charts - namespace: flux-system -spec: - interval: 10m - url: https://kubernetes.github.io/ingress-nginx - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: bitnami-charts - namespace: flux-system -spec: - interval: 10m - url: https://charts.bitnami.com/bitnami - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: kubernetes-sigs-descheduler-charts - namespace: flux-system -spec: - interval: 10m - url: https://kubernetes-sigs.github.io/descheduler - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: fairwinds-charts - namespace: flux-system -spec: - interval: 10m - url: https://charts.fairwinds.com/stable - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: banzaicloud-charts - namespace: flux-system -spec: - interval: 10m - url: https://kubernetes-charts.banzaicloud.com - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: influxdata-charts - namespace: flux-system -spec: - interval: 10m - url: https://helm.influxdata.com/ - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: infracloudio-charts - namespace: flux-system -spec: - interval: 10m - url: https://infracloudio.github.io/charts - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: twuni-charts - namespace: flux-system -spec: - interval: 10m - url: https://helm.twun.io - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: drone-charts - namespace: flux-system -spec: - interval: 10m - url: https://charts.drone.io - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: longhorn-charts - namespace: flux-system -spec: - interval: 10m - url: https://charts.longhorn.io - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: grafana-loki-charts - namespace: flux-system -spec: - interval: 10m - url: https://grafana.github.io/loki/charts - timeout: 3m ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: kubernetes-dashboard-charts - namespace: flux-system -spec: - interval: 10m - url: https://kubernetes.github.io/dashboard/ - timeout: 3m \ No newline at end of file diff --git a/cluster/flux-system/kustomization.yaml b/cluster/flux-system/kustomization.yaml index 958fc02e4..9476587c3 100644 --- a/cluster/flux-system/kustomization.yaml +++ b/cluster/flux-system/kustomization.yaml @@ -3,5 +3,4 @@ kind: Kustomization resources: - ./gotk-components.yaml - ./gotk-sync.yaml -- ./helm-chart-repositories.yaml - ./secrets.yaml \ No newline at end of file diff --git a/scripts/create-helmrelease-annotations.sh b/scripts/create-helmrelease-annotations.sh index ccba802b8..6a14228f6 100755 --- a/scripts/create-helmrelease-annotations.sh +++ b/scripts/create-helmrelease-annotations.sh @@ -4,7 +4,7 @@ shopt -s globstar # shellcheck disable=SC2155 REPO_ROOT=$(git rev-parse --show-toplevel) CLUSTER_ROOT="${REPO_ROOT}/cluster" -HELM_REPOSITORIES="${CLUSTER_ROOT}/flux-system/helm-chart-repositories" +HELM_REPOSITORIES="${CLUSTER_ROOT}/_helm-chart-repositories" # Ensure yq exist command -v yq >/dev/null 2>&1 || {