From 09006130e365124b692db8081b872aee2db7141a Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 16 Jan 2025 16:07:56 +0100 Subject: [USECASEUI] Make usecase-ui work via ingress - introduce nginx that serves as reverse proxy in front of the uui and uui-server pods - this approach makes the web app work over ingress - introduce new AAI_ADDR environment variable that may eventually be used by uui-server to interface with AAI directly Issue-ID: USECASEUI-854 Change-Id: I229e039f8dfe6df050886ade0ea37a30c7272494 Signed-off-by: Fiete Ostkamp --- .../uui/components/uui-server/resources/config/application.properties | 1 + kubernetes/uui/components/uui-server/resources/entrypoint/run.sh | 2 +- kubernetes/uui/components/uui-server/templates/deployment.yaml | 2 ++ kubernetes/uui/components/uui-server/values.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (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 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: -- cgit 1.2.3-korg