diff --git a/Dockerfile b/Dockerfile
index d6ec77822674f0b858111ac447b398bee88b9489..27994a4c34fe4b532bb234767ccb8d6125114501 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-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/helm/cridge/templates/deployment.yaml b/helm/cridge/templates/deployment.yaml
index 0353795d55c52108050cc68941e183099492838b..7fef50bf36114f2e7d521066b59457ae4ffd2cf5 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 1d87a532db9f2dedef0881fd3a0de007c17f54fb..8f08461fe463b6581f82d7e0933347b422f0f3f0 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:
diff --git a/pom.xml b/pom.xml
index 7e9b63354ba79efd9cd007b5a43a1f8e5c56b1ff..6fea924b2ac17f112360a09338a7d8d9a08e286a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.etsi.osl
org.etsi.osl.main
- 2025Q2
+ 2025Q4
../org.etsi.osl.main
@@ -25,11 +25,10 @@
UTF-8
UTF-8
- 3.2.2
- 3.1.0
- 6.10.0
+ 3.5.4
+ 7.3.1
-
@@ -113,12 +107,6 @@
-
- org.springframework.cloud
- spring-cloud-starter-kubernetes-fabric8-all
-
-
-
org.etsi.osl
org.etsi.osl.model.tmf
@@ -207,7 +195,7 @@
io.fabric8
- kubernetes-httpclient-okhttp
+ kubernetes-client
${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 cffb9ae6a7fa630a84015d7710b05658ac1a44a6..99ef50f78c59e56ec0ed3130a0f3e5f16e0a985a 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, Resource> userAclClient =