Skip to content

Commit

Permalink
Merge pull request #392 from eclipse-tractusx/merge/v2.1.0-RC3
Browse files Browse the repository at this point in the history
build(2.1.0-rc3): merge main into main
  • Loading branch information
evegufy authored Jul 30, 2024
2 parents 406362a + 827f175 commit 62a4fda
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 26 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart.

## 2.1.0-RC3

### Change

* changed to new container images
* portal-frontend: v2.1.0-RC3
* portal-backend: v2.1.0-RC2
* portal-assets: v2.0.1-RC1
* portal-backend:
* added configuration values for external service information [#385](https://github.com/eclipse-tractusx/portal/pull/385)

### Bugfix

* portal-backend:
* added information for the clearinghouseConnectDisabled flag [#387](https://github.com/eclipse-tractusx/portal/pull/387)
* removed unused secret [#383](https://github.com/eclipse-tractusx/portal/pull/383)

## 2.1.0-RC2

### Change
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
apiVersion: v2
name: portal
type: application
version: 2.1.0-RC2
appVersion: 2.1.0-RC2
version: 2.1.0-RC3
appVersion: 2.1.0-RC3
description: Helm chart for Catena-X Portal
home: https://github.com/eclipse-tractusx/portal
sources:
Expand Down
36 changes: 19 additions & 17 deletions charts/portal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@

This helm chart installs the Catena-X Portal application which consists of

* [portal-frontend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC2),
* [portal-frontend (v2.1.0-RC3)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC3),
* [portal-frontend-registration (v2.0.1-RC2)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC2),
* [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and
* [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1).
* [portal-assets (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1 and
* [portal-backend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC2).

The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.com/eclipse-tractusx/portal-iam).
This version is compatible with the 3.0.0 version of the IAM instances:
* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-3.0.0/charts/centralidp/README.md)
* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-3.0.0/charts/sharedidp/README.md)

For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md).
For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md).

For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0/docs/developer/Technical%20Documentation).
For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1/docs/developer/Technical%20Documentation).

For information about the initial wallet insert for the Operator, please refer to [initial operator wallet setup](https://github.com/eclipse-tractusx/portal-assets/blob/v2.1.0-RC1/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md).

The referenced container images are for demonstration purposes only.

Expand Down Expand Up @@ -83,7 +85,7 @@ dependencies:
| frontend.ingress.hosts[0] | object | `{"host":"","paths":[{"backend":{"port":8080,"service":"portal"},"path":"/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"registration"},"path":"/registration/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"assets"},"path":"/((assets|documentation)/.*)","pathType":"Prefix"}]}` | Provide default path for the ingress record. |
| frontend.portal.name | string | `"portal"` | |
| frontend.portal.image.name | string | `"docker.io/tractusx/portal-frontend"` | |
| frontend.portal.image.portaltag | string | `"v2.1.0-RC2"` | |
| frontend.portal.image.portaltag | string | `"v2.1.0-RC3"` | |
| frontend.portal.image.pullPolicy | string | `"IfNotPresent"` | |
| frontend.portal.resources | object | `{"limits":{"cpu":"75m","memory":"125M"},"requests":{"cpu":"25m","memory":"125M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| frontend.portal.requireHttpsUrlPattern | bool | `true` | |
Expand All @@ -94,7 +96,7 @@ dependencies:
| frontend.registration.resources | object | `{"limits":{"cpu":"75m","memory":"100M"},"requests":{"cpu":"25m","memory":"100M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| frontend.assets.name | string | `"assets"` | |
| frontend.assets.image.name | string | `"docker.io/tractusx/portal-assets"` | |
| frontend.assets.image.assetstag | string | `"v2.0.0"` | |
| frontend.assets.image.assetstag | string | `"v2.1.0-RC1"` | |
| frontend.assets.image.pullPolicy | string | `"IfNotPresent"` | |
| frontend.assets.resources | object | `{"limits":{"cpu":"45m","memory":"100M"},"requests":{"cpu":"25m","memory":"100M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| frontend.assets.path | string | `"/assets"` | |
Expand Down Expand Up @@ -141,7 +143,7 @@ dependencies:
| backend.healthChecks.readyness.path | string | `"/ready"` | |
| backend.registration.name | string | `"registration-service"` | |
| backend.registration.image.name | string | `"docker.io/tractusx/portal-registration-service"` | |
| backend.registration.image.registrationservicetag | string | `"v2.1.0-RC1"` | |
| backend.registration.image.registrationservicetag | string | `"v2.1.0-RC2"` | |
| backend.registration.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.registration.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.registration.basePath | string | `"api/registration"` | |
Expand All @@ -167,7 +169,7 @@ dependencies:
| backend.registration.submitDocumentTypeIds.type0 | string | `"COMMERCIAL_REGISTER_EXTRACT"` | |
| backend.administration.name | string | `"administration-service"` | |
| backend.administration.image.name | string | `"docker.io/tractusx/portal-administration-service"` | |
| backend.administration.image.administrationservicetag | string | `"v2.1.0-RC1"` | |
| backend.administration.image.administrationservicetag | string | `"v2.1.0-RC2"` | |
| backend.administration.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.administration.resources | object | `{"limits":{"cpu":"225m","memory":"500M"},"requests":{"cpu":"75m","memory":"500M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.administration.basePath | string | `"api/administration"` | |
Expand Down Expand Up @@ -231,7 +233,7 @@ dependencies:
| backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"[email protected]"` | Provide replyTo. |
| backend.appmarketplace.name | string | `"marketplace-app-service"` | |
| backend.appmarketplace.image.name | string | `"docker.io/tractusx/portal-marketplace-app-service"` | |
| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.1.0-RC1"` | |
| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.1.0-RC2"` | |
| backend.appmarketplace.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.appmarketplace.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.appmarketplace.basePath | string | `"api/apps"` | |
Expand Down Expand Up @@ -313,7 +315,7 @@ dependencies:
| backend.appmarketplace.companyAdminRoles.role0 | string | `"Company Admin"` | |
| backend.portalmigrations.name | string | `"portal-migrations"` | |
| backend.portalmigrations.image.name | string | `"docker.io/tractusx/portal-portal-migrations"` | |
| backend.portalmigrations.image.portalmigrationstag | string | `"v2.1.0-RC1"` | |
| backend.portalmigrations.image.portalmigrationstag | string | `"v2.1.0-RC2"` | |
| backend.portalmigrations.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.portalmigrations.resources | object | `{"limits":{"cpu":"75m","memory":"350M"},"requests":{"cpu":"25m","memory":"350M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.portalmigrations.seeding.testDataEnvironments | string | `""` | |
Expand All @@ -323,14 +325,14 @@ dependencies:
| backend.portalmigrations.logging.default | string | `"Information"` | |
| backend.portalmaintenance.name | string | `"portal-maintenance"` | |
| backend.portalmaintenance.image.name | string | `"docker.io/tractusx/portal-maintenance-service"` | |
| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.1.0-RC1"` | |
| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.1.0-RC2"` | |
| backend.portalmaintenance.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.portalmaintenance.resources | object | `{"limits":{"cpu":"75m","memory":"200M"},"requests":{"cpu":"25m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.portalmaintenance.processIdentity.processUserId | string | `"d21d2e8a-fe35-483c-b2b8-4100ed7f0953"` | |
| backend.portalmaintenance.logging.default | string | `"Information"` | |
| backend.notification.name | string | `"notification-service"` | |
| backend.notification.image.name | string | `"docker.io/tractusx/portal-notification-service"` | |
| backend.notification.image.notificationservicetag | string | `"v2.1.0-RC1"` | |
| backend.notification.image.notificationservicetag | string | `"v2.1.0-RC2"` | |
| backend.notification.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.notification.resources | object | `{"limits":{"cpu":"225m","memory":"200M"},"requests":{"cpu":"75m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.notification.basePath | string | `"api/notification"` | |
Expand All @@ -339,7 +341,7 @@ dependencies:
| backend.notification.logging.default | string | `"Information"` | |
| backend.services.name | string | `"services-service"` | |
| backend.services.image.name | string | `"docker.io/tractusx/portal-services-service"` | |
| backend.services.image.servicesservicetag | string | `"v2.1.0-RC1"` | |
| backend.services.image.servicesservicetag | string | `"v2.1.0-RC2"` | |
| backend.services.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.services.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.services.basePath | string | `"api/services"` | |
Expand Down Expand Up @@ -383,13 +385,13 @@ dependencies:
| backend.services.companyAdminRoles.role0 | string | `"Company Admin"` | |
| backend.provisioningmigrations.name | string | `"provisioning-migrations"` | |
| backend.provisioningmigrations.image.name | string | `"docker.io/tractusx/portal-provisioning-migrations"` | |
| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.1.0-RC1"` | |
| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.1.0-RC2"` | |
| backend.provisioningmigrations.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.provisioningmigrations.resources | object | `{"limits":{"cpu":"75m","memory":"200M"},"requests":{"cpu":"25m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.provisioningmigrations.logging.default | string | `"Information"` | |
| backend.processesworker.name | string | `"processes-worker"` | |
| backend.processesworker.image.name | string | `"docker.io/tractusx/portal-processes-worker"` | |
| backend.processesworker.image.processesworkertag | string | `"v2.1.0-RC1"` | |
| backend.processesworker.image.processesworkertag | string | `"v2.1.0-RC2"` | |
| backend.processesworker.image.pullPolicy | string | `"IfNotPresent"` | |
| backend.processesworker.resources | object | `{"limits":{"cpu":"225m","memory":"600M"},"requests":{"cpu":"75m","memory":"600M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
| backend.processesworker.logging.default | string | `"Information"` | |
Expand Down Expand Up @@ -481,7 +483,7 @@ dependencies:
| backend.processesworker.mailing.encryptionConfigs.index0.cipherMode | string | `"CBC"` | |
| backend.processesworker.mailing.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | |
| backend.processesworker.mailing.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey to encrypt the parameters of mailing processes. Secret-key 'mailing-encryption-key0'. Expected format is 256 bit (64 digits) hex. |
| backend.processesworker.clearinghouseConnectDisabled | bool | `false` | |
| backend.processesworker.clearinghouseConnectDisabled | bool | `false` | if set to true the self description document creation will be skipped for company registrations as well as connector registrations |
| backend.placeholder | string | `"empty"` | |
| postgresql.enabled | bool | `true` | PostgreSQL chart configuration Switch to enable or disable the PostgreSQL helm chart |
| postgresql.image | object | `{"tag":"15-debian-11"}` | Setting image tag to major to get latest minor updates |
Expand Down
12 changes: 7 additions & 5 deletions charts/portal/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@

This helm chart installs the Catena-X Portal application which consists of

* [portal-frontend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC2),
* [portal-frontend (v2.1.0-RC3)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC3),
* [portal-frontend-registration (v2.0.1-RC2)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC2),
* [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and
* [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1).
* [portal-assets (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1 and
* [portal-backend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC2).

The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.com/eclipse-tractusx/portal-iam).
This version is compatible with the 3.0.0 version of the IAM instances:
* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-3.0.0/charts/centralidp/README.md)
* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-3.0.0/charts/sharedidp/README.md)

For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md).
For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md).

For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0/docs/developer/Technical%20Documentation).
For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0-RC1/docs/developer/Technical%20Documentation).

For information about the initial wallet insert for the Operator, please refer to [initial operator wallet setup](https://github.com/eclipse-tractusx/portal-assets/blob/v2.1.0-RC1/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md).

The referenced container images are for demonstration purposes only.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@ spec:
value: "{{ .Values.centralidp.clients.portal }}"
- name: "APPMARKETPLACE__COMPANYADMINROLES__0__USERROLENAMES__0"
value: "{{ .Values.backend.appmarketplace.companyAdminRoles.role0 }}"
- name: "APPMARKETPLACE__DECENTRALIDENTITYMANAGEMENTAUTHURL"
value: "{{ .Values.decentralIdentityManagementAuthAddress }}"
- name: "APPMARKETPLACE__ISSUERDID"
value: "{{ .Values.backend.administration.issuerdid }}"
- name: "APPMARKETPLACE__BPNDIDRESOLVERURL"
value: "{{ .Values.bpnDidResolver.directoryApiAddress }}"
- name: "HEALTHCHECKS__0__PATH"
value: "{{ .Values.backend.healthChecks.startup.path}}"
{{- if .Values.backend.appmarketplace.healthChecks.startup.tags }}
Expand Down
1 change: 1 addition & 0 deletions charts/portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,7 @@ backend:
# -- EncryptionKey to encrypt the parameters of mailing processes. Secret-key 'mailing-encryption-key0'.
# Expected format is 256 bit (64 digits) hex.
encryptionKey: ""
# -- if set to true the self description document creation will be skipped for company registrations as well as connector registrations
clearinghouseConnectDisabled: false
placeholder: "empty"

Expand Down
2 changes: 1 addition & 1 deletion environments/argocd-app-templates/appsetup-int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
source:
path: charts/portal
repoURL: 'https://github.com/eclipse-tractusx/portal.git'
targetRevision: portal-2.1.0-RC2
targetRevision: portal-2.1.0-RC3
plugin:
env:
- name: AVP_SECRET
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
source:
path: charts/portal
repoURL: 'https://github.com/eclipse-tractusx/portal.git'
targetRevision: portal-2.1.0-RC2
targetRevision: portal-2.1.0-RC3
plugin:
env:
- name: AVP_SECRET
Expand Down

0 comments on commit 62a4fda

Please sign in to comment.