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

Merge branch '64-add-new-secret-controller-based-environment-variables-for-osom' into 'develop' 

Resolve "Add new secret-controller-based environment variables for OSOM"

See merge request !70
parents 71febcf6 9c41f652

compose/docker-compose.yaml.configure

+2 −1
Changes for compose/docker-compose.yaml.configure: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ services: 
        "spring.activemq.user": "artemis",

        "spring.activemq.password": "artemis",

        "logging.level.org.springframework" : "INFO",

        "logging.level.org.etsi.osl.osom" : "INFO"

        "logging.level.org.etsi.osl.osom" : "INFO",

        "SECRETS_CONTROLLER_ENABLE": false

        }'

    logging:

      driver: "json-file"

kubernetes/helm/openslice/templates/osom.yaml

+2 −1
Changes for kubernetes/helm/openslice/templates/osom.yaml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ spec: 
                  "spring.config.import": "configtree:/etc/config/",

                  "spring.datasource.url" : "{{ .Values.osom.spring.datasource.url | default "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1" }}",

                  "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 

                  "logging.level.org.springframework" : "{{ .Values.osom.spring.logLevel | default "INFO" }}"

                  "logging.level.org.springframework" : "{{ .Values.osom.spring.logLevel | default "INFO" }}",

                  "SECRETS_CONTROLLER_ENABLE": "{{ .Values.osom.secretsController.enable | default "false" }}"

                }

          resources:

            {{- toYaml .Values.resources | nindent 12 }}

kubernetes/helm/openslice/values.yaml

+2 −0
Changes for kubernetes/helm/openslice/values.yaml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ osom: 
    loglevel: INFO

    datasource:

      url: "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1"

  secretsController:

    enable: false



osscapi:

  spring: