Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMAAP][MR] Update hardcoded certificates
[oom.git]
/
kubernetes
/
dmaap
/
components
/
message-router
/
templates
/
configmap.yaml
diff --git
a/kubernetes/dmaap/components/message-router/templates/configmap.yaml
b/kubernetes/dmaap/components/message-router/templates/configmap.yaml
index
a253c51
..
7ca9bd8
100644
(file)
--- 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:
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" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-38,13
+38,12
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
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:
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" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-52,9
+51,8
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
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:
apiVersion: v1
kind: ConfigMap
metadata:
@@
-96,5
+94,3
@@
data:
{{ tpl (.Files.Glob "resources/config/dmaap/jmx-mrservice-prometheus.yml").AsConfig . | indent 2 }}
---
{{ end }}
{{ tpl (.Files.Glob "resources/config/dmaap/jmx-mrservice-prometheus.yml").AsConfig . | indent 2 }}
---
{{ end }}
-
-