Commit 2c276ffc authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2025Q4_RC' into 'main' 

Creating 2025Q4 Release

See merge request !27
parents 925d2c2e c33763e1

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -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"]

helm/cridge/templates/deployment.yaml

+4 −0
Original line number Diff line number Diff line
@@ -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" }}

helm/cridge/values.yaml

+3 −0
Original line number Diff line number Diff line 
# 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:

pom.xml

+5 −17
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>2025Q2</version>

		<version>2025Q4</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>
@@ -25,9 +25,8 @@ 
	<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>

		<spring.boot.fabric8-version>3.1.0</spring.boot.fabric8-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>
@@ -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>

src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java

+5 −4
Original line number Diff line number Diff line 
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 =