diff --git a/.github/workflows/administration-service-image-update.yml b/.github/workflows/administration-service-image-update.yml index 2018fc5d8..e2c3a441f 100644 --- a/.github/workflows/administration-service-image-update.yml +++ b/.github/workflows/administration-service-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for administration service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/maintenance-service-image-update.yml b/.github/workflows/maintenance-service-image-update.yml index 1c96d193c..99ece0628 100644 --- a/.github/workflows/maintenance-service-image-update.yml +++ b/.github/workflows/maintenance-service-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for maintenance service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/marketplace-app-service-image-update.yml b/.github/workflows/marketplace-app-service-image-update.yml index 70c94c6d9..b3c791817 100644 --- a/.github/workflows/marketplace-app-service-image-update.yml +++ b/.github/workflows/marketplace-app-service-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for marketplace-app service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/notification-service-image-update.yml b/.github/workflows/notification-service-image-update.yml index bfedbd26f..1b9892339 100644 --- a/.github/workflows/notification-service-image-update.yml +++ b/.github/workflows/notification-service-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for notification service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/portal-assets-image-update.yml b/.github/workflows/portal-assets-image-update.yml index 162e1be5e..a931c70aa 100644 --- a/.github/workflows/portal-assets-image-update.yml +++ b/.github/workflows/portal-assets-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for portal assets" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/portal-backend-release-image-update.yml b/.github/workflows/portal-backend-release-image-update.yml index 1a778153d..6f022d1ee 100644 --- a/.github/workflows/portal-backend-release-image-update.yml +++ b/.github/workflows/portal-backend-release-image-update.yml @@ -78,4 +78,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new images for portal backend" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/portal-image-update.yml b/.github/workflows/portal-image-update.yml index 7e77ab850..64e839f3e 100644 --- a/.github/workflows/portal-image-update.yml +++ b/.github/workflows/portal-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for portal" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/portal-migrations-image-update.yml b/.github/workflows/portal-migrations-image-update.yml index 8c3010a0f..792eeb4dd 100644 --- a/.github/workflows/portal-migrations-image-update.yml +++ b/.github/workflows/portal-migrations-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for portal-migrations" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/portal-registration-image-update.yml b/.github/workflows/portal-registration-image-update.yml index 8db80451b..6afa609cc 100644 --- a/.github/workflows/portal-registration-image-update.yml +++ b/.github/workflows/portal-registration-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for portal registration" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/processes-worker-image-update.yml b/.github/workflows/processes-worker-image-update.yml index b3a91db52..1838886d0 100644 --- a/.github/workflows/processes-worker-image-update.yml +++ b/.github/workflows/processes-worker-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for processes worker" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/provisioning-migrations-image-update.yml b/.github/workflows/provisioning-migrations-image-update.yml index 05d065d80..a02048f19 100644 --- a/.github/workflows/provisioning-migrations-image-update.yml +++ b/.github/workflows/provisioning-migrations-image-update.yml @@ -51,4 +51,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for provisioning-migrations" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/registration-service-image-update.yml b/.github/workflows/registration-service-image-update.yml index d649f3649..0620a82cf 100644 --- a/.github/workflows/registration-service-image-update.yml +++ b/.github/workflows/registration-service-image-update.yml @@ -50,4 +50,4 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for registration service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/.github/workflows/services-service-image-update.yml b/.github/workflows/services-service-image-update.yml index 67c7c10e1..66b106543 100644 --- a/.github/workflows/services-service-image-update.yml +++ b/.github/workflows/services-service-image-update.yml @@ -51,5 +51,5 @@ jobs: git config user.email tractusx-bot@eclipse.org git add charts/portal/values.yaml git commit -m "Add new image for services service" - bash ./consortia/scripts/push.sh + bash ./environments/push.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index e5688f85f..a17f1e5ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,36 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## 2.1.0-RC1 + +### Change + +* changed to new container images + * portal-frontend: v2.1.0-RC1 + * portal-backend: v2.1.0-RC1 + * portal-frontend-registration: v2.0.1-RC1 +* portal frontend: enabled bpdm pool and company api urls [#317](https://github.com/eclipse-tractusx/portal/pull/317) +* portal-backend: + * clearinghouse: added feature toggle for sd connectivity [#344](https://github.com/eclipse-tractusx/portal/pull/344) + * portalmigrations: enabled seeding of test data with configmap and moved processidentity userid into job [#356](https://github.com/eclipse-tractusx/portal/pull/356) + +### Technical Support + +* updated deployment configuration [#354](https://github.com/eclipse-tractusx/portal/pull/354) + * added config for association environment + * moved config into environments directory + * removed obsolete config + * added information about config in notice file +* added install comment to useDimWallet value [361](https://github.com/eclipse-tractusx/portal/pull/361) + +### Bugfix + +* portal-backend: + * added environment variable to use dim in application checklist bpdm of the processes worker job [361](https://github.com/eclipse-tractusx/portal/pull/361) + * removed obsolete centralidp database configuration [#355](https://github.com/eclipse-tractusx/portal/pull/355) + * changed to directoryApiAddress of bpn did resolver in administration service configuration [#364](https://github.com/eclipse-tractusx/portal/pull/364) + * increased memory for services service [#359](https://github.com/eclipse-tractusx/portal/pull/359) + ## 2.0.0 ### Change diff --git a/NOTICE.md b/NOTICE.md index c87d82728..1ddf11dae 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -45,6 +45,10 @@ This project depends on the following Helm chart from Bitnami: - Licence Path: https://artifacthub.io/packages/helm/bitnami/postgresql#license - Source URL: https://artifacthub.io/packages/helm/bitnami/postgresql +## Test Environments + +The project contains deployment configuration specific to hosted test environments and needed for end-to-end testing. This configuration is maintained within the [environments](/environments) directory. + ## Cryptography Content may contain encryption software. The country in which you are currently diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index af266e1cd..1b99fb478 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 2.0.0 -appVersion: 2.0.0 +version: 2.1.0-RC1 +appVersion: 2.1.0-RC1 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 67ffcebd9..770a82f69 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,13 +1,13 @@ # Helm chart for Catena-X Portal -![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) +![Version: 2.1.0-RC1](https://img.shields.io/badge/Version-2.1.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0-RC1](https://img.shields.io/badge/AppVersion-2.1.0--RC1-informational?style=flat-square) This helm chart installs the Catena-X Portal application which consists of -* [portal-frontend (v2.0.0)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0), -* [portal-frontend-registration (v2.0.0)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.0), +* [portal-frontend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC1), +* [portal-frontend-registration (v2.0.1-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC1), * [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and -* [portal-backend (v2.0.0)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0). +* [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1). 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: @@ -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 + version: 2.1.0-RC1 ``` ## Requirements @@ -83,13 +83,13 @@ 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.0.0"` | | +| frontend.portal.image.portaltag | string | `"v2.1.0-RC1"` | | | 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` | | | frontend.registration.name | string | `"registration"` | | | frontend.registration.image.name | string | `"docker.io/tractusx/portal-frontend-registration"` | | -| frontend.registration.image.registrationtag | string | `"v2.0.0"` | | +| frontend.registration.image.registrationtag | string | `"v2.0.1-RC1"` | | | frontend.registration.image.pullPolicy | string | `"IfNotPresent"` | | | 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"` | | @@ -112,7 +112,7 @@ dependencies: | backend.portalIntroductionCompanyRolePath | string | `"/companyroles"` | | | backend.portalIntroductionDataspacePath | string | `"/dataspace"` | | | backend.userManagementPath | string | `"/usermanagement"` | | -| backend.useDimWallet | bool | `false` | | +| backend.useDimWallet | bool | `false` | Enable for using Decentral Identity Management (DIM) instead of Managed Identity Wallet (MIW) as wallet | | backend.keycloak.secret | string | `"portal-backend-keycloak"` | Secret containing the database-password and the client-secret for the connection to the centralidp (CX IAM) and the client-secret for the connection to the sharedidp (CX-IAM). | | backend.keycloak.central.clientId | string | `"central-client-id"` | Provide centralidp client-id from CX IAM centralidp. | | backend.keycloak.central.clientSecret | string | `""` | Client-secret for centralidp client-id. Secret-key 'central-client-secret'. | @@ -124,13 +124,6 @@ dependencies: | backend.keycloak.central.jwtBearerOptions.tokenValidationParameters.clockSkew | string | `"00:05:00"` | | | backend.keycloak.central.jwtBearerOptions.refreshInterval | string | `"00:00:30"` | | | backend.keycloak.central.tokenPath | string | `"/auth/realms/CX-Central/protocol/openid-connect/token"` | | -| backend.keycloak.central.dbConnection.host | string | `"centralidp-postgresql-primary"` | | -| backend.keycloak.central.dbConnection.port | int | `5432` | | -| backend.keycloak.central.dbConnection.user | string | `"kccentral"` | | -| backend.keycloak.central.dbConnection.database | string | `"iamcentralidp"` | | -| backend.keycloak.central.dbConnection.password | string | `""` | Password for the kccentral username. Secret-key 'central-db-password'. | -| backend.keycloak.central.dbConnection.schema | string | `"public"` | | -| backend.keycloak.central.dbConnection.sslMode | string | `"Disable"` | | | backend.keycloak.central.useAuthTrail | bool | `true` | Flag if the api should be used with an leading /auth path | | backend.keycloak.shared.clientId | string | `"shared-client-id"` | Provide sharedidp client-id from CX IAM sharedidp. | | backend.keycloak.shared.clientSecret | string | `""` | Client-secret for sharedidp client-id. Secret-key 'shared-client-secret'. | @@ -148,7 +141,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"` | | +| backend.registration.image.registrationservicetag | string | `"v2.1.0-RC1"` | | | 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"` | | @@ -174,7 +167,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"` | | +| backend.administration.image.administrationservicetag | string | `"v2.1.0-RC1"` | | | 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"` | | @@ -238,7 +231,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"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.1.0-RC1"` | | | 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"` | | @@ -320,23 +313,24 @@ 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"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v2.1.0-RC1"` | | | 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 | `""` | | -| backend.portalmigrations.seeding.testDataPaths | string | `"Seeder/Data"` | when changing the testDataPath the processIdentity needs to be adjusted as well, or it must be ensured that the identity is existing within the files under the new path | -| backend.portalmigrations.processIdentity.processUserId | string | `"d21d2e8a-fe35-483c-b2b8-4100ed7f0953"` | | +| backend.portalmigrations.seeding.testData | object | `{"configMap":"","filename":""}` | Option to seed test data provided in a configMap | +| backend.portalmigrations.seeding.testData.configMap | string | `""` | ConfigMap containing json files for the tables to seed, e.g. companies.test.json, addresses.test.json, etc. | +| backend.portalmigrations.seeding.testData.filename | string | `""` | Filename identifying the test data files e.g. for companies.test.json the value would be "test" | | 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"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.1.0-RC1"` | | | 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"` | | +| backend.notification.image.notificationservicetag | string | `"v2.1.0-RC1"` | | | 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"` | | @@ -345,9 +339,9 @@ 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"` | | +| backend.services.image.servicesservicetag | string | `"v2.1.0-RC1"` | | | 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.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"` | | | backend.services.logging.default | string | `"Information"` | | | backend.services.logging.offersLibrary | string | `"Information"` | | @@ -389,13 +383,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"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.1.0-RC1"` | | | 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"` | | +| backend.processesworker.image.processesworkertag | string | `"v2.1.0-RC1"` | | | 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"` | | @@ -492,6 +486,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.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 | diff --git a/charts/portal/README.md.gotmpl b/charts/portal/README.md.gotmpl index a592ea305..c167a9684 100644 --- a/charts/portal/README.md.gotmpl +++ b/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)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.0.0), -* [portal-frontend-registration (v2.0.0)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.0), +* [portal-frontend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC1), +* [portal-frontend-registration (v2.0.1-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC1), * [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and -* [portal-backend (v2.0.0)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.0.0). +* [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1). 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: diff --git a/charts/portal/templates/cronjob-backend-processes.yaml b/charts/portal/templates/cronjob-backend-processes.yaml index 60f3abeaf..9f1e9e895 100644 --- a/charts/portal/templates/cronjob-backend-processes.yaml +++ b/charts/portal/templates/cronjob-backend-processes.yaml @@ -139,6 +139,8 @@ spec: value: "{{ .Values.backend.processesworker.bpdm.scope }}" - name: "APPLICATIONCHECKLIST__BPDM__USERNAME" value: "{{ .Values.backend.placeholder }}" + - name: "APPLICATIONCHECKLIST__BPDM__USEDIMWALLET" + value: "{{ .Values.backend.useDimWallet }}" - name: "APPLICATIONCHECKLIST__CLEARINGHOUSE__BASEADDRESS" value: "{{ .Values.clearinghouseAddress }}" - name: "APPLICATIONCHECKLIST__CLEARINGHOUSE__CLIENTID" @@ -204,6 +206,8 @@ spec: value: "{{ .Values.sdfactoryAddress }}{{ .Values.backend.processesworker.sdfactory.selfdescriptionPath }}" - name: "APPLICATIONCHECKLIST__SDFACTORY__USERNAME" value: "{{ .Values.backend.placeholder }}" + - name: "APPLICATIONCHECKLIST__SDFACTORY__CLEARINGHOUSECONNECTDISABLED" + value: "{{ .Values.backend.processesworker.clearinghouseConnectDisabled }}" - name: "APPLICATIONCHECKLIST__DIM__USERNAME" value: "{{ .Values.backend.placeholder }}" - name: "APPLICATIONCHECKLIST__DIM__PASSWORD" diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index dedafb86e..3f362db8a 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -95,10 +95,6 @@ spec: secretKeyRef: name: "{{ .Values.backend.keycloak.secret }}" key: "central-db-password" - - name: "DATABASEACCESS__KEYCLOAK__CONNECTIONSTRING" - value: "Server={{ .Values.backend.keycloak.central.dbConnection.host }};Database={{ .Values.backend.keycloak.central.dbConnection.database }};Port={{ .Values.backend.keycloak.central.dbConnection.port }};User Id={{ .Values.backend.keycloak.central.dbConnection.user }};Password=$(KEYCLOAK_CENTRAL_PASSWORD);Ssl Mode={{ .Values.backend.keycloak.central.dbConnection.sslMode }};" - - name: "DATABASEACCESS__KEYCLOAK__DATABASESCHEMA" - value: "{{ .Values.backend.keycloak.central.dbConnection.schema }}" - name: "APPLICATIONCHECKLIST__BPDM__BASEADDRESS" value: "{{ .Values.bpdm.portalGateAddress }}{{ .Values.bpdm.portalGateApiPath }}" - name: "APPLICATIONCHECKLIST__BPDM__CLIENTID" @@ -181,6 +177,8 @@ spec: value: "{{ .Values.backend.processesworker.sdfactory.issuerBpn }}" - name: "APPLICATIONCHECKLIST__SDFACTORY__SDFACTORYURL" value: "{{ .Values.sdfactoryAddress }}{{ .Values.backend.processesworker.sdfactory.selfdescriptionPath }}" + - name: "APPLICATIONCHECKLIST__SDFACTORY__CLEARINGHOUSECONNECTDISABLED" + value: "{{ .Values.backend.processesworker.clearinghouseConnectDisabled }}" - name: "APPLICATIONCHECKLIST__SDFACTORY__USERNAME" value: "{{ .Values.backend.placeholder }}" - name: "APPLICATIONCHECKLIST__DIM__USERNAME" @@ -266,7 +264,7 @@ spec: - name: "COMPANYDATA__ISSUERDID" value: "{{ .Values.backend.administration.issuerdid }}" - name: "COMPANYDATA__BPNDIDRESOLVERURL" - value: "{{ .Values.bpnDidResolver.managementApiAddress }}" + value: "{{ .Values.bpnDidResolver.directoryApiAddress }}" - name: "CONNECTORS__VALIDCERTIFICATIONCONTENTTYPES__0" value: "{{ .Values.backend.administration.connectors.validCertificationContentTypes.type0 }}" - name: "CONNECTORS__VALIDCERTIFICATIONCONTENTTYPES__1" @@ -277,6 +275,8 @@ spec: value: "{{ .Values.backend.administration.connectors.validCertificationContentTypes.type3 }}" - name: "CONNECTORS__SELFDESCRIPTIONDOCUMENTURL" value: "{{ .Values.portalBackendAddress }}{{ .Values.backend.administration.connectors.selfDescriptionDocumentPath }}" + - name: "CONNECTORS__CLEARINGHOUSECONNECTDISABLED" + value: "{{ .Values.backend.processesworker.clearinghouseConnectDisabled }}" - name: "DOCUMENT__ENABLESEEDENDPOINT" value: "True" - name: "DOCUMENT__FRAMEDOCUMENTTYPEIDS__0" diff --git a/charts/portal/templates/deployment-backend-notification.yaml b/charts/portal/templates/deployment-backend-notification.yaml index 39ac94549..d37cf65f3 100644 --- a/charts/portal/templates/deployment-backend-notification.yaml +++ b/charts/portal/templates/deployment-backend-notification.yaml @@ -84,10 +84,6 @@ spec: secretKeyRef: name: "{{ .Values.backend.keycloak.secret }}" key: "central-db-password" - - name: "DATABASEACCESS__KEYCLOAK__CONNECTIONSTRING" - value: "Server={{ .Values.backend.keycloak.central.dbConnection.host }};Database={{ .Values.backend.keycloak.central.dbConnection.database }};Port={{ .Values.backend.keycloak.central.dbConnection.port }};User Id={{ .Values.backend.keycloak.central.dbConnection.user }};Password=$(KEYCLOAK_CENTRAL_PASSWORD);Ssl Mode={{ .Values.backend.keycloak.central.dbConnection.sslMode }};" - - name: "DATABASEACCESS__KEYCLOAK__DATABASESCHEMA" - value: "{{ .Values.backend.keycloak.central.dbConnection.schema }}" - name: "HEALTHCHECKS__0__PATH" value: "{{ .Values.backend.healthChecks.startup.path}}" {{- if .Values.backend.notification.healthChecks.startup.tags }} diff --git a/charts/portal/templates/job-backend-portal-migrations.yaml b/charts/portal/templates/job-backend-portal-migrations.yaml index 9e2abd75a..b07d85c71 100644 --- a/charts/portal/templates/job-backend-portal-migrations.yaml +++ b/charts/portal/templates/job-backend-portal-migrations.yaml @@ -69,14 +69,30 @@ spec: - name: "SEEDING__TESTDATAENVIRONMENTS__0" value: "{{ .Values.backend.portalmigrations.seeding.testDataEnvironments }}" - name: "SEEDING__DATAPATHS__0" - value: "{{ .Values.backend.portalmigrations.seeding.testDataPaths }}" + value: "Seeder/Data" - name: "SERILOG__MINIMUMLEVEL__Default" value: "{{ .Values.backend.portalmigrations.logging.default }}" - name: "PROCESSIDENTITY__PROCESSUSERID" - value: "{{ .Values.backend.portalmigrations.processIdentity.processUserId }}" + value: "d21d2e8a-fe35-483c-b2b8-4100ed7f0953" + {{- if and (.Values.backend.portalmigrations.seeding.testData.configMap) (.Values.backend.portalmigrations.seeding.testData.filename) }} + - name: "SEEDING__DATAPATHS__1" + value: "Seeder/Data/import" + - name: "SEEDING__TESTDATAENVIRONMENTS__1" + value: "{{ .Values.backend.portalmigrations.seeding.testData.filename }}" + {{- end }} ports: - name: http containerPort: {{ .Values.portContainer }} protocol: TCP resources: {{- toYaml .Values.backend.portalmigrations.resources | nindent 10 }} + {{- if and (.Values.backend.portalmigrations.seeding.testData.configMap) (.Values.backend.portalmigrations.seeding.testData.filename) }} + volumeMounts: + - name: test-data + mountPath: /migrations/Seeder/Data/import + volumes: + - name: test-data + configMap: + name: "{{ .Values.backend.portalmigrations.seeding.testData.configMap }}" + optional: true + {{- end }} diff --git a/charts/portal/templates/secret-backend-keycloak.yaml b/charts/portal/templates/secret-backend-keycloak.yaml index 8a08ce332..ca345a9e6 100644 --- a/charts/portal/templates/secret-backend-keycloak.yaml +++ b/charts/portal/templates/secret-backend-keycloak.yaml @@ -32,13 +32,11 @@ data: # if secret exists, use value provided from values file (to cover update scenario) or existing value from secret # use data map instead of stringData to prevent base64 encoding of already base64-encoded existing value from secret # use index function for secret keys with hyphen otherwise '$secret.data.secretKey' works too - central-db-password: {{ ( .Values.backend.keycloak.central.dbConnection.password | b64enc ) | default ( index $secret.data "central-db-password" ) | quote }} central-client-secret: {{ ( .Values.backend.keycloak.central.clientSecret | b64enc ) | default ( index $secret.data "central-client-secret" ) | quote }} shared-client-secret: {{ ( .Values.backend.keycloak.shared.clientSecret | b64enc ) | default ( index $secret.data "shared-client-secret" ) | quote }} {{ else -}} stringData: # if secret doesn't exist, use provided value from values file or generate a random one - central-db-password: {{ .Values.backend.keycloak.central.dbConnection.password | default ( randAlphaNum 32 ) | quote }} central-client-secret: {{ .Values.backend.keycloak.central.clientSecret | default ( randAlphaNum 32 ) | quote }} shared-client-secret: {{ .Values.backend.keycloak.shared.clientSecret | default ( randAlphaNum 32 ) | quote }} {{ end }} diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 93ab51c58..045bff02d 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -234,6 +234,7 @@ backend: portalIntroductionCompanyRolePath: "/companyroles" portalIntroductionDataspacePath: "/dataspace" userManagementPath: "/usermanagement" + # -- Enable for using Decentral Identity Management (DIM) instead of Managed Identity Wallet (MIW) as wallet useDimWallet: false keycloak: # -- Secret containing the database-password and the client-secret for the connection to the centralidp (CX IAM) and the client-secret for the connection to the sharedidp (CX-IAM). @@ -253,15 +254,6 @@ backend: clockSkew: "00:05:00" refreshInterval: "00:00:30" tokenPath: "/auth/realms/CX-Central/protocol/openid-connect/token" - dbConnection: - host: "centralidp-postgresql-primary" - port: 5432 - user: "kccentral" - database: "iamcentralidp" - # -- Password for the kccentral username. Secret-key 'central-db-password'. - password: "" - schema: "public" - sslMode: "Disable" # -- Flag if the api should be used with an leading /auth path useAuthTrail: true shared: @@ -610,11 +602,12 @@ backend: memory: 350M seeding: testDataEnvironments: "" - # -- when changing the testDataPath the processIdentity needs to be adjusted as well, - # or it must be ensured that the identity is existing within the files under the new path - testDataPaths: "Seeder/Data" - processIdentity: - processUserId: d21d2e8a-fe35-483c-b2b8-4100ed7f0953 + # -- Option to seed test data provided in a configMap + testData: + # -- ConfigMap containing json files for the tables to seed, e.g. companies.test.json, addresses.test.json, etc. + configMap: "" + # -- Filename identifying the test data files e.g. for companies.test.json the value would be "test" + filename: "" logging: default: "Information" portalmaintenance: @@ -672,10 +665,10 @@ backend: resources: requests: cpu: 75m - memory: 300M + memory: 400M limits: cpu: 225m - memory: 300M + memory: 400M basePath: "api/services" logging: default: "Information" @@ -936,6 +929,7 @@ backend: # -- EncryptionKey to encrypt the parameters of mailing processes. Secret-key 'mailing-encryption-key0'. # Expected format is 256 bit (64 digits) hex. encryptionKey: "" + clearinghouseConnectDisabled: false placeholder: "empty" postgresql: diff --git a/consortia/argocd-app-templates/appsetup-pen.yaml b/consortia/argocd-app-templates/appsetup-pen.yaml deleted file mode 100644 index 8939719f7..000000000 --- a/consortia/argocd-app-templates/appsetup-pen.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: portal-pen -spec: - destination: - namespace: product-portal-pen - server: 'https://kubernetes.default.svc' - source: - path: charts/portal - repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.0.0 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-pen.yaml' - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-stable.yaml b/consortia/argocd-app-templates/appsetup-stable.yaml deleted file mode 100644 index c521e3d27..000000000 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ /dev/null @@ -1,283 +0,0 @@ -############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: portal -spec: - destination: - name: '' - namespace: product-portal - server: 'https://kubernetes.default.svc' - source: - path: '' - repoURL: 'https://eclipse-tractusx.github.io/charts/dev' - targetRevision: 2.0.0 - plugin: - env: - - name: HELM_VALUES - value: | - portalAddress: "https://portal.stable.demo.catena-x.net" - portalBackendAddress: "https://portal-backend.stable.demo.catena-x.net" - centralidp: - address: "https://centralidp.stable.demo.catena-x.net" - sharedidpAddress: "https://sharedidp.stable.demo.catena-x.net" - semanticsAddress: "https://semantics.stable.demo.catena-x.net" - bpdm: - poolAddress: "https://business-partners.stable.demo.catena-x.net" - poolApiPath: "/pool/v6" - portalGateAddress: "https://business-partners.stable.demo.catena-x.net" - portalGateApiPath: "/companies/test-company/v6" - custodianAddress: "https://managed-identity-wallets-new.stable.demo.catena-x.net" - sdfactoryAddress: "https://sdfactory.stable.demo.catena-x.net" - clearinghouseAddress: "https://validation.test.dih-cloud.com" - clearinghouseTokenAddress: "https://iam.test.dih-cloud.com/realms/carla/protocol/openid-connect/token" - frontend: - ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/rewrite-target: "/$$1" - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.stable.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal.stable.demo.catena-x.net" - hosts: - - host: "portal.stable.demo.catena-x.net" - paths: - - path: "/(.*)" - pathType: "Prefix" - backend: - service: "portal" - port: 8080 - - path: "/registration/(.*)" - pathType: "Prefix" - backend: - service: "registration" - port: 8080 - - path: "/((assets|documentation)/.*)" - pathType: "Prefix" - backend: - service: "assets" - port: 8080 - backend: - ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.stable.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal-backend.stable.demo.catena-x.net" - hosts: - - host: "portal-backend.stable.demo.catena-x.net" - paths: - - path: "/api/registration" - pathType: "Prefix" - backend: - service: "registration-service" - port: 8080 - - path: "/api/administration" - pathType: "Prefix" - backend: - service: "administration-service" - port: 8080 - - path: "/api/notification" - pathType: "Prefix" - backend: - service: "notification-service" - port: 8080 - - path: "/api/apps" - pathType: "Prefix" - backend: - service: "marketplace-app-service" - port: 8080 - - path: "/api/services" - pathType: "Prefix" - backend: - service: "services-service" - port: 8080 - keycloak: - central: - clientId: "" - clientSecret: "" - dbConnection: - password: "" - shared: - clientId: "" - clientSecret: "" - mailing: - host: "" - port: "" - user: "" - password: "" - registration: - logging: - default: "Debug" - bpdmLibrary: "Debug" - registrationService: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - administration: - logging: - default: "Debug" - businessLogic: "Debug" - sdfactoryLibrary: "Debug" - bpdmLibrary: "Debug" - custodianLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - - name: "HEALTHCHECKS__0__TAGS__2" - value: "provisioningdb" - onboardingServiceProvider: - encryptionKey: "" - swaggerEnabled: true - provisioning: - sharedRealm: - smtpServer: - host: "" - port: "" - user: "" - password: "" - from: "" - replyTo: "" - appmarketplace: - logging: - default: "Debug" - offersLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - portalmigrations: - logging: - default: "Debug" - seeding: - testDataEnvironments: "consortia" - notification: - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - logging: - default: "Debug" - swaggerEnabled: true - services: - logging: - default: "Debug" - offersLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - processesworker: - logging: - default: "Debug" - processesLibrary: "Debug" - bpdmLibrary: "Debug" - clearinghouseLibrary: "Debug" - custodianLibrary: "Debug" - sdfactoryLibrary: "Debug" - offerProvider: "Debug" - bpdm: - clientId: "" - clientSecret: "" - clearinghouse: - clientId: "" - clientSecret: "" - custodian: - clientId: "" - clientSecret: "" - sdfactory: - issuerBpn: "BPNL00000003CRHK" - clientId: "" - clientSecret: "" - offerprovider: - clientId: "" - clientSecret: "" - onboardingServiceProvider: - encryptionConfigs: - index0: - encryptionKey: "" - index1: - encryptionKey: "" - dim: - encryptionConfigs: - index0: - encryptionKey: "" - issuerComponent: - clientId: "" - clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" - invitation: - encryptionConfigs: - index0: - encryptionKey: "" - mailing: - encryptionConfigs: - index0: - encryptionKey: "" - - postgresql: - auth: - password: "" - replicationPassword: "" - portalPassword: "" - provisioningPassword: "" - primary: - extendedConfiguration: | - max_connections = 200 - readReplicas: - extendedConfiguration: | - max_connections = 200 - chart: portal - sources: [] - project: project-portal diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml deleted file mode 100644 index cf12cc3c6..000000000 --- a/consortia/environments/values-pen.yaml +++ /dev/null @@ -1,294 +0,0 @@ -############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -portalAddress: "https://portal-pen.dev.demo.catena-x.net" -portalBackendAddress: "https://portal-backend-pen.dev.demo.catena-x.net" -centralidp: - address: "https://centralidp-pen.dev.demo.catena-x.net" -sharedidpAddress: "https://sharedidp-pen.dev.demo.catena-x.net" -semanticsAddress: "https://semantics-pen.dev.demo.catena-x.net" -bpdm: - poolAddress: "https://business-partners-pen.dev.demo.catena-x.net" - poolApiPath: "/pool/v6" - portalGateAddress: "https://business-partners-pen.dev.demo.catena-x.net" - portalGateApiPath: "/companies/test-company/v6" -custodianAddress: "https://managed-identity-wallets-pen-new.dev.demo.catena-x.net" -sdfactoryAddress: "https://sdfactory-pen.dev.demo.catena-x.net" -clearinghouseAddress: "https://validation.test.dih-cloud.com" -clearinghouseTokenAddress: "https://iam.test.dih-cloud.com/realms/carla/protocol/openid-connect/token" -issuerComponentAddress: "https://ssi-credential-issuer-pen.dev.demo.catena-x.net" -bpnDidResolverAddress: "http://bdrs-bdrs-server:8081" -dimWrapper: - baseAddress: "https://dim-pen.dev.demo.catena-x.net" -decentralIdentityManagementAuthAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap/api/v2.0.0/iatp/catena-x-portal" -bpnDidResolver: - managementApiAddress: "http://bdrs-bdrs-server:8081" - directoryApiAddress: "https://bpn-did-resolution-service-pen.dev.demo.catena-x.net/api/directory" - -frontend: - - ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/rewrite-target: "/$1" - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal-pen.dev.demo.catena-x.net" - hosts: - - host: "portal-pen.dev.demo.catena-x.net" - paths: - - path: "/(.*)" - pathType: "Prefix" - backend: - service: "portal" - port: 8080 - - path: "/registration/(.*)" - pathType: "Prefix" - backend: - service: "registration" - port: 8080 - - path: "/((assets|documentation)/.*)" - pathType: "Prefix" - backend: - service: "assets" - port: 8080 - -backend: - ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal-backend-pen.dev.demo.catena-x.net" - hosts: - - host: "portal-backend-pen.dev.demo.catena-x.net" - paths: - - path: "/api/registration" - pathType: "Prefix" - backend: - service: "registration-service" - port: 8080 - - path: "/api/administration" - pathType: "Prefix" - backend: - service: "administration-service" - port: 8080 - - path: "/api/notification" - pathType: "Prefix" - backend: - service: "notification-service" - port: 8080 - - path: "/api/apps" - pathType: "Prefix" - backend: - service: "marketplace-app-service" - port: 8080 - - path: "/api/services" - pathType: "Prefix" - backend: - service: "services-service" - port: 8080 - - keycloak: - central: - clientId: "" - clientSecret: "" - dbConnection: - host: "centralidp-pen-postgresql-primary" - password: "" - shared: - clientId: "" - clientSecret: "" - - mailing: - host: "" - port: "" - user: "" - password: "" - senderEmail: "Notifications@catena-x.net" - - registration: - logging: - default: "Debug" - bpdmLibrary: "Debug" - registrationService: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - - administration: - logging: - default: "Debug" - businessLogic: "Debug" - sdfactoryLibrary: "Debug" - bpdmLibrary: "Debug" - custodianLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - - name: "HEALTHCHECKS__0__TAGS__2" - value: "provisioningdb" - swaggerEnabled: true - issuerdid: "did:web:dim-static-prod.dis-cloud-prod.cfapps.eu10-004.hana.ondemand.com:dim-hosted:2f45795c-d6cc-4038-96c9-63cedc0cd266:holder-iatp" - serviceAccount: - encryptionConfigs: - index0: - encryptionKey: "" - - provisioning: - sharedRealm: - smtpServer: - host: "" - port: "" - user: "" - password: "" - from: "" - replyTo: "" - - appmarketplace: - logging: - default: "Debug" - offersLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - - portalmigrations: - logging: - default: "Debug" - seeding: - testDataEnvironments: "consortia" - - notification: - logging: - default: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - - services: - logging: - default: "Debug" - offersLibrary: "Debug" - healthChecks: - startup: - tags: - - name: "HEALTHCHECKS__0__TAGS__0" - value: "keycloak" - - name: "HEALTHCHECKS__0__TAGS__1" - value: "portaldb" - swaggerEnabled: true - - processesworker: - logging: - default: "Debug" - processesLibrary: "Debug" - bpdmLibrary: "Debug" - clearinghouseLibrary: "Debug" - custodianLibrary: "Debug" - sdfactoryLibrary: "Debug" - offerProvider: "Debug" - bpdm: - clientId: "" - clientSecret: "" - clearinghouse: - clientId: "" - clientSecret: "" - custodian: - clientId: "" - clientSecret: "" - sdfactory: - issuerBpn: "BPNL00000003CRHK" - clientId: "" - clientSecret: "" - offerprovider: - clientId: "" - clientSecret: "" - onboardingServiceProvider: - encryptionConfigs: - index0: - encryptionKey: "" - index1: - encryptionKey: "" - dim: - clientId: "" - clientSecret: "" - universalResolverAddress: "https://dev.uniresolver.io/" - encryptionConfigs: - index0: - encryptionKey: "" - issuerComponent: - clientId: "" - clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" - bpnDidResolver: - apiKey: "" - invitation: - encryptionConfigs: - index0: - encryptionKey: "" - mailing: - encryptionConfigs: - index0: - encryptionKey: "" - -postgresql: - auth: - password: "" - replicationPassword: "" - portalPassword: "" - provisioningPassword: "" - primary: - extendedConfiguration: | - max_connections = 200 - readReplicas: - extendedConfiguration: | - max_connections = 200 diff --git a/consortia/argocd-app-templates/appsetup-beta.yaml b/environments/argocd-app-templates/appsetup-int.yaml similarity index 86% rename from consortia/argocd-app-templates/appsetup-beta.yaml rename to environments/argocd-app-templates/appsetup-int.yaml index 8309ac72d..ad10db77a 100644 --- a/consortia/argocd-app-templates/appsetup-beta.yaml +++ b/environments/argocd-app-templates/appsetup-int.yaml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -28,11 +28,11 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.0.0 + targetRevision: portal-2.1.0-RC1 plugin: env: - name: AVP_SECRET value: vault-secret - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-beta.yaml' + value: '-f values.yaml -f ../../environments/helm-values/values-int.yaml' project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/environments/consortia/argocd-app-templates/appsetup-dev.yaml similarity index 92% rename from consortia/argocd-app-templates/appsetup-dev.yaml rename to environments/consortia/argocd-app-templates/appsetup-dev.yaml index cfc6cbef7..2f316dda1 100644 --- a/consortia/argocd-app-templates/appsetup-dev.yaml +++ b/environments/consortia/argocd-app-templates/appsetup-dev.yaml @@ -20,7 +20,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: portal-upgrade + name: portal spec: destination: namespace: product-iam @@ -34,7 +34,7 @@ spec: - name: AVP_SECRET value: vault-secret - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-dev.yaml' + value: '-f values.yaml -f ../../environments/consortia/helm-values/values-dev.yaml' project: project-portal syncPolicy: automated: diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/environments/consortia/argocd-app-templates/appsetup-int.yaml similarity index 90% rename from consortia/argocd-app-templates/appsetup-int.yaml rename to environments/consortia/argocd-app-templates/appsetup-int.yaml index 4a127950c..faa0cff5f 100644 --- a/consortia/argocd-app-templates/appsetup-int.yaml +++ b/environments/consortia/argocd-app-templates/appsetup-int.yaml @@ -28,11 +28,11 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.0.0 + targetRevision: portal-2.1.0-RC1 plugin: env: - name: AVP_SECRET value: vault-secret - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-int.yaml' + value: '-f values.yaml -f ../../environments/consortia/helm-values/values-int.yaml' project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-rc.yaml b/environments/consortia/argocd-app-templates/appsetup-rc.yaml similarity index 93% rename from consortia/argocd-app-templates/appsetup-rc.yaml rename to environments/consortia/argocd-app-templates/appsetup-rc.yaml index 4c164196b..d92e5f1d0 100644 --- a/consortia/argocd-app-templates/appsetup-rc.yaml +++ b/environments/consortia/argocd-app-templates/appsetup-rc.yaml @@ -34,5 +34,5 @@ spec: - name: AVP_SECRET value: vault-secret - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-rc.yaml' + value: '-f values.yaml -f ../../environments/consortia/helm-values/values-rc.yaml' project: project-portal diff --git a/consortia/environments/values-dev.yaml b/environments/consortia/helm-values/values-dev.yaml similarity index 99% rename from consortia/environments/values-dev.yaml rename to environments/consortia/helm-values/values-dev.yaml index 8d129d569..7c61d2278 100644 --- a/consortia/environments/values-dev.yaml +++ b/environments/consortia/helm-values/values-dev.yaml @@ -122,8 +122,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-int.yaml b/environments/consortia/helm-values/values-int.yaml similarity index 99% rename from consortia/environments/values-int.yaml rename to environments/consortia/helm-values/values-int.yaml index 126ba8be2..267c505fa 100644 --- a/consortia/environments/values-int.yaml +++ b/environments/consortia/helm-values/values-int.yaml @@ -120,8 +120,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-rc.yaml b/environments/consortia/helm-values/values-rc.yaml similarity index 99% rename from consortia/environments/values-rc.yaml rename to environments/consortia/helm-values/values-rc.yaml index 3ff5afa99..a4edd5274 100644 --- a/consortia/environments/values-rc.yaml +++ b/environments/consortia/helm-values/values-rc.yaml @@ -122,8 +122,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-beta.yaml b/environments/helm-values/values-int.yaml similarity index 59% rename from consortia/environments/values-beta.yaml rename to environments/helm-values/values-int.yaml index fc849c3ab..1fddca8d9 100644 --- a/consortia/environments/values-beta.yaml +++ b/environments/helm-values/values-int.yaml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -17,28 +17,29 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -portalAddress: "https://portal.beta.demo.catena-x.net" -portalBackendAddress: "https://portal-backend.beta.demo.catena-x.net" +portalAddress: "https://portal.int.catena-x.net" +portalBackendAddress: "https://portal-backend.int.catena-x.net" centralidp: - address: "https://centralidp.beta.demo.catena-x.net" -sharedidpAddress: "https://sharedidp.beta.demo.catena-x.net" -semanticsAddress: "https://semantics.beta.demo.catena-x.net" + address: "https://centralidp.int.catena-x.net" +sharedidpAddress: "https://sharedidp.int.catena-x.net" +semanticsAddress: "https://semantics.int.catena-x.net" bpdm: - poolAddress: "https://business-partners.beta.demo.catena-x.net" + poolAddress: "https://business-partners.int.catena-x.net" poolApiPath: "/pool/v6" - portalGateAddress: "https://business-partners.beta.demo.catena-x.net" + portalGateAddress: "https://business-partners.int.catena-x.net" portalGateApiPath: "/companies/test-company/v6" -custodianAddress: "https://managed-identity-wallets-new.beta.demo.catena-x.net" -sdfactoryAddress: "https://sdfactory.beta.demo.catena-x.net" +custodianAddress: "https://managed-identity-wallets-new.int.catena-x.net" +sdfactoryAddress: "https://sdfactory.int.catena-x.net" clearinghouseAddress: "https://validation.test.dih-cloud.com" clearinghouseTokenAddress: "https://iam.test.dih-cloud.com/realms/carla/protocol/openid-connect/token" -issuerComponentAddress: "https://ssi-credential-issuer.beta.demo.catena-x.net" +issuerComponentAddress: "https://ssi-credential-issuer.int.catena-x.net" +bpnDidResolverAddress: "http://bdrs-bdrs-server:8081" dimWrapper: - baseAddress: "https://dim.beta.demo.catena-x.net" -decentralIdentityManagementAuthAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap/api/v2.0.0/iatp/catena-x-portal" + baseAddress: "https://dim.int.catena-x.net" +decentralIdentityManagementAuthAddress: "" bpnDidResolver: managementApiAddress: "http://bdrs-bdrs-server:8081" - directoryApiAddress: "https://bpn-did-resolution-service.beta.demo.catena-x.net/api/directory" + directoryApiAddress: "https://bpn-did-resolution-service.int.catena-x.net/api/directory" frontend: @@ -46,16 +47,17 @@ frontend: enabled: true className: "nginx" annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" nginx.ingress.kubernetes.io/rewrite-target: "/$1" nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.beta.demo.catena-x.net" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://*.int.catena-x.net" tls: - - secretName: "tls-secret" + - secretName: "portal.int.catena-x.net-tls" hosts: - - "portal.beta.demo.catena-x.net" + - "portal.int.catena-x.net" hosts: - - host: "portal.beta.demo.catena-x.net" + - host: "portal.int.catena-x.net" paths: - path: "/(.*)" pathType: "Prefix" @@ -78,16 +80,17 @@ backend: enabled: true className: "nginx" annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.beta.demo.catena-x.net" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://*.int.catena-x.net" tls: - - secretName: "tls-secret" + - secretName: "portal-backend.int.catena-x.net-tls" hosts: - - "portal-backend.beta.demo.catena-x.net" + - "portal-backend.int.catena-x.net" hosts: - - host: "portal-backend.beta.demo.catena-x.net" + - host: "portal-backend.int.catena-x.net" paths: - path: "/api/registration" pathType: "Prefix" @@ -117,20 +120,20 @@ backend: keycloak: central: - clientId: "" - clientSecret: "" - dbConnection: - password: "" + clientId: "" + clientSecret: "" shared: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" + + useDimWallet: true mailing: host: "" port: "" user: "" password: "" - senderEmail: "Notifications@catena-x.net" + senderEmail: "" registration: logging: @@ -162,12 +165,12 @@ backend: value: "portaldb" - name: "HEALTHCHECKS__0__TAGS__2" value: "provisioningdb" - issuerdid: "did:web:dim-static-prod.dis-cloud-prod.cfapps.eu10-004.hana.ondemand.com:dim-hosted:2f45795c-d6cc-4038-96c9-63cedc0cd266:holder-iatp" swaggerEnabled: true + issuerdid: "did:web:tbd" serviceAccount: encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" provisioning: sharedRealm: @@ -195,8 +198,6 @@ backend: portalmigrations: logging: default: "Debug" - seeding: - testDataEnvironments: "consortia" notification: logging: @@ -233,57 +234,62 @@ backend: sdfactoryLibrary: "Debug" offerProvider: "Debug" bpdm: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" clearinghouse: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" custodian: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" sdfactory: issuerBpn: "BPNL00000003CRHK" - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" offerprovider: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" onboardingServiceProvider: encryptionConfigs: index0: - encryptionKey: "" + cipherMode: "CBC" + paddingMode: "PKCS7" + encryptionKey: "" index1: - encryptionKey: "" + encryptionKey: "" dim: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" universalResolverAddress: "https://dev.uniresolver.io/" encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" issuerComponent: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" bpnDidResolver: - apiKey: "" + apiKey: "" invitation: encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" mailing: encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" + +replicaCount: 2 postgresql: auth: - password: "" - replicationPassword: "" - portalPassword: "" - provisioningPassword: "" + password: "" + replicationPassword: "" + portalPassword: "" + provisioningPassword: "" + architecture: "standalone" primary: extendedConfiguration: | max_connections = 200 diff --git a/consortia/scripts/push.sh b/environments/push.sh similarity index 100% rename from consortia/scripts/push.sh rename to environments/push.sh