Merge "Helm Chart Standardization of uui"

[oom.git] / kubernetes / policy / templates / policy-log-configmap.yaml

diff --git a/kubernetes/policy/templates/policy-log-configmap.yaml b/kubernetes/policy/templates/policy-log-configmap.yaml
index 24ad45e..3a62030 100644 (file)
--- a/kubernetes/policy/templates/policy-log-configmap.yaml
+++ b/kubernetes/policy/templates/policy-log-configmap.yaml
@@ -1,27 +1,41 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
 #{{ if not .Values.disablePolicyPap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: policy-pap-log-configmap
-  namespace: {{ .Values.nsPrefix }}-policy
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/config/log/xacml-pap-rest/*").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/xacml-pap-rest/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: policy-sdk-log-configmap
-  namespace: {{ .Values.nsPrefix }}-policy
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/config/log/ep_sdk_app/*").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/ep_sdk_app/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: policy-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}-policy
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{  (.Files.Glob "resources/config/log/filebeat/*").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
 #{{ end }}
 #{{ if not .Values.disablePolicyPdp }}
 ---
@@ -29,9 +43,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: policy-pdp-log-configmap
-  namespace: {{ .Values.nsPrefix }}-policy
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/config/log/xacml-pdp-rest/*").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/xacml-pdp-rest/*").AsConfig . | indent 2 }}
 #{{ end }}
 #{{ if not .Values.disablePolicyDrools }}
 ---
@@ -39,7 +53,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: policy-drools-log-configmap
-  namespace: {{ .Values.nsPrefix }}-policy
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/config/log/drools/*").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/drools/*").AsConfig . | indent 2 }}
 #{{ end }}