commit 8bfc6cf8c3d338c84c48201f7a4f274958e721a9
author BorislavG <Borislav.Glozman@amdocs.com> Tue Feb 27 15:04:26 2018 +0000
committer Alexis de Talhouët <alexis.de_talhouet@bell.ca> Thu Mar 01 18:10:31 2018 +0000
tree 2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1
parent f0a34e22011b4323bbd6a51ad313d6e547808101

Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

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..b1a9e09 100644
--- a/kubernetes/policy/templates/policy-log-configmap.yaml
+++ b/kubernetes/policy/templates/policy-log-configmap.yaml
@@ -3,25 +3,25 @@
 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 +29,9 @@
 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 +39,7 @@
 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 }}