Merge "Improve error handling"

diff --git a/kubernetes/oom/Chart.yaml b/kubernetes/kube2msb/Chart.yaml
similarity index 100%
rename from kubernetes/oom/Chart.yaml
rename to kubernetes/kube2msb/Chart.yaml

diff --git a/kubernetes/oom/templates/oom-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
similarity index 60%
rename from kubernetes/oom/templates/oom-registrator-deployment.yaml
rename to kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
index 1432949..502c1fa 100644 (file)
--- a/kubernetes/oom/templates/oom-registrator-deployment.yaml
+++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
@@ -1,24 +1,24 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: oom-registrator
-  namespace: "{{ .Values.nsPrefix }}-oom"
+  name: kube2msb-registrator
+  namespace: "{{ .Values.nsPrefix }}-kube2msb"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: oom-registrator
+      app: kube2msb-registrator
   template:
     metadata:
       labels:
-        app: oom-registrator
-      name: oom-registrator
+        app: kube2msb-registrator
+      name: kube2msb-registrator
     spec:
-      hostname: oom-registrator
+      hostname: kube2msb-registrator
       containers:
       - args:
         image: {{ .Values.image.kube2msb }}
-        name: oom-registrator
+        name: kube2msb-registrator
         env:
         - name: KUBE_MASTER_URL
           value: {{ .Values.kubeMasterUrl }}

diff --git a/kubernetes/oom/values.yaml b/kubernetes/kube2msb/values.yaml
similarity index 100%
rename from kubernetes/oom/values.yaml
rename to kubernetes/kube2msb/values.yaml

diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index aeb4f5e..f752608 100644 (file)
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -34,27 +34,27 @@ kind: Service
 metadata:
   name: msb-iag
   namespace: "{{ .Values.nsPrefix }}-msb"
-    labels:
-      app: msb-iag
-  spec:
-    ports:
-      - port: {{ .Values.iagPort }}
-        nodePort: {{ .Values.iagNodePort }}
-    selector:
-      app: msb-iag
-    type: NodePort
-  ---
-  apiVersion: v1
-  kind: Service
-  metadata:
-    name: msb-eag
-    namespace: "{{ .Values.nsPrefix }}-msb"
-    labels:
-      app: msb-eag
-  spec:
-    ports:
-      - port: {{ .Values.eagPort }}
-        nodePort: {{ .Values.eagNodePort }}
-    selector:
-      app: msb-eag
-    type: NodePort
\ No newline at end of file
+  labels:
+    app: msb-iag
+spec:
+  ports:
+    - port: {{ .Values.iagPort }}
+      nodePort: {{ .Values.iagNodePort }}
+  selector:
+    app: msb-iag
+  type: NodePort
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: msb-eag
+  namespace: "{{ .Values.nsPrefix }}-msb"
+  labels:
+    app: msb-eag
+spec:
+  ports:
+    - port: {{ .Values.eagPort }}
+      nodePort: {{ .Values.eagNodePort }}
+  selector:
+    app: msb-eag
+  type: NodePort

diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index b3fabb2..b819b1c 100644 (file)
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -20,6 +20,17 @@ metadata:
     app: portalapps
   name: portalapps
   namespace: "{{ .Values.nsPrefix }}-portal"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "portal",
+          "version": "v2",
+          "url": "/",
+          "protocol": "REST"
+          "port": "8989",
+          "visualRange":"1"
+      }
+      ]'
 spec:
   ports:
   - name: portal-1