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 "[UUI] Service Mesh Compliance for UUI"
[oom.git]
/
kubernetes
/
vid
/
templates
/
configmap.yaml
diff --git
a/kubernetes/vid/templates/configmap.yaml
b/kubernetes/vid/templates/configmap.yaml
index
f7dbf07
..
5c423e6
100644
(file)
--- a/
kubernetes/vid/templates/configmap.yaml
+++ b/
kubernetes/vid/templates/configmap.yaml
@@
-1,3
+1,4
@@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright © 2017 Amdocs, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-11,19
+12,32
@@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+*/}}
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/vid/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/log/vid/*").AsConfig . | indent 2 }}
---
+{{ include "common.log.configMap" . }}
+---
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-
filebeat-configmap
+ name: {{ include "common.fullname" . }}-
db-init
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
data:
data:
-{{ tpl (.Files.Glob "resources/config/
log/filebeat/*
").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/
db_cmd.sh
").AsConfig . | indent 2 }}