summaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap/components/message-router/templates/configmap.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-02-10 12:11:53 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-03-31 14:37:24 +0000
commitd060b429ac549682dce9dd8b1225aa6726b74181 (patch)
tree88840dfedffbf60c510f1e60abdd1df4e0bac4fe /kubernetes/dmaap/components/message-router/templates/configmap.yaml
parent81054fe936c851f10c18c03980de6f9548efe6b1 (diff)
[DMAAP][MR] Update hardcoded certificates
Instead of hardcoding certificates inside the container, add them into helm charts, so it's easier to update. Issue-ID: DMAAP-1547 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I7fcb8831539d8d9d5d25bcaae44a3c66672f7b1a (cherry picked from commit e5b6ffc663a2314fd545aa540cbdee6380adf00b)
Diffstat (limited to 'kubernetes/dmaap/components/message-router/templates/configmap.yaml')
-rw-r--r--kubernetes/dmaap/components/message-router/templates/configmap.yaml12
1 files changed, 4 insertions, 8 deletions
diff --git a/kubernetes/dmaap/components/message-router/templates/configmap.yaml b/kubernetes/dmaap/components/message-router/templates/configmap.yaml
index a253c512eb..7ca9bd872a 100644
--- a/kubernetes/dmaap/components/message-router/templates/configmap.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/configmap.yaml
@@ -30,7 +30,7 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-cadi-prop-configmap
+ name: {{ include "common.fullname" . }}-logback-xml-configmap
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -38,13 +38,12 @@ metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/dmaap/cadi.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/dmaap/logback.xml").AsConfig . | indent 2 }}
---
-
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-logback-xml-configmap
+ name: {{ include "common.fullname" . }}-etc
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -52,9 +51,8 @@ metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/dmaap/logback.xml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/etc/*").AsConfig . | indent 2 }}
---
-
apiVersion: v1
kind: ConfigMap
metadata:
@@ -96,5 +94,3 @@ data:
{{ tpl (.Files.Glob "resources/config/dmaap/jmx-mrservice-prometheus.yml").AsConfig . | indent 2 }}
---
{{ end }}
-
-