Commit e93e66fc authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

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

parent abea8a79

kubernetes/helm/openslice/templates/oasapi.yaml

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ spec: 
            - 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 }}

kubernetes/helm/openslice/templates/osportalapi.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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 }}

kubernetes/helm/openslice/templates/osscapi.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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 }}