Run all components in one namespace

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

1 files changed, 8 insertions, 8 deletions

diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index 28ca0303b1..b676e3c6d1 100644
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: portaldb
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portaldb
 spec:
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: portalapps
   name: portalapps
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -58,9 +58,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: vnc-portal
-  name: vnc-portal
-  namespace: "{{ .Values.nsPrefix }}-portal"
+    app: portal-vnc
+  name: portal-vnc
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: tcp-1
@@ -72,7 +72,7 @@ spec:
     targetPort: 5900
     nodePort: {{ .Values.nodePortPrefix }}12
   selector:
-    app: vnc-portal
+    app: portal-vnc
   type: NodePort
 #{{ end }}
 #{{ if not .Values.disablePortalPortalwidgets }}
@@ -81,7 +81,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portalwidgets
 spec:
@@ -91,4 +91,4 @@ spec:
   selector:
     app: portalwidgets
   clusterIP: None
-#{{ end }}
\ No newline at end of file
+#{{ end }}