diff options
Diffstat (limited to 'kubernetes/uui')
11 files changed, 54 insertions, 16 deletions
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml index 900a6c97e1..0d1d7f2f6f 100644 --- a/kubernetes/uui/Chart.yaml +++ b/kubernetes/uui/Chart.yaml @@ -18,7 +18,7 @@ apiVersion: v2 description: ONAP uui name: uui -version: 13.1.0 +version: 15.0.0 dependencies: - name: common @@ -31,14 +31,17 @@ dependencies: version: ~13.x-0 repository: '@local' - name: uui-server - version: ~13.x-0 + version: ~15.x-0 repository: 'file://components/uui-server' - name: uui-nlp version: ~13.x-0 repository: 'file://components/uui-nlp' - name: uui-intent-analysis - version: ~13.x-0 + version: ~15.x-0 repository: 'file://components/uui-intent-analysis' - name: uui-llm-adaptation - version: ~13.x-0 + version: ~15.x-0 repository: 'file://components/uui-llm-adaptation' + - name: nginx + version: ~18.3.x-0 + repository: '@local' diff --git a/kubernetes/uui/components/uui-intent-analysis/Chart.yaml b/kubernetes/uui/components/uui-intent-analysis/Chart.yaml index bd1f6eedab..25fa9459c5 100644 --- a/kubernetes/uui/components/uui-intent-analysis/Chart.yaml +++ b/kubernetes/uui/components/uui-intent-analysis/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v2 description: ONAP uui intent analysis name: uui-intent-analysis -version: 13.0.0 +version: 15.0.0 dependencies: - name: common diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml index 73903ceae9..a930e50b1c 100644 --- a/kubernetes/uui/components/uui-intent-analysis/values.yaml +++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml @@ -40,7 +40,7 @@ secrets: password: '{{ .Values.postgres.config.pgUserPassword }}' passwordPolicy: generate -image: onap/usecase-ui-intent-analysis:14.0.0 +image: onap/usecase-ui-intent-analysis:15.0.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml b/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml index 1c36c236ee..2391ac35f1 100644 --- a/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml +++ b/kubernetes/uui/components/uui-llm-adaptation/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v2 description: ONAP uui llm adaptation name: uui-llm-adaptation -version: 13.0.0 +version: 15.0.0 dependencies: - name: common diff --git a/kubernetes/uui/components/uui-llm-adaptation/values.yaml b/kubernetes/uui/components/uui-llm-adaptation/values.yaml index f5804efb20..cda22163db 100644 --- a/kubernetes/uui/components/uui-llm-adaptation/values.yaml +++ b/kubernetes/uui/components/uui-llm-adaptation/values.yaml @@ -40,7 +40,7 @@ secrets: password: '{{ .Values.postgres.config.pgUserPassword }}' passwordPolicy: generate -image: onap/usecase-ui-llm-adaptation:14.0.0 +image: onap/usecase-ui-llm-adaptation:15.0.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml index 82e395ed45..034768256f 100644 --- a/kubernetes/uui/components/uui-server/Chart.yaml +++ b/kubernetes/uui/components/uui-server/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 description: ONAP uui server name: uui-server -version: 13.0.0 +version: 15.0.0 dependencies: - name: common diff --git a/kubernetes/uui/components/uui-server/resources/config/application.properties b/kubernetes/uui/components/uui-server/resources/config/application.properties index 36308c0313..67b0ff08c9 100644 --- a/kubernetes/uui/components/uui-server/resources/config/application.properties +++ b/kubernetes/uui/components/uui-server/resources/config/application.properties @@ -14,6 +14,7 @@ ## limitations under the License. ## ## General App Properties +spring.application.name=uui-server server.servlet.contextPath=/api/usecaseui-server/v1 server.port=8082 spring.http.multipart.max-file-size=128MB diff --git a/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh index 283d55b741..6f585273a8 100644 --- a/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh +++ b/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh @@ -32,7 +32,7 @@ $dbScript 127.0.0.1 5432 postgres uui echo "usecase-ui database init script finished normally..." JAVA_PATH="$JAVA_HOME/bin/java" -JAVA_OPTS="-Xms50m -Xmx128m" +JAVA_OPTS="-XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}" echo @JAVA_PATH@ $JAVA_PATH echo @JAVA_OPTS@ $JAVA_OPTS diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml index ae08054d88..d19f180f4e 100644 --- a/kubernetes/uui/components/uui-server/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml @@ -100,6 +100,8 @@ spec: value: {{tpl .Values.msbaddr .}} - name: MR_ADDR value: {{tpl .Values.mraddr .}} + - name: AAI_ADDR + value: {{tpl .Values.aaiaddr .}} - name: POSTGRES_IP value: {{.Values.postgres.service.name2}} - name: POSTGRES_PORT diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml index 6e715bd7a9..15cce631ca 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -48,13 +48,14 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/usecase-ui-server:14.0.0 +image: onap/usecase-ui-server:15.0.0 pullPolicy: Always # application configuration msbaddr: msb-iag.{{include "common.namespace" .}}:80 mraddr: message-router.{{include "common.namespace" .}}:3904 +aaiaddr: aai.{{include "common.namespace" .}}:80 # application configuration override for postgres postgres: diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml index 2cc0837f41..c9a0331350 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -25,7 +25,7 @@ subChartsOnly: flavor: small # application image -image: onap/usecase-ui:14.0.0 +image: onap/usecase-ui:15.0.0 pullPolicy: Always # application configuration @@ -80,11 +80,11 @@ service: ]{{ end }} ingress: - enabled: false + enabled: true service: - - baseaddr: "uui-ui" - name: "uui" - port: 8080 + - baseaddr: uui + name: uui-proxy + port: 80 config: ssl: "redirect" @@ -114,3 +114,34 @@ resources: cpu: "500m" memory: "1Gi" unlimited: {} + +nginx: + fullnameOverride: uui-proxy + serverBlock: |- + server { + listen 8080; + listen [::]:8080; + + # Redirect root path to /usecase-ui + location = / { + return 301 /usecase-ui; + } + + # frontend + location /usecase-ui { + proxy_pass http://uui:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + # backend + location /api { + proxy_pass http://uui-server:8082; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + } |