From 75fd575eb4616667b1269658146c087bc207cac7 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Mon, 15 Jul 2024 11:39:25 +0000 Subject: [PATCH 01/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 647e03f65..240da04ff 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: v2.1.0-RC1 + portaltag: 087b4518d4ca078c0497276ba44c79c5f4496d0e pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From bb7549783fa5a3c87d79718a4854bf1e61b72fe3 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 09:18:37 +0000 Subject: [PATCH 02/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 240da04ff..0d257dc90 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: 087b4518d4ca078c0497276ba44c79c5f4496d0e + portaltag: a9e8ad56996284c6d0971adb0c269cb91d895803 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From f651c57dfb674a0cec33118e1c7cf94f24e6aaac Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 09:21:08 +0000 Subject: [PATCH 03/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 0d257dc90..cffe4a75b 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: a9e8ad56996284c6d0971adb0c269cb91d895803 + portaltag: fd2f8348a3a603a45941852c60974b3f2c9b4359 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 23f69eb183cf6ff6b4363caad22648891e520b89 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 09:46:28 +0000 Subject: [PATCH 04/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index cffe4a75b..d9945ceb5 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: fd2f8348a3a603a45941852c60974b3f2c9b4359 + portaltag: 286545c889b0d866c26a075b61cc4019db85a78f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 3930a4be243b3d2b67663a3702dead4084c1a90a Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 10:01:01 +0000 Subject: [PATCH 05/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index d9945ceb5..ec7c73963 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: 286545c889b0d866c26a075b61cc4019db85a78f + portaltag: 3f31936c81ee176634253b6465e94fbe6023f8c9 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From dd3b7c0cac4aa49385aa26e3edb6eae6f646bdac Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 12:05:03 +0000 Subject: [PATCH 06/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index ec7c73963..a0ca97caf 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: 3f31936c81ee176634253b6465e94fbe6023f8c9 + portaltag: 9a5d80aeb2b2d98afaa4b1d4109ee6d20b7807ba pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 2fb2e379d5f2e6fd4bb0dd78c6dae745d40048b2 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 16 Jul 2024 12:57:46 +0000 Subject: [PATCH 07/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index a0ca97caf..8e6715b67 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: 9a5d80aeb2b2d98afaa4b1d4109ee6d20b7807ba + portaltag: b2804501cb811e548c5ff34d51863a7bb1a6c114 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 7628be1d5b922560ff518fe5e89e91740da256c6 Mon Sep 17 00:00:00 2001 From: Martin Rohrmeier Date: Tue, 16 Jul 2024 16:18:37 +0200 Subject: [PATCH 08/16] fix: set correct path for consent osp --- CHANGELOG.md | 1 + charts/portal/README.md | 2 +- charts/portal/values.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a17f1e5ec..41b49db68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel * 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) + * set correct value for consent_osp ## 2.0.0 diff --git a/charts/portal/README.md b/charts/portal/README.md index 770a82f69..e10a88eaa 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -448,7 +448,7 @@ dependencies: | backend.processesworker.onboardingServiceProvider.encryptionConfigs.index1.paddingMode | string | `"PKCS7"` | | | backend.processesworker.onboardingServiceProvider.encryptionConfigs.index1.encryptionKey | string | `""` | EncryptionKey for onboardingserviceprovider. Secret-key 'onboardingserviceprovider-encryption-key1'. Expected format is 256 bit (64 digits) hex. When upgrading from v2.0.0-RC1 please read document portal-upgrade-details.md | | backend.processesworker.networkRegistration.loginDocumentPath | string | `"/documentation/?path=docs%2F09.+Others%28s%29%2F01.+Login.md"` | | -| backend.processesworker.networkRegistration.externalRegistrationPath | string | `"/?overlay=consent_osp"` | | +| backend.processesworker.networkRegistration.externalRegistrationPath | string | `"/consent_osp"` | | | backend.processesworker.networkRegistration.closeApplicationPath | string | `"/decline"` | The logic to decline an application is not yet implemented in the backend - this will currently lead to a 404 page when clicking on the link in the mail | | backend.processesworker.dim.clientId | string | `"dim-client-id"` | Provide dim client-id from CX IAM centralidp. | | backend.processesworker.dim.clientSecret | string | `""` | Client-secret for dim client-id. Secret-key 'dim-client-secret'. | diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 87f54ab80..5e0bd6444 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -860,7 +860,7 @@ backend: encryptionKey: "" networkRegistration: loginDocumentPath: "/documentation/?path=docs%2F09.+Others%28s%29%2F01.+Login.md" - externalRegistrationPath: "/?overlay=consent_osp" + externalRegistrationPath: "/consent_osp" # -- The logic to decline an application is not yet implemented in the backend - this will currently lead to a 404 page when clicking on the link in the mail closeApplicationPath: "/decline" dim: From c0a585e8184d235c4b304ddcd6d19928ce7d853e Mon Sep 17 00:00:00 2001 From: Martin Rohrmeier Date: Tue, 16 Jul 2024 16:45:21 +0200 Subject: [PATCH 09/16] fix: move bugfix message to unreleased --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41b49db68..ce1e5b093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## unreleased + +### Bugfix + +* portal-cd: + * set correct path for consent osp url + ## 2.1.0-RC1 ### Change @@ -31,7 +38,6 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel * 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) - * set correct value for consent_osp ## 2.0.0 @@ -300,4 +306,4 @@ n/a ### Change * added product helm chart for portal, combining frontend and backend chart. -* moved repository to eclipse-tractusx. \ No newline at end of file +* moved repository to eclipse-tractusx. From c9a459165f2f2d883b306e0e361aed8a01cb2ab6 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 17 Jul 2024 06:07:25 +0000 Subject: [PATCH 10/16] Add new image for portal registration --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 5e0bd6444..f979c1cbb 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -141,7 +141,7 @@ frontend: name: "registration" image: name: "docker.io/tractusx/portal-frontend-registration" - registrationtag: v2.0.1-RC1 + registrationtag: 37eeb7b9463cab38d6d9cc31edbaf0887ce5fd5f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From c5831a0b9657e3b6749b8f4b0237a780360145e5 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 17 Jul 2024 06:08:13 +0000 Subject: [PATCH 11/16] Add new image for portal registration --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index f979c1cbb..52892c5b1 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -141,7 +141,7 @@ frontend: name: "registration" image: name: "docker.io/tractusx/portal-frontend-registration" - registrationtag: 37eeb7b9463cab38d6d9cc31edbaf0887ce5fd5f + registrationtag: 9851f833454f6bd56dc8faeca98a61979526f75f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 764bee18bfd0746f7a2b776cc98a93daed6dbfce Mon Sep 17 00:00:00 2001 From: Karsten Thiems <150006841+typecastcloud@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:43:24 +0200 Subject: [PATCH 12/16] fix(roles): update role name for approval notifications (#372) Currently Service Manager receives notifications regarding app approval process. Refs: #370 --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 52892c5b1..817dff669 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -500,7 +500,7 @@ backend: role1: "Company Admin" approveAppUserRoles: role0: "Sales Manager" - role1: "Service Manager" + role1: "App Manager" activationUserRoles: role0: "Sales Manager" role1: "App Manager" From b1e282edc137c428f4c04e4036334e6c7b93017e Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 17 Jul 2024 14:41:22 +0000 Subject: [PATCH 13/16] Add new image for portal --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 817dff669..254b2e0eb 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -126,7 +126,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: b2804501cb811e548c5ff34d51863a7bb1a6c114 + portaltag: v2.1.0-RC2 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 2a9a6c01161f666c66ac7e811e652ef713c96caa Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 17 Jul 2024 15:50:17 +0000 Subject: [PATCH 14/16] Add new image for portal registration --- charts/portal/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 254b2e0eb..96d5b1784 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -141,7 +141,7 @@ frontend: name: "registration" image: name: "docker.io/tractusx/portal-frontend-registration" - registrationtag: 9851f833454f6bd56dc8faeca98a61979526f75f + registrationtag: v2.0.1-RC2 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 8cede8bcc14a2fdb1bc52b1fe63e43692556d324 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Wed, 17 Jul 2024 17:57:34 +0200 Subject: [PATCH 15/16] fix(encryptionKey): align dim and issuerComponent config (#368) Refs: #358 --- charts/portal/README.md | 10 +++++----- charts/portal/templates/cronjob-backend-processes.yaml | 10 +++++----- .../templates/deployment-backend-administration.yaml | 10 +++++----- charts/portal/templates/secret-backend-interfaces.yaml | 6 ++---- charts/portal/values.yaml | 9 --------- environments/consortia/helm-values/values-dev.yaml | 5 +---- environments/consortia/helm-values/values-int.yaml | 5 +---- environments/consortia/helm-values/values-rc.yaml | 5 +---- environments/helm-values/values-int.yaml | 3 --- 9 files changed, 20 insertions(+), 43 deletions(-) diff --git a/charts/portal/README.md b/charts/portal/README.md index e10a88eaa..cb3d11a93 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -467,11 +467,11 @@ dependencies: | backend.processesworker.issuerComponent.clientSecret | string | `""` | Client-secret for dim client-id. Secret-key 'issuercomponent-client-secret'. | | backend.processesworker.issuerComponent.grantType | string | `"client_credentials"` | | | backend.processesworker.issuerComponent.scope | string | `"openid"` | | -| backend.processesworker.issuerComponent.encryptionConfigIndex | int | `0` | | -| backend.processesworker.issuerComponent.encryptionConfigs.index0.index | int | `0` | | -| backend.processesworker.issuerComponent.encryptionConfigs.index0.cipherMode | string | `"CBC"` | | -| backend.processesworker.issuerComponent.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | | -| backend.processesworker.issuerComponent.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for the issuer component. Secret-key 'issuercomponent-encryption-key0'. Expected format is 256 bit (64 digits) hex. | +| backend.processesworker.dim.encryptionConfigIndex | int | `0` | | +| backend.processesworker.dim.encryptionConfigs.index0.index | int | `0` | | +| backend.processesworker.dim.encryptionConfigs.index0.cipherMode | string | `"CBC"` | | +| backend.processesworker.dim.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | | +| backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for the issuer component. Secret-key 'issuercomponent-encryption-key0'. Expected format is 256 bit (64 digits) hex. | | backend.processesworker.bpnDidResolver.apiKey | string | `""` | ApiKey for management endpoint of the bpnDidResolver. Secret-key 'bpndidresolver-api-key'. | | backend.processesworker.invitation.invitedUserInitialRoles.role0 | string | `"Company Admin"` | | | backend.processesworker.invitation.initialLoginTheme | string | `"catenax-shared"` | | diff --git a/charts/portal/templates/cronjob-backend-processes.yaml b/charts/portal/templates/cronjob-backend-processes.yaml index 9f1e9e895..b4b063c49 100644 --- a/charts/portal/templates/cronjob-backend-processes.yaml +++ b/charts/portal/templates/cronjob-backend-processes.yaml @@ -268,18 +268,18 @@ spec: - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__CALLBACKURL" value: "{{ .Values.portalBackendAddress }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGINDEX" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigIndex }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigIndex }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__INDEX" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.index }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.index }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY" valueFrom: secretKeyRef: name: "{{ .Values.backend.interfaces.secret }}" - key: "issuercomponent-encryption-key0" + key: "dim-encryption-key0" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__CIPHERMODE" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.cipherMode }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.cipherMode }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__PADDINGMODE" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.paddingMode }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.paddingMode }}" - name: "BPNDIDRESOLVER__BASEADDRESS" value: "{{ .Values.bpnDidResolver.managementApiAddress }}" - name: "BPNDIDRESOLVER__APIKEY" diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index 3f362db8a..ee0596e18 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -241,18 +241,18 @@ spec: - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__CALLBACKURL" value: "{{ .Values.portalBackendAddress }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGINDEX" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigIndex }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigIndex }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__INDEX" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.index }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.index }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY" valueFrom: secretKeyRef: name: "{{ .Values.backend.interfaces.secret }}" - key: "issuercomponent-encryption-key0" + key: "dim-encryption-key0" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__CIPHERMODE" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.cipherMode }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.cipherMode }}" - name: "APPLICATIONCHECKLIST__ISSUERCOMPONENT__ENCRYPTIONCONFIGS__0__PADDINGMODE" - value: "{{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.paddingMode }}" + value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.paddingMode }}" - name: "COMPANYDATA__USECASEPARTICIPATIONMEDIATYPES__0" value: "{{ .Values.backend.administration.companyData.useCaseParticipationMediaTypes.type0 }}" - name: "COMPANYDATA__SSICERTIFICATEMEDIATYPES__0" diff --git a/charts/portal/templates/secret-backend-interfaces.yaml b/charts/portal/templates/secret-backend-interfaces.yaml index e1cb98b25..04c507a5f 100644 --- a/charts/portal/templates/secret-backend-interfaces.yaml +++ b/charts/portal/templates/secret-backend-interfaces.yaml @@ -38,13 +38,12 @@ data: sdfactory-client-secret: {{ coalesce ( .Values.backend.processesworker.sdfactory.clientSecret | b64enc ) ( index $secret.data "sdfactory-client-secret" ) | default ( randAlphaNum 32 ) | quote }} offerprovider-client-secret: {{ coalesce ( .Values.backend.processesworker.offerprovider.clientSecret | b64enc ) ( index $secret.data "offerprovider-client-secret" ) | default ( randAlphaNum 32 ) | quote }} dim-client-secret: {{ coalesce ( .Values.backend.processesworker.dim.clientSecret | b64enc ) ( index $secret.data "dim-client-secret" ) | default ( randAlphaNum 32 ) | quote }} - dim-encryption-key0: {{ coalesce ( .Values.backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "dim-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} onboardingserviceprovider-encryption-key0: {{ coalesce ( .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "onboardingserviceprovider-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} onboardingserviceprovider-encryption-key1: {{ coalesce ( .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index1.encryptionKey | b64enc ) ( index $secret.data "onboardingserviceprovider-encryption-key1" ) | default ( randAlphaNum 32 ) | quote }} invitation-encryption-key0: {{ coalesce ( .Values.backend.processesworker.invitation.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "invitation-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} mailing-encryption-key0: {{ coalesce ( .Values.backend.processesworker.mailing.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "mailing-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} issuercomponent-client-secret: {{ coalesce ( .Values.backend.processesworker.issuerComponent.clientSecret | b64enc ) ( index $secret.data "issuercomponent-client-secret" ) | default ( randAlphaNum 32 ) | quote }} - issuercomponent-encryption-key0: {{ coalesce ( .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "issuercomponent-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} + dim-encryption-key0: {{ coalesce ( .Values.backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "dim-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} bpndidresolver-api-key: {{ coalesce ( .Values.backend.processesworker.bpnDidResolver.apiKey | b64enc ) ( index $secret.data "bpndidresolver-api-key" ) | default ( randAlphaNum 32 ) | quote }} serviceaccount-encryption-key0: {{ coalesce ( .Values.backend.administration.serviceAccount.encryptionConfigs.index0.encryptionKey | b64enc ) ( index $secret.data "serviceaccount-encryption-key0" ) | default ( randAlphaNum 32 ) | quote }} {{ else -}} @@ -56,13 +55,12 @@ stringData: sdfactory-client-secret: {{ .Values.backend.processesworker.sdfactory.clientSecret | default ( randAlphaNum 32 ) | quote }} offerprovider-client-secret: {{ .Values.backend.processesworker.offerprovider.clientSecret | default ( randAlphaNum 32 ) | quote }} dim-client-secret: {{ .Values.backend.processesworker.dim.clientSecret | default ( randAlphaNum 32 ) | quote }} - dim-encryption-key0: {{ .Values.backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} onboardingserviceprovider-encryption-key0: {{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} onboardingserviceprovider-encryption-key1: {{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index1.encryptionKey | default ( randAlphaNum 32 ) | quote }} invitation-encryption-key0: {{ .Values.backend.processesworker.invitation.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} mailing-encryption-key0: {{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} issuercomponent-client-secret: {{ .Values.backend.processesworker.issuerComponent.clientSecret | default ( randAlphaNum 32 ) | quote }} - issuercomponent-encryption-key0: {{ .Values.backend.processesworker.issuerComponent.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} + dim-encryption-key0: {{ .Values.backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} bpndidresolver-api-key: {{ .Values.backend.processesworker.bpnDidResolver.apiKey | default ( randAlphaNum 32 ) | quote }} serviceaccount-encryption-key0: {{ .Values.backend.administration.serviceAccount.encryptionConfigs.index0.encryptionKey | default ( randAlphaNum 32 ) | quote }} {{ end }} diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 96d5b1784..0c3f4c706 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -893,15 +893,6 @@ backend: clientSecret: "" grantType: "client_credentials" scope: "openid" - encryptionConfigIndex: 0 - encryptionConfigs: - index0: - index: 0 - cipherMode: "CBC" - paddingMode: "PKCS7" - # -- EncryptionKey for the issuer component. Secret-key 'issuercomponent-encryption-key0'. - # Expected format is 256 bit (64 digits) hex. - encryptionKey: "" bpnDidResolver: # -- ApiKey for management endpoint of the bpnDidResolver. Secret-key 'bpndidresolver-api-key'. apiKey: "" diff --git a/environments/consortia/helm-values/values-dev.yaml b/environments/consortia/helm-values/values-dev.yaml index 7c61d2278..b354068dd 100644 --- a/environments/consortia/helm-values/values-dev.yaml +++ b/environments/consortia/helm-values/values-dev.yaml @@ -261,13 +261,10 @@ backend: universalResolverAddress: "https://dev.uniresolver.io/" encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" issuerComponent: clientId: "" clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" bpnDidResolver: apiKey: "" invitation: diff --git a/environments/consortia/helm-values/values-int.yaml b/environments/consortia/helm-values/values-int.yaml index 267c505fa..1b3fddd4a 100644 --- a/environments/consortia/helm-values/values-int.yaml +++ b/environments/consortia/helm-values/values-int.yaml @@ -261,13 +261,10 @@ backend: universalResolverAddress: "https://dev.uniresolver.io/" encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" issuerComponent: clientId: "" clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" bpnDidResolver: apiKey: "" invitation: diff --git a/environments/consortia/helm-values/values-rc.yaml b/environments/consortia/helm-values/values-rc.yaml index a4edd5274..2414caaf2 100644 --- a/environments/consortia/helm-values/values-rc.yaml +++ b/environments/consortia/helm-values/values-rc.yaml @@ -261,13 +261,10 @@ backend: universalResolverAddress: "https://dev.uniresolver.io/" encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" issuerComponent: clientId: "" clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" bpnDidResolver: apiKey: "" invitation: diff --git a/environments/helm-values/values-int.yaml b/environments/helm-values/values-int.yaml index 1fddca8d9..eea0cdd27 100644 --- a/environments/helm-values/values-int.yaml +++ b/environments/helm-values/values-int.yaml @@ -267,9 +267,6 @@ backend: issuerComponent: clientId: "" clientSecret: "" - encryptionConfigs: - index0: - encryptionKey: "" bpnDidResolver: apiKey: "" invitation: From c07aff59c4216bc10d6d2af509e97d8d35344d69 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 17 Jul 2024 18:30:23 +0200 Subject: [PATCH 16/16] build(2.1.0-RC2): bump version and update docs --- CHANGELOG.md | 14 +++++++++++--- charts/portal/Chart.yaml | 4 ++-- charts/portal/README.md | 19 +++++++------------ charts/portal/README.md.gotmpl | 4 ++-- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-int.yaml | 2 +- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce1e5b093..c0e39b042 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,20 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. -## unreleased +## 2.1.0-RC2 + +### Change + +* changed to new container images + * portal-frontend: v2.1.0-RC2 + * portal-frontend-registration: v2.0.1-RC2 ### Bugfix -* portal-cd: - * set correct path for consent osp url +* portal-backend: + * set correct path for consent osp link in mail notification [#371](https://github.com/eclipse-tractusx/portal/pull/371) + * update role name for app approval notifications [#372](https://github.com/eclipse-tractusx/portal/pull/372) + aligned dim and issuerComponent encryption key config [#368](https://github.com/eclipse-tractusx/portal/pull/368) ## 2.1.0-RC1 diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index 1b99fb478..8455be6d4 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 2.1.0-RC1 -appVersion: 2.1.0-RC1 +version: 2.1.0-RC2 +appVersion: 2.1.0-RC2 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 cb3d11a93..6a24254f9 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,11 +1,11 @@ # Helm chart for Catena-X Portal -![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) +![Version: 2.1.0-RC2](https://img.shields.io/badge/Version-2.1.0--RC2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0-RC2](https://img.shields.io/badge/AppVersion-2.1.0--RC2-informational?style=flat-square) This helm chart installs the Catena-X Portal application which consists of -* [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-frontend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC2), +* [portal-frontend-registration (v2.0.1-RC2)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC2), * [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and * [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1). @@ -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.1.0-RC1 + version: 2.1.0-RC2 ``` ## 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.1.0-RC1"` | | +| frontend.portal.image.portaltag | string | `"v2.1.0-RC2"` | | | frontend.portal.image.pullPolicy | string | `"IfNotPresent"` | | | frontend.portal.resources | object | `{"limits":{"cpu":"75m","memory":"125M"},"requests":{"cpu":"25m","memory":"125M"}}` | We recommend to review the default resource limits as this should a conscious choice. | | frontend.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.1-RC1"` | | +| frontend.registration.image.registrationtag | string | `"v2.0.1-RC2"` | | | 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"` | | @@ -250,7 +250,7 @@ dependencies: | backend.appmarketplace.activeAppCompanyAdminRoles.role0 | string | `"IT Admin"` | | | backend.appmarketplace.activeAppCompanyAdminRoles.role1 | string | `"Company Admin"` | | | backend.appmarketplace.approveAppUserRoles.role0 | string | `"Sales Manager"` | | -| backend.appmarketplace.approveAppUserRoles.role1 | string | `"Service Manager"` | | +| backend.appmarketplace.approveAppUserRoles.role1 | string | `"App Manager"` | | | backend.appmarketplace.activationUserRoles.role0 | string | `"Sales Manager"` | | | backend.appmarketplace.activationUserRoles.role1 | string | `"App Manager"` | | | backend.appmarketplace.ITAdminRoles.role0 | string | `"IT Admin"` | | @@ -467,11 +467,6 @@ dependencies: | backend.processesworker.issuerComponent.clientSecret | string | `""` | Client-secret for dim client-id. Secret-key 'issuercomponent-client-secret'. | | backend.processesworker.issuerComponent.grantType | string | `"client_credentials"` | | | backend.processesworker.issuerComponent.scope | string | `"openid"` | | -| backend.processesworker.dim.encryptionConfigIndex | int | `0` | | -| backend.processesworker.dim.encryptionConfigs.index0.index | int | `0` | | -| backend.processesworker.dim.encryptionConfigs.index0.cipherMode | string | `"CBC"` | | -| backend.processesworker.dim.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | | -| backend.processesworker.dim.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for the issuer component. Secret-key 'issuercomponent-encryption-key0'. Expected format is 256 bit (64 digits) hex. | | backend.processesworker.bpnDidResolver.apiKey | string | `""` | ApiKey for management endpoint of the bpnDidResolver. Secret-key 'bpndidresolver-api-key'. | | backend.processesworker.invitation.invitedUserInitialRoles.role0 | string | `"Company Admin"` | | | backend.processesworker.invitation.initialLoginTheme | string | `"catenax-shared"` | | diff --git a/charts/portal/README.md.gotmpl b/charts/portal/README.md.gotmpl index c167a9684..584f4da77 100644 --- a/charts/portal/README.md.gotmpl +++ b/charts/portal/README.md.gotmpl @@ -4,8 +4,8 @@ This helm chart installs the Catena-X Portal application which consists of -* [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-frontend (v2.1.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.1.0-RC2), +* [portal-frontend-registration (v2.0.1-RC2)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1-RC2), * [portal-assets (v2.0.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.0.0) and * [portal-backend (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.1.0-RC1). diff --git a/environments/argocd-app-templates/appsetup-int.yaml b/environments/argocd-app-templates/appsetup-int.yaml index ad10db77a..dce7d521c 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.1.0-RC1 + targetRevision: portal-2.1.0-RC2 plugin: env: - name: AVP_SECRET diff --git a/environments/consortia/argocd-app-templates/appsetup-int.yaml b/environments/consortia/argocd-app-templates/appsetup-int.yaml index faa0cff5f..dd0953600 100644 --- a/environments/consortia/argocd-app-templates/appsetup-int.yaml +++ b/environments/consortia/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.1.0-RC1 + targetRevision: portal-2.1.0-RC2 plugin: env: - name: AVP_SECRET