aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Latusek <jk.latusek@gmail.com>2020-12-09 10:35:48 +0100
committerJakub Latusek <j.latusek@samsung.com>2020-12-09 10:35:48 +0100
commit071001aa85bfdc06181aedd21a4a3a118fec7883 (patch)
tree87dbf33460dce6ef89d4149967396e5d186f7c94
parent208c952967efcd791eb0ffc5432c92284bc5c881 (diff)
[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 <j.latusek@samsung.com> Change-Id: Id91e9afe881fa744e5398425d0b4438c15488374 Issue-ID: OOM-2562
-rw-r--r--kubernetes/consul/components/consul-server/Chart.yaml (renamed from kubernetes/consul/charts/consul-server/Chart.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/requirements.yaml (renamed from kubernetes/consul/charts/consul-server/requirements.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/NOTES.txt (renamed from kubernetes/consul/charts/consul-server/templates/NOTES.txt)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/service.yaml (renamed from kubernetes/consul/charts/consul-server/templates/service.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/statefulset.yaml (renamed from kubernetes/consul/charts/consul-server/templates/statefulset.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/values.yaml (renamed from kubernetes/consul/charts/consul-server/values.yaml)0
-rw-r--r--kubernetes/consul/requirements.yaml4
7 files changed, 4 insertions, 0 deletions
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index 8a94ed5b68..8a94ed5b68 100644
--- a/kubernetes/consul/charts/consul-server/Chart.yaml
+++ b/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
index 6963d207e7..6963d207e7 100644
--- a/kubernetes/consul/charts/consul-server/requirements.yaml
+++ b/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
index 157fe92427..157fe92427 100644
--- a/kubernetes/consul/charts/consul-server/templates/NOTES.txt
+++ b/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
index c24ddfb7e4..c24ddfb7e4 100644
--- a/kubernetes/consul/charts/consul-server/templates/service.yaml
+++ b/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
index 16fda3a510..16fda3a510 100644
--- a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml
+++ b/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
index 48a26effd7..48a26effd7 100644
--- a/kubernetes/consul/charts/consul-server/values.yaml
+++ b/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