diff options
Diffstat (limited to 'kubernetes/uui')
6 files changed, 43 insertions, 5 deletions
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml index 03c42df008..0d1d7f2f6f 100644 --- a/kubernetes/uui/Chart.yaml +++ b/kubernetes/uui/Chart.yaml @@ -42,3 +42,6 @@ dependencies: - name: uui-llm-adaptation 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-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 4271bbc380..15cce631ca 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -55,6 +55,7 @@ pullPolicy: Always 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 56bcabe240..c9a0331350 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -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; + } + } |