From 8bfc6cf8c3d338c84c48201f7a4f274958e721a9 Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Tue, 27 Feb 2018 15:04:26 +0000
Subject: Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
---
 .../aai/templates/data-router-configmap.yaml       | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'kubernetes/aai/templates/data-router-configmap.yaml')

diff --git a/kubernetes/aai/templates/data-router-configmap.yaml b/kubernetes/aai/templates/data-router-configmap.yaml
index 57822135b2..3de38a740a 100644
--- a/kubernetes/aai/templates/data-router-configmap.yaml
+++ b/kubernetes/aai/templates/data-router-configmap.yaml
@@ -2,48 +2,48 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-prop-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-prop-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/data-router.properties").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v8-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v8-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v8.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v9-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v9-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v9.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v10-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v10-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v10.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v11-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v11-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v11.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: data-router-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -51,8 +51,8 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-dynamic-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-dynamic-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/dynamic/routes/entity-event.route").AsConfig . | indent 2 }}
 {{ tpl (.Files.Glob "resources/config/data-router/dynamic/conf/entity-event-policy.xml").AsConfig . | indent 2 }}
-- 
cgit 1.2.3-korg