build(portal-2.0.0-RC3): merge release into main #273

Reviewed-By: Phil Schneider <info@philschneider.de>

CHANGELOG.md

@@ -2,19 +2,36 @@
 
 New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart.
 
-## 2.0.0-RC2
+## 2.0.0-RC3
 
 ### Change
 
 * changed to new container images
   * portal-frontend: v2.0.0-RC2
+  * portal-backend: v2.0.0-RC3
+* portal-backend:
+  * added additional dim management configuration
+
+### Bugfix
+
+* portal-backend:
+  * fixed configuration for bpn did resolver
+  * fixed configuration for did
+  * fixed configuration for did management
+
+## 2.0.0-RC2
+
+### Change
+
+* changed to new container images
+  * portal-backend: v2.0.0-RC2
   * portal-frontend-registration: v2.0.0-RC1
 * portal-frontend: changed bdpm pool api path and improve configuration
 * portal-backend:
   * moved bpdm api paths into config / helm chart
   * activated dim wallet creation
   * increased resource limits for processes worker
-  * added configuration for did resolver
+  * added configuration for bpn did resolver
   * adjusted configuration for issuerComponent
 
 ### Bugfix

charts/portal/Chart.yaml

@@ -20,8 +20,8 @@
 apiVersion: v2
 name: portal
 type: application
-version: 2.0.0-RC2
-appVersion: 2.0.0-RC2
+version: 2.0.0-RC3
+appVersion: 2.0.0-RC3
 description: Helm chart for Catena-X Portal
 home: https://github.com/eclipse-tractusx/portal
 sources:

charts/portal/README.md

@@ -1,13 +1,13 @@
 # Helm chart for Catena-X Portal
 
-![Version: 2.0.0-RC2](https://img.shields.io/badge/Version-2.0.0--RC2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-RC2](https://img.shields.io/badge/AppVersion-2.0.0--RC2-informational?style=flat-square)
+![Version: 2.0.0-RC3](https://img.shields.io/badge/Version-2.0.0--RC3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-RC3](https://img.shields.io/badge/AppVersion-2.0.0--RC3-informational?style=flat-square)
 
 This helm chart installs the Catena-X Portal application which consists of
 
-* [portal-frontend (v2.0.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0-RC1),
+* [portal-frontend (v2.0.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0-RC2),
 * [portal-frontend-registration (v2.0.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.0-RC1),
 * [portal-assets (v1.8.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v1.8.0) and
-* [portal-backend (v2.0.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0-RC2).
+* [portal-backend (v2.0.0-RC3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0-RC3).
 
 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-rc.2 version of the IAM instances:
@@ -41,7 +41,7 @@ To use the helm chart as a dependency:
 dependencies:
   - name: portal
     repository: https://eclipse-tractusx.github.io/charts/dev
-    version: 2.0.0-RC2
+    version: 2.0.0-RC3
 ```
 
 ## Requirements
@@ -70,15 +70,19 @@ dependencies:
 | clearinghouseAddress | string | `"https://validation.example.org"` | Provide clearinghouse base address. |
 | clearinghouseTokenAddress | string | `"https://keycloak.example.org/realms/example/protocol/openid-connect/token"` | Provide clearinghouse token address. |
 | issuerComponentAddress | string | `"https://issuercomponent.example.org"` | Provide issuer component base address |
-| bpnDidResolverAddress | string | `"http://bpndidresolver.example.org/"` | Base address of the Bpn Did Resolver |
+| bpnDidResolverAddress | string | `"http://bpn-did-resolution-service-bdrs-server:8081/api/management"` | Provide management api address of the BPN DID Resolver Service |
+| dimWrapper | object | `{"apiPath":"/api/dim","baseAddress":"https://dim.example.org"}` | Provide the configuration of the dim wrapper address |
+| dimWrapper.baseAddress | string | `"https://dim.example.org"` | Provide the dim base address |
+| dimWrapper.apiPath | string | `"/api/dim"` | Provide the api path |
+| decentralIdentityManagementAuthAddress | string | `"https://dis-integration-service-prod.eu10.dim.cloud.sap/api/v2.0.0/iatp/catena-x-portal"` |  |
 | frontend.ingress.enabled | bool | `false` | Portal frontend ingress parameters, enable ingress record generation for portal frontend. |
 | frontend.ingress.name | string | `"frontend"` |  |
 | frontend.ingress.tls[0] | object | `{"hosts":[""],"secretName":""}` | Provide tls secret. |
 | frontend.ingress.tls[0].hosts | list | `[""]` | Provide host for tls secret. |
 | 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.0.0-RC1"` |  |
+| frontend.portal.image.portaltag | string | `"v2.0.0-RC2"` |  |
 | 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.registration.name | string | `"registration"` |  |
@@ -142,7 +146,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.0.0-RC2"` |  |
+| backend.registration.image.registrationservicetag | string | `"v2.0.0-RC3"` |  |
 | 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"` |  |
@@ -168,7 +172,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.0.0-RC2"` |  |
+| backend.administration.image.administrationservicetag | string | `"v2.0.0-RC3"` |  |
 | 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"` |  |
@@ -207,6 +211,12 @@ dependencies:
 | backend.administration.userManagement.userAdminRoles.role0 | string | `"Company Admin"` |  |
 | backend.administration.userManagement.userAdminRoles.role1 | string | `"IT Admin"` |  |
 | backend.administration.serviceAccount.clientId | string | `"technical_roles_management"` |  |
+| backend.administration.serviceAccount.encryptionConfigIndex | int | `0` |  |
+| backend.administration.serviceAccount.encryptionConfigs.index0.index | int | `0` |  |
+| backend.administration.serviceAccount.encryptionConfigs.index0.cipherMode | string | `"CBC"` |  |
+| backend.administration.serviceAccount.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` |  |
+| backend.administration.serviceAccount.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for service account creation. Secret-key 'serviceaccount-encryption-key0'. Expected format is 256 bit (64 digits) hex. |
+| backend.administration.serviceAccount.dimCreationRoles.role0 | string | `"Identity Wallet Management"` |  |
 | backend.administration.swaggerEnabled | bool | `false` |  |
 | backend.administration.frameDocumentTypeIds.type0 | string | `"CX_FRAME_CONTRACT"` |  |
 | backend.provisioning.centralRealmId | string | `"CX-Central"` |  |
@@ -225,7 +235,7 @@ dependencies:
 | backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"smtp@example.org"` | 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.0.0-RC2"` |  |
+| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.0.0-RC3"` |  |
 | 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"` |  |
@@ -307,7 +317,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.0.0-RC2"` |  |
+| backend.portalmigrations.image.portalmigrationstag | string | `"v2.0.0-RC3"` |  |
 | 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 | `""` |  |
@@ -316,14 +326,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.0.0-RC2"` |  |
+| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.0.0-RC3"` |  |
 | 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.0.0-RC2"` |  |
+| backend.notification.image.notificationservicetag | string | `"v2.0.0-RC3"` |  |
 | 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"` |  |
@@ -332,7 +342,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.0.0-RC2"` |  |
+| backend.services.image.servicesservicetag | string | `"v2.0.0-RC3"` |  |
 | backend.services.image.pullPolicy | string | `"IfNotPresent"` |  |
 | backend.services.resources | object | `{"limits":{"cpu":"225m","memory":"300M"},"requests":{"cpu":"75m","memory":"300M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
 | backend.services.basePath | string | `"api/services"` |  |
@@ -376,13 +386,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.0.0-RC2"` |  |
+| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.0.0-RC3"` |  |
 | 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.0.0-RC2"` |  |
+| backend.processesworker.image.processesworkertag | string | `"v2.0.0-RC3"` |  |
 | 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"` |  |
@@ -465,7 +475,7 @@ dependencies:
 | backend.processesworker.issuerComponent.encryptionConfigs.index0.cipherMode | string | `"CBC"` |  |
 | backend.processesworker.issuerComponent.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` |  |
 | backend.processesworker.issuerComponent.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for the issuer component. Secret-key 'issuercomponent-encryption-key0'. Expected format is 256 bit (64 digits) hex. |
-| backend.processesworker.bpnDidResolver.apiKey | string | `""` | ApiKey for bpnDidResolver. Secret-key 'bpndidresolver-api-key'. |
+| backend.processesworker.bpnDidResolver.apiKey | string | `""` | ApiKey for management endpoint of the bpnDidResolver. Secret-key 'bpndidresolver-api-key'. |
 | backend.processesworker.invitation.invitedUserInitialRoles.role0 | string | `"Company Admin"` |  |
 | backend.processesworker.invitation.initialLoginTheme | string | `"catenax-shared"` |  |
 | backend.processesworker.invitation.closeApplicationPath | string | `"/decline"` |  |

charts/portal/README.md.gotmpl

@@ -4,10 +4,10 @@
 
 This helm chart installs the Catena-X Portal application which consists of
 
-* [portal-frontend (v2.0.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0-RC1),
+* [portal-frontend (v2.0.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0-RC2),
 * [portal-frontend-registration (v2.0.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.0-RC1),
 * [portal-assets (v1.8.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v1.8.0) and
-* [portal-backend (v2.0.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0-RC2).
+* [portal-backend (v2.0.0-RC3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0-RC3).
 
 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-rc.2 version of the IAM instances:

charts/portal/templates/cronjob-backend-processes.yaml

@@ -114,6 +114,8 @@ spec:
               value: "{{ .Values.portalAddress }}{{ .Values.backend.portalIntroductionCompanyRolePath }}"
             - name: "APPLICATIONACTIVATION__DATASPACEADDRESS"
               value: "{{ .Values.portalAddress }}{{ .Values.backend.portalIntroductionDataspacePath }}"
+            - name: "APPLICATIONACTIVATION__USEDIMWALLET"
+              value: "{{ .Values.backend.useDimWallet }}"
             - name: "APPLICATIONCHECKLIST__BPDM__BASEADDRESS"
               value: "{{ .Values.bpdm.portalGateAddress }}{{ .Values.bpdm.portalGateApiPath }}"
             - name: "APPLICATIONCHECKLIST__BPDM__CLIENTID"
@@ -214,11 +216,11 @@ spec:
             - name: "APPLICATIONCHECKLIST__DIM__TOKENADDRESS"
               value: "{{ .Values.centralidp.address }}{{ .Values.backend.keycloak.central.tokenPath }}"
             - name: "APPLICATIONCHECKLIST__DIM__BASEADDRESS"
-              value: "{{ .Values.backend.processesworker.dim.baseAddress }}"
+              value: "{{ .Values.dimWrapper.baseAddress }}{{ .Values.dimWrapper.apiPath }}"
             - name: "APPLICATIONCHECKLIST__DIM__UNIVERSALRESOLVERADDRESS"
               value: "{{ .Values.backend.processesworker.dim.universalResolverAddress }}"
             - name: "APPLICATIONCHECKLIST__DIM__DIDDOCUMENTBASELOCATION"
-              value: "{{ .Values.portalAddress }}{{ .Values.backend.processesworker.dim.didDocumentPath }}"
+              value: "{{ .Values.portalBackendAddress }}{{ .Values.backend.processesworker.dim.didDocumentPath }}"
             - name: "APPLICATIONCHECKLIST__DIM__MAXVALIDATIONTIMEINDAYS"
               value: "{{ .Values.backend.processesworker.dim.maxValidationTimeInDays }}"
             - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGINDEX"
@@ -268,9 +270,9 @@ spec:
               value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.cipherMode }}"
             - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__PADDINGMODE"
               value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.paddingMode }}"
-            - name: "APPLICATIONCHECKLIST__BPNDIDRESOLVER__BASEADDRESS"
+            - name: "BPNDIDRESOLVER__BASEADDRESS"
               value: "{{ .Values.bpnDidResolverAddress }}"
-            - name: "APPLICATIONCHECKLIST__BPNDIDRESOLVER__APIKEY"
+            - name: "BPNDIDRESOLVER__APIKEY"
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.backend.interfaces.secret }}"
@@ -388,6 +390,10 @@ spec:
               value: "{{ .Values.centralidp.clients.portal }}"
             - name: "OFFERSUBSCRIPTIONPROCESS__ITADMINROLES__0__USERROLENAMES__0"
               value: "{{ .Values.backend.processesworker.offerSubscriptionProcess.itAdminRoles.role0 }}"
+            - name: "OFFERSUBSCRIPTIONPROCESS__DIMCREATIONROLES__0__CLIENTID"
+              value: "{{ .Values.centralidp.clients.portal }}"
+            - name: "OFFERSUBSCRIPTIONPROCESS__DIMCREATIONROLES__0__USERROLENAMES__0"
+              value: "{{ .Values.backend.administration.serviceAccount.dimCreationRoles.role0 }}"
             - name: "OFFERPROVIDER__SERVICEMANAGERROLES__0__CLIENTID"
               value: "{{ .Values.centralidp.clients.portal }}"
             - name: "OFFERPROVIDER__SERVICEMANAGERROLES__0__USERROLENAMES__0"