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.

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

feat: upgrade to TX EDC 0.7 #92

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
4739a4d
chore(deps): bump docker/login-action from 2 to 3
dependabot[bot] Oct 6, 2023
56d0661
feat: first try to upgrade to current versions of EDC and Jena.
drcgjung Oct 19, 2023
fb587a3
feat: Adapt location of shaded google collections. Adapt to changes i…
drcgjung Oct 20, 2023
97d4452
feat: upgrade okio to non-vulnerable version. remove jakarata validat…
drcgjung Oct 20, 2023
15a4912
Merge branch 'feature/KA-409-upgrade-edcasset-v3' into feature/upgrad…
drcgjung Oct 20, 2023
d355e6a
chore(deps): bump helm/chart-testing-action from 2.4.0 to 2.6.1
dependabot[bot] Nov 3, 2023
0204a1c
chore(deps): bump org.junit:junit-bom from 5.9.3 to 5.10.1
dependabot[bot] Nov 6, 2023
e8b99da
fix: adapt aws netty lib to match the EDC awssdk dependency.
drcgjung Nov 9, 2023
114684a
Merge remote-tracking branch 'eclipse/dependabot/maven/main/org.junit…
drcgjung Nov 9, 2023
5ddf5d9
Merge remote-tracking branch 'eclipse/dependabot/github_actions/main/…
drcgjung Nov 9, 2023
fd5d47e
Merge remote-tracking branch 'eclipse/dependabot/github_actions/main/…
drcgjung Nov 9, 2023
f76ab27
fix: upgrade docker image and opentelemetry versions. flexibilize rem…
drcgjung Nov 9, 2023
01903c1
Merge remote-tracking branch 'eclipse/main' into feature/upgrade-tx-e…
drcgjung Feb 13, 2024
7f541e6
feat: upgrade version and get tests to run
drcgjung Feb 13, 2024
1353c7e
Merge remote-tracking branch 'eclipse/main' into feature/upgrade-tx-e…
drcgjung Mar 4, 2024
a195e61
feat: refactor full connector chart into agent plane only chart
drcgjung Mar 4, 2024
d5e2cae
feat: upgradable and testable agent-plane-only charts.
drcgjung Mar 9, 2024
95adb67
chore: add chart test and upgradability check.
drcgjung Mar 9, 2024
841e41c
chore: upgrade version and add s3 runtime dependency.
drcgjung Mar 9, 2024
838c9d6
Merge remote-tracking branch 'eclipse/main' into feature/upgrade-tx-e…
drcgjung Apr 17, 2024
fcd00d1
chore: double step in helm-chart-lint workflow
drcgjung Apr 17, 2024
7f2eb48
chore: make sure the right java version is used for linting build
drcgjung Apr 17, 2024
459ee81
chore: wrong extra args
drcgjung Apr 17, 2024
5400599
chore: ct --helm-extra-args and --helm-extra-set-args are bevaving di…
drcgjung Apr 17, 2024
fca0d00
chore: upgrade version because of helm/chart changes.
drcgjung Apr 17, 2024
6987e8d
chore: choose the correct chart value for the image regisry.
drcgjung Apr 17, 2024
8425a14
feat: align with matchmaking implementation.
drcgjung Apr 23, 2024
955ded3
feat: upgrade to tx-edc 0.7.0 / edc 0.6.1
drcgjung Apr 23, 2024
d3b53ab
fix: trailing spaces in chart.
drcgjung Apr 23, 2024
9055b18
fix: http client configguration override adopted to EDC 0.6.1 upstream
drcgjung Apr 25, 2024
7120f2e
fix: jackson dependencies completed and homogenized.
drcgjung Apr 25, 2024
3290298
fix: mitigate some CVE's in dependencies.
drcgjung Apr 25, 2024
ee9ccc1
chore: refresh dependencies.
drcgjung Apr 25, 2024
ae73c1b
feat: upgrade to EDC 0.7.0 asset definitions and transfer callback in…
drcgjung Apr 29, 2024
20b9167
fix: cleanup code aligned with matchmaking agent.
drcgjung Apr 30, 2024
e6d9746
fix: debug the transfer process/callback mechanism.
drcgjung May 6, 2024
7e64c0a
fix: correct logging rendering of the callback endpoint.
drcgjung May 6, 2024
619c69d
fix: skill creation/update needs to escape regexes.
drcgjung May 6, 2024
419eaa5
fix: add default runMode=ALL for skill registration. remove redundant…
drcgjung May 7, 2024
1cc7858
feat: upgrade charts to EDC 0.7 and 2405 ssi/iatp functionality
drcgjung May 7, 2024
959fb32
fix: do not use temporary image names and tags in normal workflows.
drcgjung May 7, 2024
ae6b3da
fix: correct callback endpoint name.
drcgjung May 7, 2024
0aa1310
fix: helm lint errors.
drcgjung May 7, 2024
93f43b9
fix: get the charts to run sideways with the tx-connector chart in um…
drcgjung May 10, 2024
dcee419
fix: helm linting
drcgjung May 10, 2024
ecbb2b9
fix: helm linting
drcgjung May 10, 2024
83c564c
fix: chart testing values were inconsistent
drcgjung May 10, 2024
ff06a36
fix: address umbrella deployments with connector-side-by-side.
drcgjung May 10, 2024
949beb3
fix: debug control plane references.
drcgjung May 10, 2024
29d51ae
fix: control and management templates.
drcgjung May 10, 2024
a23d00c
fix: lint errors.
drcgjung May 10, 2024
6dd0bf9
fix: chart integration test values.
drcgjung May 10, 2024
3d2ad72
fix: linting issues.
drcgjung May 10, 2024
cc1ce3b
chore: update DEPENDENCIES.
drcgjung May 10, 2024
6551459
fix: trailing quotes.
drcgjung May 13, 2024
03ffb12
chore: make sure the dependent repositories are available when chart …
drcgjung May 13, 2024
baa7de1
chore: update DEPENDENCIES after successful IP checks.
drcgjung May 15, 2024
642ad6e
fix: add resources to agent plane as borrowed from the tractusx charts
drcgjung May 15, 2024
94abcf5
docs: broken link because of style change.
drcgjung May 15, 2024
d157a90
fix: agent plane name was fixed in chart helpers.
drcgjung May 15, 2024
d49adbd
style: copyright license headers should use fixed period formatting.
drcgjung May 16, 2024
9c0c4eb
fix: important code smells/forgery threats as of codeql results 2024-…
drcgjung May 16, 2024
d417eb4
fix: important code smells/forgery threats as of codeql results 2024-…
drcgjung May 16, 2024
5dd2869
fix: incorrect signaling target port in agent service.
drcgjung May 17, 2024
f682324
fix: wrong azure environment vars.
drcgjung May 17, 2024
b9fb296
docs: changelog for the upcoming release.
drcgjung May 17, 2024
b89f17b
docs|fix: chart test for azure-vault plane fixed. Document the charts.
drcgjung May 18, 2024
2a3b7ac
fix: make ct install use the default values
drcgjung May 18, 2024
b94e1d5
fix: yaml lint
drcgjung May 18, 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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.12.19-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') }}

- name: Agent Plane Hashicorp Container Build and push
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.12.19-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') }}

- name: Agent Plane Azure Vault Container Build and push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
64 changes: 60 additions & 4 deletions .github/workflows/helm-chart-lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
#
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -56,23 +56,38 @@ jobs:
lint-test:
runs-on: ubuntu-latest
steps:
# get the code
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

# Set-Up Helm
- name: Set up Helm
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
with:
version: v3.10.3

# Set-Up Java
- name: Setup JDK 17
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'

# Set-Up Python
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.9

# Set-Up CT
- name: Set up chart-testing
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

- name: Run chart-testing (list-changed)
id: list-changed
run: |
Expand All @@ -81,6 +96,47 @@ jobs:
echo "CHART_CHANGED=true" >> $GITHUB_ENV
fi

# run chart linting
- name: Run chart-testing (lint)
run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
# Preparing a kind cluster to install and test charts on
- name: Create kind cluster
uses: container-tools/kind-action@0fc957b58d9a5bc9ca57a1b419324a2074c7653b # v2.0.3
with:
# upgrade version, default (v0.17.0) uses node image v1.21.1 and doesn't work with more recent node image versions
version: v0.20.0
# default value for event_name != workflow_dispatch
node_image: ${{ github.event.inputs.node_image || 'kindest/node:v1.27.3' }}
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'

- name: Build Java/Docker via Maven
run: |
./mvnw -s settings.xml deploy -Drepo=kind-registry:5000/tractusx/ -Dmaven.deploy.skip -DskipTests -Pwith-docker-image
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'

# install the chart to the kind cluster and run helm test
# define charts to test with the --charts parameter
- name: Run chart-testing (install)
run: |
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add hashicorp https://helm.releases.hashicorp.com
ct install --charts charts/agent-plane,charts/agent-plane-azure-vault --config charts/config/chart-testing-config.yaml --helm-extra-set-args="--set=imageRegistry=kind-registry:5000/"
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'

# Upgrade the released chart version with the locally available chart
# default value for event_name != workflow_dispatch
- name: Run helm upgrade on agent plane
run: |
helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
helm install agent tractusx-dev/agent-plane --version ${{ github.event.inputs.upgrade_from }} --set=image.registry=kind-registry:5000/
helm dependency update charts/agent-plane
helm upgrade agent charts/agent-plamne
if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != '' && github.event.inputs.upgrade_from != 'x.x.x'

# Upgrade the released chart version with the locally available chart
# default value for event_name != workflow_dispatch
- name: Run helm upgrade on agent plane azure vault
run: |
helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
helm install agent-azure tractusx-dev/agent-plane-azure-vault --version ${{ github.event.inputs.upgrade_from }} --set=imageRegistry=kind-registry:5000/
helm dependency update charts/agent-plane-azure-vault
helm upgrade agent-azure charts/agent-plane-azure-vault
if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != '' && github.event.inputs.upgrade_from != 'x.x.x'

2 changes: 1 addition & 1 deletion .github/workflows/helm-chart-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
#
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .tractusx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,39 @@ All notable changes to this product will be documented in this file.

# Released

## [1.12.19] - 2024-05-17

### Added

- Federated Catalogue: Support for sh:shape in top-level graph for implementing goal-oriented skills, operate according to the CS 24.05 standard
- Matchmaking Agent: Possibility to use an external matchmaking agent (which can host actual graph data)
- Charts for Agent Plane Only Deployments (agent-plane, agent-plane-vault) in Umbrella with Tractus-X Connector (tractusx-connector, tractusx-connector-azure-vault)

### Changed

- Adapted to Tractus-X EDC 0.7.0
- Upgraded to the latest possible version of dependent libraries
- Improvements when interacting with EDC control plane

### Removed

- Support for Tractus-X EDC <0.6.x, compatibility modes
- Charts for Complete Connector Deployments (agent-connector)

## [1.11.16] - 2024-02-20

### Added

- Federated Catalogue: More asset properties mapped, operate according CX 24.03 standards

### Changed

- Adapted to Tractus-X EDC 0.5.4
- Upgraded to the latest possible version of dependent libraries
- Improvements when interacting with EDC control plane

### Removed

## [1.10.15] - 2023-11-22

### Added
Expand Down
Loading
Loading