Run all components in one namespace

[oom.git] / kubernetes / portal / templates / all-services.yaml

diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index b3fabb2..b676e3c 100644 (file)
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disablePortalPortaldb }}
 apiVersion: v1
 kind: Service
 metadata:
   name: portaldb
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portaldb
 spec:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: portaldb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePortalPortalapps }}
 ---
 apiVersion: v1
 kind: Service
@@ -19,7 +22,18 @@ metadata:
   labels:
     app: portalapps
   name: portalapps
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "portal",
+          "version": "v2",
+          "url": "/",
+          "protocol": "REST"
+          "port": "8989",
+          "visualRange":"1"
+      }
+      ]'
 spec:
   ports:
   - name: portal-1
@@ -37,14 +51,16 @@ spec:
   selector:
     app: portalapps
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePortalVncPortal }}
 ---
 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
@@ -56,14 +72,16 @@ spec:
     targetPort: 5900
     nodePort: {{ .Values.nodePortPrefix }}12
   selector:
-    app: vnc-portal
+    app: portal-vnc
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePortalPortalwidgets }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portalwidgets
 spec:
@@ -73,3 +91,4 @@ spec:
   selector:
     app: portalwidgets
   clusterIP: None
+#{{ end }}