From 22f3b16043de9d28461a523202018ef82fcb892d Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 7 Feb 2023 13:10:01 +0100 Subject: [UUI] Make UUI SM compatible Change the service definitions and deployment to support the nonTLS setup (AAF removal) using existing templates Issue-ID: OOM-2998 Signed-off-by: Andreas Geissler Change-Id: If86aa97e2bc8eef628a02d43407b2f16b1d06783 --- .../resources/config/application.properties | 2 ++ .../uui-server/templates/deployment.yaml | 6 ++-- .../uui/components/uui-server/templates/job.yaml | 1 + .../components/uui-server/templates/service.yaml | 39 ++-------------------- kubernetes/uui/components/uui-server/values.yaml | 31 +++++++++++++---- 5 files changed, 31 insertions(+), 48 deletions(-) (limited to 'kubernetes/uui/components/uui-server') diff --git a/kubernetes/uui/components/uui-server/resources/config/application.properties b/kubernetes/uui/components/uui-server/resources/config/application.properties index ee531dc741..cb26c750f9 100644 --- a/kubernetes/uui/components/uui-server/resources/config/application.properties +++ b/kubernetes/uui/components/uui-server/resources/config/application.properties @@ -47,7 +47,9 @@ logging.level.*=INFO endpoints.shutdown.enabled=true endpoints.shutdown.sensitive=false +{{- if (include "common.needTLS" .) }} server.ssl.protocol=TLS server.ssl.key-store={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12 server.ssl.key-store-password=${KEYSTORE_PASSWORD} server.ssl.key-store-type=PKCS12 +{{- end }} diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml index 13b8774f47..b25427a3be 100644 --- a/kubernetes/uui/components/uui-server/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml @@ -22,8 +22,7 @@ spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} template: - metadata: - {{- include "common.templateMetadata" . | nindent 6 }} + metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: {{ include "common.podSecurityContext" . | indent 6 | trim }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . ) }} @@ -74,8 +73,7 @@ spec: - | export $(cat {{ .Values.certInitializer.credsPath }}/mycreds.prop | xargs -0) bash /uui/run.sh - ports: - - containerPort: {{ .Values.service.internalPort }} + ports: {{ include "common.containerPorts" . | nindent 10 }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml index 73bde037de..62cf7bb967 100644 --- a/kubernetes/uui/components/uui-server/templates/job.yaml +++ b/kubernetes/uui/components/uui-server/templates/job.yaml @@ -58,6 +58,7 @@ spec: - name: init-data mountPath: /aaa/init/postgres.sql subPath: postgres.sql + {{ include "common.waitForJobContainer" . | indent 6 | trim }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" volumes: diff --git a/kubernetes/uui/components/uui-server/templates/service.yaml b/kubernetes/uui/components/uui-server/templates/service.yaml index 157dac396d..fd6a25408d 100644 --- a/kubernetes/uui/components/uui-server/templates/service.yaml +++ b/kubernetes/uui/components/uui-server/templates/service.yaml @@ -1,5 +1,6 @@ {{/* # Copyright © 2017 Amdocs, Bell Canada +# Modifications Copyright © 2018 AT&T, ZTE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,40 +15,4 @@ # limitations under the License. */}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} - annotations: - msb.onap.org/service-info: '[ - { - "serviceName": "usecaseui-server", - "version": "v1", - "url": "/api/usecaseui-server/v1", - "protocol": "REST", - "port": "{{.Values.service.internalPort}}", - "visualRange":"1", - "enable_ssl": true - } - ]' -spec: - type: {{ .Values.service.type }} - ports: - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.uuiPortPrefix | default .Values.uuiPortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - {{- end}} - selector: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} +{{ include "common.service" . }} diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml index 44f4399d10..f5f8f9d095 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -93,7 +93,7 @@ pullPolicy: Always # application configuration -msbaddr: msb-iag.{{include "common.namespace" .}}:443 +msbaddr: msb-iag.{{include "common.namespace" .}}:80 mraddr: message-router.{{include "common.namespace" .}}:3904 # application configuration override for postgres @@ -143,18 +143,31 @@ readiness: service: type: NodePort name: uui-server - portName: http internalPort: 8082 - nodePort: 99 + ports: + - name: http + port: 8082 + nodePort: '99' + annotations: + msb.onap.org/service-info: | + {{ if .Values.global.msbEnabled -}}[ + { + "serviceName": "usecaseui-server", + "version": "v1", + "url": "/api/usecase-server/v1", + "path":"/iui/usecaseui", + "protocol": "REST", + "visualRange":"1", + "port": "{{ .Values.service.port }}", + } + ]{{ end }} ingress: enabled: false service: - - baseaddr: uui-server-api + - baseaddr: "uui-server-api" name: "uui-server" port: 8082 - config: - ssl: "redirect" # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little @@ -190,4 +203,8 @@ serviceAccount: securityContext: user_id: 100 - group_id: 655533 \ No newline at end of file + group_id: 655533 + +wait_for_job_container: + containers: + - '{{ include "common.name" . }}-job' -- cgit 1.2.3-korg