From e93e66fc8b9896fdde3b3cd9810d961cf1cbad78 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 2 Nov 2024 21:03:18 +0000
Subject: [PATCH] Closes #34. Adding missing environmental variables for APIs
configuration in HELM Chart
---
kubernetes/helm/openslice/templates/oasapi.yaml | 6 ++++--
kubernetes/helm/openslice/templates/osportalapi.yaml | 4 +++-
kubernetes/helm/openslice/templates/osscapi.yaml | 4 +++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index ea1ffac..bf78b5d 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -39,7 +39,8 @@ spec:
env:
- name: SPRING_APPLICATION_JSON
value: >-
- {
+ {
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/ostmfdb?createDatabaseIfNotExist=true&useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -55,7 +56,8 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
- "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}"
+ "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 8c2927c..6df11d4 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -41,6 +41,7 @@ spec:
- name: SPRING_APPLICATION_JSON
value: >-
{
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.portalapi.spring.logLevel | default "INFO" }}",
- "logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}"
+ "logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index cf96f7d..758d519 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -40,6 +40,7 @@ spec:
- name: SPRING_APPLICATION_JSON
value: >-
{
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework": "{{ .Values.osscapi.spring.logLevel | default "INFO" }}",
- "kroki.serverurl":"{{ .Values.rooturl }}/kroki"
+ "kroki.serverurl":"{{ .Values.rooturl }}/kroki",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
--
GitLab