From 4a191e34f6df0d616937a409c05d3630a698760a Mon Sep 17 00:00:00 2001
From: "michael.koch" <michael.koch@open-xchange.com>
Date: Tue, 27 Sep 2022 09:51:11 +0000
Subject: [PATCH] Use globally defined appRoot value
---
helm/core-ui-middleware/Chart.yaml | 2 +-
helm/core-ui-middleware/templates/_ingress.tpl | 2 +-
helm/core-ui-middleware/templates/deployment.yaml | 2 +-
helm/core-ui-middleware/values.yaml | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/helm/core-ui-middleware/Chart.yaml b/helm/core-ui-middleware/Chart.yaml
index 06cfafb..026d92e 100644
--- a/helm/core-ui-middleware/Chart.yaml
+++ b/helm/core-ui-middleware/Chart.yaml
@@ -24,5 +24,5 @@ version: 1.3.1
appVersion: "1.4.1"
dependencies:
- name: ox-common
- version: 1.0.17
+ version: 1.0.22
repository: "oci://registry.open-xchange.com/common/charts"
diff --git a/helm/core-ui-middleware/templates/_ingress.tpl b/helm/core-ui-middleware/templates/_ingress.tpl
index 09b1d01..2a8e9a0 100644
--- a/helm/core-ui-middleware/templates/_ingress.tpl
+++ b/helm/core-ui-middleware/templates/_ingress.tpl
@@ -1,4 +1,4 @@
{{- define "core-ui-middleware.ingressPathMappings" -}}
paths:
- - path: {{ .Values.appRoot }}
+ - path: "{{ include "ox-common.appsuite.appRoot" . }}/"
{{- end -}}
diff --git a/helm/core-ui-middleware/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml
index 09acd67..b0deea4 100644
--- a/helm/core-ui-middleware/templates/deployment.yaml
+++ b/helm/core-ui-middleware/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
- name: LOG_LEVEL
value: "{{ .Values.logLevel }}"
- name: APP_ROOT
- value: "{{ .Values.appRoot }}"
+ value: "{{ include "ox-common.appsuite.appRoot" . }}/"
- name: COMPRESS_FILE_SIZE
value: "{{ .Values.compressFileSize }}"
- name: COMPRESS_FILE_TYPES
diff --git a/helm/core-ui-middleware/values.yaml b/helm/core-ui-middleware/values.yaml
index 3423015..4d35504 100644
--- a/helm/core-ui-middleware/values.yaml
+++ b/helm/core-ui-middleware/values.yaml
@@ -102,7 +102,6 @@ probe:
cacheTTL: 30000
logLevel: info
baseUrls: []
-appRoot: '/'
compressFileSize: 600
compressFileTypes: application/javascript application/json application/x-javascript application/xml application/xml+rss text/css text/html text/javascript text/plain text/xml image/svg+xml
--
GitLab