diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-04-22 22:42:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-22 22:42:08 +0000 |
| commit | 927588ef469f35709f1800c5d3a4f2b563cd4528 (patch) | |
| tree | ff89b96c7e7a400b0829fce51b0e30f40d2b2b96 /kubernetes/appc/templates/configmap.yaml | |
| parent | 079eb677c8338acdea23b013f6bf25d8e269f25c (diff) | |
| parent | 531d03fe9bbcff204520eb4e7bb606bc20a50cbb (diff) | |
Merge "[APPC] use common templates for logs"
Diffstat (limited to 'kubernetes/appc/templates/configmap.yaml')
| -rw-r--r-- | kubernetes/appc/templates/configmap.yaml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/kubernetes/appc/templates/configmap.yaml b/kubernetes/appc/templates/configmap.yaml index 72dc6172dc..fe206a9322 100644 --- a/kubernetes/appc/templates/configmap.yaml +++ b/kubernetes/appc/templates/configmap.yaml @@ -119,19 +119,6 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.fullname" . }}-filebeat - 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/log4j/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: name: {{ include "common.fullname" . }}-logging-cfg namespace: {{ include "common.namespace" . }} labels: @@ -141,3 +128,5 @@ metadata: heritage: {{ .Release.Service }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} + +{{ include "common.log.configMap" . }} |