From 071001aa85bfdc06181aedd21a4a3a118fec7883 Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Wed, 9 Dec 2020 10:35:48 +0100 Subject: [PATCH] [CONSUL] 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: Id91e9afe881fa744e5398425d0b4438c15488374 Issue-ID: OOM-2562 --- kubernetes/consul/{charts => components}/consul-server/Chart.yaml | 0 .../consul/{charts => components}/consul-server/requirements.yaml | 0 .../consul/{charts => components}/consul-server/templates/NOTES.txt | 0 .../{charts => components}/consul-server/templates/service.yaml | 0 .../{charts => components}/consul-server/templates/statefulset.yaml | 0 kubernetes/consul/{charts => components}/consul-server/values.yaml | 0 kubernetes/consul/requirements.yaml | 4 ++++ 7 files changed, 4 insertions(+) rename kubernetes/consul/{charts => components}/consul-server/Chart.yaml (100%) rename kubernetes/consul/{charts => components}/consul-server/requirements.yaml (100%) rename kubernetes/consul/{charts => components}/consul-server/templates/NOTES.txt (100%) rename kubernetes/consul/{charts => components}/consul-server/templates/service.yaml (100%) rename kubernetes/consul/{charts => components}/consul-server/templates/statefulset.yaml (100%) rename kubernetes/consul/{charts => components}/consul-server/values.yaml (100%) diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml similarity index 100% rename from kubernetes/consul/charts/consul-server/Chart.yaml rename to kubernetes/consul/components/consul-server/Chart.yaml diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml similarity index 100% rename from kubernetes/consul/charts/consul-server/requirements.yaml rename to kubernetes/consul/components/consul-server/requirements.yaml diff --git a/kubernetes/consul/charts/consul-server/templates/NOTES.txt b/kubernetes/consul/components/consul-server/templates/NOTES.txt similarity index 100% rename from kubernetes/consul/charts/consul-server/templates/NOTES.txt rename to kubernetes/consul/components/consul-server/templates/NOTES.txt diff --git a/kubernetes/consul/charts/consul-server/templates/service.yaml b/kubernetes/consul/components/consul-server/templates/service.yaml similarity index 100% rename from kubernetes/consul/charts/consul-server/templates/service.yaml rename to kubernetes/consul/components/consul-server/templates/service.yaml diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/components/consul-server/templates/statefulset.yaml similarity index 100% rename from kubernetes/consul/charts/consul-server/templates/statefulset.yaml rename to kubernetes/consul/components/consul-server/templates/statefulset.yaml diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/components/consul-server/values.yaml similarity index 100% rename from kubernetes/consul/charts/consul-server/values.yaml rename to kubernetes/consul/components/consul-server/values.yaml diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml index 2161e6e16e..bde1c36b17 100644 --- a/kubernetes/consul/requirements.yaml +++ b/kubernetes/consul/requirements.yaml @@ -23,3 +23,7 @@ dependencies: - name: repositoryGenerator version: ~7.x-0 repository: '@local' + - name: consul-server + version: ~7.x-0 + repository: 'file://components/consul-server' + condition: cds-command-executor.enabled -- 2.16.6