Skip to content
Snippets Groups Projects
Commit e93e66fc authored by trantzas's avatar trantzas
Browse files

Closes #34. Adding missing environmental variables for APIs configuration in HELM Chart

parent abea8a79
No related branches found
No related tags found
2 merge requests!46MR for Release 2024Q4,!42Merge develop into side branch
Pipeline #9657 passed
...@@ -39,7 +39,8 @@ spec: ...@@ -39,7 +39,8 @@ spec:
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
value: >- 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.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.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}", "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
...@@ -55,7 +56,8 @@ spec: ...@@ -55,7 +56,8 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "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: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -41,6 +41,7 @@ spec: ...@@ -41,6 +41,7 @@ spec:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
value: >- value: >-
{ {
"origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true", "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}", "spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}", "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
...@@ -57,7 +58,8 @@ spec: ...@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.portalapi.spring.logLevel | default "INFO" }}", "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: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -40,6 +40,7 @@ spec: ...@@ -40,6 +40,7 @@ spec:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
value: >- value: >-
{ {
"origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true", "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}", "spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}", "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
...@@ -57,7 +58,8 @@ spec: ...@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework": "{{ .Values.osscapi.spring.logLevel | default "INFO" }}", "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: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment