Run all components in one namespace

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

28 files changed, 148 insertions, 148 deletions

diff --git a/resources/config/aai-data/environments/simpledemo.json b/resources/config/aai-data/environments/simpledemo.json
index 99edba2..7b299f7 100644
--- a/resources/config/aai-data/environments/simpledemo.json
+++ b/resources/config/aai-data/environments/simpledemo.json
@@ -33,16 +33,16 @@
 		"PROJECT_HOME": "/opt/app/aai-traversal",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https://aai-servicei.{{.Values.nsPrefix}}:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -54,11 +54,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",
@@ -85,16 +85,16 @@
 		"PROJECT_HOME": "/opt/app/aai-resources",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -106,11 +106,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",
diff --git a/resources/config/data-router/dynamic/routes/entity-event.route b/resources/config/data-router/dynamic/routes/entity-event.route
index 81e1cf9..293688e 100644
--- a/resources/config/data-router/dynamic/routes/entity-event.route
+++ b/resources/config/data-router/dynamic/routes/entity-event.route
@@ -1,4 +1,4 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://dmaap.onap-message-router:3904"/>
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://dmaap.{{.Values.nsPrefix}}:3904"/>
   <to uri="bean:entityEventPolicy?method=process"/>
 </route>
diff --git a/resources/config/haproxy/haproxy.cfg b/resources/config/haproxy/haproxy.cfg
index d777327..6e6f489 100644
--- a/resources/config/haproxy/haproxy.cfg
+++ b/resources/config/haproxy/haproxy.cfg
@@ -95,7 +95,7 @@ backend IST_Default_8447
         balance roundrobin
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-resources.onap-aai  aai-resources.onap-aai:8447  port 8447 ssl verify none
+        server aai-resources.{{.Values.nsPrefix}}  aai-resources.{{.Values.nsPrefix}}:8447  port 8447 ssl verify none
 
 #######################
 # BACKEND 8446#########
@@ -105,7 +105,7 @@ backend IST_AAI_8446
         balance roundrobin
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-traversal.onap-aai aai-traversal.onap-aai:8446  port 8446 ssl verify none
+        server aai-traversal.{{.Values.nsPrefix}} aai-traversal.{{.Values.nsPrefix}}:8446  port 8446 ssl verify none
 
 listen IST_AAI_STATS
         mode http
diff --git a/resources/config/log/filebeat/filebeat.yml b/resources/config/log/filebeat/filebeat.yml
index f316b86..89c6932 100644
--- a/resources/config/log/filebeat/filebeat.yml
+++ b/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@ output.logstash:
   #List of logstash server ip addresses with port number.
   #But, in our case, this will be the loadbalancer IP address.
   #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
-  hosts: ["logstash.onap-log:5044"]
+  hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
   #If enable will do load balancing among availabe Logstash, automatically.
   loadbalance: true
 
diff --git a/resources/config/model-loader/appconfig/model-loader.properties b/resources/config/model-loader/appconfig/model-loader.properties
index 58b80d8..5d61fba 100644
--- a/resources/config/model-loader/appconfig/model-loader.properties
+++ b/resources/config/model-loader/appconfig/model-loader.properties
@@ -1,6 +1,6 @@
 # Model Loader Distribution Client Configuration
 ml.distribution.ACTIVE_SERVER_TLS_AUTH=false
-ml.distribution.ASDC_ADDRESS=sdc-be.onap-sdc:8443
+ml.distribution.ASDC_ADDRESS=sdc-be.{{.Values.nsPrefix}}:8443
 ml.distribution.CONSUMER_GROUP=aai-ml-group
 ml.distribution.CONSUMER_ID=aai-ml
 ml.distribution.ENVIRONMENT_NAME=AUTO
@@ -13,7 +13,7 @@ ml.distribution.USER=aai
 ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG
 
 # Model Loader AAI REST Client Configuration
-ml.aai.BASE_URL=https://aai-service.onap-aai:8443
+ml.aai.BASE_URL=https://aai-service.{{.Values.nsPrefix}}:8443
 ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/
 ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/
 ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images
diff --git a/resources/config/search-data-service/appconfig/elastic-search.properties b/resources/config/search-data-service/appconfig/elastic-search.properties
index 006fc6e..c19667a 100644
--- a/resources/config/search-data-service/appconfig/elastic-search.properties
+++ b/resources/config/search-data-service/appconfig/elastic-search.properties
@@ -1,5 +1,5 @@
 # ElasticSearch Configuration
 
 es.cluster-name=ES_AAI
-es.ip-address=elasticsearch.onap-aai
+es.ip-address=aai-elasticsearch.{{.Values.nsPrefix}}
 es.http-port=9200
diff --git a/resources/config/sparky-be/appconfig/aai.properties b/resources/config/sparky-be/appconfig/aai.properties
index 3b45428..aaca346 100644
--- a/resources/config/sparky-be/appconfig/aai.properties
+++ b/resources/config/sparky-be/appconfig/aai.properties
@@ -6,7 +6,7 @@
 #
 # The ip address/hostname and port to the desired AAI instance
 #
-aai.rest.host=aai-service.onap-aai
+aai.rest.host=aai-service.{{.Values.nsPrefix}}
 aai.rest.port=8443
 
 ############################## REST ##############################
@@ -84,4 +84,4 @@ aai.ssl.truststore.type=jks
 aai.taskProcessor.maxConcurrentWorkers=5
 aai.taskProcessor.transactionRateControllerEnabled=false
 aai.taskProcessor.numSamplesPerThreadForRunningAverage=100
-aai.taskProcessor.targetTPS=100
\ No newline at end of file
+aai.taskProcessor.targetTPS=100
diff --git a/resources/config/sparky-be/appconfig/elasticsearch.properties b/resources/config/sparky-be/appconfig/elasticsearch.properties
index 82b5af3..99aea27 100644
--- a/resources/config/sparky-be/appconfig/elasticsearch.properties
+++ b/resources/config/sparky-be/appconfig/elasticsearch.properties
@@ -7,7 +7,7 @@
 # The ip address/hostname and port to the desired AAI instance
 # For development it's recommended to use a local instance of ES
 #
-elasticsearch.ipAddress=elasticsearch.onap-aai
+elasticsearch.ipAddress=aai-elasticsearch.{{.Values.nsPrefix}}
 elasticsearch.httpPort=9200
 elasticsearch.javaApiPort=8443
 
@@ -69,4 +69,4 @@ elasticsearch.taskProcessor.maxConcurrentWorkers=5
 elasticsearch.taskProcessor.transactionRateControllerEnabled=false
 elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100
 elasticsearch.taskProcessor.targetTPS=100
-elasticsearch.clusterName=ES_AAI_LOCALHOST
\ No newline at end of file
+elasticsearch.clusterName=ES_AAI_LOCALHOST
diff --git a/resources/config/sparky-be/appconfig/portal/portal.properties b/resources/config/sparky-be/appconfig/portal/portal.properties
index 33d91cf..9014736 100644
--- a/resources/config/sparky-be/appconfig/portal/portal.properties
+++ b/resources/config/sparky-be/appconfig/portal/portal.properties
@@ -7,10 +7,10 @@ portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServic
 
 # Instance of ECOMP Portal where the app has been on-boarded
 # use insecure http for dev purposes to avoid self-signed certificate
-ecomp_rest_url = http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi
+ecomp_rest_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi
 
 # Standard global logon page
-ecomp_redirect_url = http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm
+ecomp_redirect_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm
 
 # Name of cookie to extract on login request
 csp_cookie_name = EPService
diff --git a/resources/config/sparky-be/appconfig/search-service.properties b/resources/config/sparky-be/appconfig/search-service.properties
index 5f4985a..57e3475 100644
--- a/resources/config/sparky-be/appconfig/search-service.properties
+++ b/resources/config/sparky-be/appconfig/search-service.properties
@@ -6,7 +6,7 @@
 #
 # The ip address/hostname and port to the desired Search Data Service instance
 #
-search-service.ipAddress=search-data-service.onap-aai
+search-service.ipAddress=search-data-service.{{.Values.nsPrefix}}
 search-service.httpPort=9509
 
 ############################## Indexes ##############################
@@ -29,4 +29,4 @@ search-service.type=default
 ############################## Certs ##############################
 search-service.ssl.cert-name=client-cert-onap.p12
 search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-search-service.ssl.keystore=tomcat_keystore
\ No newline at end of file
+search-service.ssl.keystore=tomcat_keystore
diff --git a/templates/aai-deployment-configmap.yaml b/templates/aai-deployment-configmap.yaml
index 40d4909..6684555 100644
--- a/templates/aai-deployment-configmap.yaml
+++ b/templates/aai-deployment-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-deployment-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/aai-deployment.yaml b/templates/aai-deployment.yaml
index 4e8d82f..db6da64 100644
--- a/templates/aai-deployment.yaml
+++ b/templates/aai-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.aaiServiceReplicas }}
   selector:
diff --git a/templates/aai-filebeat-configmap.yaml b/templates/aai-filebeat-configmap.yaml
index 5a123a5..2ca1ac2 100644
--- a/templates/aai-filebeat-configmap.yaml
+++ b/templates/aai-filebeat-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml
index dd7d7cc..c07214d 100644
--- a/templates/aai-resources-deployment.yaml
+++ b/templates/aai-resources-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-resources
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.aaiResourceReplicas }}
   selector:
diff --git a/templates/aai-resources-traversal-configmap.yaml b/templates/aai-resources-traversal-configmap.yaml
index ebd6913..cdcaae6 100644
--- a/templates/aai-resources-traversal-configmap.yaml
+++ b/templates/aai-resources-traversal-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-chef-config-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
 ---
@@ -11,7 +11,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-resources-environments-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
 ---
@@ -19,7 +19,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-resources-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/resources/logback.xml").AsConfig . | indent 2 }}
 ---
@@ -27,7 +27,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-traversal-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/traversal/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml
index 38e7fb0..84a0d0f 100644
--- a/templates/aai-traversal-deployment.yaml
+++ b/templates/aai-traversal-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-traversal
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.aaiTraversalReplicas }}
   selector:
@@ -48,7 +48,7 @@ spec:
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
         - name: RESOURCES_HOSTNAME
-          value: aai-resources.{{ .Values.nsPrefix }}-aai
+          value: aai-resources.{{ .Values.nsPrefix }}
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
diff --git a/templates/all-services.yaml b/templates/all-services.yaml
index 77f7dc1..01f24a7 100644
--- a/templates/all-services.yaml
+++ b/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hbase
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: hbase
 spec:
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-service
   annotations:
@@ -192,7 +192,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: model-loader-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: model-loader-service
 spec:
@@ -212,7 +212,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gremlin
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: gremlin
 spec:
@@ -227,16 +227,16 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: elasticsearch
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-elasticsearch
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    app: elasticsearch
+    app: aai-elasticsearch
 spec:
   ports:
-  - name: "elasticsearch-port"
+  - name: "aai-elasticsearch-port"
     port: 9200
   selector:
-    app: elasticsearch
+    app: aai-elasticsearch
   clusterIP: None
 #{{ end }}
 #{{ if not .Values.disableAaiSearchDataService }}
@@ -245,7 +245,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: search-data-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: search-data-service
 spec:
@@ -262,7 +262,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-traversal
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-traversal
 spec:
@@ -281,7 +281,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-resources
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-resources
 spec:
@@ -300,7 +300,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sparky-be
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sparky-be
 spec:
@@ -310,4 +310,4 @@ spec:
   selector:
     app: sparky-be
   clusterIP: None
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/templates/data-router-configmap.yaml b/templates/data-router-configmap.yaml
index 5782213..3de38a7 100644
--- a/templates/data-router-configmap.yaml
+++ b/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 }}
diff --git a/templates/data-router-deployment.yaml b/templates/data-router-deployment.yaml
index 6fb1751..610ecb6 100644
--- a/templates/data-router-deployment.yaml
+++ b/templates/data-router-deployment.yaml
@@ -2,18 +2,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: data-router
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-data-router
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.dataRouterReplicas }}
   selector:
     matchLabels:
-      app: data-router
+      app: aai-data-router
   template:
     metadata:
       labels:
-        app: data-router
-      name: data-router
+        app: aai-data-router
+      name: aai-data-router
     spec:
       initContainers:
       - command:
@@ -35,10 +35,10 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: init-sysctl
         volumeMounts:
-        - name: data-router-logs
+        - name: aai-data-router-logs
           mountPath: /logroot/
       containers:
-      - name: data-router
+      - name: aai-data-router
         image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         env:
@@ -62,29 +62,29 @@ spec:
           readOnly: true
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml
           subPath: aai_oxm_v8.xml
-          name: data-router-model-v8
+          name: aai-data-router-model-v8
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v9.xml
           subPath: aai_oxm_v9.xml
-          name: data-router-model-v9
+          name: aai-data-router-model-v9
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v10.xml
           subPath: aai_oxm_v10.xml
-          name: data-router-model-v10
+          name: aai-data-router-model-v10
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v11.xml
           subPath: aai_oxm_v11.xml
-          name: data-router-model-v11
+          name: aai-data-router-model-v11
         - mountPath:  /opt/app/data-router/config/auth
-          name: data-router-auth
+          name: aai-data-router-auth
         - mountPath:  /opt/app/data-router/config/data-router.properties
-          name: data-router-properties
+          name: aai-data-router-properties
           subPath: data-router.properties
         - mountPath: /opt/app/data-router/dynamic/routes/entity-event.route
           subPath: entity-event.route
-          name: data-router-dynamic-route
+          name: aai-data-router-dynamic-route
         - mountPath: /opt/app/data-router/dynamic/conf/entity-event-policy.xml
           subPath: entity-event-policy.xml
-          name: data-router-dynamic-policy
+          name: aai-data-router-dynamic-policy
         - mountPath: /logs/
-          name: data-router-logs
+          name: aai-data-router-logs
         ports:
         - containerPort: 9502
         readinessProbe:
@@ -96,31 +96,31 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: data-router-model-v8
+      - name: aai-data-router-model-v8
         configMap:
-          name: data-router-model-v8-configmap
-      - name: data-router-model-v9
+          name: aai-data-router-model-v8-configmap
+      - name: aai-data-router-model-v9
         configMap:
-          name: data-router-model-v9-configmap
-      - name: data-router-model-v10
+          name: aai-data-router-model-v9-configmap
+      - name: aai-data-router-model-v10
         configMap:
-          name: data-router-model-v10-configmap
-      - name: data-router-model-v11
+          name: aai-data-router-model-v10-configmap
+      - name: aai-data-router-model-v11
         configMap:
-          name: data-router-model-v11-configmap
-      - name: data-router-auth
+          name: aai-data-router-model-v11-configmap
+      - name: aai-data-router-auth
         secret:
-          secretName: data-router-secret
-      - name: data-router-properties
+          secretName: aai-data-router-secret
+      - name: aai-data-router-properties
         configMap:
-          name: data-router-prop-configmap
-      - name: data-router-dynamic-route
+          name: aai-data-router-prop-configmap
+      - name: aai-data-router-dynamic-route
         configMap:
-          name: data-router-dynamic-configmap
-      - name: data-router-dynamic-policy
+          name: aai-data-router-dynamic-configmap
+      - name: aai-data-router-dynamic-policy
         configMap:
-          name: data-router-dynamic-configmap
-      - name: data-router-logs
+          name: aai-data-router-dynamic-configmap
+      - name: aai-data-router-logs
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs"
       restartPolicy: Always
diff --git a/templates/elasticsearch-configmap.yaml b/templates/elasticsearch-configmap.yaml
index 4a02346..56b0252 100644
--- a/templates/elasticsearch-configmap.yaml
+++ b/templates/elasticsearch-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-elasticsearch-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/elasticsearch/config/elasticsearch.yml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/elasticsearch-deployment.yaml b/templates/elasticsearch-deployment.yaml
index 7eae172..1babb05 100644
--- a/templates/elasticsearch-deployment.yaml
+++ b/templates/elasticsearch-deployment.yaml
@@ -2,18 +2,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: elasticsearch
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-elasticsearch
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.elasticsearchReplicas }}
   selector:
     matchLabels:
-      app: elasticsearch
+      app: aai-elasticsearch
   template:
     metadata:
       labels:
-        app: elasticsearch
-      name: elasticsearch
+        app: aai-elasticsearch
+      name: aai-elasticsearch
     spec:
       initContainers:
       - command:
@@ -37,9 +37,9 @@ spec:
         volumeMounts:
         - name: elasticsearch-data
           mountPath: /logroot/
-      hostname: elasticsearch
+      hostname: aai-elasticsearch
       containers:
-      - name: elasticsearch
+      - name: aai-elasticsearch
         image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
diff --git a/templates/hbase-deployment.yaml b/templates/hbase-deployment.yaml
index 5b2a98c..f8ef613 100644
--- a/templates/hbase-deployment.yaml
+++ b/templates/hbase-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: hbase
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-hbase
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.hbaseReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: hbase
-      name: hbase
+      name: aai-hbase
     spec:
       hostname: hbase
       containers:
diff --git a/templates/modelloader-deployment-configmap.yaml b/templates/modelloader-deployment-configmap.yaml
index e5a59a1..9337f55 100644
--- a/templates/modelloader-deployment-configmap.yaml
+++ b/templates/modelloader-deployment-configmap.yaml
@@ -2,16 +2,16 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: model-loader-prop-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-model-loader-prop-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/model-loader.properties").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: model-loader-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-model-loader-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-model-loader-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/modelloader-deployment.yaml b/templates/modelloader-deployment.yaml
index c5a788c..e11df7c 100644
--- a/templates/modelloader-deployment.yaml
+++ b/templates/modelloader-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: model-loader-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-model-loader-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.modelLoaderReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: model-loader-service
-      name: model-loader-service
+      name: aai-model-loader-service
     spec:
       containers:
       - name: model-loader-service
@@ -56,10 +56,10 @@ spec:
           path: /etc/localtime
       - name: aai-model-loader-prop-config
         configMap:
-          name: model-loader-prop-configmap
+          name: aai-model-loader-prop-configmap
       - name: aai-model-loader-auth-config
         secret:
-          secretName: model-loader-secret
+          secretName: aai-model-loader-secret
       - name: filebeat-conf
         configMap:
           name: aai-filebeat-configmap
diff --git a/templates/search-data-service-configmap.yaml b/templates/search-data-service-configmap.yaml
index 8f707d4..43d9da0 100644
--- a/templates/search-data-service-configmap.yaml
+++ b/templates/search-data-service-configmap.yaml
@@ -2,16 +2,16 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: search-data-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-search-data-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: search-data-keystone-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-search-data-keystone-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/tomcat_keystore").AsSecrets . | indent 2 }}
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-search-policy-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }}
 ---
@@ -28,7 +28,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-search-data-service-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/search-data-service-deployment.yaml b/templates/search-data-service-deployment.yaml
index 7202e0d..fc5a0d2 100644
--- a/templates/search-data-service-deployment.yaml
+++ b/templates/search-data-service-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: search-data-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-search-data-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.searchDataServiceReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: search-data-service
-      name: search-data-service
+      name: aai-search-data-service
     spec:
       containers:
       - name: search-data-service
@@ -74,10 +74,10 @@ spec:
           path: /etc/localtime
       - name: aai-search-data-service-config
         configMap:
-          name: search-data-configmap
+          name: aai-search-data-configmap
       - name: aai-search-data-service-auth-config
         secret:
-          secretName: search-data-keystone-secret
+          secretName: aai-search-data-keystone-secret
       - name: aai-search-data-search-policy-config
         configMap:
           name: aai-search-policy-configmap
diff --git a/templates/sparky-be-deployment-configmap.yaml b/templates/sparky-be-deployment-configmap.yaml
index 590608b..3a0c7fb 100644
--- a/templates/sparky-be-deployment-configmap.yaml
+++ b/templates/sparky-be-deployment-configmap.yaml
@@ -2,32 +2,32 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sparky-be-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-sparky-be-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sparky-be-model-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-sparky-be-model-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/model/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sparky-be-portal-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-sparky-be-portal-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/portal/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: sparky-be-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-sparky-be-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -36,7 +36,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-sparky-be-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/sparky-be/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/sparky-be-deployment.yaml b/templates/sparky-be-deployment.yaml
index e533928..e73c7b3 100644
--- a/templates/sparky-be-deployment.yaml
+++ b/templates/sparky-be-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: sparky-be
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-sparky-be
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.sparkyReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: sparky-be
-      name: sparky-be
+      name: aai-sparky-be
     spec:
       containers:
       - name: sparky-be
@@ -83,16 +83,16 @@ spec:
           path: /etc/localtime
       - name: aai-sparky-be-config
         configMap:
-          name: sparky-be-configmap
+          name: aai-sparky-be-configmap
       - name: aai-sparky-be-model-config
         configMap:
-          name: sparky-be-model-configmap
+          name: aai-sparky-be-model-configmap
       - name: aai-sparky-be-portal-config
         configMap:
-          name: sparky-be-portal-configmap
+          name: aai-sparky-be-portal-configmap
       - name: aai-sparky-be-auth-config
         secret:
-          secretName: sparky-be-secret
+          secretName: aai-sparky-be-secret
       - name: filebeat-conf
         configMap:
           name: aai-filebeat-configmap