From 8bf97e0adc10bcda303047b1ee461c445983e861 Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Wed, 9 Dec 2020 10:43:23 +0100 Subject: [PATCH] [MULTICLOUD] Move components to component dir Helm 3.4 requires the dependencies in the charts dir to be included in the requirements. Dependencies need to be moved to the components folder Signed-off-by: Jakub Latusek Change-Id: I7af44019a47e79e3132142352518c2aa70406422 Issue-ID: OOM-2562 --- .../{charts => components}/prometheus-alertmanager/Chart.yaml | 0 .../prometheus-alertmanager/resources/config/alertmanager.yml | 0 .../prometheus-alertmanager/templates/configmap.yaml | 0 .../prometheus-alertmanager/templates/deployment.yaml | 0 .../prometheus-alertmanager/templates/pv.yaml | 0 .../prometheus-alertmanager/templates/pvc.yaml | 0 .../prometheus-alertmanager/templates/service.yaml | 0 .../{charts => components}/prometheus-alertmanager/values.yaml | 0 .../{charts => components}/prometheus-grafana/Chart.yaml | 0 .../prometheus-grafana/resources/config/grafana.ini | 0 .../prometheus-grafana/templates/configmap.yaml | 0 .../prometheus-grafana/templates/deployment.yaml | 0 .../{charts => components}/prometheus-grafana/templates/pv.yaml | 0 .../{charts => components}/prometheus-grafana/templates/pvc.yaml | 0 .../prometheus-grafana/templates/service.yaml | 0 .../{charts => components}/prometheus-grafana/values.yaml | 0 .../multicloud/components/multicloud-prometheus/requirements.yaml | 6 ++++++ 17 files changed, 6 insertions(+) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/Chart.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/resources/config/alertmanager.yml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/templates/configmap.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/templates/deployment.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/templates/pv.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/templates/pvc.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/templates/service.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-alertmanager/values.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/Chart.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/resources/config/grafana.ini (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/templates/configmap.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/templates/deployment.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/templates/pv.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/templates/pvc.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/templates/service.yaml (100%) rename kubernetes/multicloud/components/multicloud-prometheus/{charts => components}/prometheus-grafana/values.yaml (100%) diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml similarity index 100% rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml index 0328610623..b17f2701f0 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml @@ -20,3 +20,9 @@ dependencies: - name: repositoryGenerator version: ~7.x-0 repository: '@local' + - name: prometheus-alertmanager + version: ~7.x-0 + repository: 'file://components/prometheus-alertmanager' + - name: prometheus-grafana + version: ~7.x-0 + repository: 'file://components/prometheus-grafana' \ No newline at end of file -- 2.16.6