diff options
| -rwxr-xr-x | kubernetes/oneclick/createAll.bash | 2 | ||||
| -rwxr-xr-x | kubernetes/oneclick/deleteAll.bash | 2 | ||||
| -rw-r--r-- | kubernetes/oneclick/setenv.bash | 2 | ||||
| -rw-r--r-- | kubernetes/uui/Chart.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/uui/templates/all-services.yaml | 15 | ||||
| -rw-r--r-- | kubernetes/uui/templates/uui-deployment.yaml | 34 | ||||
| -rw-r--r-- | kubernetes/uui/values.yaml | 6 |
7 files changed, 62 insertions, 3 deletions
diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index c23f01456a..72d852ded6 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -13,7 +13,7 @@ Usage: $0 [PARAMs] -i [INSTANCE] : ONAP deployment instance # (default: 1) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: - sdc, aai ,mso, message-router, robot, vid, aaf + sdc, aai ,mso, message-router, robot, vid, aaf, uui sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk EOF } diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index 53f2d4d9fa..2d5779ea2a 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -32,7 +32,7 @@ Usage: $0 [PARAMs] -n [NAMESPACE] : Kubernetes namespace (required) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: - sdc, aai ,mso, message-router, robot, vid, aaf + sdc, aai ,mso, message-router, robot, vid, aaf, uui sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk EOF } diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index 785ebb6248..add69f39a1 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,7 @@ #!/bin/bash # Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB -HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'kube2msb' 'aaf' 'vfc') +HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'uui' 'aaf' 'vfc' 'kube2msb') ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001} ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker} ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker} diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml new file mode 100644 index 0000000000..1813f6e636 --- /dev/null +++ b/kubernetes/uui/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: uui +version: 1.1.0 diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml new file mode 100644 index 0000000000..e768fe26ac --- /dev/null +++ b/kubernetes/uui/templates/all-services.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: uui + name: uui + namespace: "{{ .Values.nsPrefix }}-uui" +spec: + ports: + - name: uui + nodePort: {{ .Values.uuiPortPrefix }}98 + port: 8080 + selector: + app: uui + type: NodePort diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml new file mode 100644 index 0000000000..e23202a907 --- /dev/null +++ b/kubernetes/uui/templates/uui-deployment.yaml @@ -0,0 +1,34 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: uui + name: uui + namespace: "{{ .Values.nsPrefix }}-uui" +spec: + selector: + matchLabels: + app: uui + template: + metadata: + labels: + app: uui + name: uui + spec: + containers: + - image: {{ .Values.image.uuiImage }}:{{ .Values.image.uuiVersion }} + imagePullPolicy: {{ .Values.pullPolicy }} + command: + - /bin/bash + - -c + - /home/uui/tomcat/bin/catalina.sh run + name: uui + ports: + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml new file mode 100644 index 0000000000..c233c76115 --- /dev/null +++ b/kubernetes/uui/values.yaml @@ -0,0 +1,6 @@ +nsPrefix: onap +pullPolicy: Always +uuiPortPrefix: 302 +image: + uuiImage: nexus3.onap.org:10001/onap/usecase-ui + uuiVersion: latest |