Run all components in one namespace

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

diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 85c4f01..385b5f4 100644 (file)
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
   name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: zookeeper
 spec:
@@ -12,12 +13,14 @@ spec:
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: global-kafka
 spec:
@@ -27,15 +30,28 @@ spec:
   selector:
     app: global-kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterDmaap }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: dmaap
     version: 1.0.0
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "message-router",
+          "version": "v1",
+          "url": "/",
+          "protocol": "REST",
+          "port": "3904",
+          "visualRange":"1"
+      }
+      ]'
 spec:
   ports:
   - name: mr1
@@ -47,3 +63,4 @@ spec:
   selector:
     app: dmaap
   type: NodePort
+#{{ end }}
\ No newline at end of file