Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[VFC] Use log template"
[oom.git]
/
kubernetes
/
multicloud
/
templates
/
configmap.yaml
diff --git
a/kubernetes/multicloud/templates/configmap.yaml
b/kubernetes/multicloud/templates/configmap.yaml
index
dc356a3
..
c76f531
100644
(file)
--- a/
kubernetes/multicloud/templates/configmap.yaml
+++ b/
kubernetes/multicloud/templates/configmap.yaml
@@
-1,5
+1,6
@@
{{/*
# Copyright © 2017 Amdocs, Bell Canada
{{/*
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-14,19
+15,18
@@
# limitations under the License.
*/}}
# limitations under the License.
*/}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: multicloud-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+{{ include "common.log.configMap" . }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-log-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/framework/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/log/framework/*").AsConfig . | indent 2 }}
---
@@
-35,5
+35,10
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-provider-plugin-configmap
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-provider-plugin-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/provider-plugin.json").AsConfig . | indent 2 }}
data:
{{ tpl (.Files.Glob "resources/config/provider-plugin.json").AsConfig . | indent 2 }}