Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature : TX 2412 upgrade (TX EDC 0.8.0 release) #261

Merged
merged 8 commits into from
Dec 2, 2024
Merged

feature : TX 2412 upgrade (TX EDC 0.8.0 release) #261

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e52ea7
feature: final release of TX EDX 0.8.0 adapted.
drcgjung Nov 22, 2024
df18abe
chore: update DEPS and include manual workflow chart testing.
drcgjung Nov 22, 2024
a57cd68
chore: correct manual workflow chart testing.
drcgjung Nov 22, 2024
a5762d3
chore: allow multi-platform build. see TRG4.08
drcgjung Nov 22, 2024
2931007
chore: add multi-platform support to CHANGELOG.
drcgjung Nov 22, 2024
daf2dab
chore: pin docker buildx action
drcgjung Nov 22, 2024
dda2160
chore: incorrect comment syntax
drcgjung Nov 22, 2024
42f7b1a
chore: update DEPs after IP check.
drcgjung Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ) }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-chart-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
309 changes: 156 additions & 153 deletions DEPENDENCIES
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the DEPENDENCIES file before I merge the PR. There should be no restricted libraries once you run the dash tool.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are clear rules for commiters and there are the obvious exceptions

https://github.com/eclipse-tractusx/tractusx-edc/blob/25da0bc59107d8bc379d8162002698165ecefff9/DEPENDENCIES#L571

So If you could please open an IP check on that one line

maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.21.0, , restricted, clearlydefined

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know the process, might have been on a different branch when I ran the command. Now the IP ticket is created, let's wait for approval then the DEPENDENCIES file can be updated.

Output:

A review is required for maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.21.0.
A review request was created https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/17433 .

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion agent-plane/agentplane-azure-vault/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions agent-plane/agentplane-azure-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent-plane/agentplane-hashicorp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions agent-plane/agentplane-hashicorp/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading