From 9fb1aea066fb83952436ab126403b2608c0bbc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= <jcapucho@av.it.pt>
Date: Thu, 7 Aug 2025 15:19:06 +0100
Subject: [PATCH 1/5] chore: Add imagePullSecrets configuration value

Allows users to configure `imagePullSecrets` for the cridge deployment
allowing the use of private registries.
---
 helm/cridge/templates/deployment.yaml | 4 ++++
 helm/cridge/values.yaml               | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/helm/cridge/templates/deployment.yaml b/helm/cridge/templates/deployment.yaml
index 0353795..7fef50b 100644
--- a/helm/cridge/templates/deployment.yaml
+++ b/helm/cridge/templates/deployment.yaml
@@ -22,6 +22,10 @@ spec:
         org.etsi.osl.service: cridge
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
diff --git a/helm/cridge/values.yaml b/helm/cridge/values.yaml
index 1d87a53..8f08461 100644
--- a/helm/cridge/values.yaml
+++ b/helm/cridge/values.yaml
@@ -1,5 +1,8 @@
 # Default values for cridge.
 
+# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
+
 replicaCount: 1
 
 image:
-- 
GitLab


From eda16621cfa011e12363f053ea8b6633c4fcf484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= <jcapucho@av.it.pt>
Date: Thu, 7 Aug 2025 18:49:45 +0100
Subject: [PATCH 2/5] chore: Remove spring cloud dependency

Spring cloud seems to be entirely unused except the fabric8 kubernetes
client, which is already transitively depended on. This commit removes
the spring cloud dependency completely and replaces it with a direct
dependency on the fabric8 kubernetes client.

This also fixes various error messages being thrown by the discovery
client when using cridge for a remote cluster management.
---
 pom.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e9b633..e58327f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.boot-version>3.2.2</spring.boot-version>
-		<spring.boot.fabric8-version>3.1.0</spring.boot.fabric8-version>
 		<fabric8.version>6.10.0</fabric8.version>
-		 
+
 		<!-- 
 		<spring.boot-version>${spring-boot-version}</spring.boot-version>
 		<spring.boot.fabric8-version>3.0.5</spring.boot.fabric8-version>
@@ -67,11 +66,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
-				<version>${spring.boot.fabric8-version}</version>
-			</dependency>
 
 			<!-- Camel BOM -->
 			<dependency>
@@ -113,12 +107,6 @@
 
 		<!-- fabric8 -->
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
-		</dependency>
-
-
 		<dependency>
 			<groupId>org.etsi.osl</groupId>
 			<artifactId>org.etsi.osl.model.tmf</artifactId>
@@ -207,7 +195,7 @@
 
 		<dependency>
 			<groupId>io.fabric8</groupId>
-			<artifactId>kubernetes-httpclient-okhttp</artifactId>
+			<artifactId>kubernetes-client</artifactId>
 			<version>${fabric8.version}</version>
 		</dependency>
 
-- 
GitLab


From 3736910a7526fa19273a79850bb9493ca58ab7f3 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Mon, 18 Aug 2025 17:51:47 +0000
Subject: [PATCH 3/5] Preparing the develop branch for 2025Q4 Release Cycle

---
 Dockerfile | 4 ++--
 pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d6ec778..3f1327a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
 MAINTAINER openslice.io
 RUN mkdir /opt/shareclasses
 RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.cridge-1.2.0-exec.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.2.0-exec.jar"]
+COPY target/org.etsi.osl.cridge-1.3.0-SNAPSHOT-exec.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.3.0-SNAPSHOT-exec.jar"]
diff --git a/pom.xml b/pom.xml
index 7e9b633..def3f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.etsi.osl</groupId>
 		<artifactId>org.etsi.osl.main</artifactId>
-		<version>2025Q2</version>
+		<version>2025Q4-SNAPSHOT</version>
 		<relativePath>../org.etsi.osl.main</relativePath>
 	</parent>
 
-- 
GitLab


From a10b39d39124700f2ef5cf5cd12a0100ec97e4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= <jcapucho@av.it.pt>
Date: Thu, 7 Aug 2025 15:01:11 +0100
Subject: [PATCH 4/5] fix: Update fabric8 kubernetes client to 7.3.1

This fixes comptability with kubernetes 1.33
---
 pom.xml                                                  | 8 ++++----
 .../java/org/etsi/osl/cridge/CridgeIntegrationTest.java  | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95a9e8e..95667ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,10 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring.boot-version>3.2.2</spring.boot-version>
-		<fabric8.version>6.10.0</fabric8.version>
-
-		<!-- 
+		<spring.boot-version>3.5.4</spring.boot-version>
+		<fabric8.version>7.3.1</fabric8.version>
+		 
+		<!--
 		<spring.boot-version>${spring-boot-version}</spring.boot-version>
 		<spring.boot.fabric8-version>3.0.5</spring.boot.fabric8-version>
 		<fabric8.version>6.6.2</fabric8.version>
diff --git a/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java b/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
index cffb9ae..99ef50f 100644
--- a/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
+++ b/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
@@ -1,8 +1,8 @@
 package org.etsi.osl.cridge;
 
 import static io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext.v1CRDFromCustomResourceType;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -42,12 +42,12 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.api.model.ServiceList;
+import io.fabric8.kubernetes.api.model.StatusBuilder;
 import io.fabric8.kubernetes.api.model.WatchEvent;
 import io.fabric8.kubernetes.api.model.WatchEventBuilder;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionListBuilder;
-import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionRequestFluent.V1beta1ServiceReferenceObjectsNested;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
@@ -324,9 +324,10 @@ public class CridgeIntegrationTest {
         "/apis/examples.osl.etsi.org/v1alpha1/namespaces/orderid-xxx-xxx-xxx/mycalculators?allowWatchBookmarks=true&watch=true")
         .andUpgradeToWebSocket().open().waitFor(10L)
         .andEmit(new WatchEvent(getMyCalculator("amycalculator"), "ADDED")).waitFor(20L)
-        .andEmit(new WatchEventBuilder().withNewStatusObject()
+        .andEmit(new WatchEvent(new StatusBuilder()
             .withMessage("410 - the event requested is outdated")
-            .withCode(HttpURLConnection.HTTP_GONE).endStatusObject().build())
+            .withCode(HttpURLConnection.HTTP_GONE)
+            .build(), null))
         .done().always();
 
     MixedOperation<MyCalculator, KubernetesResourceList<MyCalculator>, Resource<MyCalculator>> userAclClient =
-- 
GitLab


From c33763e17131b1d2c28709d93dc33f0bcb30a3fd Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Sat, 24 Jan 2026 21:32:06 +0000
Subject: [PATCH 5/5] Preparation for Release 2025Q4

---
 Dockerfile | 4 ++--
 pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3f1327a..27994a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
 MAINTAINER openslice.io
 RUN mkdir /opt/shareclasses
 RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.cridge-1.3.0-SNAPSHOT-exec.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.3.0-SNAPSHOT-exec.jar"]
+COPY target/org.etsi.osl.cridge-1.3.0-exec.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.3.0-exec.jar"]
diff --git a/pom.xml b/pom.xml
index 95667ca..6fea924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.etsi.osl</groupId>
 		<artifactId>org.etsi.osl.main</artifactId>
-		<version>2025Q4-SNAPSHOT</version>
+		<version>2025Q4</version>
 		<relativePath>../org.etsi.osl.main</relativePath>
 	</parent>
 
-- 
GitLab