From e7203a4796274445df921c2eebe661283ea9ad28 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 6 Jun 2024 08:14:09 +0000 Subject: [PATCH 01/31] 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 fddbf8193..8c7eab684 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: 28767aff339bda1b875e815d7e2dd9155fe10916 + portaltag: 2b0d76b9c662af159076dbc841894c7c2c394c8f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 68e461cea0efe5943a321f09a027fc488a4d9797 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 10 Jun 2024 09:39:12 +0200 Subject: [PATCH 02/31] chore(consortia): update app templates (#339) --- .../argocd-app-templates/appsetup-dev.yaml | 2 +- .../appsetup-upgrade.yaml | 38 ------------------- consortia/environments/values-upgrade.yaml | 27 ------------- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 consortia/argocd-app-templates/appsetup-upgrade.yaml delete mode 100644 consortia/environments/values-upgrade.yaml diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml index 5188c5b9a..3fda7cafb 100644 --- a/consortia/argocd-app-templates/appsetup-dev.yaml +++ b/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 diff --git a/consortia/argocd-app-templates/appsetup-upgrade.yaml b/consortia/argocd-app-templates/appsetup-upgrade.yaml deleted file mode 100644 index ff062886c..000000000 --- a/consortia/argocd-app-templates/appsetup-upgrade.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 -spec: - destination: - namespace: product-portal - 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-upgrade.yaml' - project: project-portal diff --git a/consortia/environments/values-upgrade.yaml b/consortia/environments/values-upgrade.yaml deleted file mode 100644 index 95f805a60..000000000 --- a/consortia/environments/values-upgrade.yaml +++ /dev/null @@ -1,27 +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 -############################################################### - -replicaCount: 0 - -postgresql: - auth: - password: "" - replicationPassword: "" - portalPassword: "" - provisioningPassword: "" From fd29a11039e5534b92212006181c8e58e41e718c Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 12 Jun 2024 11:31:19 +0000 Subject: [PATCH 03/31] 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 8c7eab684..75c267685 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: 2b0d76b9c662af159076dbc841894c7c2c394c8f + portaltag: 27eef3257a84318d08eda63d15910725c8ad8524 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From b59eb11101219776f2630c71c246120a54523236 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 13 Jun 2024 19:28:02 +0000 Subject: [PATCH 04/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 75c267685..d26da47c7 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + registrationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + administrationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + appmarketplaceservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + portalmigrationstag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + portalmaintenancetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + notificationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + servicesservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + provisioningmigrationstag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: f65f5cab48beaf09c9b48d9b95f2cfe613b7f648 + processesworkertag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 639037a8f261b7cf6d6de789abd841ba87a864e0 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 14 Jun 2024 12:19:09 +0000 Subject: [PATCH 05/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index d26da47c7..fb3870901 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + registrationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + administrationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + appmarketplaceservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + portalmigrationstag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + portalmaintenancetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + notificationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + servicesservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + provisioningmigrationstag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: c364572c5e2f98869c91ea2de2cb44ccbd6753d7 + processesworkertag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 3329bcb45cb34cb7cc2c6ac0a88cf4adb64a083e Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Mon, 17 Jun 2024 07:57:54 +0000 Subject: [PATCH 06/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index fb3870901..7580a8481 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + registrationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + administrationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + appmarketplaceservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + portalmigrationstag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + portalmaintenancetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + notificationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + servicesservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + provisioningmigrationstag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: 3baed5a1cb620285097a11a67d45bc28f56c1c0f + processesworkertag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 820718a59e3c2f30ba5d5145f3176fc12d024f57 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 19 Jun 2024 13:29:11 +0000 Subject: [PATCH 07/31] 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 7580a8481..4780e8d54 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: 27eef3257a84318d08eda63d15910725c8ad8524 + portaltag: b127c85cc030a96856d8a93b32a93330962e7cf1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 062f48968cec606d09eb327f4afd821b6214d698 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Mon, 24 Jun 2024 09:40:17 +0000 Subject: [PATCH 08/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 4780e8d54..6f386faa7 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + registrationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + administrationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + appmarketplaceservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + portalmigrationstag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + portalmaintenancetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + notificationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + servicesservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + provisioningmigrationstag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: b41820cf0bc65f0fda37c6f03846a26dbe72a93b + processesworkertag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From cd2e22e8b6bf76484d497363175a7a4c98498f9d Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Tue, 25 Jun 2024 12:36:24 +0200 Subject: [PATCH 09/31] feat(clearinghouse): add feature toggle for sd connectivity (#344) Refs: https://github.com/eclipse-tractusx/portal-backend/issues/792 Reviewed-By: Evelyn Gurschler --- charts/portal/templates/cronjob-backend-processes.yaml | 2 ++ .../portal/templates/deployment-backend-administration.yaml | 4 ++++ charts/portal/values.yaml | 1 + 3 files changed, 7 insertions(+) diff --git a/charts/portal/templates/cronjob-backend-processes.yaml b/charts/portal/templates/cronjob-backend-processes.yaml index 60f3abeaf..6e7b3c77d 100644 --- a/charts/portal/templates/cronjob-backend-processes.yaml +++ b/charts/portal/templates/cronjob-backend-processes.yaml @@ -204,6 +204,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..7ab54498d 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -181,6 +181,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" @@ -277,6 +279,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/values.yaml b/charts/portal/values.yaml index 6f386faa7..5c700e057 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -936,6 +936,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: From cf00c8b12cb4dc21d43f0a2f5ab2fcb15f395103 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 25 Jun 2024 10:38:58 +0000 Subject: [PATCH 10/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 5c700e057..a7eacf45a 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + registrationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + administrationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + appmarketplaceservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + portalmigrationstag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + portalmaintenancetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + notificationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + servicesservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + provisioningmigrationstag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: e170c2be9cddfabb68ffa22b7a5f3e841647cf4d + processesworkertag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 6223b3dba16ea8a531daeeaabc162405677224b0 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 27 Jun 2024 13:01:42 +0000 Subject: [PATCH 11/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index a7eacf45a..332e5711b 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + registrationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + administrationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + appmarketplaceservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + portalmigrationstag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + portalmaintenancetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + notificationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + servicesservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + provisioningmigrationstag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: 03f9dcbcf8d7760e5d5e8d13b51eb17b72c09027 + processesworkertag: e49fa8f59a48b2c0a65c049d681c281790b52690 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From f2798a1e148fa5fb5250c37015ef1666da55f382 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 4 Jul 2024 09:10:27 +0000 Subject: [PATCH 12/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 332e5711b..54552a525 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + registrationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + administrationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + appmarketplaceservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: e49fa8f59a48b2c0a65c049d681c281790b52690 + portalmigrationstag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + portalmaintenancetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + notificationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: e49fa8f59a48b2c0a65c049d681c281790b52690 + servicesservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: e49fa8f59a48b2c0a65c049d681c281790b52690 + provisioningmigrationstag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: e49fa8f59a48b2c0a65c049d681c281790b52690 + processesworkertag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 9a4486ace4f8bd0827391a0ab0b78bbf74b0004b Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Mon, 8 Jul 2024 14:01:42 +0000 Subject: [PATCH 13/31] 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 54552a525..4b15d69cc 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: b127c85cc030a96856d8a93b32a93330962e7cf1 + portaltag: 8bf7a8516802f009cb8f807adda35e62fea5590e pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 87cf3ac1a50f6ab9344e0787ee38555166eeda1e Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Tue, 9 Jul 2024 07:31:37 +0000 Subject: [PATCH 14/31] 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 4b15d69cc..cd735c69f 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: 989a5721a04e29da71f8f2a4119fd7b88e57888f + registrationtag: 2e65e06ae7f71b28979bc2f9711ec94c59f9a3c6 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From ba8668ef4b52d1dff64b01e798ce050b68dfb20a Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Wed, 10 Jul 2024 12:58:39 +0000 Subject: [PATCH 15/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index cd735c69f..f290a3ada 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -299,7 +299,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + registrationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -348,7 +348,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + administrationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -466,7 +466,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + appmarketplaceservicetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -598,7 +598,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + portalmigrationstag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -621,7 +621,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + portalmaintenancetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -639,7 +639,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + notificationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -666,7 +666,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + servicesservicetag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -746,7 +746,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + provisioningmigrationstag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -762,7 +762,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: e1e97809b48b199a72a7a0fa43511d3d5e8d2ee1 + processesworkertag: 7e1447a89f17161d288a769c989e735e67b61abb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 7eb1089917d3a73987ce6207ded16722d65b72a9 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 10 Jul 2024 15:59:27 +0200 Subject: [PATCH 16/31] chore: remove obsolete centralidp database configuration (#355) https://github.com/eclipse-tractusx/portal/issues/351 --- .../templates/deployment-backend-administration.yaml | 4 ---- .../templates/deployment-backend-notification.yaml | 4 ---- charts/portal/templates/secret-backend-keycloak.yaml | 2 -- charts/portal/values.yaml | 9 --------- consortia/argocd-app-templates/appsetup-stable.yaml | 2 -- consortia/environments/values-beta.yaml | 2 -- consortia/environments/values-dev.yaml | 2 -- consortia/environments/values-int.yaml | 2 -- consortia/environments/values-pen.yaml | 3 --- consortia/environments/values-rc.yaml | 2 -- 10 files changed, 32 deletions(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index 7ab54498d..f874dc2cf 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" 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/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 f290a3ada..17606e04e 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -253,15 +253,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: diff --git a/consortia/argocd-app-templates/appsetup-stable.yaml b/consortia/argocd-app-templates/appsetup-stable.yaml index c521e3d27..ba4f80df4 100644 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ b/consortia/argocd-app-templates/appsetup-stable.yaml @@ -125,8 +125,6 @@ spec: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-beta.yaml b/consortia/environments/values-beta.yaml index fc849c3ab..7549e5266 100644 --- a/consortia/environments/values-beta.yaml +++ b/consortia/environments/values-beta.yaml @@ -119,8 +119,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml index 8d129d569..7c61d2278 100644 --- a/consortia/environments/values-dev.yaml +++ b/consortia/environments/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/consortia/environments/values-int.yaml index 126ba8be2..267c505fa 100644 --- a/consortia/environments/values-int.yaml +++ b/consortia/environments/values-int.yaml @@ -120,8 +120,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml index cf12cc3c6..d96ac5b35 100644 --- a/consortia/environments/values-pen.yaml +++ b/consortia/environments/values-pen.yaml @@ -120,9 +120,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - host: "centralidp-pen-postgresql-primary" - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml index 3ff5afa99..a4edd5274 100644 --- a/consortia/environments/values-rc.yaml +++ b/consortia/environments/values-rc.yaml @@ -122,8 +122,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" From e74f0a7113729b677827fbd2c0dc134958230a83 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 10 Jul 2024 16:58:22 +0200 Subject: [PATCH 17/31] chore: update deployment config (#354) - deploy to association environment - move deployment config into environments directory - add information about deployment configuration in notice file - remove obsolete deployment config from consortia (pen, stable, beta envs) --- .../administration-service-image-update.yml | 2 +- .../maintenance-service-image-update.yml | 2 +- .../marketplace-app-service-image-update.yml | 2 +- .../notification-service-image-update.yml | 2 +- .../workflows/portal-assets-image-update.yml | 2 +- .../portal-backend-release-image-update.yml | 2 +- .github/workflows/portal-image-update.yml | 2 +- .../portal-migrations-image-update.yml | 2 +- .../portal-registration-image-update.yml | 2 +- .../processes-worker-image-update.yml | 2 +- .../provisioning-migrations-image-update.yml | 2 +- .../registration-service-image-update.yml | 2 +- .../services-service-image-update.yml | 2 +- NOTICE.md | 4 + .../argocd-app-templates/appsetup-pen.yaml | 38 --- .../argocd-app-templates/appsetup-stable.yaml | 281 ----------------- consortia/environments/values-beta.yaml | 290 ------------------ .../argocd-app-templates/appsetup-int.yaml | 6 +- .../argocd-app-templates/appsetup-dev.yaml | 2 +- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-rc.yaml | 2 +- .../consortia/helm-values}/values-dev.yaml | 0 .../consortia/helm-values}/values-int.yaml | 0 .../consortia/helm-values}/values-rc.yaml | 0 .../helm-values/values-int.yaml | 117 +++---- {consortia/scripts => environments}/push.sh | 0 26 files changed, 85 insertions(+), 683 deletions(-) delete mode 100644 consortia/argocd-app-templates/appsetup-pen.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-stable.yaml delete mode 100644 consortia/environments/values-beta.yaml rename consortia/argocd-app-templates/appsetup-beta.yaml => environments/argocd-app-templates/appsetup-int.yaml (86%) rename {consortia => environments/consortia}/argocd-app-templates/appsetup-dev.yaml (93%) rename {consortia => environments/consortia}/argocd-app-templates/appsetup-int.yaml (93%) rename {consortia => environments/consortia}/argocd-app-templates/appsetup-rc.yaml (93%) rename {consortia/environments => environments/consortia/helm-values}/values-dev.yaml (100%) rename {consortia/environments => environments/consortia/helm-values}/values-int.yaml (100%) rename {consortia/environments => environments/consortia/helm-values}/values-rc.yaml (100%) rename consortia/environments/values-pen.yaml => environments/helm-values/values-int.yaml (60%) rename {consortia/scripts => environments}/push.sh (100%) diff --git a/.github/workflows/administration-service-image-update.yml b/.github/workflows/administration-service-image-update.yml index 3a8c27ec0..93398bf2c 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 6756957d7..c1c20c0a6 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 f341fb45d..eefc869bf 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 b8efc2e53..cdf06326a 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 5b74aa552..1297a8756 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 e3a9f9541..b20648d26 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 4d9cd9e52..624750fd7 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 1367c57bc..df4d345df 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 dad4dc4c1..0ce15b15d 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 5f4f860d4..bf363baf1 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 4300349d6..1f8b1b875 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 d07286512..6d3cbdad7 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 fa22c8697..0edbc3065 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/NOTICE.md b/NOTICE.md index 2a2f10432..e61b43180 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -38,6 +38,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/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 ba4f80df4..000000000 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ /dev/null @@ -1,281 +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: "" - 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-beta.yaml b/consortia/environments/values-beta.yaml deleted file mode 100644 index 7549e5266..000000000 --- a/consortia/environments/values-beta.yaml +++ /dev/null @@ -1,290 +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.beta.demo.catena-x.net" -portalBackendAddress: "https://portal-backend.beta.demo.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" -bpdm: - poolAddress: "https://business-partners.beta.demo.catena-x.net" - poolApiPath: "/pool/v6" - portalGateAddress: "https://business-partners.beta.demo.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" -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" -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" -bpnDidResolver: - managementApiAddress: "http://bdrs-bdrs-server:8081" - directoryApiAddress: "https://bpn-did-resolution-service.beta.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://*.beta.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal.beta.demo.catena-x.net" - hosts: - - host: "portal.beta.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://*.beta.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "portal-backend.beta.demo.catena-x.net" - hosts: - - host: "portal-backend.beta.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: "" - 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" - 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 - 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..21aedc27c 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: chore/349-deploy-to-eV 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 93% rename from consortia/argocd-app-templates/appsetup-dev.yaml rename to environments/consortia/argocd-app-templates/appsetup-dev.yaml index 3fda7cafb..7a1b06de8 100644 --- a/consortia/argocd-app-templates/appsetup-dev.yaml +++ b/environments/consortia/argocd-app-templates/appsetup-dev.yaml @@ -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 93% rename from consortia/argocd-app-templates/appsetup-int.yaml rename to environments/consortia/argocd-app-templates/appsetup-int.yaml index 4a127950c..dda0470be 100644 --- a/consortia/argocd-app-templates/appsetup-int.yaml +++ b/environments/consortia/argocd-app-templates/appsetup-int.yaml @@ -34,5 +34,5 @@ spec: - 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 100% rename from consortia/environments/values-dev.yaml rename to environments/consortia/helm-values/values-dev.yaml diff --git a/consortia/environments/values-int.yaml b/environments/consortia/helm-values/values-int.yaml similarity index 100% rename from consortia/environments/values-int.yaml rename to environments/consortia/helm-values/values-int.yaml diff --git a/consortia/environments/values-rc.yaml b/environments/consortia/helm-values/values-rc.yaml similarity index 100% rename from consortia/environments/values-rc.yaml rename to environments/consortia/helm-values/values-rc.yaml diff --git a/consortia/environments/values-pen.yaml b/environments/helm-values/values-int.yaml similarity index 60% rename from consortia/environments/values-pen.yaml rename to environments/helm-values/values-int.yaml index d96ac5b35..e821a28b8 100644 --- a/consortia/environments/values-pen.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,29 +17,29 @@ # 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" +portalAddress: "https://portal.int.catena-x.net" +portalBackendAddress: "https://portal-backend.int.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" + 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-pen.dev.demo.catena-x.net" + poolAddress: "https://business-partners.int.catena-x.net" poolApiPath: "/pool/v6" - portalGateAddress: "https://business-partners-pen.dev.demo.catena-x.net" + portalGateAddress: "https://business-partners.int.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" +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-pen.dev.demo.catena-x.net" +issuerComponentAddress: "https://ssi-credential-issuer.int.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" + baseAddress: "https://dim.int.catena-x.net" +decentralIdentityManagementAuthAddress: "" bpnDidResolver: managementApiAddress: "http://bdrs-bdrs-server:8081" - directoryApiAddress: "https://bpn-did-resolution-service-pen.dev.demo.catena-x.net/api/directory" + directoryApiAddress: "https://bpn-did-resolution-service.int.catena-x.net/api/directory" frontend: @@ -47,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://*.dev.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-pen.dev.demo.catena-x.net" + - "portal.int.catena-x.net" hosts: - - host: "portal-pen.dev.demo.catena-x.net" + - host: "portal.int.catena-x.net" paths: - path: "/(.*)" pathType: "Prefix" @@ -79,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://*.dev.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-pen.dev.demo.catena-x.net" + - "portal-backend.int.catena-x.net" hosts: - - host: "portal-backend-pen.dev.demo.catena-x.net" + - host: "portal-backend.int.catena-x.net" paths: - path: "/api/registration" pathType: "Prefix" @@ -118,11 +120,13 @@ backend: keycloak: central: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" shared: - clientId: "" - clientSecret: "" + clientId: "" + clientSecret: "" + + useDimWallet: true mailing: host: "" @@ -162,11 +166,11 @@ backend: - 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" + issuerdid: "did:web:tbd" serviceAccount: encryptionConfigs: index0: - encryptionKey: "" + encryptionKey: "" provisioning: sharedRealm: @@ -194,8 +198,6 @@ backend: portalmigrations: logging: default: "Debug" - seeding: - testDataEnvironments: "consortia" notification: logging: @@ -232,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 From 84375bbc6bce8a31c7206ac3f41c222ebcb45b08 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 10 Jul 2024 18:53:34 +0200 Subject: [PATCH 18/31] feat(portalmigrations): enable seeding of test data with configmap (#356) enable seeding of test data with configmap and move default seeding path and processidentity userid out of values file, into job, as changing those values isn't intuitive --- .../job-backend-portal-migrations.yaml | 20 +++++++++++++++++-- charts/portal/values.yaml | 11 +++++----- 2 files changed, 24 insertions(+), 7 deletions(-) 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/values.yaml b/charts/portal/values.yaml index 17606e04e..f809d0f50 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -601,11 +601,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: From 6bb2712e2444ed3e5eb4dbfb8b9a7e266ed6e910 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 11 Jul 2024 07:49:50 +0200 Subject: [PATCH 19/31] fix: increase memory for services service (#359) https://github.com/eclipse-tractusx/portal/issues/352 --- charts/portal/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index f809d0f50..babf9ddd3 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -664,10 +664,10 @@ backend: resources: requests: cpu: 75m - memory: 300M + memory: 400M limits: cpu: 225m - memory: 300M + memory: 400M basePath: "api/services" logging: default: "Information" From f3f014e8bd9658bad2cec13d986c4ad6b894b0b4 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 11 Jul 2024 14:45:46 +0000 Subject: [PATCH 20/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index babf9ddd3..e4b5c6db5 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -290,7 +290,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb + registrationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -339,7 +339,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb + administrationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -457,7 +457,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: 7e1447a89f17161d288a769c989e735e67b61abb + appmarketplaceservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -589,7 +589,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: 7e1447a89f17161d288a769c989e735e67b61abb + portalmigrationstag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -613,7 +613,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: 7e1447a89f17161d288a769c989e735e67b61abb + portalmaintenancetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -631,7 +631,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: 7e1447a89f17161d288a769c989e735e67b61abb + notificationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -658,7 +658,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: 7e1447a89f17161d288a769c989e735e67b61abb + servicesservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -738,7 +738,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: 7e1447a89f17161d288a769c989e735e67b61abb + provisioningmigrationstag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -754,7 +754,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: 7e1447a89f17161d288a769c989e735e67b61abb + processesworkertag: 158f664d0d078261dd9af544d03a53af231ba0bb pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 12e7d266e5bcaa64f28e1ae57bb397e0b9ba37d3 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 12 Jul 2024 06:37:24 +0200 Subject: [PATCH 21/31] chore(association): change sender mail https://github.com/eclipse-tractusx/portal/issues/349 --- environments/helm-values/values-int.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/helm-values/values-int.yaml b/environments/helm-values/values-int.yaml index e821a28b8..1fddca8d9 100644 --- a/environments/helm-values/values-int.yaml +++ b/environments/helm-values/values-int.yaml @@ -133,7 +133,7 @@ backend: port: "" user: "" password: "" - senderEmail: "Notifications@catena-x.net" + senderEmail: "" registration: logging: From 3d281c947112aba939f04d62de9e56b8611bd9ba Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 10:11:28 +0000 Subject: [PATCH 22/31] 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 e4b5c6db5..15946a3b6 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: 2e65e06ae7f71b28979bc2f9711ec94c59f9a3c6 + registrationtag: 6f1f8c613869bfa861111def26d87f0bf7c761a0 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 1dff341609ed45801f6e023bfe6baa3f8810d6d9 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 12:45:35 +0000 Subject: [PATCH 23/31] 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 15946a3b6..0a2bf37ca 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: 6f1f8c613869bfa861111def26d87f0bf7c761a0 + registrationtag: 2ebd0870200436b35c34ecf62e22e51f54a7d7f1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 4e34da6e964ac69967478875c81983079d1a3064 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 13:26:49 +0000 Subject: [PATCH 24/31] 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 0a2bf37ca..da63d0a31 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: 8bf7a8516802f009cb8f807adda35e62fea5590e + portaltag: a84060724f40c9a5edd468de52060854c5cbc1f6 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 8b37afb49a607b034ae56c320f3aba01d16a283c Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 12 Jul 2024 16:04:04 +0200 Subject: [PATCH 25/31] fix: add environment variable to use dim in application checklist bpdm in the configuration of the processes worker job https://github.com/eclipse-tractusx/portal/issues/361 --- charts/portal/templates/cronjob-backend-processes.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/portal/templates/cronjob-backend-processes.yaml b/charts/portal/templates/cronjob-backend-processes.yaml index 6e7b3c77d..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" From fcb356b283fe6484e8f874344cd90731ff8057f6 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 12 Jul 2024 16:04:37 +0200 Subject: [PATCH 26/31] docs: add install comment to useDimWallet value --- charts/portal/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index da63d0a31..9028b7fa2 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). From bccb26716eca289f3365094a6a86552ee34f6b34 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 12 Jul 2024 16:36:23 +0200 Subject: [PATCH 27/31] fix(bdrs-url): change to directoryApiAddress (#364) https://github.com/eclipse-tractusx/portal/issues/363 --- charts/portal/templates/deployment-backend-administration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index f874dc2cf..3f362db8a 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -264,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" From 7baa78be083393922386cdcf38fdc3dc001ea6fa Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 15:30:09 +0000 Subject: [PATCH 28/31] 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 9028b7fa2..953e512f0 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: a84060724f40c9a5edd468de52060854c5cbc1f6 + portaltag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 7945646da9f4cb9adcd20ad518046e3839ede559 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 16:09:14 +0000 Subject: [PATCH 29/31] Add new images for portal backend --- charts/portal/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 953e512f0..eb3e40843 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -291,7 +291,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb + registrationservicetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -340,7 +340,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb + administrationservicetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -458,7 +458,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb + appmarketplaceservicetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -590,7 +590,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: 158f664d0d078261dd9af544d03a53af231ba0bb + portalmigrationstag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -614,7 +614,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: 158f664d0d078261dd9af544d03a53af231ba0bb + portalmaintenancetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -632,7 +632,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb + notificationservicetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -659,7 +659,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: 158f664d0d078261dd9af544d03a53af231ba0bb + servicesservicetag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -739,7 +739,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: 158f664d0d078261dd9af544d03a53af231ba0bb + provisioningmigrationstag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: @@ -755,7 +755,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: 158f664d0d078261dd9af544d03a53af231ba0bb + processesworkertag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From bc7d3f44c3f0bb5d1a678c5f6e316249dbfaa8f8 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Fri, 12 Jul 2024 19:05:44 +0000 Subject: [PATCH 30/31] 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 eb3e40843..647e03f65 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: 2ebd0870200436b35c34ecf62e22e51f54a7d7f1 + registrationtag: v2.0.1-RC1 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: From 50e7277340eb1d4cd530eb114df497cc1e126665 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 12 Jul 2024 22:23:55 +0200 Subject: [PATCH 31/31] build(2.1.0-rc1): bump version and update docs --- CHANGELOG.md | 30 ++++++++++++ charts/portal/Chart.yaml | 4 +- charts/portal/README.md | 49 +++++++++---------- charts/portal/README.md.gotmpl | 6 +-- charts/portal/values.yaml | 2 +- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-int.yaml | 2 +- 7 files changed, 60 insertions(+), 35 deletions(-) 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/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/values.yaml b/charts/portal/values.yaml index 647e03f65..1d3dabddf 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -155,7 +155,7 @@ frontend: name: "assets" image: name: "docker.io/tractusx/portal-assets" - assetstag: 7318865adbb091bc57a67e1a721f6cf6e158dd08 + assetstag: v2.0.0 pullPolicy: "IfNotPresent" # -- We recommend to review the default resource limits as this should a conscious choice. resources: diff --git a/environments/argocd-app-templates/appsetup-int.yaml b/environments/argocd-app-templates/appsetup-int.yaml index 21aedc27c..ad10db77a 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: chore/349-deploy-to-eV + targetRevision: portal-2.1.0-RC1 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 dda0470be..faa0cff5f 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.0.0 + targetRevision: portal-2.1.0-RC1 plugin: env: - name: AVP_SECRET