diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2017-11-30 15:35:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-30 15:35:19 +0000 |
| commit | 2e1bf7ae7e14f597ad468e5e43443c129be0ac11 (patch) | |
| tree | decea995d976d6325511197f56a480507b2c9801 /kubernetes | |
| parent | 65b3b8785a81e414e984b8f95efc0e501b20eefb (diff) | |
| parent | ac1b3e650fbbb05f16df8b6f1b840870e9963e08 (diff) | |
Merge "Adjust UUI to latest (Amsterdam)" into release-1.1.0
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/uui/templates/all-services.yaml | 29 | ||||
| -rw-r--r-- | kubernetes/uui/templates/uui-deployment.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/uui/templates/uui-server-deployment.yaml | 37 | ||||
| -rw-r--r-- | kubernetes/uui/values.yaml | 9 |
4 files changed, 76 insertions, 2 deletions
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 |