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

Fix medium security findings #341

Merged
merged 76 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
ae0b70e
chore: [TRACEFOSS-XXX] compatibility matrix
ds-jleyh Oct 27, 2023
ecbbfca
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
640c1af
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
a9b09c4
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
782a303
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
b01d4e5
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
487063a
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
f2834ae
chore:[TRACEFOSS-XXX] TODO add detailAspectModels
Nov 2, 2023
7e7c35c
chore: TRACEFOSS-XXX add cypress docker image
ds-mwesener Nov 7, 2023
b58cbeb
chore: TRACEFOSS-XXX add cypress docker image
ds-mwesener Nov 7, 2023
aec77b0
Merge branch 'main' into chore/TRACEFOSS-XXX-fix-trg
ds-mwesener Nov 7, 2023
1a1e250
chore: TRACEFOSS-XXX run as nonroot user
ds-lcapellino Nov 7, 2023
46215f7
chore: TRACEFOSS-XXX add correct resource request
ds-lcapellino Nov 7, 2023
e64ec22
chore: TRACEFOSS-XXX add correct resource request
ds-lcapellino Nov 7, 2023
4091c8b
chore: TRACEFOSS-XXX add correct resource request
ds-lcapellino Nov 7, 2023
3de4645
chore: TRACEFOSS-XXX add correct resource request
ds-lcapellino Nov 7, 2023
b7ec81d
chore(): [TRACEFOSS-XXX] modified compatibility matrix. Added service…
ds-jleyh Nov 8, 2023
6650a95
Merge branch 'eclipse-tractusx:main' into chore/TRACEFOSS-XXX-compati…
ds-jleyh Nov 8, 2023
1d3610f
feature: TRACEFOSS-2796 count query temp
ds-ext-sceronik Nov 8, 2023
e794a14
chore: TRACEFOSS-XXX trg fix
ds-mwesener Nov 8, 2023
a1481d5
chore: TRACEFOSS-XXX trg fix
ds-mwesener Nov 8, 2023
a54a9ae
Update Dependencies Backend Action
ds-mwesener Nov 8, 2023
91a3db6
Merge pull request #747 from catenax-ng/action/dependencies
ds-mwesener Nov 8, 2023
1f57c5c
Merge pull request #730 from catenax-ng/chore/TRACEFOSS-XXX-TODO
ds-lcapellino Nov 8, 2023
3d8e7be
chore: TRACEFOSS-XXX trg fix
ds-mwesener Nov 8, 2023
5cf2606
Merge pull request #746 from catenax-ng/chore/TRACEFOSS-XXX-fix-trg
ds-mwesener Nov 8, 2023
a947fe0
chore: [TRACEFOSS-XXX] modified compatibility matrix: removed compati…
ds-jleyh Nov 8, 2023
686ccf5
chore: [TRACEFOSS-XXX] Added a job to display the selected environment
ds-ashanmugavel Nov 8, 2023
2bda26b
chore: [TRACEFOSS-XXX] Update argo.yml
ds-ashanmugavel Nov 8, 2023
0e3d7d8
chore: [TRACEFOSS-XXX] Update argo.yml
ds-ashanmugavel Nov 8, 2023
9f50c64
chore: [TRACEFOSS-XXX] Update CHANGELOG.md
ds-ashanmugavel Nov 8, 2023
b576105
feature: TRACEFOSS-2796 partial count working
ds-ext-sceronik Nov 8, 2023
d033e3d
Merge pull request #748 from catenax-ng/chore/TRACEFOSS-XXX-ARGO-Work…
ds-lcapellino Nov 8, 2023
0dd5a3e
feature: TRACEFOSS-2796 refactor and implementation of custom count f…
ds-ext-sceronik Nov 8, 2023
441a547
feature: TRACEFOSS-2796 add changelog info
ds-ext-sceronik Nov 9, 2023
8b4a043
feature: TRACEFOSS-2796 merge main
ds-ext-sceronik Nov 9, 2023
978b8a0
feature(docs):[TRACEFOSS-XXX] updated broken image links
ds-mmaul Nov 9, 2023
cab3cba
feature(docs):[TRACEFOSS-XXX] added TODO for merging other-parts.serv…
ds-mmaul Nov 9, 2023
36ba322
feature: TRACEFOSS-2796 support for filtering notifications by assetId
ds-ext-sceronik Nov 9, 2023
3a3873a
feature(docs):[TRACEFOSS-XXX] updated Structure documentation
ds-mmaul Nov 9, 2023
b0d5862
chore: [TRACEFOSS-XXX] modified compatibility matrix: added informati…
ds-jleyh Nov 9, 2023
bfd0d92
chore: TRACEFOSS-XXX update SecurityConfig to not use deprecated methods
ds-lcapellino Nov 9, 2023
3ea1e48
chore: TRACEFOSS-XXX remove unused parameter
ds-lcapellino Nov 9, 2023
9caade4
chore: TRACEFOSS-2796 adapt frontend to use correct filter
ds-mwesener Nov 9, 2023
009a8dd
Revert "chore: TRACEFOSS-XXX add correct resource request"
ds-lcapellino Nov 9, 2023
12bcf4b
Merge pull request #710 from catenax-ng/chore/TRACEFOSS-XXX-compatibi…
ds-mwesener Nov 9, 2023
535c728
Update Dependencies Backend Action
ds-mwesener Nov 9, 2023
705dc9b
Merge pull request #752 from catenax-ng/chore/TRACEFOSS-XXX-update-docs
ds-mwesener Nov 9, 2023
fa9a376
Merge pull request #751 from catenax-ng/action/dependencies
ds-mwesener Nov 9, 2023
76bcb50
chore: TRACEFOSS-XXX remove unused parameter
ds-lcapellino Nov 9, 2023
50cf209
chore: TRACEFOSS-XXX update chart-testing-action
ds-lcapellino Nov 9, 2023
7a48403
Merge pull request #750 from catenax-ng/chore/TRACEFOSS-XXX-fix-mediu…
ds-lcapellino Nov 9, 2023
e4c424f
chore: TRACEFOSS-XXX update dependencies with dependabot recommendations
ds-lcapellino Nov 10, 2023
f310e59
chore: TRACEFOSS-XXX update CHANGELOG.md
ds-lcapellino Nov 10, 2023
2976279
chore: TRACEFOSS-XXX update CHANGELOG.md
ds-lcapellino Nov 10, 2023
3fd1749
Merge pull request #755 from catenax-ng/chore/TRACEFOSS-XXX-bump-depe…
ds-mwesener Nov 10, 2023
ab8b5f1
Merge pull request #749 from catenax-ng/feature/TRACEFOSS-2796-count-…
ds-mmaul Nov 10, 2023
4cef7b9
Update Dependencies Backend Action
ds-mmaul Nov 10, 2023
d27780f
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 10, 2023
f22f152
Merge pull request #756 from catenax-ng/action/dependencies
ds-mwesener Nov 10, 2023
3565b35
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 10, 2023
7396cab
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 10, 2023
682feb5
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 10, 2023
37c621c
Merge branch 'main' into feature/TRACEFOSS-2327-update-dialog-ui
ds-mwesener Nov 10, 2023
a7f4ec3
Merge pull request #757 from catenax-ng/feature/TRACEFOSS-2327-update…
ds-mwesener Nov 10, 2023
da7c497
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 10, 2023
cac1aa1
feature: TRACEFOSS-2796 fix issue with counting filter
ds-ext-sceronik Nov 10, 2023
69ac7d8
feature: TRACEFOSS-2796 formatting
ds-ext-sceronik Nov 10, 2023
823fa8e
Merge pull request #758 from catenax-ng/bug/TRACEFOSS-2796-fix-count-…
ds-mwesener Nov 10, 2023
fb0c8fa
chore: TRACEFOSS-2327 fixed some ui topics
ds-mwesener Nov 13, 2023
7086150
feature: TRACEFOSS-2796 fix specific zero count issue on sql querry
ds-ext-sceronik Nov 13, 2023
43c3d54
feature: TRACEFOSS-2796 remove commented code
ds-ext-sceronik Nov 13, 2023
e780373
Merge pull request #760 from catenax-ng/bug/TRACEFOSS-2796-fix-count-…
ds-mwesener Nov 13, 2023
5e9e7f2
Update Dependencies Backend Action
ds-mwesener Nov 13, 2023
fee5b08
Merge pull request #759 from catenax-ng/feature/TRACEFOSS-2327-update…
ds-mwesener Nov 13, 2023
04265f8
Merge pull request #761 from catenax-ng/action/dependencies
ds-mwesener Nov 13, 2023
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
14 changes: 12 additions & 2 deletions .github/workflows/argo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,18 @@ env:
ARGO_INT_B_TRACE_X_INSTANCE: "https://argo.int.demo.catena-x.net/api/v1/applications/traceability-foss-int-b"
ARGO_INT_B_RegistryReload: "https://traceability-int-b.int.demo.catena-x.net/api/registry/reload"

jobs:
jobs:

print_environment:
runs-on: ubuntu-latest
steps:
- name: ${{ github.event.inputs.environment }}
run: |
echo "### inputs" >> $GITHUB_STEP_SUMMARY
echo "- environment: ${{ github.event.inputs.environment }}" >> $GITHUB_STEP_SUMMARY

hard_refresh_environment:
needs: print_environment
runs-on: ubuntu-latest
steps:

Expand All @@ -87,7 +96,7 @@ jobs:
echo ::add-mask::$ARGO_TOKEN
echo ARGO_TOKEN=$ARGO_TOKEN >> $GITHUB_ENV

- name: Hard refresh environment
- name: Hard refresh environment ${{ github.event.inputs.environment }}
run: |
source ./.github/argo/argo_config.sh

Expand All @@ -103,6 +112,7 @@ jobs:
curl -X GET -H "Authorization: Bearer ${{ env.ARGO_TOKEN }}" "$resource?refresh=hard&appNamespace=argocd"
done
sleep 40

delete_environment:
needs: hard_refresh_environment
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: 'maven'

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/e2e-tests-xray_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down Expand Up @@ -96,12 +96,12 @@ jobs:
path: frontend/cypress/e2e

- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x

- name: Cypress run all tests
uses: cypress-io/github-action@v6.5.0 # use the explicit version number
uses: cypress-io/github-action@v6.6.0 # use the explicit version number
with:
start: npm run start:auth:e2ea
wait-on: "http://localhost:4200"
Expand Down Expand Up @@ -158,12 +158,12 @@ jobs:
# path: frontend/cypress/e2e
#
# - name: Use Node.js 18.x
# uses: actions/setup-node@v3
# uses: actions/setup-node@v4
# with:
# node-version: 18.x
#
# - name: Cypress run all tests
# uses: cypress-io/github-action@v6.5.0 # use the explicit version number
# uses: cypress-io/github-action@v6.6.0 # use the explicit version number
# with:
# start: npm start
# wait-on: "http://localhost:4200"
Expand Down Expand Up @@ -212,12 +212,12 @@ jobs:
# Error: connect ECONNREFUSED 127.0.0.1:4200"

# - name: Use Node.js 18.x
# uses: actions/setup-node@v3
# uses: actions/setup-node@v4
# with:
# node-version: 18.x

# - name: Use Node.js 16.x
# uses: actions/setup-node@v3
# uses: actions/setup-node@v4
# with:
# node-version: 16.x
#
Expand All @@ -226,7 +226,7 @@ jobs:
# run: npx playwright install --with-deps webkit
#
# - name: Cypress run all tests
# uses: cypress-io/github-action@v6.5.0 # use the explicit version number
# uses: cypress-io/github-action@v6.6.0 # use the explicit version number
# with:
# start: npm start:auth:e2ea
# wait-on: "http://localhost:4200"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-chart-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
helm repo add tx-item-relationship-service https://catenax-ng.github.io/tx-item-relationship-service

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
uses: helm/chart-releaser-action@v1.6.0
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "${{ env.RELEASE_VERSION }}"
2 changes: 1 addition & 1 deletion .github/workflows/helm-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
version: v3.9.3

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
distribution: 'temurin'

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-scan-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Install chrome
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: docker build -t localhost:5000/traceability-foss:fe_${{ github.sha }} .

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.12.0
uses: aquasecurity/trivy-action@0.14.0
with:
image-ref: 'localhost:5000/traceability-foss:fe_${{ github.sha }}'
format: "sarif"
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
ref: ${{needs.prepare-env.outputs.check_sha}}

- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.12.0
uses: aquasecurity/trivy-action@0.14.0
with:
scan-type: "config"
hide-progress: false
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
tags: localhost:5000/traceability-foss:trivy

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.12.0
uses: aquasecurity/trivy-action@0.14.0
with:
image-ref: localhost:5000/traceability-foss:trivy
trivyignores: "./.github/workflows/.trivyignore"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Install chrome
Expand Down
5 changes: 5 additions & 0 deletions .tractusx
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
product: "Traceability FOSS"
leadingRepository: "https://github.com/eclipse-tractusx/traceability-foss"
repositories: []

# section to explicitly skip certain release guideline checks
skipReleaseChecks:
alignedBaseImage:
- "frontend/cypress/Dockerfile"
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Added
- Cypress Login to E2E Environment to enable cypress e2e tests.
- Fixed bug in argo workflow which allows to successfully run on INT-A/INT-B
- New job named 'print_environment' to the Argo-workflow that prints the selected environment to the GitHub Step Summary.
- Added NOTIFICATION_COUNT_EQUAL filter strategy for Assets as built Specifications
- Added new supported filter for notifications assetId that allows filtering alerts and investigations by assetId

### Changed
- Fixed table-settings reset bug
Expand All @@ -17,6 +20,20 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Bump jetty-http from 11.0.15 to 11.0.17
- Assets response have now list of notification ids rather than count of existing notifications
- Frontend adapt to backend api changes for activeAlerts and activeInvestigations
- Reconfigured all docker images user settings
- Adapted memory / cpu requests and limits in default values helm file
- Fixed textarea field for dialog.
- Removed duplicated cancel buttons from investigation and alerts workflows

- Migrate to not deprecated methods in HTTP security
- Bump actions/setup-node@ from v3 to v4
- Bump helm/chart-releaser-action from v1.5.0 to v1.6.0
- Bump aquasecurity/trivy-action from 0.12.0 to 0.14.0
- Bump cypress-io/github-action from v6.5.0 to v6.6.0
- Bump spring-core version from 6.0.12 to 6.0.13
- Bump compiler-plugin version 3.10.1 to 3.11.0
- Bump commons-io version 2.13.0 to 2.15.0
-

### Removed

Expand Down
22 changes: 22 additions & 0 deletions COMPATIBILITY_MATRIX.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Compatibility matrix v1.0

## Catena-X Release?
- [x] yes -> Catena-X Release <version>
- [ ] no


### (Trace-X Release) [<version>| Release Notes](https://github.com/catenax-ng/tx-traceability-foss/releases/tag/<version>)

#### Trace-X version 1.3.14

| Name of service | Version | Comments |
|----------------------------------|---------|------------|
| postgresql | 12.1.6 | |
| postgresql alias: edc-postgresql | 12.1.6 | |
| pgadmin4 | 1.13.6 | |
| irs-helm | 6.8.0 | |
| tractusx-connector | 0.5.0 | |
| discovery service | 0.1.0 | |
| portal | ? | |
| SD-Factory | ? | |
| wallet | ? | |
14 changes: 7 additions & 7 deletions DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause
maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
maven/mavencentral/commons-digester/commons-digester/2.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
maven/mavencentral/commons-io/commons-io/2.13.0, Apache-2.0, approved, #8717
maven/mavencentral/commons-io/commons-io/2.15.0, Apache-2.0, approved, #11244
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
maven/mavencentral/commons-validator/commons-validator/1.7, Apache-2.0, approved, clearlydefined
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
Expand Down Expand Up @@ -263,9 +263,9 @@ maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.15, EPL-2.0 OR Apache-2.0
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.4.1-20231027.142046-3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.4.1-20231027.142046-3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.4.1-20231027.142046-3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.4.1-20231110.130443-8, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.4.1-20231110.130443-8, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.4.1-20231110.130443-8, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.traceability/tx-backend/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.traceability/tx-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.flywaydb/flyway-core/9.16.3, Apache-2.0, approved, #7935
Expand Down Expand Up @@ -399,11 +399,11 @@ maven/mavencentral/org.springframework/spring-aop/6.0.11, Apache-2.0, approved,
maven/mavencentral/org.springframework/spring-aspects/6.0.11, Apache-2.0, approved, #5930
maven/mavencentral/org.springframework/spring-beans/6.0.11, Apache-2.0, approved, #5937
maven/mavencentral/org.springframework/spring-context/6.0.11, Apache-2.0, approved, #5936
maven/mavencentral/org.springframework/spring-core/6.0.12, Apache-2.0 AND BSD-3-Clause, approved, #5948
maven/mavencentral/org.springframework/spring-core/6.0.13, Apache-2.0 AND BSD-3-Clause, approved, #5948
maven/mavencentral/org.springframework/spring-expression/6.0.11, Apache-2.0, approved, #3284
maven/mavencentral/org.springframework/spring-expression/6.0.12, Apache-2.0, approved, #3284
maven/mavencentral/org.springframework/spring-expression/6.0.13, Apache-2.0, approved, #3284
maven/mavencentral/org.springframework/spring-jcl/6.0.11, Apache-2.0, approved, #3283
maven/mavencentral/org.springframework/spring-jcl/6.0.12, Apache-2.0, approved, #3283
maven/mavencentral/org.springframework/spring-jcl/6.0.13, Apache-2.0, approved, #3283
maven/mavencentral/org.springframework/spring-jdbc/6.0.11, Apache-2.0, approved, #5924
maven/mavencentral/org.springframework/spring-jdbc/6.0.13, Apache-2.0, approved, #5924
maven/mavencentral/org.springframework/spring-orm/6.0.11, Apache-2.0, approved, #5925
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -1497,7 +1497,7 @@ npm/npmjs/@types/eslint/8.4.2, MIT, approved, #2429
npm/npmjs/@types/estree/0.0.51, MIT, approved, clearlydefined
npm/npmjs/@types/express-serve-static-core/4.17.34, MIT, approved, #6020
npm/npmjs/@types/express/4.17.17, MIT, approved, #5760
npm/npmjs/@types/geojson/7946.0.8, MIT, approved, clearlydefined
npm/npmjs/@types/geojson/7946.0.8, MIT, approved, #11480
npm/npmjs/@types/glob/7.2.0, MIT, approved, clearlydefined
npm/npmjs/@types/http-proxy/1.17.11, MIT, approved, #8414
npm/npmjs/@types/jasmine/4.3.1, MIT, approved, clearlydefined
Expand Down
2 changes: 1 addition & 1 deletion charts/traceability-foss/charts/backend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ resources:
cpu: 500m
memory: 512Mi
requests:
cpu: 500m
cpu: 250m
memory: 512Mi

nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion charts/traceability-foss/charts/frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ resources:
cpu: 500m
memory: 512Mi
requests:
cpu: 500m
cpu: 250m
memory: 512Mi

nodeSelector: { }
Expand Down
38 changes: 35 additions & 3 deletions charts/traceability-foss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ frontend:
cpu: 500m
memory: 512Mi
requests:
cpu: 125m
cpu: 250m
memory: 512Mi

nodeSelector: {}
Expand Down Expand Up @@ -222,7 +222,7 @@ backend:
cpu: 500m
memory: 512Mi
requests:
cpu: 125m
cpu: 250m
memory: 512Mi

nodeSelector: {}
Expand Down Expand Up @@ -324,7 +324,7 @@ pgadmin4:
resources:
limits:
cpu: 1000m
memory: 1Gi
memory: 512Mi
requests:
cpu: 256m
memory: 512Mi
Expand All @@ -344,13 +344,29 @@ postgresql:
database: "trace"
username: "traceuser"

resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 512Mi

#########################
# IRS configuration #
#########################
irs-helm:
enabled: false # <irs-helm.enabled>
nameOverride: "tracex-irs"
fullnameOverride: "tracex-irs"

resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 512Mi
###################################
# EDC Consumer configuration #
###################################
Expand All @@ -361,6 +377,14 @@ tractusx-connector:
participant:
id: "BPN"

resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 512Mi

##################################
# EDC Postgres Configuration #
##################################
Expand All @@ -385,3 +409,11 @@ edc-postgresql:
password: "CHANGEME"
database: "trace"
username: "traceuser"

resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 512Mi
Loading
Loading