Skip to content

Commit

Permalink
chore: upgrade version and interact with https in the container.
Browse files Browse the repository at this point in the history
  • Loading branch information
drcgjung committed Jun 1, 2024
1 parent 99ad23f commit a906bb9
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
4 changes: 2 additions & 2 deletions charts/aas-bridge/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
9 changes: 6 additions & 3 deletions charts/aas-bridge/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>0.10.5-SNAPSHOT</version>
<version>0.13.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tractus-X Knowledge Agents AAS Bridges</name>
<description>Provides Implementations for Bridging Knowledge Agents and AAS</description>
Expand Down
4 changes: 2 additions & 2 deletions sparql-aas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sparql-aas/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>0.10.5-SNAPSHOT</version>
<version>0.13.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -67,17 +69,22 @@ 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);

MessageBusInternalConfig busConfig = MessageBusInternalConfig.builder().build();

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();
Expand Down
2 changes: 1 addition & 1 deletion upgrade_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a906bb9

Please sign in to comment.