diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a633f1..49b16da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=0.10.5-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=0.13.6-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings diff --git a/README.md b/README.md index 379de4e..7a9572f 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ kubectl wait --namespace ingress-nginx \ --selector=app.kubernetes.io/component=controller \ --timeout=90s # transfer images -kind load docker-image docker.io/tractusx/aas-bridge:0.10.5-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/aas-bridge:0.13.6-SNAPSHOT --name ka # run container test ct install --charts charts/aas-bridge ``` diff --git a/charts/aas-bridge/Chart.yaml b/charts/aas-bridge/Chart.yaml index 9c4b585..2e1f370 100644 --- a/charts/aas-bridge/Chart.yaml +++ b/charts/aas-bridge/Chart.yaml @@ -30,7 +30,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/ sources: - https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/tree/main/sparql-aas type: application -appVersion: "0.10.5-SNAPSHOT" -version: 0.10.5-SNAPSHOT +appVersion: "0.13.6-SNAPSHOT" +version: 0.13.6-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/aas-bridge/templates/deployment.yaml b/charts/aas-bridge/templates/deployment.yaml index 9d95869..a782af0 100644 --- a/charts/aas-bridge/templates/deployment.yaml +++ b/charts/aas-bridge/templates/deployment.yaml @@ -61,7 +61,8 @@ spec: {{- if .Values.livenessProbe.enabled }} livenessProbe: httpGet: - path: /serialization?includeConceptDescriptions=true + scheme: HTTPS + path: /api/v3.0/description port: default failureThreshold: {{ .Values.livenessProbe.failureThreshold }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} @@ -70,7 +71,8 @@ spec: {{- if .Values.readinessProbe.enabled }} readinessProbe: httpGet: - path: /serialization?includeConceptDescriptions=true + scheme: HTTPS + path: /api/v3.0/description port: default failureThreshold: {{ .Values.readinessProbe.failureThreshold }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} @@ -79,7 +81,8 @@ spec: {{- if .Values.startupProbe.enabled }} startupProbe: httpGet: - path: /serialization?includeConceptDescriptions=true + scheme: HTTPS + path: /api/v3.0/description port: default failureThreshold: {{ .Values.startupProbe.failureThreshold }} periodSeconds: {{ .Values.startupProbe.periodSeconds }} diff --git a/pom.xml b/pom.xml index 31ae1b0..81ba4e0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.eclipse.tractusx.agents aas - 0.10.5-SNAPSHOT + 0.13.6-SNAPSHOT pom Tractus-X Knowledge Agents AAS Bridges Provides Implementations for Bridging Knowledge Agents and AAS diff --git a/sparql-aas/README.md b/sparql-aas/README.md index 1b77e03..707883c 100644 --- a/sparql-aas/README.md +++ b/sparql-aas/README.md @@ -88,7 +88,7 @@ mvn -s ../../../settings.xml install -Pwith-docker-image Alternatively, after a sucessful [build](#building) the docker image of the Sparql-To-AAS bridge is created using ```console -docker build -t tractusx/aas-bridge:0.10.5-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/aas-bridge:0.13.6-SNAPSHOT -f src/main/docker/Dockerfile . ``` To run the docker image against a local knowledge graph, you could invoke this command @@ -98,7 +98,7 @@ docker run -p 8080:8080 \ -v $(pwd)/resources:/app/resources \ -e "PROVIDER_SPARQL_ENDPOINT=http://oem-provider-agent:8082/sparql" \ -e "PROVIDER_CREDENTIAL_BASIC=Basic Zm9vOg==" \ - tractusx/aas-bridge:0.10.5-SNAPSHOT + tractusx/aas-bridge:0.13.6-SNAPSHOT ```` Afterwards, you should be able to access the [local AAS endpoint](http://localhost:8080/) via REST diff --git a/sparql-aas/pom.xml b/sparql-aas/pom.xml index 7230cdc..e78c6fa 100644 --- a/sparql-aas/pom.xml +++ b/sparql-aas/pom.xml @@ -25,7 +25,7 @@ org.eclipse.tractusx.agents aas - 0.10.5-SNAPSHOT + 0.13.6-SNAPSHOT ../pom.xml diff --git a/sparql-aas/src/main/java/org/eclipse/tractusx/agents/aasbridge/AasBridge.java b/sparql-aas/src/main/java/org/eclipse/tractusx/agents/aasbridge/AasBridge.java index 893f925..856bc4a 100644 --- a/sparql-aas/src/main/java/org/eclipse/tractusx/agents/aasbridge/AasBridge.java +++ b/sparql-aas/src/main/java/org/eclipse/tractusx/agents/aasbridge/AasBridge.java @@ -26,6 +26,8 @@ import de.fraunhofer.iosb.ilt.faaast.service.exception.ConfigurationException; import de.fraunhofer.iosb.ilt.faaast.service.exception.EndpointException; import de.fraunhofer.iosb.ilt.faaast.service.exception.MessageBusException; +import de.fraunhofer.iosb.ilt.faaast.service.filestorage.FileStorageConfig; +import de.fraunhofer.iosb.ilt.faaast.service.filestorage.memory.FileStorageInMemoryConfig; import de.fraunhofer.iosb.ilt.faaast.service.messagebus.internal.MessageBusInternalConfig; import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultEnvironment; import org.slf4j.Logger; @@ -67,7 +69,7 @@ public static void main(String[] args) throws ConfigurationException, AssetConne mainLogger.debug("Built persistenceConfig {}", persistenceConfig); - HttpEndpointConfig httpConfig = HttpEndpointConfig.builder().cors(true).build(); + HttpEndpointConfig httpConfig = HttpEndpointConfig.builder().cors(true).port(8080).build(); mainLogger.debug("Built httpConfig {}", httpConfig); @@ -75,9 +77,14 @@ public static void main(String[] args) throws ConfigurationException, AssetConne mainLogger.debug("Built busConfig {}", busConfig); + FileStorageConfig fsConfig = FileStorageInMemoryConfig.builder().build(); + + mainLogger.debug("Built fsConfig {}", fsConfig); + ServiceConfig serviceConfig = ServiceConfig.builder() .core(coreConfig) .persistence(persistenceConfig) + .fileStorage(fsConfig) .endpoint(httpConfig) .messageBus(busConfig) .build(); diff --git a/upgrade_version.sh b/upgrade_version.sh index 3ecdb79..198613d 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=0.10.5-SNAPSHOT +OLD_VERSION=0.13.6-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C