summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-09-23 09:02:31 -0400
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-02-12 14:05:31 +0000
commitc70bc7e2bb69ee409d78ba433dbff30f2cac04b9 (patch)
treed1dee1c5cd47e77c42a14ca799c7dbfecb0ba07a /kubernetes/dcaegen2/components/dcae-bootstrap/resources/config
parent4e7114252d86f891420318391bcfb6d0f929ed56 (diff)
Pick up new tls init container
Remove unneeded dashboard inputs file Prepend release name to filebeat configmap name Issue-ID: DCAEGEN2-917 Issue-ID: DCAEGEN2-1923 Issue-ID: DCAEGEN2-1805 Signed-off-by: Jack Lucas <jflucas@research.att.com> Change-Id: I53ef20046d7e16c4e0a2defd41c846d91af4ec09
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-bootstrap/resources/config')
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json
index d459d5bb95..e5057427e8 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json
@@ -28,11 +28,11 @@
"config_path": "/usr/share/filebeat/filebeat.yml",
"config_subpath": "filebeat.yml",
"image" : "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}",
- "config_map" : "dcae-filebeat-configmap"
+ "config_map" : "{{ include "common.release" . }}-dcae-filebeat-configmap"
},
"tls":
{
- "cert_path": "/opt/tls/shared",
+ "cert_path": "/opt/app/osaaf",
"image": "{{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}",
"component_ca_cert_path": "/opt/dcae/cacert/cacert.pem",
"ca_cert_configmap": "{{ include "common.fullname" . }}-dcae-cacert"