diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-05-21 16:38:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-21 16:38:41 +0000 |
| commit | ba3de83903bfc5ddddd3d2d2349a5a2b7aeae1cb (patch) | |
| tree | d273544b499ad862e0601e5fc315df8afe28e546 | |
| parent | 5f17b51bae1c91155ff7f1c11281d4706bc07b8f (diff) | |
| parent | 068a2db7524dd95635a2fe5ca7f45522649f52cd (diff) | |
Merge "Add etcd to requirements.yaml"
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: |