From 060328548ebba2b603c206044f58bf46b029da74 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 21:24:12 +0000 Subject: [PATCH 01/21] Revert "Preparing develop to be merged with main (docker image tags)" This reverts commit bb3669f0c8d74a7f8e343f41d51709b303b7ce69 --- compose/docker-compose.yaml.configure | 18 +++++++++--------- kubernetes/helm/openslice/values.yaml | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index ce1ebc0..0638cbc 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -86,7 +86,7 @@ services: build: context: ../../org.etsi.osl.portal.api/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -134,7 +134,7 @@ services: build: context: ../../org.etsi.osl.mano/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -160,7 +160,7 @@ services: build: context: ../../org.etsi.osl.bugzilla/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -186,7 +186,7 @@ services: build: context: ../../org.etsi.osl.tmf.api/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -234,7 +234,7 @@ services: build: context: ../../org.etsi.osl.osom/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop environment: SPRING_APPLICATION_JSON: '{ "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1", @@ -260,7 +260,7 @@ services: build: context: ../../org.etsi.osl.oas/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -302,7 +302,7 @@ services: build: context: ../../org.etsi.osl.cridge/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -331,7 +331,7 @@ services: build: context: ../../org.etsi.osl.metrico/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop environment: SPRING_APPLICATION_JSON: '{ "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", @@ -376,7 +376,7 @@ services: build: context: ../../org.etsi.osl.centrallog.service/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index ba45552..ee1f4f7 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -19,12 +19,12 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" centrallog: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" keycloak: repository: quay.io/keycloak/keycloak pullPolicy: Always @@ -39,22 +39,22 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" osom: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" portalapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" osscapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" mysql: repository: mysql pullPolicy: Always @@ -64,27 +64,27 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" portalweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" tmfweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" cridge: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" metrico: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" bugzillaurl: example.com:443/bugzilla bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z -- GitLab From 0e84f5041c7459fdc1b969fd385d98d76ed9c175 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 28 Jan 2025 12:38:15 +0000 Subject: [PATCH 02/21] Preparing for Release 2025Q2 --- pom.xml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index bfa0fc3..4f9205a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 2024Q4 + 2025Q2-SNAPSHOT pom org.etsi.osl.main @@ -33,24 +33,24 @@ 1.7.0 - 1.0.1 - 1.0.1 - 1.0.1 - 1.1.0 - 2024Q4 - 1.0.1 - 1.1.0 - 1.0.1 - 1.1.0 - 1.0.1 - 1.1.0 - 1.0.1 - 1.0.1 - 1.0.1 - 1.0.1 - 1.1.0 - 1.1.0 - 0.9 + 1.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.2.0-SNAPSHOT + 2025Q2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.1.1-SNAPSHOT + 1.0.2-SNAPSHOT + 1.2.0-SNAPSHOT + 1.0.2-SNAPSHOT + 1.2.0-SNAPSHOT + 1.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 1.2.0-SNAPSHOT + 1.2.0-SNAPSHOT + 1.0.0-SNAPSHOT -- GitLab From 0329bcbff205b357f1114dd78051035976004cb1 Mon Sep 17 00:00:00 2001 From: trantzas Date: Thu, 30 Jan 2025 15:58:44 +0000 Subject: [PATCH 03/21] fix for #42: Include metrico directory in deploy.sh --- compose/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/deploy.sh b/compose/deploy.sh index d8ac538..fc6da1c 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -43,6 +43,7 @@ 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.tmf.web updaterepo org.etsi.osl.portal.web -- GitLab From 238db7b3ac3e2d95990b3fb381a7b4cc01596e5a Mon Sep 17 00:00:00 2001 From: trantzas Date: Sat, 15 Feb 2025 18:10:57 +0000 Subject: [PATCH 04/21] Changing Openslice HELM chart version to 2025Q2-SNAPSHOT --- kubernetes/helm/openslice/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml index 8a0612a..b8ede11 100644 --- a/kubernetes/helm/openslice/Chart.yaml +++ b/kubernetes/helm/openslice/Chart.yaml @@ -20,4 +20,4 @@ version: 2.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2024Q4 +appVersion: 2025Q2-SNAPSHOT -- GitLab From a26fe8b08222161b88f60f01a15e4115d7b68dcf Mon Sep 17 00:00:00 2001 From: trantzas Date: Wed, 19 Feb 2025 11:09:18 +0000 Subject: [PATCH 05/21] Fix for Remove root user enforcement in deploy.sh script (#43) --- compose/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/deploy.sh b/compose/deploy.sh index fc6da1c..34ee9ab 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -62,5 +62,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:13.3.7 npm install +docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:13.3.7 ng build --configuration production --deleteOutputPath=false -- GitLab From 3eb25e58294ca9f09d7b86d22e06e78f2f8ea01b Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 2 Apr 2025 19:27:48 +0300 Subject: [PATCH 06/21] feat: expose ingressClassName to values --- kubernetes/helm/openslice/templates/openslice-ingress.yaml | 2 +- kubernetes/helm/openslice/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml index a5f7314..365ffc7 100644 --- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml +++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml @@ -10,7 +10,7 @@ metadata: {{- toYaml .Values.ingress.annotations | nindent 4 }} name: {{ include "openslice.fullname" . }}-openslice-ingress spec: - ingressClassName: nginx + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} rules: - http: paths: diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index ee1f4f7..e531b73 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -190,6 +190,7 @@ service: port: 80 ingress: + ingressClassName: nginx paths: - path: "/tmf-api" service: "osscapi" -- GitLab From cd7db081a983db7ef2f885c810ba0b64518a1c2e Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Thu, 3 Apr 2025 13:01:48 +0300 Subject: [PATCH 07/21] feat: use kroki ingressclass from values --- kubernetes/helm/openslice/templates/kroki-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm/openslice/templates/kroki-ingress.yaml b/kubernetes/helm/openslice/templates/kroki-ingress.yaml index 5127bdb..c146764 100644 --- a/kubernetes/helm/openslice/templates/kroki-ingress.yaml +++ b/kubernetes/helm/openslice/templates/kroki-ingress.yaml @@ -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: -- GitLab From 0dd90f71d1cdc1cccce4d7ff58742be1c6cb9b0e Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 15 Apr 2025 13:48:40 +0000 Subject: [PATCH 08/21] Update ng-cli version --- ci-templates/build.yml | 2 +- ci-templates/build_unprotected.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-templates/build.yml b/ci-templates/build.yml index 79ab2b8..ec1dfd2 100644 --- a/ci-templates/build.yml +++ b/ci-templates/build.yml @@ -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 diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml index bf2678b..4802d83 100644 --- a/ci-templates/build_unprotected.yml +++ b/ci-templates/build_unprotected.yml @@ -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 -- GitLab From a112d09974ca485eb386d54d4868430353ca246c Mon Sep 17 00:00:00 2001 From: trantzas Date: Wed, 16 Apr 2025 15:00:19 +0000 Subject: [PATCH 09/21] Removing the obsolete option to retain the output path between Angular builds (fix for #46) --- ci-templates/build.yml | 2 +- ci-templates/build_unprotected.yml | 2 +- compose/deploy.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-templates/build.yml b/ci-templates/build.yml index ec1dfd2..64c988e 100644 --- a/ci-templates/build.yml +++ b/ci-templates/build.yml @@ -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/ diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml index 4802d83..55e0fdf 100644 --- a/ci-templates/build_unprotected.yml +++ b/ci-templates/build_unprotected.yml @@ -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/ diff --git a/compose/deploy.sh b/compose/deploy.sh index 34ee9ab..654c720 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -63,4 +63,4 @@ fi echo "Installing npm packages..." docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:13.3.7 npm install -docker run -u $(id -u) --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:13.3.7 ng build --configuration production -- GitLab From 59f985b31896c70a86297cfd9c623cd3e81bf083 Mon Sep 17 00:00:00 2001 From: trantzas Date: Wed, 16 Apr 2025 15:01:36 +0000 Subject: [PATCH 10/21] Updating ng-cli version in deploy.sh (fix for #46) --- compose/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/deploy.sh b/compose/deploy.sh index 654c720..03c3828 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -62,5 +62,5 @@ fi echo "Installing npm packages..." -docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:13.3.7 npm install -docker run -u $(id -u) --rm -v "$PWD":/app trion/ng-cli:13.3.7 ng build --configuration production +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 -- GitLab From f97afea68e6285cff9524577efac30b5c2dc0625 Mon Sep 17 00:00:00 2001 From: trantzas Date: Thu, 15 May 2025 07:56:36 +0000 Subject: [PATCH 11/21] Update file pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4f9205a..70bd709 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ 1.2.0-SNAPSHOT 1.2.0-SNAPSHOT 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT -- GitLab From 047911f2b42d1847367ed798a04a4fc82f92a8c3 Mon Sep 17 00:00:00 2001 From: trantzas Date: Thu, 15 May 2025 10:22:35 +0000 Subject: [PATCH 12/21] Added MCP server in docker-compose (fix for #48) --- compose/docker-compose.yaml.configure | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 0638cbc..9a7e6d4 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -355,6 +355,38 @@ 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:develop + 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 + networks: + - front + - back portainer: container_name: portainer -- GitLab From f76e766531c0a77f572a410db499d4fc6e696110 Mon Sep 17 00:00:00 2001 From: trantzas Date: Thu, 15 May 2025 13:08:03 +0000 Subject: [PATCH 13/21] Adding log rotation for MCP server in Docker Compose file (fix for #48) --- compose/docker-compose.yaml.configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 9a7e6d4..a77e868 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -384,6 +384,11 @@ services: }' ports: - 13015:13015 + logging: + driver: "json-file" + options: + max-size: "500m" + max-file: "2" networks: - front - back -- GitLab From 1e491e6f827de830fa8cbeb422dab1889455a440 Mon Sep 17 00:00:00 2001 From: trantzas Date: Wed, 18 Jun 2025 14:39:23 +0000 Subject: [PATCH 14/21] added mcp.server project to deploy.sh (fix for #49) --- compose/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/deploy.sh b/compose/deploy.sh index 03c3828..ba0cd28 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -44,6 +44,7 @@ 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 -- GitLab From be32171e00f833363d1d423810aa34d066a02bf9 Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Tue, 15 Jul 2025 16:05:49 +0300 Subject: [PATCH 15/21] Updated docker-compose.yaml.configure services to add log rotation --- compose/docker-compose.yaml.configure | 102 ++++++++++++++++++-------- 1 file changed, 73 insertions(+), 29 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index a77e868..282bdf1 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -1,4 +1,3 @@ -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 @@ -51,32 +65,37 @@ services: - back keycloak: - container_name: keycloak - image: quay.io/keycloak/keycloak:16.1.1 - restart: always - profiles: ["dev", "prod"] - environment: - DB_VENDOR: MYSQL - DB_ADDR: amysql - DB_DATABASE: keycloak - DB_USER: keycloak - DB_PASSWORD: password - KEYCLOAK_USER: admin - KEYCLOAK_PASSWORD: Pa55w0rd - JDBC_PARAMS: "useSSL=false" - JAVA_OPTS: "-server -Xms512m -Xmx2048m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -XX:+UseAdaptiveSizePolicy -XX:MaxMetaspaceSize=1024m -Djava.net.preferIPv4Stack=true -Djboss.as.management.blocking.timeout=3600" - KEYCLOAK_IMPORT: /tmp/realm-export.json - PROXY_ADDRESS_FORWARDING: "true" - volumes: - - ./keycloak-init:/tmp - ports: - - 8080:8080 - - 8443:8443 - depends_on: - - mysql-portal - networks: - - front - - back + container_name: keycloak + image: quay.io/keycloak/keycloak:16.1.1 + restart: always + profiles: ["dev", "prod"] + environment: + DB_VENDOR: MYSQL + DB_ADDR: amysql + DB_DATABASE: keycloak + DB_USER: keycloak + DB_PASSWORD: password + KEYCLOAK_USER: admin + KEYCLOAK_PASSWORD: Pa55w0rd + JDBC_PARAMS: "useSSL=false" + JAVA_OPTS: "-server -Xms512m -Xmx2048m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -XX:+UseAdaptiveSizePolicy -XX:MaxMetaspaceSize=1024m -Djava.net.preferIPv4Stack=true -Djboss.as.management.blocking.timeout=3600" + KEYCLOAK_IMPORT: /tmp/realm-export.json + PROXY_ADDRESS_FORWARDING: "true" + volumes: + - ./keycloak-init:/tmp + logging: + driver: "json-file" + options: + max-size: "200m" + max-file: "5" + ports: + - 8080:8080 + - 8443:8443 + depends_on: + - mysql-portal + networks: + - front + - back osportalapi: @@ -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: @@ -400,6 +429,11 @@ services: profiles: ["dev", "prod"] networks: - front + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "3" ports: - 9000:9000 volumes: @@ -422,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: @@ -436,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: -- GitLab From acb184a8486bb6d92b4c3c69b48ab56f869a1c71 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 16 Jul 2025 15:01:21 +0300 Subject: [PATCH 16/21] feat: add mcp server to helm chart and expose values --- .../helm/openslice/templates/mcp-server.yaml | 76 +++++++++++++++++++ kubernetes/helm/openslice/values.yaml | 16 +++- 2 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 kubernetes/helm/openslice/templates/mcp-server.yaml diff --git a/kubernetes/helm/openslice/templates/mcp-server.yaml b/kubernetes/helm/openslice/templates/mcp-server.yaml new file mode 100644 index 0000000..8c346fe --- /dev/null +++ b/kubernetes/helm/openslice/templates/mcp-server.yaml @@ -0,0 +1,76 @@ +{{- if .Values.mcpserver.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: mcpserver + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- include "openslice.labels" . | nindent 4 }} + name: {{ include "openslice.fullname" . }}-mcpserver +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: mcpserver + {{- include "openslice.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: mcpserver + {{- include "openslice.selectorLabels" . | nindent 8 }} + spec: + containers: + - name: {{ include "openslice.fullname" . }}-mcpserver + image: "{{ .Values.image.mcpserver.repository }}:{{ .Values.image.mcpserver.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.mcpserver.pullPolicy | default "Always" }} + env: + - name: SPRING_APPLICATION_JSON + value: >- + { + "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 }}", + "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": "{{ .Values.mcpserver.springdoc.clientSecret }}", + "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.mcpserver.spring.logLevel | default "INFO" }}" + } + ports: + - containerPort: 13015 + resources: + {{- toYaml .Values.resources | nindent 12 }} + restartPolicy: Always +--- +apiVersion: v1 +kind: Service +metadata: + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: mcpserver + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- include "openslice.labels" . | nindent 4 }} + name: {{ include "openslice.fullname" . }}-mcpserver +spec: + ports: + - name: "13015" + port: 13015 + targetPort: 13015 + selector: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: mcpserver + {{- include "openslice.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index e531b73..d9c29db 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -85,6 +85,11 @@ image: pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" + mcpserver: + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server + # Overrides the image tag whose default is the chart appVersion. + tag: develop + pullPolicy: Always bugzillaurl: example.com:443/bugzilla bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z @@ -114,7 +119,7 @@ spring: oauthClientSecret: secret mysql: - storage: 10Gi + storage: 100Mi metrico: enabled: true @@ -123,7 +128,7 @@ metrico: loglevel: DEBUG cridge: - enabled: true + enabled: false logLevel: INFO spring: loglevel: INFO @@ -154,6 +159,13 @@ osscapi: spring: loglevel: INFO +mcpserver: + enabled: true + springdoc: + clientSecret: secret + spring: + logLevel: INFO + # Storage class to be used for provisioning. Default is manual # storageClass: ~ -- GitLab From fad20a7922e0ab98932d1c96a8c0776981f3d6c2 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 16 Jul 2025 15:02:08 +0300 Subject: [PATCH 17/21] feat: use correct values --- kubernetes/helm/openslice/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index d9c29db..65d6918 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -119,7 +119,7 @@ spring: oauthClientSecret: secret mysql: - storage: 100Mi + storage: 10Gi metrico: enabled: true @@ -128,7 +128,7 @@ metrico: loglevel: DEBUG cridge: - enabled: false + enabled: true logLevel: INFO spring: loglevel: INFO -- GitLab From 557665165172ecfcf53e87484ad8f8e2a726c04c Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 16 Jul 2025 15:48:35 +0300 Subject: [PATCH 18/21] feat: expose the mcp server by ingress --- kubernetes/helm/openslice/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 65d6918..d65bcf8 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -225,6 +225,9 @@ ingress: - path: "/" service: "tmfweb" port: 80 + - path: "/mcpserver" + service: "mcpserver" + port: 13015 annotations: {} -- GitLab From 852fc256139761b2aeeaedec1d8e172210599d70 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Thu, 17 Jul 2025 12:38:49 +0300 Subject: [PATCH 19/21] feat: created correct ingress for mcpserver --- .../templates/mcp-server-ingress.yaml.yaml | 23 +++++++++++++++++++ .../helm/openslice/templates/mcp-server.yaml | 8 +++---- kubernetes/helm/openslice/values.yaml | 3 --- 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 kubernetes/helm/openslice/templates/mcp-server-ingress.yaml.yaml diff --git a/kubernetes/helm/openslice/templates/mcp-server-ingress.yaml.yaml b/kubernetes/helm/openslice/templates/mcp-server-ingress.yaml.yaml new file mode 100644 index 0000000..0c515e6 --- /dev/null +++ b/kubernetes/helm/openslice/templates/mcp-server-ingress.yaml.yaml @@ -0,0 +1,23 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "openslice.fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- include "openslice.labels" . | nindent 4 }} + annotations: + nginx.ingress.kubernetes.io/rewrite-target: "/$1" + name: {{ include "openslice.fullname" . }}-mcpserver-ingress +spec: + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} + rules: + - http: + paths: + - pathType: ImplementationSpecific + path: "/mcpserver/(.*)" + backend: + service: + name: {{ include "openslice.fullname" . }}-mcpserver + port: + number: 13015 diff --git a/kubernetes/helm/openslice/templates/mcp-server.yaml b/kubernetes/helm/openslice/templates/mcp-server.yaml index 8c346fe..942f9a9 100644 --- a/kubernetes/helm/openslice/templates/mcp-server.yaml +++ b/kubernetes/helm/openslice/templates/mcp-server.yaml @@ -34,13 +34,13 @@ spec: "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 }}", - "spring-addons.issuers[0].uri": "http://keycloak:8080/auth/realms/openslice", + "spring-addons.issuers[0].uri": "{{ .Values.rooturl }}/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", + "spring.security.oauth2.resourceserver.jwt.issuer-uri": "{{ .Values.rooturl }}/auth/realms/openslice", + "springdoc.oAuthFlow.authorizationUrl": "{{ .Values.rooturl }}/auth/realms/openslice/protocol/openid-connect/auth", + "springdoc.oAuthFlow.tokenUrl": "{{ .Values.rooturl }}/auth/realms/openslice/protocol/openid-connect/token", "springdoc.oauth.client-id": "osapiWebClientId", "springdoc.oauth.clientsecret": "{{ .Values.mcpserver.springdoc.clientSecret }}", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index d65bcf8..65d6918 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -225,9 +225,6 @@ ingress: - path: "/" service: "tmfweb" port: 80 - - path: "/mcpserver" - service: "mcpserver" - port: 13015 annotations: {} -- GitLab From 4109cc5473fd26f8f55bda2041b5557dea81777d Mon Sep 17 00:00:00 2001 From: trantzas Date: Fri, 18 Jul 2025 12:22:22 +0000 Subject: [PATCH 20/21] Merging "2025Q2_RC" to "develop" branch --- compose/docker-compose.yaml.configure | 4 +-- kubernetes/helm/openslice/Chart.yaml | 4 +-- kubernetes/helm/openslice/values.yaml | 4 +-- pom.xml | 40 +++++++++++++-------------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 282bdf1..905739d 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -369,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" diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml index b8ede11..506eb59 100644 --- a/kubernetes/helm/openslice/Chart.yaml +++ b/kubernetes/helm/openslice/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.0.0 +version: 2.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2025Q2-SNAPSHOT +appVersion: 2025Q2 diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 65d6918..146ea3e 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -123,9 +123,9 @@ mysql: metrico: enabled: true - logLevel: DEBUG + logLevel: INFO spring: - loglevel: DEBUG + loglevel: INFO cridge: enabled: true diff --git a/pom.xml b/pom.xml index 70bd709..4768038 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 2025Q2-SNAPSHOT + 2025Q2 pom org.etsi.osl.main @@ -33,25 +33,25 @@ 1.7.0 - 1.0.2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.2.0-SNAPSHOT - 2025Q2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.1.1-SNAPSHOT - 1.0.2-SNAPSHOT - 1.2.0-SNAPSHOT - 1.0.2-SNAPSHOT - 1.2.0-SNAPSHOT - 1.0.2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.0.2-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 1.0.2 + 1.0.2 + 1.0.2 + 1.2.0 + 2025Q2 + 1.0.2 + 1.1.1 + 1.1.0 + 1.2.0 + 1.0.2 + 1.2.0 + 1.1.0 + 1.0.2 + 1.0.2 + 1.0.2 + 1.2.0 + 1.2.0 + 1.0.0 + 1.0.0 -- GitLab From 212bb2e4ad3e8d1c292a2e1ed21123e487ac9b5d Mon Sep 17 00:00:00 2001 From: trantzas Date: Fri, 18 Jul 2025 13:20:54 +0000 Subject: [PATCH 21/21] Preparing develop to merge with main --- compose/docker-compose.yaml.configure | 20 ++++++++++---------- kubernetes/helm/openslice/values.yaml | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 905739d..5026f35 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -105,7 +105,7 @@ services: build: context: ../../org.etsi.osl.portal.api/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -153,7 +153,7 @@ services: build: context: ../../org.etsi.osl.mano/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -179,7 +179,7 @@ services: build: context: ../../org.etsi.osl.bugzilla/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -210,7 +210,7 @@ services: build: context: ../../org.etsi.osl.tmf.api/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -258,7 +258,7 @@ services: build: context: ../../org.etsi.osl.osom/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest environment: SPRING_APPLICATION_JSON: '{ "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1", @@ -289,7 +289,7 @@ services: build: context: ../../org.etsi.osl.oas/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -331,7 +331,7 @@ services: build: context: ../../org.etsi.osl.cridge/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -360,7 +360,7 @@ services: build: context: ../../org.etsi.osl.metrico/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest environment: SPRING_APPLICATION_JSON: '{ "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", @@ -391,7 +391,7 @@ services: build: context: ../../org.etsi.osl.mcp.server/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server:develop + 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", @@ -447,7 +447,7 @@ services: build: context: ../../org.etsi.osl.centrallog.service/ dockerfile: Dockerfile - image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop + image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 146ea3e..cc86020 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -19,12 +19,12 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" centrallog: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" keycloak: repository: quay.io/keycloak/keycloak pullPolicy: Always @@ -39,22 +39,22 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" osom: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" portalapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" osscapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" mysql: repository: mysql pullPolicy: Always @@ -64,31 +64,31 @@ image: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" portalweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" tmfweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" cridge: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" metrico: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "develop" + tag: "latest" mcpserver: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server # Overrides the image tag whose default is the chart appVersion. - tag: develop + tag: latest pullPolicy: Always bugzillaurl: example.com:443/bugzilla -- GitLab