Merging "develop" to "main" branch

Kostis Trantzasrequested to merge
develop into main

Merge request reports

ci-templates/build.yml

+2 −2
Changes for ci-templates/build.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:13.3.7

  image: trion/ng-cli:14.2.9

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then
@@ -36,7 +36,7 @@ 
          cp ./src/assets/config/config.prod.default.json ./src/assets/config/config.prod.json

      fi

    - npm install

    - ng build --configuration production --deleteOutputPath=false

    - ng build --configuration production

  artifacts:

    paths:

      - dist/

ci-templates/build_unprotected.yml

+2 −2
Changes for ci-templates/build_unprotected.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:13.3.7

  image: trion/ng-cli:14.2.9

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then
@@ -30,7 +30,7 @@ 
          cp ./src/assets/config/config.prod.default.json ./src/assets/config/config.prod.json

      fi

    - npm install

    - ng build --configuration production --deleteOutputPath=false

    - ng build --configuration production

  artifacts:

    paths:

      - dist/

compose/deploy.sh

+4 −2
Changes for compose/deploy.sh: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ updaterepo org.etsi.osl.osom 
updaterepo org.etsi.osl.oas

updaterepo org.etsi.osl.tmf.api

updaterepo org.etsi.osl.cridge

updaterepo org.etsi.osl.metrico

updaterepo org.etsi.osl.mcp.server



updaterepo org.etsi.osl.tmf.web

updaterepo org.etsi.osl.portal.web
@@ -61,5 +63,5 @@ fi 


echo "Installing npm packages..."



docker run -u 0 --rm -v "$PWD":/app trion/ng-cli:13.3.7 npm install

docker run -u 0 --rm -v "$PWD":/app trion/ng-cli:13.3.7 ng build --configuration production --deleteOutputPath=false
 
docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:14.2.9 npm install

docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:14.2.9 ng build --configuration production

compose/docker-compose.yaml.configure

+86 −5
Changes for compose/docker-compose.yaml.configure: 86 added lines, 5 removed lines.
Original line number Diff line number Diff line 
version: '3.4'

services:



  artemis:
@@ -10,6 +9,11 @@ services: 
    - 8161:8161

    - 61616:61616

    - 61613:61613

    logging:

      driver: "json-file"

      options:

        max-size: "100m"

        max-file: "3"    

    volumes:

    -  /var/log/activemq:/var/log/activemq

    networks:
@@ -23,6 +27,11 @@ services: 
    ports:

    - 80:80

    - 443:443

    logging:

      driver: "json-file"

      options:

        max-size: "500m"

        max-file: "3"

    volumes:

    - ./nginx/nginx.conf:/etc/nginx/nginx.conf

    - ./nginx/certificates:/etc/nginx/certificates
@@ -44,6 +53,11 @@ services: 
      MYSQL_ROOT_HOST: "%"

    ports:

    -  "13306:3306"

    logging:

      driver: "json-file"

      options:

        max-size: "200m"

        max-file: "2"    

    volumes:

    -  ~/mysql/data:/var/lib/mysql

    - ./mysql-init:/docker-entrypoint-initdb.d
@@ -69,6 +83,11 @@ services: 
      PROXY_ADDRESS_FORWARDING: "true"

    volumes:

    - ./keycloak-init:/tmp

    logging:

      driver: "json-file"

      options:

        max-size: "200m"

        max-file: "5"    

    ports:

      - 8080:8080

      - 8443:8443
@@ -114,7 +133,7 @@ services: 
    logging:

      driver: "json-file"

      options:

        max-size: "1g"

        max-size: "750m"

        max-file: "3"

    volumes:

    - ./repo:/root
@@ -145,7 +164,7 @@ services: 
    logging:

      driver: "json-file"

      options:

        max-size: "1g"

        max-size: "800m"

        max-file: "3"      

    ports:

    - 13011:13011
@@ -170,6 +189,11 @@ services: 
        "bugzillakey":"",

        "main_operations_product":""

        }'

    logging:

      driver: "json-file"

      options:

        max-size: "200m"

        max-file: "3"    

    ports:

    - 13010:13010

    networks:
@@ -244,6 +268,11 @@ services: 
        "logging.level.org.springframework" : "INFO",

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

        }'

    logging:

      driver: "json-file"

      options:

        max-size: "1g"

        max-file: "3"    

    ports:

    - 13100:13100

    networks:
@@ -340,8 +369,8 @@ services: 
        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

        "spring.activemq.user": "artemis",

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

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

        "logging.level.org.etsi.osl.metrico" : "DEBUG"

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

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

        }'

    logging:

      driver: "json-file"
@@ -355,6 +384,43 @@ services: 
    - osscapi

    - mysql-portal



  oslmcp:

    container_name: openslice-mcp

    restart: always

    profiles: ["prod"]

    build:

        context:  ../../org.etsi.osl.mcp.server/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url": "jdbc:mysql://amysql/osdb?createDatabaseIfNotExist=true",

        "spring.datasource.username":"root",

        "spring.datasource.password":"letmein",

        "spring-addons.issuers[0].uri": "http://keycloak:8080/auth/realms/openslice",

        "spring-addons.issuers[0].username-json-path":"$.preferred_username",

        "spring-addons.issuers[0].claims[0].jsonPath":"$.realm_access.roles",

        "spring-addons.issuers[0].claims[1].jsonPath":"$.resource_access.*.roles",

        "spring.security.oauth2.resourceserver.jwt.issuer-uri": "http://keycloak:8080/auth/realms/openslice",

        "springdoc.oAuthFlow.authorizationUrl": "http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/auth",

        "springdoc.oAuthFlow.tokenUrl": "http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/token",        

        "springdoc.oauth.client-id" : "osapiWebClientId",

        "springdoc.oauth.clientsecret" : "secret",

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

        "spring.activemq.user": "artemis",

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

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

        }'

    ports:

    - 13015:13015

    logging:

      driver: "json-file"

      options:

        max-size: "500m"

        max-file: "2" 

    networks:

    - front

    - back

    

  portainer:

    container_name: portainer
@@ -363,6 +429,11 @@ services: 
    profiles: ["dev", "prod"]

    networks:

      - front

    logging:

      driver: "json-file"

      options:

        max-size: "100m"

        max-file: "3"    

    ports:

    - 9000:9000

    volumes:
@@ -385,6 +456,11 @@ services: 
        "centrallogurl":"http://elk_ip:elk_port/index_name/_doc",

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

        }'

    logging:

      driver: "json-file"

      options:

        max-size: "800m"

        max-file: "3"    

    ports:

    - 13013:13013

    networks:
@@ -399,6 +475,11 @@ services: 
      - blockdiag

    environment:

      - KROKI_BLOCKDIAG_HOST=blockdiag

    logging:

      driver: "json-file"

      options:

        max-size: "500m"

        max-file: "3"    

    ports:

      - "8000:8000"

    networks:

kubernetes/helm/openslice/templates/kroki-ingress.yaml

+1 −1
Changes for kubernetes/helm/openslice/templates/kroki-ingress.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ metadata: 
    nginx.ingress.kubernetes.io/rewrite-target: "/$1"

  name: {{ include "openslice.fullname" . }}-kroki-ingress

spec:

  ingressClassName: nginx

  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}

  rules:

    - http:

        paths: