Adjust UUI to latest
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>
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index 9135622..7b23b36 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -25,4 +25,33 @@
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 41d33b1..db7ac1a 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -24,6 +24,9 @@
- -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 0000000..2462a69
--- /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 c233c76..361c68a 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