From 7933e5cc2676648a90f45df242e81e2d2cef6323 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 24 Oct 2024 15:50:18 +0000 Subject: [PATCH 1/3] 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 032035a3..d9e8aa48 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -172,7 +172,7 @@ frontend: name: "registration" image: name: "docker.io/tractusx/portal-frontend-registration" - registrationtag: v2.1.0-rc.1 + registrationtag: v2.1.0-RC1 pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry pullSecrets: [] From 16baf50475ec8b2ed2612795e3b181e820d69871 Mon Sep 17 00:00:00 2001 From: eclipse-tractusx-bot Date: Thu, 24 Oct 2024 15:56:46 +0000 Subject: [PATCH 2/3] 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 d9e8aa48..aad37837 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -155,7 +155,7 @@ frontend: name: "portal" image: name: "docker.io/tractusx/portal-frontend" - portaltag: 713f8a527000b4ad095e7e6c37f5690076adc012 + portaltag: v2.3.0-RC1 pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry pullSecrets: [] From 81ba444068c9d1e32106bd887ff2ad6c7e609f6b Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 24 Oct 2024 18:16:27 +0200 Subject: [PATCH 3/3] build(2.3.0-rc1): bump version and update docs --- CHANGELOG.md | 9 +++++ charts/localdev/Chart.yaml | 2 +- charts/portal/Chart.yaml | 4 +- charts/portal/README.md | 38 +++++++++---------- charts/portal/README.md.gotmpl | 12 +++--- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-stable.yaml | 2 +- 7 files changed, 39 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef8cc17c..ea70e122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## 2.3.0-RC1 + +### Change + +* changed to new container images + * portal-frontend: v2.3.0-RC1 + * portal-backend: v2.3.0-RC1 + + portal-frontend-registration: v2.1.0-RC1 + ## 2.3.0-alpha.3 ## Feature diff --git a/charts/localdev/Chart.yaml b/charts/localdev/Chart.yaml index 4e94ccc1..4c7eb7c3 100644 --- a/charts/localdev/Chart.yaml +++ b/charts/localdev/Chart.yaml @@ -33,7 +33,7 @@ dependencies: - condition: portal.enabled name: portal repository: file://../portal - version: 2.3.0-alpha.3 + version: 2.3.0-RC1 - condition: centralidp.enabled name: centralidp repository: https://eclipse-tractusx.github.io/charts/dev diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index 4a575d72..28ef203e 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 2.3.0-alpha.3 -appVersion: 2.3.0-alpha.3 +version: 2.3.0-RC1 +appVersion: 2.3.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 82be5b1f..04a9c01d 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,18 +1,18 @@ # Helm chart for Catena-X Portal -![Version: 2.3.0-alpha.3](https://img.shields.io/badge/Version-2.3.0--alpha.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-alpha.3](https://img.shields.io/badge/AppVersion-2.3.0--alpha.3-informational?style=flat-square) +![Version: 2.3.0-RC1](https://img.shields.io/badge/Version-2.3.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-RC1](https://img.shields.io/badge/AppVersion-2.3.0--RC1-informational?style=flat-square) This helm chart installs the Portal application which consists of -* [portal-frontend (v2.3.0-alpha.3)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-alpha.3), -* [portal-frontend-registration (v2.1.0-alpha.1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-alpha.1), +* [portal-frontend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC1), +* [portal-frontend-registration (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-RC1), * [portal-assets (v2.2.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0) and -* [portal-backend (v2.3.0-alpha.3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-alpha.3). +* [portal-backend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC1). The Portal is designed to work with the [IAM](https://github.com/eclipse-tractusx/portal-iam). -This version is compatible with the 3.0.1 version of the IAM instances: -* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-3.0.1/charts/centralidp/README.md) -* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-3.0.1/charts/sharedidp/README.md) +This version is compatible with the 4.0.0-rc.1 version of the IAM instances: +* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-4.0.0-rc.1/charts/centralidp/README.md) +* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-4.0.0-rc.1/charts/sharedidp/README.md) For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md). @@ -45,7 +45,7 @@ To use the helm chart as a dependency: dependencies: - name: portal repository: https://eclipse-tractusx.github.io/charts/dev - version: 2.3.0-alpha.3 + version: 2.3.0-RC1 ``` ## Requirements @@ -100,14 +100,14 @@ dependencies: | frontend.ingress.hosts[0] | object | `{"host":"","paths":[{"backend":{"port":8080,"service":"portal"},"path":"/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"registration"},"path":"/registration/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"assets"},"path":"/((assets|documentation)/.*)","pathType":"Prefix"}]}` | Provide default path for the ingress record. | | frontend.portal.name | string | `"portal"` | | | frontend.portal.image.name | string | `"docker.io/tractusx/portal-frontend"` | | -| frontend.portal.image.portaltag | string | `"v2.3.0-alpha.3"` | | +| frontend.portal.image.portaltag | string | `"v2.3.0-RC1"` | | | frontend.portal.image.pullPolicy | string | `"IfNotPresent"` | | | frontend.portal.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | frontend.portal.resources | object | `{"limits":{"cpu":"75m","memory":"125M"},"requests":{"cpu":"25m","memory":"125M"}}` | We recommend to review the default resource limits as this should a conscious choice. | | 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.1.0-alpha.1"` | | +| frontend.registration.image.registrationtag | string | `"v2.1.0-RC1"` | | | frontend.registration.image.pullPolicy | string | `"IfNotPresent"` | | | frontend.registration.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | 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. | @@ -161,7 +161,7 @@ dependencies: | backend.healthChecks.readyness.path | string | `"/ready"` | | | backend.registration.name | string | `"registration-service"` | | | backend.registration.image.name | string | `"docker.io/tractusx/portal-registration-service"` | | -| backend.registration.image.registrationservicetag | string | `"v2.3.0-alpha.3"` | | +| backend.registration.image.registrationservicetag | string | `"v2.3.0-RC1"` | | | backend.registration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.registration.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.registration.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -188,7 +188,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.3.0-alpha.3"` | | +| backend.administration.image.administrationservicetag | string | `"v2.3.0-RC1"` | | | backend.administration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.administration.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.administration.resources | object | `{"limits":{"cpu":"225m","memory":"500M"},"requests":{"cpu":"75m","memory":"500M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -253,7 +253,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.3.0-alpha.3"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.3.0-RC1"` | | | backend.appmarketplace.image.pullPolicy | string | `"IfNotPresent"` | | | backend.appmarketplace.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.appmarketplace.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -336,7 +336,7 @@ dependencies: | backend.appmarketplace.companyAdminRoles.role0 | string | `"Company Admin"` | | | backend.portalmigrations.name | string | `"portal-migrations"` | | | backend.portalmigrations.image.name | string | `"docker.io/tractusx/portal-portal-migrations"` | | -| backend.portalmigrations.image.portalmigrationstag | string | `"v2.3.0-alpha.3"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v2.3.0-RC1"` | | | backend.portalmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmigrations.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.portalmigrations.resources | object | `{"limits":{"cpu":"225m","memory":"350M"},"requests":{"cpu":"75m","memory":"350M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -348,7 +348,7 @@ dependencies: | backend.portalmigrations.logging.default | string | `"Information"` | | | backend.portalmaintenance.name | string | `"portal-maintenance"` | | | backend.portalmaintenance.image.name | string | `"docker.io/tractusx/portal-maintenance-service"` | | -| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.3.0-alpha.3"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.3.0-RC1"` | | | backend.portalmaintenance.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmaintenance.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.portalmaintenance.resources | object | `{"limits":{"cpu":"75m","memory":"200M"},"requests":{"cpu":"25m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -357,7 +357,7 @@ dependencies: | backend.portalmaintenance.logging.default | string | `"Information"` | | | backend.notification.name | string | `"notification-service"` | | | backend.notification.image.name | string | `"docker.io/tractusx/portal-notification-service"` | | -| backend.notification.image.notificationservicetag | string | `"v2.3.0-alpha.3"` | | +| backend.notification.image.notificationservicetag | string | `"v2.3.0-RC1"` | | | backend.notification.image.pullPolicy | string | `"IfNotPresent"` | | | backend.notification.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.notification.resources | object | `{"limits":{"cpu":"225m","memory":"200M"},"requests":{"cpu":"75m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -367,7 +367,7 @@ dependencies: | backend.notification.logging.default | string | `"Information"` | | | backend.services.name | string | `"services-service"` | | | backend.services.image.name | string | `"docker.io/tractusx/portal-services-service"` | | -| backend.services.image.servicesservicetag | string | `"v2.3.0-alpha.3"` | | +| backend.services.image.servicesservicetag | string | `"v2.3.0-RC1"` | | | backend.services.image.pullPolicy | string | `"IfNotPresent"` | | | backend.services.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.services.resources | object | `{"limits":{"cpu":"225m","memory":"400M"},"requests":{"cpu":"75m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. | @@ -412,14 +412,14 @@ dependencies: | backend.services.companyAdminRoles.role0 | string | `"Company Admin"` | | | backend.provisioningmigrations.name | string | `"provisioning-migrations"` | | | backend.provisioningmigrations.image.name | string | `"docker.io/tractusx/portal-provisioning-migrations"` | | -| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.3.0-alpha.3"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.3.0-RC1"` | | | backend.provisioningmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.provisioningmigrations.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.provisioningmigrations.resources | object | `{"limits":{"cpu":"75m","memory":"200M"},"requests":{"cpu":"25m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. | | backend.provisioningmigrations.logging.default | string | `"Information"` | | | backend.processesworker.name | string | `"processes-worker"` | | | backend.processesworker.image.name | string | `"docker.io/tractusx/portal-processes-worker"` | | -| backend.processesworker.image.processesworkertag | string | `"v2.3.0-alpha.3"` | | +| backend.processesworker.image.processesworkertag | string | `"v2.3.0-RC1"` | | | backend.processesworker.image.pullPolicy | string | `"IfNotPresent"` | | | backend.processesworker.image.pullSecrets | list | `[]` | Pull secrets for private docker registry | | backend.processesworker.resources | object | `{"limits":{"cpu":"225m","memory":"600M"},"requests":{"cpu":"75m","memory":"600M"}}` | We recommend to review the default resource limits as this should a conscious choice. | diff --git a/charts/portal/README.md.gotmpl b/charts/portal/README.md.gotmpl index 4f302c56..55d829ba 100644 --- a/charts/portal/README.md.gotmpl +++ b/charts/portal/README.md.gotmpl @@ -4,15 +4,15 @@ This helm chart installs the Portal application which consists of -* [portal-frontend (v2.3.0-alpha.3)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-alpha.3), -* [portal-frontend-registration (v2.1.0-alpha.1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-alpha.1), +* [portal-frontend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.3.0-RC1), +* [portal-frontend-registration (v2.1.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.1.0-RC1), * [portal-assets (v2.2.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0) and -* [portal-backend (v2.3.0-alpha.3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-alpha.3). +* [portal-backend (v2.3.0-RC1)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.3.0-RC1). The Portal is designed to work with the [IAM](https://github.com/eclipse-tractusx/portal-iam). -This version is compatible with the 3.0.1 version of the IAM instances: -* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-3.0.1/charts/centralidp/README.md) -* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-3.0.1/charts/sharedidp/README.md) +This version is compatible with the 4.0.0-rc.1 version of the IAM instances: +* [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-4.0.0-rc.1/charts/centralidp/README.md) +* [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-4.0.0-rc.1/charts/sharedidp/README.md) For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v2.2.0/docs/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md). diff --git a/environments/argocd-app-templates/appsetup-int.yaml b/environments/argocd-app-templates/appsetup-int.yaml index 43613a3f..861622b6 100644 --- a/environments/argocd-app-templates/appsetup-int.yaml +++ b/environments/argocd-app-templates/appsetup-int.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.3.0-alpha.3 + targetRevision: portal-2.3.0-RC1 plugin: env: - name: AVP_SECRET diff --git a/environments/argocd-app-templates/appsetup-stable.yaml b/environments/argocd-app-templates/appsetup-stable.yaml index be8d2238..401e10df 100644 --- a/environments/argocd-app-templates/appsetup-stable.yaml +++ b/environments/argocd-app-templates/appsetup-stable.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.3.0-alpha.3 + targetRevision: portal-2.3.0-RC1 plugin: env: - name: AVP_SECRET