diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-03-31 20:36:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-03-31 20:36:11 +0000 |
| commit | 340267ab46f41493c1509b9d77a3ccbdb529eb27 (patch) | |
| tree | b0f28ddbcdc8ce1a0897734ab400d98b8255a09f /kubernetes/dmaap/components/message-router/templates/configmap.yaml | |
| parent | 20a7b21e9ceb5d2018d83b1a6b7b8672db84eaeb (diff) | |
| parent | d060b429ac549682dce9dd8b1225aa6726b74181 (diff) | |
Merge "[DMAAP][MR] Update hardcoded certificates" into guilin
Diffstat (limited to 'kubernetes/dmaap/components/message-router/templates/configmap.yaml')
| -rw-r--r-- | kubernetes/dmaap/components/message-router/templates/configmap.yaml | 12 |
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 }} - - |