X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Fall-services.yaml;h=01f24a7dd2e849c4bb23f0c0dfebb6ed412cea1a;hb=8bfc6cf8c3d338c84c48201f7a4f274958e721a9;hp=77f7dc1f9bb8690bd768bfccf1fcd5843aa661e2;hpb=f0a34e22011b4323bbd6a51ad313d6e547808101;p=oom.git

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 77f7dc1f9b..01f24a7dd2 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/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 }}