From ac1b3e650fbbb05f16df8b6f1b840870e9963e08 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 28 Nov 2017 15:47:31 -0500
Subject: Adjust UUI to latest (Amsterdam)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes:
    add uui-server
    fix uui health check
    add MSB registration endpoint to uui

Change-Id: I0f1b10a67e980fd134f28c559ab1396b2e9febb3
Issue-ID: OOM-474
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 kubernetes/uui/templates/all-services.yaml         | 29 +++++++++++++++++
 kubernetes/uui/templates/uui-deployment.yaml       |  3 ++
 .../uui/templates/uui-server-deployment.yaml       | 37 ++++++++++++++++++++++
 kubernetes/uui/values.yaml                         |  9 ++++--
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/uui/templates/uui-server-deployment.yaml

(limited to 'kubernetes')

diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index 9135622116..7b23b36808 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -25,4 +25,33 @@ spec:
   selector:
     app: uui
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableUuiServer }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: uui-server
+  name: uui-server
+  namespace: "{{ .Values.nsPrefix }}-uui"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "usecaseui-server",
+          "version": "v1",
+          "url": "/api/usecaseui/server/v1",
+          "protocol": "UI"
+          "port": "8080",
+          "visualRange":"1|0"
+      }
+      ]'
+spec:
+  ports:
+  - name: uui-server
+    nodePort: {{ .Values.uuiPortPrefix }}99
+    port: 8082
+  selector:
+    app: uui-server
+  type: NodePort
 #{{ end }}
\ No newline at end of file
diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml
index 41d33b194e..db7ac1a9da 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -24,6 +24,9 @@ spec:
           - -c
           - /home/uui/tomcat/bin/catalina.sh run
         name: uui
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
         ports:
         - containerPort: 8080
         readinessProbe:
diff --git a/kubernetes/uui/templates/uui-server-deployment.yaml b/kubernetes/uui/templates/uui-server-deployment.yaml
new file mode 100644
index 0000000000..2462a69be1
--- /dev/null
+++ b/kubernetes/uui/templates/uui-server-deployment.yaml
@@ -0,0 +1,37 @@
+#{{ if not .Values.disableUuiUui }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: uui-server
+  name: uui-server
+  namespace: "{{ .Values.nsPrefix }}-uui"
+spec:
+  selector:
+    matchLabels:
+      app: uui-server
+  template:
+    metadata:
+      labels:
+        app: uui-server
+      name: uui-server
+    spec:
+      containers:
+      - image: {{ .Values.uuiserver.image }}:{{ .Values.uuiserver.version }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: uui-server
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        - name: MR_ADDR
+          value: {{ .Values.mraddr }}
+        ports:
+        - containerPort: 8082
+        readinessProbe:
+          tcpSocket:
+            port: 8082
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index c233c76115..361c68a196 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -1,6 +1,11 @@
 nsPrefix: onap
 pullPolicy: Always
-uuiPortPrefix: 302
+uuiPortPrefix: 303
+msbaddr: msb-iag.onap-msb:80
+mraddr: dmaap.onap-message-router:3904
 image:
   uuiImage: nexus3.onap.org:10001/onap/usecase-ui
-  uuiVersion: latest
+  uuiVersion: v1.0.1
+uuiserver:
+  image: nexus3.onap.org:10001/onap/usecase-ui/usecase-ui-server
+  version: v1.0.1
-- 
cgit 1.2.3-korg