commit c70bc7e2bb69ee409d78ba433dbff30f2cac04b9
author Jack Lucas <jflucas@research.att.com> Mon Sep 23 09:02:31 2019 -0400
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Wed Feb 12 14:05:31 2020 +0000
tree d1dee1c5cd47e77c42a14ca799c7dbfecb0ba07a
parent 4e7114252d86f891420318391bcfb6d0f929ed56

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

kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml

diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml
index b8dadaa..f1add2d 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml
@@ -27,7 +27,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dcae-filebeat-configmap
+  name: {{ include "common.release" . }}-dcae-filebeat-configmap
   namespace: {{include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
@@ -42,7 +42,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dcae-filebeat-configmap
+  name: {{ include "common.release" . }}-dcae-filebeat-configmap
   namespace: {{ .Values.dcae_ns }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}