| commit | ba3de83903bfc5ddddd3d2d2349a5a2b7aeae1cb | [log] [tgz] |
|---|---|---|
| author | Borislav Glozman <Borislav.Glozman@amdocs.com> | Tue May 21 16:38:41 2019 +0000 |
| committer | Gerrit Code Review <gerrit@onap.org> | Tue May 21 16:38:41 2019 +0000 |
| tree | d273544b499ad862e0601e5fc315df8afe28e546 | |
| parent | 5f17b51bae1c91155ff7f1c11281d4706bc07b8f [diff] | |
| parent | 068a2db7524dd95635a2fe5ca7f45522649f52cd [diff] |
Merge "Add etcd to requirements.yaml"
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml index 566af50..7754685 100644 --- a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml +++ b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
@@ -22,4 +22,6 @@ - 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 e451421..d6fa40d 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 15aade5..22ddd17 100644 --- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
@@ -75,6 +75,14 @@ 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: