From b2c50d7deffcbdd682e4c847f11ceb358f4156d8 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Thu, 1 Aug 2024 18:00:17 +0300
Subject: [PATCH 01/32] Merge "main" into develop

---
 compose/docker-compose.yaml.configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index 088d9c8..ef91ade 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",
@@ -233,7 +233,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",
@@ -259,7 +259,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",
@@ -301,7 +301,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",
@@ -345,7 +345,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",
-- 
GitLab


From e8385c6a3b08f6ae30c707ba642a451fd0a7fcc1 Mon Sep 17 00:00:00 2001
From: dgiannopoulos <dimitris.giannopoulos@hotmail.com>
Date: Thu, 5 Sep 2024 16:19:31 +0300
Subject: [PATCH 02/32] feat: error handling and kubeconfig from local dir

---
 .../templates/{cridge-config.yaml => cridge-secret.yaml}  | 6 ++++--
 kubernetes/helm/openslice/templates/cridge.yaml           | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename kubernetes/helm/openslice/templates/{cridge-config.yaml => cridge-secret.yaml} (61%)

diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml
similarity index 61%
rename from kubernetes/helm/openslice/templates/cridge-config.yaml
rename to kubernetes/helm/openslice/templates/cridge-secret.yaml
index 2c62c9a..e790b53 100644
--- a/kubernetes/helm/openslice/templates/cridge-config.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml
@@ -1,5 +1,6 @@
+{{- $kubeconfig := .Values.kubeconfig | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
@@ -8,6 +9,7 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
   name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+type: Opaque
 data:
   config: |-
-    {{- .Files.Get "files/org.etsi.osl.cridge/config" | nindent 4 }}
+    {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index 5e55846..aebb439 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -24,10 +24,6 @@ spec:
         org.etsi.osl.service: cridge
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
-      initContainers:
-        - name: init-osscapi
-          image: busybox:1.28
-          command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"]
       containers:
         - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
@@ -51,5 +47,5 @@ spec:
       restartPolicy: Always
       volumes:
         - name: cridge-kubeconfig
-          configMap:
-            name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+          secret:
+            secretName: {{ include "openslice.fullname" . }}-cridge-kubeconfig
-- 
GitLab


From f1444a8dc5f0d817ddbfa9b94f48f0ea6b7f2a00 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Mon, 9 Sep 2024 10:30:54 +0000
Subject: [PATCH 03/32] Development preparation for release 2024Q4

---
 pom.xml | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index b22ca3a..73ff751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,16 +5,16 @@
 
 	<groupId>org.etsi.osl</groupId>
 	<artifactId>org.etsi.osl.main</artifactId>
-	<version>1.0.0</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>org.etsi.osl.main</name>
 	<organization>
-		<name>openslice.io</name>
-		<url>http://openslice.io</url>
+		<name>OpenSlice by ETSI</name>
+		<url>https://osl.etsi.org</url>
 	</organization>
 
-	<inceptionYear>2019</inceptionYear>
+	<inceptionYear>2024Q4</inceptionYear>
 
 	<properties>
 		<jackson.version>2.8.11</jackson.version>
@@ -33,24 +33,23 @@
 		<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>
 
 		<!-- osl components -->
-		<org.etsi.osl.bugzilla.version>1.0.0</org.etsi.osl.bugzilla.version>
-		<org.etsi.osl.centrallog.client.version>1.0.0</org.etsi.osl.centrallog.client.version>
-		<org.etsi.osl.centrallog.service.version>1.0.0</org.etsi.osl.centrallog.service.version>
-		<org.etsi.osl.cridge.version>1.0.0</org.etsi.osl.cridge.version>
-		<org.etsi.osl.main.version>1.0.0</org.etsi.osl.main.version>
-		<org.etsi.osl.mano.version>1.0.0</org.etsi.osl.mano.version>
-		<org.etsi.osl.model.version>1.0.0</org.etsi.osl.model.version>
-		<org.etsi.osl.model.k8s.version>1.0.0</org.etsi.osl.model.k8s.version>
-		<org.etsi.osl.model.nfv.version>1.0.0</org.etsi.osl.model.nfv.version>
-		<org.etsi.osl.model.tmf.version>1.0.0</org.etsi.osl.model.tmf.version>
-		<org.etsi.osl.oas.version>1.0.0</org.etsi.osl.oas.version>
-		<org.etsi.osl.osom.version>1.0.0</org.etsi.osl.osom.version>
-		<org.etsi.osl.portal.api.version>1.0.0</org.etsi.osl.portal.api.version>
-		<org.etsi.osl.portal.web.version>1.0.0</org.etsi.osl.portal.web.version>
-		<org.etsi.osl.sol005nbi.osm.version>1.0.0</org.etsi.osl.sol005nbi.osm.version>
-		<org.etsi.osl.sol005nbi.osm10.version>1.0.0</org.etsi.osl.sol005nbi.osm10.version>
-		<org.etsi.osl.tmf.api.version>1.0.0</org.etsi.osl.tmf.api.version>
-		<org.etsi.osl.tmf.web.version>1.0.0</org.etsi.osl.tmf.web.version>
+		<org.etsi.osl.bugzilla.version>1.0.1-SNAPSHOT</org.etsi.osl.bugzilla.version>
+		<org.etsi.osl.centrallog.client.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.client.version>
+		<org.etsi.osl.centrallog.service.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.service.version>
+		<org.etsi.osl.cridge.version>1.1.0-SNAPSHOT</org.etsi.osl.cridge.version>
+		<org.etsi.osl.main.version>2.0.0-SNAPSHOT</org.etsi.osl.main.version>
+		<org.etsi.osl.mano.version>1.0.1-SNAPSHOT</org.etsi.osl.mano.version>
+		<org.etsi.osl.model.k8s.version>1.0.1-SNAPSHOT</org.etsi.osl.model.k8s.version>
+		<org.etsi.osl.model.nfv.version>1.0.1-SNAPSHOT</org.etsi.osl.model.nfv.version>
+		<org.etsi.osl.model.tmf.version>1.1.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
+		<org.etsi.osl.oas.version>1.0.1-SNAPSHOT</org.etsi.osl.oas.version>
+		<org.etsi.osl.osom.version>1.0.1-SNAPSHOT</org.etsi.osl.osom.version>
+		<org.etsi.osl.portal.api.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.api.version>
+		<org.etsi.osl.portal.web.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.web.version>
+		<org.etsi.osl.sol005nbi.osm.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>
+		<org.etsi.osl.sol005nbi.osm10.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
+		<org.etsi.osl.tmf.api.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
+		<org.etsi.osl.tmf.web.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
 
 
 		<!-- mainly for gw api -->
-- 
GitLab


From 285c643d9597f028323295a2126aed54ec6723de Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Wed, 11 Sep 2024 08:15:28 +0000
Subject: [PATCH 04/32] feat: sanitize version naming

---
 ci-templates/default.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ci-templates/default.yml b/ci-templates/default.yml
index e49b634..c231446 100644
--- a/ci-templates/default.yml
+++ b/ci-templates/default.yml
@@ -7,11 +7,23 @@ stages:
 
 .default:
   before_script:
+    - set -e
     - |
       if [ "$CI_COMMIT_REF_PROTECTED" = true ] && [ -n "$CI_COMMIT_TAG" ]; then
         export APP_VERSION=$CI_COMMIT_TAG
       elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then
         export APP_VERSION="develop"
       else
-        export APP_VERSION=$CI_COMMIT_REF_NAME
+        # Replace '/' with '-' and check for any invalid characters
+        APP_VERSION=$(echo "$CI_COMMIT_REF_NAME" | sed 's|/|-|g')
+        
+        # Check for invalid characters (only allow lowercase letters, digits, '_', '.', '-')
+        if echo "$APP_VERSION" | grep -q '[^a-zA-Z0-9._-]'; then
+          echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, 0-9, '_', '.', and '-' are allowed."
+          exit 1
+        fi
+
+        # Convert to lowercase
+        export APP_VERSION=$(echo "$APP_VERSION" | tr 'A-Z' 'a-z')
       fi
+    - echo "APP_VERSION set to $APP_VERSION"
-- 
GitLab


From d596cf78902dee9f1bfe68449d1f207665056e63 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Mon, 16 Sep 2024 13:46:20 +0000
Subject: [PATCH 05/32] Development preparation for release 2024Q4

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73ff751..67406a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.etsi.osl</groupId>
 	<artifactId>org.etsi.osl.main</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2024Q4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>org.etsi.osl.main</name>
@@ -14,7 +14,7 @@
 		<url>https://osl.etsi.org</url>
 	</organization>
 
-	<inceptionYear>2024Q4</inceptionYear>
+	<inceptionYear>2019</inceptionYear>
 
 	<properties>
 		<jackson.version>2.8.11</jackson.version>
@@ -37,7 +37,7 @@
 		<org.etsi.osl.centrallog.client.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.client.version>
 		<org.etsi.osl.centrallog.service.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.service.version>
 		<org.etsi.osl.cridge.version>1.1.0-SNAPSHOT</org.etsi.osl.cridge.version>
-		<org.etsi.osl.main.version>2.0.0-SNAPSHOT</org.etsi.osl.main.version>
+		<org.etsi.osl.main.version>2024Q4-SNAPSHOT</org.etsi.osl.main.version>
 		<org.etsi.osl.mano.version>1.0.1-SNAPSHOT</org.etsi.osl.mano.version>
 		<org.etsi.osl.model.k8s.version>1.0.1-SNAPSHOT</org.etsi.osl.model.k8s.version>
 		<org.etsi.osl.model.nfv.version>1.0.1-SNAPSHOT</org.etsi.osl.model.nfv.version>
-- 
GitLab


From ed17739c2e72f2573f8bff3b5cc429cb1fe3e1ef Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 30 Oct 2024 10:50:15 +0000
Subject: [PATCH 06/32] Bump model.k8s version based on
 https://labs.etsi.org/rep/osl/code/org.etsi.osl.model.k8s/-/issues/8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67406a8..2b834d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 		<org.etsi.osl.cridge.version>1.1.0-SNAPSHOT</org.etsi.osl.cridge.version>
 		<org.etsi.osl.main.version>2024Q4-SNAPSHOT</org.etsi.osl.main.version>
 		<org.etsi.osl.mano.version>1.0.1-SNAPSHOT</org.etsi.osl.mano.version>
-		<org.etsi.osl.model.k8s.version>1.0.1-SNAPSHOT</org.etsi.osl.model.k8s.version>
+		<org.etsi.osl.model.k8s.version>1.1.0-SNAPSHOT</org.etsi.osl.model.k8s.version>
 		<org.etsi.osl.model.nfv.version>1.0.1-SNAPSHOT</org.etsi.osl.model.nfv.version>
 		<org.etsi.osl.model.tmf.version>1.1.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
 		<org.etsi.osl.oas.version>1.0.1-SNAPSHOT</org.etsi.osl.oas.version>
-- 
GitLab


From 58021f3d551fe32793bcfafe758f14a7b4c3d3d2 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Thu, 31 Oct 2024 16:21:08 +0000
Subject: [PATCH 07/32] Relates to #33

---
 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 9a9ba16..efc4815 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
+    - mvn deploy -s ci_settings.xml -DskipTests -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index a5c8669..369d8d9 100644
--- a/ci-templates/build_unprotected.yml
+++ b/ci-templates/build_unprotected.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn install -s ci_settings.xml
+    - mvn install -s ci_settings.xml -DskipTests
   artifacts:
     paths:
       - target/
-- 
GitLab


From abea8a79263e482f696ac6e392bc8d87dffd3bca Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Fri, 1 Nov 2024 10:28:45 +0000
Subject: [PATCH 08/32] Restore test executionfor maven in unprotected
 branches. Relates to #33.

---
 ci-templates/build_unprotected.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index 369d8d9..a5c8669 100644
--- a/ci-templates/build_unprotected.yml
+++ b/ci-templates/build_unprotected.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn install -s ci_settings.xml -DskipTests
+    - mvn install -s ci_settings.xml
   artifacts:
     paths:
       - target/
-- 
GitLab


From e93e66fc8b9896fdde3b3cd9810d961cf1cbad78 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 2 Nov 2024 21:03:18 +0000
Subject: [PATCH 09/32] Closes #34. Adding missing environmental variables for
 APIs configuration in HELM Chart

---
 kubernetes/helm/openslice/templates/oasapi.yaml      | 6 ++++--
 kubernetes/helm/openslice/templates/osportalapi.yaml | 4 +++-
 kubernetes/helm/openslice/templates/osscapi.yaml     | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index ea1ffac..bf78b5d 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -39,7 +39,8 @@ spec:
           env:          
             - 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 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 8c2927c..6df11d4 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -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 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index cf96f7d..758d519 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -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 }}
-- 
GitLab


From 34c15abc096bc6e9be317b0835d76a40ca821c2b Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Fri, 8 Nov 2024 08:37:44 +0000
Subject: [PATCH 10/32] fix for #34

---
 kubernetes/helm/openslice/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml
index 18a24ba..61f0a21 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: 1.0.0
+version: 2.0.0-SNAPSHOT
 
 # 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: 2024Q2
+appVersion: 2024Q4-SNAPSHOT
-- 
GitLab


From 09ea399d8b2331b7b3e27b1f0390fa689903e051 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 9 Nov 2024 12:06:44 +0000
Subject: [PATCH 11/32] recover tests at develop (relates to #33)

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index efc4815..9a9ba16 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -DskipTests -Dversion=$APP_VERSION
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
-- 
GitLab


From d67be292333a1b2b0a61dfd4598ee86e651f6442 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 11:29:51 +0000
Subject: [PATCH 12/32] fix for #33

---
 ci-templates/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 9a9ba16..7e284d3 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,8 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
+    - export MAVEN_OPTS="-Xms1024m -Xmx4096m -XX:MaxPermSize=1024"
+    - mvn deploy -X -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
-- 
GitLab


From bed07deb9f5069c0a4a955851d6de551c4c0f7ee Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 11:43:42 +0000
Subject: [PATCH 13/32] fix for #33

---
 ci-templates/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 7e284d3..895f53f 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,8 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - export MAVEN_OPTS="-Xms1024m -Xmx4096m -XX:MaxPermSize=1024"
-    - mvn deploy -X -s ci_settings.xml -Dversion=$APP_VERSION
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=org.etsi.osl.services.api.ServiceCatalogIntegrationTest -DskipTests=true
   artifacts:
     paths:
       - target/
-- 
GitLab


From 171b82d7e5ef64d3bf47d9fcc30bfa380276fd8b Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 11:49:23 +0000
Subject: [PATCH 14/32] fix for #33

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 895f53f..696ab97 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=org.etsi.osl.services.api.ServiceCatalogIntegrationTest -DskipTests=true
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceCatalogIntegrationTest
   artifacts:
     paths:
       - target/
-- 
GitLab


From 93abcdfa11ce602f2579d0754f74b4ac4a1257d8 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 12:01:04 +0000
Subject: [PATCH 15/32] fix for #33

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 696ab97..9a9ba16 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceCatalogIntegrationTest
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
-- 
GitLab


From f1e5cab1b4eb35407bcbd05d35dcace38406debd Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 12:49:34 +0000
Subject: [PATCH 16/32] fix for #33

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 9a9ba16..d9626be 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceNSLCMRepoServiceTest
   artifacts:
     paths:
       - target/
-- 
GitLab


From 0d1b14c37ad961ca30ff284fea0cfed1b3e44c81 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 12:54:22 +0000
Subject: [PATCH 17/32] fix for #33

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index d9626be..dd20b9a 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceNSLCMRepoServiceTest
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceSpecificationApiControllerTest
   artifacts:
     paths:
       - target/
-- 
GitLab


From 0ced63f671bfe6a721ce87c6999dcc55266a75c2 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 13:09:00 +0000
Subject: [PATCH 18/32] fix for #33

---
 ci-templates/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index dd20b9a..9a9ba16 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION -Dtest=ServiceSpecificationApiControllerTest
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
-- 
GitLab


From a44ed227b852a5d90802e47fbb2b58dd2944737a Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 17:18:53 +0200
Subject: [PATCH 19/32] Update the maven image that is used in building
 pipelines (fix for #35)

---
 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 9a9ba16..25b110b 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -1,7 +1,7 @@
 .maven_build:
   extends: .default
   stage: build
-  image: maven:3.9.5-ibm-semeru-17-focal
+  image: maven:3.9.9-ibm-semeru-17-focal
   script:
     - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index a5c8669..8a597f8 100644
--- a/ci-templates/build_unprotected.yml
+++ b/ci-templates/build_unprotected.yml
@@ -1,7 +1,7 @@
 .maven_build:
   extends: .default
   stage: build
-  image: maven:3.9.5-ibm-semeru-17-focal
+  image: maven:3.9.9-ibm-semeru-17-focal
   script:
     - mvn install -s ci_settings.xml
   artifacts:
diff --git a/compose/deploy.sh b/compose/deploy.sh
index 94071cf..d8ac538 100644
--- a/compose/deploy.sh
+++ b/compose/deploy.sh
@@ -23,7 +23,7 @@ updaterepo(){
 
         # Build maven project if .pom file is present
         if [ -f  "./pom.xml" ]; then
-            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests
+            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.9-ibm-semeru-17-focal mvn clean verify -DskipTests
         fi
 }
 
-- 
GitLab


From aa9166de7f95612881ba517732786f7c52d960b2 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 20 Nov 2024 17:23:22 +0200
Subject: [PATCH 20/32] Update the ng-cli image that is used in building
 pipelines (fix for #36)

---
 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 9a9ba16..44bf144 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:14.2.6
+  image: trion/ng-cli:13.3.7
   script:
     - |
       if [ ! -f  "./src/assets/config/theming.scss" ]; then
diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index a5c8669..f936c46 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:14.2.6
+  image: trion/ng-cli:13.3.7
   script:
     - |
       if [ ! -f  "./src/assets/config/theming.scss" ]; then
-- 
GitLab


From e3326188aeab189373285e97d62287bf1beb6f07 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 22 Nov 2024 15:53:57 +0200
Subject: [PATCH 21/32] feat: enhance cridge helm chart

---
 kubernetes/helm/openslice/Chart.yaml          |  2 +-
 .../openslice/templates/cridge-secret.yaml    | 21 +++++++++++++++++--
 .../helm/openslice/templates/cridge.yaml      | 10 ++++-----
 kubernetes/helm/openslice/values.yaml         |  4 ++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml
index 18a24ba..0e5de20 100644
--- a/kubernetes/helm/openslice/Chart.yaml
+++ b/kubernetes/helm/openslice/Chart.yaml
@@ -20,4 +20,4 @@ version: 1.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: 2024Q2
+appVersion: 2024Q4-SNAPSHOT
diff --git a/kubernetes/helm/openslice/templates/cridge-secret.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml
index e790b53..4a32bff 100644
--- a/kubernetes/helm/openslice/templates/cridge-secret.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml
@@ -1,4 +1,15 @@
-{{- $kubeconfig := .Values.kubeconfig | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}
+{{ if .Values.cridge.enabled }}
+
+{{- $kubeconfigBase64 := .Values.cridge.kubeconfig.base64 | default "" -}}
+{{- $kubeconfigFile := .Values.cridge.kubeconfig.raw | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}
+{{- $kubeconfig := "" -}}
+
+{{- if $kubeconfigBase64 }}
+  {{- $kubeconfig = $kubeconfigBase64 | b64dec }}
+{{- else if $kubeconfigFile }}
+  {{- $kubeconfig = $kubeconfigFile }}
+{{- end }}
+
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,8 +19,14 @@ metadata:
     org.etsi.osl.service: cridge
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
-  name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+  name: {{ include "openslice.fullname" . }}-kubeconfig
 type: Opaque
 data:
   config: |-
+    {{- if $kubeconfig }}
+    {{ $kubeconfig | b64enc | nindent 4 }}
+    {{- else }}
     {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}
+    {{- end }}
+
+{{- end }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index aebb439..1065639 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.cridge.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:	
@@ -9,9 +10,7 @@ metadata:
     {{- include "openslice.labels" . | nindent 4 }}
   name: {{ include "openslice.fullname" . }}-cridge
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
       app: {{ include "openslice.fullname" . }}
@@ -41,11 +40,12 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
-            - name: cridge-kubeconfig
+            - name: kubeconfig
               readOnly: true
               mountPath: /root/.kube
       restartPolicy: Always
       volumes:
-        - name: cridge-kubeconfig
+        - name: kubeconfig
           secret:
-            secretName: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+            secretName: {{ include "openslice.fullname" . }}-kubeconfig
+{{- end }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 178451e..7af2383 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -112,9 +112,13 @@ mysql:
   storage: 10Gi
   
 cridge:
+  enabled: true
   logLevel: INFO
   spring:
     loglevel: INFO
+  kubeconfig:
+    base64: ""   # Provide base64-encoded kubeconfig here if available
+    raw: ""      # Provide raw kubeconfig here if available
 
 portalapi:
   logLevel: INFO
-- 
GitLab


From 7ce0a2ba2cc68365ad1f92c62e620a34bbc6b2b1 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 22 Nov 2024 16:36:15 +0200
Subject: [PATCH 22/32] fix: gitlab ci syntax

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3787a3a..95f4774 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,11 @@ include:
 
   - local: ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED == "true"'
 
   - local: ci-templates/build_unprotected.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED != "true"'
 
 
 maven_build:
-- 
GitLab


From bc6d54a81dcfc604e39a5ed6d6b64b47ab45819e Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 22 Nov 2024 14:42:50 +0000
Subject: [PATCH 23/32] Revert "fix: gitlab ci syntax"

This reverts commit 7ce0a2ba2cc68365ad1f92c62e620a34bbc6b2b1
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95f4774..3787a3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,11 @@ include:
 
   - local: ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED == "true"'
+      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
 
   - local: ci-templates/build_unprotected.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED != "true"'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
 
 
 maven_build:
-- 
GitLab


From f64923e5e7b7d8bc79c5375ab83c5fdeab9184cc Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 22 Nov 2024 14:56:02 +0000
Subject: [PATCH 24/32] fix: gitlab ci syntax

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3787a3a..95f4774 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,11 @@ include:
 
   - local: ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED == "true"'
 
   - local: ci-templates/build_unprotected.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED != "true"'
 
 
 maven_build:
-- 
GitLab


From d616d4c29ae58df6ebe267c9afa2294a93bdf7da Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 4 Jan 2025 21:12:51 +0200
Subject: [PATCH 25/32] fix for #40:

- Update Artemis version
---
 compose/docker-compose.yaml.configure | 2 +-
 kubernetes/helm/openslice/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index ef91ade..50cf25a 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -3,7 +3,7 @@ services:
 
   artemis:
     container_name: anartemis
-    image: apache/activemq-artemis:2.30.0
+    image: apache/activemq-artemis:2.31.1
     restart: always
     profiles: ["dev", "prod"]
     ports:
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 7af2383..4f6d0d8 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -9,7 +9,7 @@ image:
     repository: apache/activemq-artemis
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "2.30.0"
+    tag: "2.31.1"
   blockdiag:
     repository: yuzutech/kroki-blockdiag
     pullPolicy: Always
-- 
GitLab


From b0afc7cd3fc321a09d926ce34c66b92c37278b72 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 11 Jan 2025 15:18:28 +0000
Subject: [PATCH 26/32] fix for #41:

- Added intial metrico MPV version (0.9)
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 2b834d7..7d4a319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 		<org.etsi.osl.sol005nbi.osm10.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
 		<org.etsi.osl.tmf.api.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
 		<org.etsi.osl.tmf.web.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
+		<org.etsi.osl.metrico>0.9-SNAPSHOT</org.etsi.osl.metrico>
 
 
 		<!-- mainly for gw api -->
-- 
GitLab


From 3f2aaa552775a02218107ae8eebe6182e0af0477 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 11 Jan 2025 15:34:51 +0000
Subject: [PATCH 27/32] fix for #41:

- added missing .version note
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d4a319..db558b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 		<org.etsi.osl.sol005nbi.osm10.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
 		<org.etsi.osl.tmf.api.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
 		<org.etsi.osl.tmf.web.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
-		<org.etsi.osl.metrico>0.9-SNAPSHOT</org.etsi.osl.metrico>
+		<org.etsi.osl.metrico.version>0.9-SNAPSHOT</org.etsi.osl.metrico.version>
 
 
 		<!-- mainly for gw api -->
-- 
GitLab


From fe4d3ef439cebf501b62931b8351b75541813108 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Mon, 13 Jan 2025 18:40:03 +0200
Subject: [PATCH 28/32] fix for #42:

- include METRICO in docker-compose.yaml.configure
---
 compose/docker-compose.yaml.configure | 33 ++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index 50cf25a..0638cbc 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -206,7 +206,8 @@ services:
         "spring.activemq.user": "artemis",
         "spring.activemq.password": "artemis",
         "logging.level.org.springframework" : "INFO",
-        "logging.level.org.etsi.osl.tmf.api" : "INFO",      
+        "logging.level.org.etsi.osl.tmf.api" : "INFO",
+        "logging.level.org.etsi.osl.tmf.*" : "INFO",
         "kroki.serverurl" : "http://localhost/kroki",
         "server.forward-headers-strategy":"FRAMEWORK"
         }'
@@ -323,6 +324,36 @@ services:
     depends_on:
     - osscapi
 
+  metrico:
+    container_name: openslice-metrico
+    restart: always
+    profiles: [ "prod"]
+    build:
+        context:  ../../org.etsi.osl.metrico/
+        dockerfile: Dockerfile      
+    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",
+        "spring.datasource.username":"root",
+        "spring.datasource.password":"letmein",
+        "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:
+      driver: "json-file"
+      options:
+        max-size: "800m"
+        max-file: "3"        
+    networks:
+    - front
+    - back
+    depends_on:
+    - osscapi
+    - mysql-portal
 
     
   portainer:
-- 
GitLab


From f8a2a400bdc823e6b286faa6dac6a695c746afb7 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Mon, 13 Jan 2025 19:08:29 +0200
Subject: [PATCH 29/32] fix for #42:

- Include METRICO in Helm Chart
---
 .../helm/openslice/templates/metrico.yaml     | 46 +++++++++++++++++++
 kubernetes/helm/openslice/values.yaml         | 11 +++++
 2 files changed, 57 insertions(+)
 create mode 100644 kubernetes/helm/openslice/templates/metrico.yaml

diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml
new file mode 100644
index 0000000..620ca0a
--- /dev/null
+++ b/kubernetes/helm/openslice/templates/metrico.yaml
@@ -0,0 +1,46 @@
+{{ if .Values.metrico.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:	
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "openslice.fullname" . }}
+    org.etsi.osl.service: metrico
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- include "openslice.labels" . | nindent 4 }}
+  name: {{ include "openslice.fullname" . }}-metrico
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ include "openslice.fullname" . }}
+      org.etsi.osl.service: metrico
+      {{- include "openslice.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "openslice.fullname" . }}
+        org.etsi.osl.service: metrico
+        {{- include "openslice.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.metrico.pullPolicy | default "Always" }}
+          name: {{ include "openslice.fullname" . }}-metrico
+          env:
+            - name: SPRING_APPLICATION_JSON
+              value: >-
+                {
+                  "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/metricodb?createDatabaseIfNotExist=true",
+                  "spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
+                  "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
+                  "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.metrico.spring.logLevel | default "INFO" }}",
+                  "logging.level.org.etsi.osl.cridge" : "{{ .Values.metrico.logLevel | default "INFO" }}" 
+                }
+      restartPolicy: Always
+{{- end }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 4f6d0d8..ee1f4f7 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -80,6 +80,11 @@ image:
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     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: "develop"
 
 bugzillaurl: example.com:443/bugzilla
 bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
@@ -110,6 +115,12 @@ spring:
 
 mysql:
   storage: 10Gi
+
+metrico:
+  enabled: true
+  logLevel: DEBUG
+  spring:
+    loglevel: DEBUG
   
 cridge:
   enabled: true
-- 
GitLab


From 60c8b3e3018c4bb5879e438e28191b64dbb2c3f0 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Tue, 14 Jan 2025 14:14:16 +0200
Subject: [PATCH 30/32] Preparing the 2024Q4_RC:

- Remove -SNAPSHOT from pom.xml
- Remove -SNAPSHOT from Chart.yaml
---
 kubernetes/helm/openslice/Chart.yaml |  4 +--
 pom.xml                              | 38 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml
index 61f0a21..8a0612a 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-SNAPSHOT
+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-SNAPSHOT
+appVersion: 2024Q4
diff --git a/pom.xml b/pom.xml
index db558b3..bfa0fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.etsi.osl</groupId>
 	<artifactId>org.etsi.osl.main</artifactId>
-	<version>2024Q4-SNAPSHOT</version>
+	<version>2024Q4</version>
 	<packaging>pom</packaging>
 
 	<name>org.etsi.osl.main</name>
@@ -33,24 +33,24 @@
 		<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>
 
 		<!-- osl components -->
-		<org.etsi.osl.bugzilla.version>1.0.1-SNAPSHOT</org.etsi.osl.bugzilla.version>
-		<org.etsi.osl.centrallog.client.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.client.version>
-		<org.etsi.osl.centrallog.service.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.service.version>
-		<org.etsi.osl.cridge.version>1.1.0-SNAPSHOT</org.etsi.osl.cridge.version>
-		<org.etsi.osl.main.version>2024Q4-SNAPSHOT</org.etsi.osl.main.version>
-		<org.etsi.osl.mano.version>1.0.1-SNAPSHOT</org.etsi.osl.mano.version>
-		<org.etsi.osl.model.k8s.version>1.1.0-SNAPSHOT</org.etsi.osl.model.k8s.version>
-		<org.etsi.osl.model.nfv.version>1.0.1-SNAPSHOT</org.etsi.osl.model.nfv.version>
-		<org.etsi.osl.model.tmf.version>1.1.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
-		<org.etsi.osl.oas.version>1.0.1-SNAPSHOT</org.etsi.osl.oas.version>
-		<org.etsi.osl.osom.version>1.0.1-SNAPSHOT</org.etsi.osl.osom.version>
-		<org.etsi.osl.portal.api.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.api.version>
-		<org.etsi.osl.portal.web.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.web.version>
-		<org.etsi.osl.sol005nbi.osm.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>
-		<org.etsi.osl.sol005nbi.osm10.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
-		<org.etsi.osl.tmf.api.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
-		<org.etsi.osl.tmf.web.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
-		<org.etsi.osl.metrico.version>0.9-SNAPSHOT</org.etsi.osl.metrico.version>
+		<org.etsi.osl.bugzilla.version>1.0.1</org.etsi.osl.bugzilla.version>
+		<org.etsi.osl.centrallog.client.version>1.0.1</org.etsi.osl.centrallog.client.version>
+		<org.etsi.osl.centrallog.service.version>1.0.1</org.etsi.osl.centrallog.service.version>
+		<org.etsi.osl.cridge.version>1.1.0</org.etsi.osl.cridge.version>
+		<org.etsi.osl.main.version>2024Q4</org.etsi.osl.main.version>
+		<org.etsi.osl.mano.version>1.0.1</org.etsi.osl.mano.version>
+		<org.etsi.osl.model.k8s.version>1.1.0</org.etsi.osl.model.k8s.version>
+		<org.etsi.osl.model.nfv.version>1.0.1</org.etsi.osl.model.nfv.version>
+		<org.etsi.osl.model.tmf.version>1.1.0</org.etsi.osl.model.tmf.version>
+		<org.etsi.osl.oas.version>1.0.1</org.etsi.osl.oas.version>
+		<org.etsi.osl.osom.version>1.1.0</org.etsi.osl.osom.version>
+		<org.etsi.osl.portal.api.version>1.0.1</org.etsi.osl.portal.api.version>
+		<org.etsi.osl.portal.web.version>1.0.1</org.etsi.osl.portal.web.version>
+		<org.etsi.osl.sol005nbi.osm.version>1.0.1</org.etsi.osl.sol005nbi.osm.version>
+		<org.etsi.osl.sol005nbi.osm10.version>1.0.1</org.etsi.osl.sol005nbi.osm10.version>
+		<org.etsi.osl.tmf.api.version>1.1.0</org.etsi.osl.tmf.api.version>
+		<org.etsi.osl.tmf.web.version>1.1.0</org.etsi.osl.tmf.web.version>
+		<org.etsi.osl.metrico.version>0.9</org.etsi.osl.metrico.version>
 
 
 		<!-- mainly for gw api -->
-- 
GitLab


From dd6d193a27706ae532bfb6c76cc67a185ed211a3 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Tue, 14 Jan 2025 13:02:18 +0000
Subject: [PATCH 31/32] fix for #38:

- remove lowercase enforcement in docker image names at image creation pipelines
---
 ci-templates/default.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci-templates/default.yml b/ci-templates/default.yml
index c231446..54b1720 100644
--- a/ci-templates/default.yml
+++ b/ci-templates/default.yml
@@ -17,13 +17,12 @@ stages:
         # Replace '/' with '-' and check for any invalid characters
         APP_VERSION=$(echo "$CI_COMMIT_REF_NAME" | sed 's|/|-|g')
         
-        # Check for invalid characters (only allow lowercase letters, digits, '_', '.', '-')
+        # Check for invalid characters (only allow lowercase and uppercase letters, digits, '_', '.', '-')
         if echo "$APP_VERSION" | grep -q '[^a-zA-Z0-9._-]'; then
-          echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, 0-9, '_', '.', and '-' are allowed."
+          echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, A-Z, 0-9, '_', '.', and '-' are allowed."
           exit 1
         fi
 
-        # Convert to lowercase
-        export APP_VERSION=$(echo "$APP_VERSION" | tr 'A-Z' 'a-z')
+        export APP_VERSION
       fi
     - echo "APP_VERSION set to $APP_VERSION"
-- 
GitLab


From bb3669f0c8d74a7f8e343f41d51709b303b7ce69 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Tue, 14 Jan 2025 18:58:57 +0000
Subject: [PATCH 32/32] Preparing develop to be merged with main (docker image
 tags)

---
 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 0638cbc..ce1ebc0 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:develop
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest
     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: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",
@@ -160,7 +160,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",
@@ -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:develop
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest
     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: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",
@@ -260,7 +260,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",
@@ -302,7 +302,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",
@@ -331,7 +331,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",
@@ -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: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 ee1f4f7..ba45552 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,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: "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"
 
 bugzillaurl: example.com:443/bugzilla
 bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
-- 
GitLab