diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 6f29f025..52243b21 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -57,6 +57,9 @@ jobs: format: "sarif" output: "trivy-results1.sarif" vuln-type: "os,library" + severity: 'CRITICAL,HIGH' # While vulnerabilities of all severities are reported in the SARIF output, the exit code and workflow failure are triggered only by these specified severities (CRITICAL or HIGH). + exit-code: '1' # Trivy exits with code 1 if vulnerabilities are found, causing the workflow step to fail. + limit-severities-for-sarif: true - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 diff --git a/CHANGELOG.md b/CHANGELOG.md index ea70e122..ccc88c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## 2.3.0-RC4 + +### Change + +* changed to new container images + * portal-frontend: v2.3.0-RC4 + * portal-backend: v2.3.0-RC2 + + portal-assets: v2.3.0-RC1 +* portal-backend: changed operator default information [#469](https://github.com/eclipse-tractusx/portal/pull/469) + ## 2.3.0-RC1 ### Change diff --git a/charts/localdev/Chart.yaml b/charts/localdev/Chart.yaml index 4c7eb7c3..2b279f0c 100644 --- a/charts/localdev/Chart.yaml +++ b/charts/localdev/Chart.yaml @@ -33,15 +33,15 @@ dependencies: - condition: portal.enabled name: portal repository: file://../portal - version: 2.3.0-RC1 + version: 2.3.0-RC4 - condition: centralidp.enabled name: centralidp repository: https://eclipse-tractusx.github.io/charts/dev - version: 4.0.0-alpha.1 + version: 4.0.0-rc.1 - condition: sharedidp.enabled name: sharedidp repository: https://eclipse-tractusx.github.io/charts/dev - version: 4.0.0-alpha.1 + version: 4.0.0-rc.1 - condition: pgadmin4.enabled name: pgadmin4 repository: https://helm.runix.net diff --git a/charts/localdev/README.md b/charts/localdev/README.md index 1d9b3a1d..5f7ad106 100644 --- a/charts/localdev/README.md +++ b/charts/localdev/README.md @@ -574,10 +574,10 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi | Repository | Name | Version | |------------|------|---------| -| file://../portal | portal | 2.3.0-alpha.3 | +| file://../portal | portal | 2.3.0-RC4 | | https://charts.bitnami.com/bitnami | postgresportal(postgresql) | 12.12.x | -| https://eclipse-tractusx.github.io/charts/dev | centralidp | 4.0.0-alpha.1 | -| https://eclipse-tractusx.github.io/charts/dev | sharedidp | 4.0.0-alpha.1 | +| https://eclipse-tractusx.github.io/charts/dev | centralidp | 4.0.0-rc.1 | +| https://eclipse-tractusx.github.io/charts/dev | sharedidp | 4.0.0-rc.1 | | https://helm.runix.net | pgadmin4 | 1.17.x | ## Values @@ -709,7 +709,6 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi | centralidp.keycloak.postgresql.nameOverride | string | `"centralidp-postgresql"` | | | centralidp.keycloak.postgresql.auth.password | string | `"dbpasswordcentralidp"` | | | centralidp.keycloak.postgresql.auth.postgresPassword | string | `"dbpasswordcentralidp"` | | -| centralidp.keycloak.proxy | string | `"edge"` | | | centralidp.keycloak.ingress.enabled | bool | `true` | | | centralidp.keycloak.ingress.ingressClassName | string | `"nginx"` | | | centralidp.keycloak.ingress.hostname | string | `"centralidp.tx.test"` | | @@ -781,7 +780,6 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi | sharedidp.keycloak.postgresql.nameOverride | string | `"sharedidp-postgresql"` | | | sharedidp.keycloak.postgresql.auth.password | string | `"dbpasswordsharedidp"` | | | sharedidp.keycloak.postgresql.auth.postgresPassword | string | `"dbpasswordsharedidp"` | | -| sharedidp.keycloak.proxy | string | `"edge"` | | | sharedidp.keycloak.ingress.enabled | bool | `true` | | | sharedidp.keycloak.ingress.ingressClassName | string | `"nginx"` | | | sharedidp.keycloak.ingress.hostname | string | `"sharedidp.tx.test"` | | diff --git a/charts/localdev/values-tls.yaml b/charts/localdev/values-tls.yaml index 1ed89e06..cb650829 100644 --- a/charts/localdev/values-tls.yaml +++ b/charts/localdev/values-tls.yaml @@ -132,7 +132,7 @@ centralidp: keycloak: initContainers: - name: import - image: docker.io/tractusx/portal-iam:v4.0.0-alpha.1 + image: docker.io/tractusx/portal-iam:v4.0.0-rc.1 imagePullPolicy: IfNotPresent command: - sh @@ -145,7 +145,7 @@ centralidp: - name: themes mountPath: /themes - name: init-certs - image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1 + image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0 imagePullPolicy: IfNotPresent command: ["/bin/bash"] args: @@ -233,7 +233,7 @@ sharedidp: keycloak: initContainers: - name: import - image: docker.io/tractusx/portal-iam:v4.0.0-alpha.1 + image: docker.io/tractusx/portal-iam:v4.0.0-rc.1 imagePullPolicy: IfNotPresent command: - sh @@ -250,7 +250,7 @@ sharedidp: - name: themes-catenax-shared-portal mountPath: /themes-catenax-shared-portal - name: init-certs - image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1 + image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0 imagePullPolicy: IfNotPresent command: ["/bin/bash"] args: diff --git a/charts/localdev/values.yaml b/charts/localdev/values.yaml index 44e293ed..565dfb0e 100644 --- a/charts/localdev/values.yaml +++ b/charts/localdev/values.yaml @@ -163,7 +163,6 @@ portal: clientId: "sa-cl5-custodian-2" clientSecret: "changeme" sdfactory: - issuerBpn: "BPNL00000003CRHK" clientId: "sa-cl8-cx-1" clientSecret: "changeme" offerprovider: @@ -295,7 +294,6 @@ centralidp: auth: password: "dbpasswordcentralidp" postgresPassword: "dbpasswordcentralidp" - proxy: edge ingress: enabled: true ingressClassName: "nginx" @@ -392,7 +390,6 @@ sharedidp: auth: password: "dbpasswordsharedidp" postgresPassword: "dbpasswordsharedidp" - proxy: edge ingress: enabled: true ingressClassName: "nginx" diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index 28ef203e..340e5ad4 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 2.3.0-RC1 -appVersion: 2.3.0-RC1 +version: 2.3.0-RC4 +appVersion: 2.3.0-RC4 description: Helm chart for Catena-X Portal home: https://github.com/eclipse-tractusx/portal sources: diff --git a/charts/portal/README.md b/charts/portal/README.md index 04a9c01d..66af96b8 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,26 +1,26 @@ # Helm chart for Catena-X Portal -![Version: 2.3.0-RC1](https://img.shields.io/badge/Version-2.3.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-RC1](https://img.shields.io/badge/AppVersion-2.3.0--RC1-informational?style=flat-square) +![Version: 2.3.0-RC4](https://img.shields.io/badge/Version-2.3.0--RC4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-RC4](https://img.shields.io/badge/AppVersion-2.3.0--RC4-informational?style=flat-square) This helm chart installs the Portal application which consists of -* [portal-frontend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC1), +* [portal-frontend (v2.3.0-RC4)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC4), * [portal-frontend-registration (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-RC1), -* [portal-assets (v2.2.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0) and -* [portal-backend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC1). +* [portal-assets (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.3.0-RC1) and +* [portal-backend (v2.3.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC2). The Portal is designed to work with the [IAM](https://github.com/eclipse-tractusx/portal-iam). This version is compatible with the 4.0.0-rc.1 version of the IAM instances: * [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-4.0.0-rc.1/charts/centralidp/README.md) * [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-4.0.0-rc.1/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.2.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.3.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.2.0/docs/developer/Technical%20Documentation). +For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.3.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.2.0/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md). +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.3.0-RC1/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md). -In case of usage of the Decentral Identity Management (DIM) Wallet: this version is compatible with the 1.2.x version of the [SSI DIM Middle Layer](https://github.com/SAP/ssi-dim-middle-layer). +In case of usage of the Decentral Identity Management (DIM) Wallet: this version is compatible with the 2.1.x version of the [SSI DIM Middle Layer](https://github.com/SAP/ssi-dim-middle-layer). The referenced container images are for demonstration purposes only. @@ -45,7 +45,7 @@ To use the helm chart as a dependency: dependencies: - name: portal repository: https://eclipse-tractusx.github.io/charts/dev - version: 2.3.0-RC1 + version: 2.3.0-RC4 ``` ## Requirements @@ -83,16 +83,16 @@ dependencies: | dimWrapper.apiPath | string | `"/api/dim"` | Provide the api path | | dimWrapper.tokenAddress | string | `"https://keycloak.example.org/realms/example/protocol/openid-connect/token"` | Provide dim token address. | | decentralIdentityManagementAuthAddress | string | `"https://dis-integration-service-prod.eu10.dim.cloud.sap/api/v2.0.0/iatp/catena-x-portal"` | | -| operator | object | `{"bpn":"empty","city":"15","country_alpha2code":"DE","name":"CX-Operator","region":"","shortname":"CX-Operator","streetAdditional":"","streetName":"tbd","streetNumber":"","zipCode":""}` | Set information related to the operator company | +| operator | object | `{"bpn":"empty","city":"Munich","country_alpha2code":"DE","name":"Catena-X","region":"","shortname":"Catena-X","streetAdditional":"","streetName":"Street","streetNumber":"1","zipCode":"0001"}` | Set information related to the operator company | | operator.bpn | string | `"empty"` | The bpn of the operator | -| operator.name | string | `"CX-Operator"` | The name of the operator | -| operator.shortname | string | `"CX-Operator"` | The shortname of the operator | -| operator.city | string | `"15"` | The city of the operator address | +| operator.name | string | `"Catena-X"` | The name of the operator | +| operator.shortname | string | `"Catena-X"` | The shortname of the operator | +| operator.city | string | `"Munich"` | The city of the operator address | | operator.region | string | `""` | The region of the operator address | | operator.streetAdditional | string | `""` | Additional street information of the operator address | -| operator.streetName | string | `"tbd"` | The street name of the operator address | -| operator.streetNumber | string | `""` | The street number of the operator address | -| operator.zipCode | string | `""` | The zipcode of the operator address | +| operator.streetName | string | `"Street"` | The street name of the operator address | +| operator.streetNumber | string | `"1"` | The street number of the operator address | +| operator.zipCode | string | `"0001"` | The zipcode of the operator address | | operator.country_alpha2code | string | `"DE"` | The alpha 2 code of the operator address | | frontend.ingress.enabled | bool | `false` | Portal frontend ingress parameters, enable ingress record generation for portal frontend. | | frontend.ingress.name | string | `"frontend"` | | @@ -100,7 +100,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.3.0-RC1"` | | +| frontend.portal.image.portaltag | string | `"v2.3.0-RC4"` | | | frontend.portal.image.pullPolicy | string | `"IfNotPresent"` | | | frontend.portal.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -113,7 +113,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.2.0"` | | +| frontend.assets.image.assetstag | string | `"v2.3.0-RC1"` | | | frontend.assets.image.pullPolicy | string | `"IfNotPresent"` | | | frontend.assets.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -161,7 +161,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.3.0-RC1"` | | +| backend.registration.image.registrationservicetag | string | `"v2.3.0-RC2"` | | | backend.registration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.registration.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -188,10 +188,10 @@ 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.3.0-RC1"` | | +| backend.administration.image.administrationservicetag | string | `"v2.3.0-RC2"` | | | backend.administration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.administration.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | -| 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.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.administration.basePath | string | `"api/administration"` | | | backend.administration.logging.businessLogic | string | `"Information"` | | | backend.administration.logging.sdfactoryLibrary | string | `"Information"` | | @@ -253,10 +253,10 @@ 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.3.0-RC1"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.3.0-RC2"` | | | backend.appmarketplace.image.pullPolicy | string | `"IfNotPresent"` | | | backend.appmarketplace.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | -| 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.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.appmarketplace.basePath | string | `"api/apps"` | | | backend.appmarketplace.logging.default | string | `"Information"` | | | backend.appmarketplace.logging.offersLibrary | string | `"Information"` | | @@ -336,7 +336,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.3.0-RC1"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v2.3.0-RC2"` | | | backend.portalmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmigrations.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.portalmigrations.resources | object | `{"limits":{"cpu":"225m","memory":"350M"},"requests":{"cpu":"75m","memory":"350M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -348,7 +348,7 @@ 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.3.0-RC1"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.3.0-RC2"` | | | backend.portalmaintenance.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmaintenance.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -357,7 +357,7 @@ dependencies: | 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.3.0-RC1"` | | +| backend.notification.image.notificationservicetag | string | `"v2.3.0-RC2"` | | | backend.notification.image.pullPolicy | string | `"IfNotPresent"` | | | backend.notification.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -367,7 +367,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.3.0-RC1"` | | +| backend.services.image.servicesservicetag | string | `"v2.3.0-RC2"` | | | backend.services.image.pullPolicy | string | `"IfNotPresent"` | | | backend.services.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -412,14 +412,14 @@ 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.3.0-RC1"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.3.0-RC2"` | | | backend.provisioningmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.provisioningmigrations.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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.3.0-RC1"` | | +| backend.processesworker.image.processesworkertag | string | `"v2.3.0-RC2"` | | | backend.processesworker.image.pullPolicy | string | `"IfNotPresent"` | | | backend.processesworker.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | diff --git a/charts/portal/README.md.gotmpl b/charts/portal/README.md.gotmpl index 55d829ba..590195c7 100644 --- a/charts/portal/README.md.gotmpl +++ b/charts/portal/README.md.gotmpl @@ -4,23 +4,23 @@ This helm chart installs the Portal application which consists of -* [portal-frontend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC1), +* [portal-frontend (v2.3.0-RC4)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC4), * [portal-frontend-registration (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-RC1), -* [portal-assets (v2.2.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0) and -* [portal-backend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC1). +* [portal-assets (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.3.0-RC1) and +* [portal-backend (v2.3.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC2). The Portal is designed to work with the [IAM](https://github.com/eclipse-tractusx/portal-iam). This version is compatible with the 4.0.0-rc.1 version of the IAM instances: * [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-4.0.0-rc.1/charts/centralidp/README.md) * [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-4.0.0-rc.1/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.2.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.3.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.2.0/docs/developer/Technical%20Documentation). +For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v2.3.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.2.0/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md). +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.3.0-RC1/docs/developer/Technical%20Documentation/Operator%20Wallet%20Setup/Initial%20Setup.md). -In case of usage of the Decentral Identity Management (DIM) Wallet: this version is compatible with the 1.2.x version of the [SSI DIM Middle Layer](https://github.com/SAP/ssi-dim-middle-layer). +In case of usage of the Decentral Identity Management (DIM) Wallet: this version is compatible with the 2.1.x version of the [SSI DIM Middle Layer](https://github.com/SAP/ssi-dim-middle-layer). The referenced container images are for demonstration purposes only. diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index f6517bd1..3cd52b95 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -91,23 +91,23 @@ decentralIdentityManagementAuthAddress: "https://dis-integration-service-prod.eu # -- Set information related to the operator company operator: # -- The bpn of the operator - bpn: "empty" + bpn: "BPNL00000003CRHK" # -- The name of the operator - name: "CX-Operator" + name: "Catena-X" # -- The shortname of the operator - shortname: "CX-Operator" + shortname: "Catena-X" # -- The city of the operator address - city: "15" + city: "Munich" # --The region of the operator address region: "" # -- Additional street information of the operator address streetAdditional: "" # -- The street name of the operator address - streetName: "tbd" + streetName: "Street" # -- The street number of the operator address - streetNumber: "" + streetNumber: "1" # -- The zipcode of the operator address - zipCode: "" + zipCode: "0001" # -- The alpha 2 code of the operator address country_alpha2code: "DE" @@ -188,7 +188,7 @@ frontend: name: "assets" image: name: "docker.io/tractusx/portal-assets" - assetstag: 1938b28ec6f3d6163285e8a118defeba564f66d6 + assetstag: v2.3.0-RC1 pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry pullSecrets: [] @@ -385,10 +385,10 @@ backend: resources: requests: cpu: 75m - memory: 500M + memory: 600M limits: cpu: 225m - memory: 500M + memory: 600M basePath: "api/administration" logging: businessLogic: "Information" @@ -505,10 +505,10 @@ backend: resources: requests: cpu: 75m - memory: 400M + memory: 500M limits: cpu: 225m - memory: 400M + memory: 500M basePath: "api/apps" logging: default: "Information" diff --git a/environments/argocd-app-templates/appsetup-int.yaml b/environments/argocd-app-templates/appsetup-int.yaml index 861622b6..75594cfb 100644 --- a/environments/argocd-app-templates/appsetup-int.yaml +++ b/environments/argocd-app-templates/appsetup-int.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.3.0-RC1 + targetRevision: portal-2.3.0-RC4 plugin: env: - name: AVP_SECRET diff --git a/environments/argocd-app-templates/appsetup-stable.yaml b/environments/argocd-app-templates/appsetup-stable.yaml index 401e10df..0c7df23d 100644 --- a/environments/argocd-app-templates/appsetup-stable.yaml +++ b/environments/argocd-app-templates/appsetup-stable.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.3.0-RC1 + targetRevision: portal-2.3.0-RC4 plugin: env: - name: AVP_SECRET diff --git a/environments/helm-values/values-int.yaml b/environments/helm-values/values-int.yaml index 2f430e73..dac4179a 100644 --- a/environments/helm-values/values-int.yaml +++ b/environments/helm-values/values-int.yaml @@ -41,8 +41,6 @@ decentralIdentityManagementAuthAddress: "https://dis-integration-service-prod.eu bpnDidResolver: managementApiAddress: "http://bdrs-bdrs-server:8081" directoryApiAddress: "https://bpn-did-resolution-service.int.catena-x.net/api/directory" -operator: - bpn: "BPNL00000003CRHK" frontend: @@ -246,7 +244,6 @@ backend: clientId: "" clientSecret: "" sdfactory: - issuerBpn: "BPNL00000003CRHK" clientId: "" clientSecret: "" offerprovider: diff --git a/environments/helm-values/values-stable.yaml b/environments/helm-values/values-stable.yaml index 12337181..b59bed37 100644 --- a/environments/helm-values/values-stable.yaml +++ b/environments/helm-values/values-stable.yaml @@ -244,7 +244,6 @@ backend: clientId: "" clientSecret: "" sdfactory: - issuerBpn: "BPNL00000003CRHK" clientId: "" clientSecret: "" offerprovider: