summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiran Kamineni <kiran.k.kamineni@intel.com>2019-05-20 17:22:36 -0700
committerKiran Kamineni <kiran.k.kamineni@intel.com>2019-05-20 17:22:43 -0700
commit068a2db7524dd95635a2fe5ca7f45522649f52cd (patch)
tree3eae6ddefcfcaa8be7fa4c66566db4a66df30ff9
parent56c00a827fea30b5cc71a6a70639ceb7f03ad895 (diff)
Add etcd to requirements.yaml
Add etcd to requirements.yaml and add the service name to the configuration file Issue-ID: MULTICLOUD-638 Change-Id: Idef37e50f535dcb79e39e5cebfd2c95c660b8e3c Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json1
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/values.yaml8
3 files changed, 12 insertions, 1 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
index 566af50cfe..77546853ca 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
@@ -22,4 +22,6 @@ dependencies:
- name: mongo
version: ~4.x-0
repository: '@local'
-
+ - name: etcd
+ version: ~4.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
index e451421a5b..d6fa40d471 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
+++ b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
@@ -6,5 +6,6 @@
"database-type": "mongo",
"database-address": "multicloud-k8s-mongo",
+ "etcd-ip": "multicloud-k8s-etcd",
"plugin-dir": "/opt/multicloud/k8splugin/plugins"
} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
index 15aade560d..22ddd17ead 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
@@ -75,6 +75,14 @@ mongo:
enabled: true
disableNfsProvisioner: true
+#etcd chart overrides for k8splugin
+etcd:
+ nameOverride: multicloud-k8s-etcd
+ service:
+ name: multicloud-k8s-etcd
+ persistence:
+ mountSubPath: multicloud-k8s/etcd/data
+ enabled: true
# No persistence right now as we rely on Mongo to handle that
persistence: