summaryrefslogtreecommitdiffstats
path: root/kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-04-27 13:15:51 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-27 13:15:51 +0000
commit38dfe516feabe7bdb41c3c6ccd4fd6bba28588a6 (patch)
tree7b1b4ae79ce7d3fc9a895e2ef533e9001e977374 /kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml
parentc5c722c70df7be7ed0693b8169d876aa57b202c4 (diff)
parent8c2a16283583a6e830bdf915bdbfee9f49b8b992 (diff)
Merge "[CLAMP] use common templates for logs"
Diffstat (limited to 'kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml')
-rw-r--r--kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml15
1 files changed, 2 insertions, 13 deletions
diff --git a/kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml b/kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml
index 0011c6a6d4..f66312c741 100644
--- a/kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml
+++ b/kubernetes/clamp/charts/clamp-backend/templates/configmap.yaml
@@ -26,16 +26,5 @@ metadata:
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
spring_application_json: {{ tpl .Values.config.springApplicationJson . | quote }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.release" . }}-clamp-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+
+{{ include "common.log.configMap" . }}