Skip to content

Commit 1d51fed

Browse files
authored
Merge pull request #92 from catenax-ng/feature/upgrade-tx-edc-060
feat: upgrade to TX EDC 0.7
2 parents 6917953 + b94e1d5 commit 1d51fed

File tree

131 files changed

+3345
-7994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+3345
-7994
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
2+
# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
33
#
44
# See the NOTICE file(s) distributed with this work for additional
55
# information regarding copyright ownership.

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
type=semver,pattern={{version}}
143143
type=semver,pattern={{major}}
144144
type=semver,pattern={{major}}.{{minor}}
145-
type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
145+
type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
146146
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
147147
148148
- name: Agent Plane Hashicorp Container Build and push
@@ -180,7 +180,7 @@ jobs:
180180
type=semver,pattern={{version}}
181181
type=semver,pattern={{major}}
182182
type=semver,pattern={{major}}.{{minor}}
183-
type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
183+
type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
184184
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
185185
186186
- name: Agent Plane Azure Vault Container Build and push

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################
2-
# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
2+
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
33
#
44
# See the NOTICE file(s) distributed with this work for additional
55
# information regarding copyright ownership.

.github/workflows/helm-chart-lint.yml

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#
3-
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
44
#
55
# See the NOTICE file(s) distributed with this work for additional
66
# information regarding copyright ownership.
@@ -56,23 +56,38 @@ jobs:
5656
lint-test:
5757
runs-on: ubuntu-latest
5858
steps:
59+
# get the code
5960
- name: Checkout
6061
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6162
with:
6263
fetch-depth: 0
6364

65+
# Set-Up Helm
6466
- name: Set up Helm
6567
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
6668
with:
6769
version: v3.10.3
6870

71+
# Set-Up Java
72+
- name: Setup JDK 17
73+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
74+
with:
75+
java-version: '17'
76+
distribution: 'temurin'
77+
cache: 'maven'
78+
79+
# Set-Up Python
6980
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
7081
with:
7182
python-version: 3.9
7283

84+
# Set-Up CT
7385
- name: Set up chart-testing
7486
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
7587

88+
- name: Run chart-testing (lint)
89+
run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
90+
7691
- name: Run chart-testing (list-changed)
7792
id: list-changed
7893
run: |
@@ -81,6 +96,47 @@ jobs:
8196
echo "CHART_CHANGED=true" >> $GITHUB_ENV
8297
fi
8398
84-
# run chart linting
85-
- name: Run chart-testing (lint)
86-
run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml
99+
# Preparing a kind cluster to install and test charts on
100+
- name: Create kind cluster
101+
uses: container-tools/kind-action@0fc957b58d9a5bc9ca57a1b419324a2074c7653b # v2.0.3
102+
with:
103+
# upgrade version, default (v0.17.0) uses node image v1.21.1 and doesn't work with more recent node image versions
104+
version: v0.20.0
105+
# default value for event_name != workflow_dispatch
106+
node_image: ${{ github.event.inputs.node_image || 'kindest/node:v1.27.3' }}
107+
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'
108+
109+
- name: Build Java/Docker via Maven
110+
run: |
111+
./mvnw -s settings.xml deploy -Drepo=kind-registry:5000/tractusx/ -Dmaven.deploy.skip -DskipTests -Pwith-docker-image
112+
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'
113+
114+
# install the chart to the kind cluster and run helm test
115+
# define charts to test with the --charts parameter
116+
- name: Run chart-testing (install)
117+
run: |
118+
helm repo add bitnami https://charts.bitnami.com/bitnami
119+
helm repo add hashicorp https://helm.releases.hashicorp.com
120+
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/"
121+
if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'
122+
123+
# Upgrade the released chart version with the locally available chart
124+
# default value for event_name != workflow_dispatch
125+
- name: Run helm upgrade on agent plane
126+
run: |
127+
helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
128+
helm install agent tractusx-dev/agent-plane --version ${{ github.event.inputs.upgrade_from }} --set=image.registry=kind-registry:5000/
129+
helm dependency update charts/agent-plane
130+
helm upgrade agent charts/agent-plamne
131+
if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != '' && github.event.inputs.upgrade_from != 'x.x.x'
132+
133+
# Upgrade the released chart version with the locally available chart
134+
# default value for event_name != workflow_dispatch
135+
- name: Run helm upgrade on agent plane azure vault
136+
run: |
137+
helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
138+
helm install agent-azure tractusx-dev/agent-plane-azure-vault --version ${{ github.event.inputs.upgrade_from }} --set=imageRegistry=kind-registry:5000/
139+
helm dependency update charts/agent-plane-azure-vault
140+
helm upgrade agent-azure charts/agent-plane-azure-vault
141+
if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != '' && github.event.inputs.upgrade_from != 'x.x.x'
142+

.github/workflows/helm-chart-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#
3-
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
44
#
55
# See the NOTICE file(s) distributed with this work for additional
66
# information regarding copyright ownership.

.tractusx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################
2-
# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
2+
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
33
#
44
# See the NOTICE file(s) distributed with this work for additional
55
# information regarding copyright ownership.

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,39 @@ All notable changes to this product will be documented in this file.
2424

2525
# Released
2626

27+
## [1.12.19] - 2024-05-17
28+
29+
### Added
30+
31+
- Federated Catalogue: Support for sh:shape in top-level graph for implementing goal-oriented skills, operate according to the CS 24.05 standard
32+
- Matchmaking Agent: Possibility to use an external matchmaking agent (which can host actual graph data)
33+
- Charts for Agent Plane Only Deployments (agent-plane, agent-plane-vault) in Umbrella with Tractus-X Connector (tractusx-connector, tractusx-connector-azure-vault)
34+
35+
### Changed
36+
37+
- Adapted to Tractus-X EDC 0.7.0
38+
- Upgraded to the latest possible version of dependent libraries
39+
- Improvements when interacting with EDC control plane
40+
41+
### Removed
42+
43+
- Support for Tractus-X EDC <0.6.x, compatibility modes
44+
- Charts for Complete Connector Deployments (agent-connector)
45+
46+
## [1.11.16] - 2024-02-20
47+
48+
### Added
49+
50+
- Federated Catalogue: More asset properties mapped, operate according CX 24.03 standards
51+
52+
### Changed
53+
54+
- Adapted to Tractus-X EDC 0.5.4
55+
- Upgraded to the latest possible version of dependent libraries
56+
- Improvements when interacting with EDC control plane
57+
58+
### Removed
59+
2760
## [1.10.15] - 2023-11-22
2861

2962
### Added

0 commit comments

Comments
 (0)