Merge pull request #261 from big-data-spaces/feature/2412-upgrade

feature : TX 2412 upgrade (TX EDC 0.8.0 release)
eclipse-tractusx · Dec 2, 2024 · da562d0 · da562d0
2 parents 7e61f79 + 42f7b1a
commit da562d0
Show file tree

Hide file tree

Showing 9 changed files with 182 additions and 162 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,6 +99,10 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
+      # Needed to create multi-platform image
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 #(v3.7.1)
+
       # Enable deployment access (on demand or main branch and version tags only)
       - name: Login to GitHub Container Registry
         if: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v') ) }}
@@ -150,6 +154,8 @@ jobs:
         with:
           context: agent-plane/agentplane-hashicorp
           file: agent-plane/agentplane-hashicorp/src/main/docker/Dockerfile
+          # Needed to create multi-platform image
+          platforms: linux/amd64, linux/arm64
           # Build image for verification purposes on every trigger event. Only push if event is not a PR
           push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }}
           tags: ${{ steps.meta-hash.outputs.tags }}
@@ -188,6 +194,8 @@ jobs:
         with:
           context: agent-plane/agentplane-azure-vault/.
           file: agent-plane/agentplane-azure-vault/src/main/docker/Dockerfile
+          # Needed to create multi-platform image
+          platforms: linux/amd64, linux/arm64
           # Build image for verification purposes on every trigger event. Only push if event is not a PR
           push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }}
           tags: ${{ steps.meta-azr.outputs.tags }}

diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml
@@ -86,7 +86,7 @@ jobs:
         uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
 
       - name: Run chart-testing (lint)
-        run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
+        run: ct lint --all --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
 
       - name: Run chart-testing (list-changed)
         id: list-changed

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,15 @@ All notable changes to this product will be documented in this file.
 
 # Released
 
+## [1.14.24] - 2024-11-25
+
+### Added
+
+### Changed
+
+- Adapted to Tractus-X EDC 0.8.0
+- Multi-Platform Support
+
 ## [1.13.22] - 2024-07-29
 
 ### Added

diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/agent-plane/agentplane-azure-vault/README.md b/agent-plane/agentplane-azure-vault/README.md
@@ -90,7 +90,7 @@ Project license: Apache License, Version 2.0
 
 **Used base image**
 
-- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:23-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin

diff --git a/agent-plane/agentplane-azure-vault/src/main/docker/Dockerfile b/agent-plane/agentplane-azure-vault/src/main/docker/Dockerfile
@@ -22,10 +22,10 @@ ENV OTEL_AGENT_LOCATION="https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.10.1-r0 --no-cache
+RUN apk update && apk add curl=8.11.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:22-jre-alpine
+FROM eclipse-temurin:23-jre-alpine
 
 ARG APP_USER=docker
 ARG APP_UID=10100

diff --git a/agent-plane/agentplane-hashicorp/README.md b/agent-plane/agentplane-hashicorp/README.md
@@ -90,7 +90,7 @@ Project license: Apache License, Version 2.0
 
 **Used base image**
 
-- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:23-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin

diff --git a/agent-plane/agentplane-hashicorp/src/main/docker/Dockerfile b/agent-plane/agentplane-hashicorp/src/main/docker/Dockerfile
@@ -21,10 +21,10 @@ ENV OTEL_AGENT_LOCATION="https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.10.1-r0 --no-cache
+RUN apk update && apk add curl=8.11.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:22-jre-alpine
+FROM eclipse-temurin:23-jre-alpine
 
 ARG APP_USER=docker
 ARG APP_UID=10100

diff --git a/pom.xml b/pom.xml
@@ -39,8 +39,8 @@
 
         <junit.version>5.11.0</junit.version>
         <mockito.version>5.2.0</mockito.version>
-        <tx.edc.version>0.8.0-rc4</tx.edc.version>
-        <edc.version>0.10.0-20241006-SNAPSHOT</edc.version>
+        <tx.edc.version>0.8.0</tx.edc.version>
+        <edc.version>0.10.1</edc.version>
         <org.apache.jena.version>4.9.0</org.apache.jena.version>
         <awssdk.version>2.26.7</awssdk.version>
         <com.azure.azure-identity.version>1.13.2</com.azure.azure-identity.version>