Merge "Add msb and kube2msb registrator to oneclick"

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index 0d9a68a..04c984d 100644 (file)
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -76,7 +76,7 @@ metadata:
           "serviceName": "policy-pdp",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
           "port": "8081",
           "visualRange":"1"
       },
@@ -84,7 +84,7 @@ metadata:
           "serviceName": "policy-pdp-deprecated",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
           "port": "8081",
           "visualRange":"1",
           "path":"/pdp"

diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 88cbe8e..2cd895b 100644 (file)
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -54,6 +54,26 @@ metadata:
     app: sdc-be
   name: sdc-be
   namespace: "{{ .Values.nsPrefix }}-sdc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "sdc-deprecated",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1",
+          "path":"/sdc/v1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-be-port-8443
@@ -73,6 +93,17 @@ metadata:
     app: sdc-fe
   name: sdc-fe
   namespace: "{{ .Values.nsPrefix }}-sdc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc-gui",
+          "version": "v1",
+          "url": "/sdc1",
+          "protocol": "UI",
+          "port": "8181",
+          "visualRange":"0|1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-fe-port-9443