From 5eb3546e4353ed7f92ee8bb6e6249d62ade8712e Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 8 May 2024 10:55:16 +0200 Subject: [PATCH] build(1.8.1): bump version and update docs --- CHANGELOG.md | 7 +++ charts/portal/Chart.yaml | 4 +- charts/portal/README.md | 45 +++++++------------ charts/portal/README.md.gotmpl | 2 +- charts/portal/values.yaml | 18 ++++---- .../argocd-app-templates/appsetup-beta.yaml | 2 +- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-pen.yaml | 2 +- .../argocd-app-templates/appsetup-stable.yaml | 2 +- .../appsetup-upgrade.yaml | 2 +- 10 files changed, 41 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b23c53ea..9a95e9804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## 1.8.1 + +### Bugfix + +* changed to new container image for portal-backend: v1.8.1 +* changed ingress to work without tls enabled and to comply with TRG-5.04 + ## 1.8.0 ### Change diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index 54539dee8..4e9a6a65d 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 1.8.0 -appVersion: 1.8.0 +version: 1.8.1 +appVersion: 1.8.1 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 08b4aa12d..b8449e717 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,13 +1,13 @@ # Helm chart for Catena-X Portal -![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.0](https://img.shields.io/badge/AppVersion-1.8.0-informational?style=flat-square) +![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.1](https://img.shields.io/badge/AppVersion-1.8.1-informational?style=flat-square) This helm chart installs the Catena-X Portal application which consists of * [portal-frontend (v1.8.0)](https://github.com/eclipse-tractusx/portal-frontend/tree/v1.8.0), * [portal-frontend-registration (v1.6.0)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v1.6.0), * [portal-assets (v1.8.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v1.8.0) and -* [portal-backend (v1.8.0)](https://github.com/eclipse-tractusx/portal-backend/tree/v1.8.0). +* [portal-backend (v1.8.1)](https://github.com/eclipse-tractusx/portal-backend/tree/v1.8.1). 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 2.1.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: 1.8.0 + version: 1.8.1 ``` ## Requirements @@ -67,14 +67,9 @@ dependencies: | clearinghouseAddress | string | `"https://validation.example.org"` | Provide clearinghouse base address. | | clearinghouseTokenAddress | string | `"https://keycloak.example.org/realms/example/protocol/openid-connect/token"` | Provide clearinghouse token address. | | frontend.ingress.enabled | bool | `false` | Portal frontend ingress parameters, enable ingress record generation for portal frontend. | -| frontend.ingress.className | string | `"nginx"` | | -| frontend.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$1"` | | -| frontend.ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` | | -| frontend.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | -| frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://*.example.org"` | Provide CORS allowed origin. | -| frontend.ingress.tls[0] | object | `{"hosts":[""],"secretName":""}` | Provide tls secret. | -| frontend.ingress.tls[0].hosts | list | `[""]` | Provide host for tls secret. | -| frontend.ingress.hosts[0] | object | `{"host":"portal.example.org","paths":[{"backend":{"port":8080,"service":"portal"},"path":"/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"registration"},"path":"/registration/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"assets"},"path":"/((assetsORdocumentation)/.*)","pathType":"Prefix"}]}` | Provide default path for the ingress record. | +| frontend.ingress.name | string | `"frontend"` | | +| frontend.ingress.tls | list | `[]` | Ingress TLS configuration | +| 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 | `"v1.8.0"` | | @@ -94,14 +89,8 @@ dependencies: | frontend.centralidpAuthPath | string | `"/auth"` | | | frontend.bpdmPartnersPoolApiPath | string | `"/pool/api"` | | | backend.ingress.enabled | bool | `false` | Portal-backend ingress parameters, enable ingress record generation for portal-backend. | -| backend.ingress.name | string | `"portal-backend"` | | -| backend.ingress.className | string | `"nginx"` | | -| backend.ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` | | -| backend.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | -| backend.ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"8m"` | | -| backend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://*.example.org"` | Provide CORS allowed origin. | -| backend.ingress.tls[0] | object | `{"hosts":[""],"secretName":""}` | Provide tls secret. | -| backend.ingress.tls[0].hosts | list | `[""]` | Provide host for tls secret. | +| backend.ingress.name | string | `"backend"` | | +| backend.ingress.tls | list | `[]` | Ingress TLS configuration | | backend.ingress.hosts[0] | object | `{"host":"portal-backend.example.org","paths":[{"backend":{"port":8080,"service":"registration-service"},"path":"/api/registration","pathType":"Prefix"},{"backend":{"port":8080,"service":"administration-service"},"path":"/api/administration","pathType":"Prefix"},{"backend":{"port":8080,"service":"notification-service"},"path":"/api/notification","pathType":"Prefix"},{"backend":{"port":8080,"service":"provisioning-service"},"path":"/api/provisioning","pathType":"Prefix"},{"backend":{"port":8080,"service":"marketplace-app-service"},"path":"/api/apps","pathType":"Prefix"},{"backend":{"port":8080,"service":"services-service"},"path":"/api/services","pathType":"Prefix"}]}` | Provide default path for the ingress record. | | backend.dotnetEnvironment | string | `"Production"` | | | backend.dbConnection.schema | string | `"portal"` | | @@ -147,7 +136,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 | `"v1.8.0"` | | +| backend.registration.image.registrationservicetag | string | `"v1.8.1"` | | | backend.registration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.registration.resources | object | `{"requests":{"cpu":"15m","memory":"385M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.registration.basePath | string | `"api/registration"` | | @@ -173,7 +162,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 | `"v1.8.0"` | | +| backend.administration.image.administrationservicetag | string | `"v1.8.1"` | | | backend.administration.image.pullPolicy | string | `"IfNotPresent"` | | | backend.administration.resources | object | `{"requests":{"cpu":"15m","memory":"385M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.administration.basePath | string | `"api/administration"` | | @@ -236,7 +225,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 | `"v1.8.0"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.8.1"` | | | backend.appmarketplace.image.pullPolicy | string | `"IfNotPresent"` | | | backend.appmarketplace.resources | object | `{"requests":{"cpu":"15m","memory":"445M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.appmarketplace.basePath | string | `"api/apps"` | | @@ -318,7 +307,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 | `"v1.8.0"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v1.8.1"` | | | backend.portalmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmigrations.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.portalmigrations.seeding.testDataEnvironments | string | `""` | | @@ -327,14 +316,14 @@ 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 | `"v1.8.0"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.8.1"` | | | backend.portalmaintenance.image.pullPolicy | string | `"IfNotPresent"` | | | backend.portalmaintenance.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | 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 | `"v1.8.0"` | | +| backend.notification.image.notificationservicetag | string | `"v1.8.1"` | | | backend.notification.image.pullPolicy | string | `"IfNotPresent"` | | | backend.notification.resources | object | `{"requests":{"cpu":"15m","memory":"300M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.notification.basePath | string | `"api/notification"` | | @@ -343,7 +332,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 | `"v1.8.0"` | | +| backend.services.image.servicesservicetag | string | `"v1.8.1"` | | | backend.services.image.pullPolicy | string | `"IfNotPresent"` | | | backend.services.resources | object | `{"requests":{"cpu":"15m","memory":"445M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.services.basePath | string | `"api/services"` | | @@ -387,13 +376,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 | `"v1.8.0"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.8.1"` | | | backend.provisioningmigrations.image.pullPolicy | string | `"IfNotPresent"` | | | backend.provisioningmigrations.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | 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 | `"v1.8.0"` | | +| backend.processesworker.image.processesworkertag | string | `"v1.8.1"` | | | backend.processesworker.image.pullPolicy | string | `"IfNotPresent"` | | | backend.processesworker.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | backend.processesworker.logging.default | string | `"Information"` | | diff --git a/charts/portal/README.md.gotmpl b/charts/portal/README.md.gotmpl index bf316223f..cd5cc4cf4 100644 --- a/charts/portal/README.md.gotmpl +++ b/charts/portal/README.md.gotmpl @@ -7,7 +7,7 @@ This helm chart installs the Catena-X Portal application which consists of * [portal-frontend (v1.8.0)](https://github.com/eclipse-tractusx/portal-frontend/tree/v1.8.0), * [portal-frontend-registration (v1.6.0)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v1.6.0), * [portal-assets (v1.8.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v1.8.0) and -* [portal-backend (v1.8.0)](https://github.com/eclipse-tractusx/portal-backend/tree/v1.8.0). +* [portal-backend (v1.8.1)](https://github.com/eclipse-tractusx/portal-backend/tree/v1.8.1). 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 2.1.0 version of the IAM instances: diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index eaed8d574..4ddb7074f 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -270,7 +270,7 @@ backend: name: "registration-service" image: name: "docker.io/tractusx/portal-registration-service" - registrationservicetag: v1.8.0 + registrationservicetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -320,7 +320,7 @@ backend: name: "administration-service" image: name: "docker.io/tractusx/portal-administration-service" - administrationservicetag: v1.8.0 + administrationservicetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -437,7 +437,7 @@ backend: name: "marketplace-app-service" image: name: "docker.io/tractusx/portal-marketplace-app-service" - appmarketplaceservicetag: v1.8.0 + appmarketplaceservicetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -570,7 +570,7 @@ backend: name: "portal-migrations" image: name: "docker.io/tractusx/portal-portal-migrations" - portalmigrationstag: v1.8.0 + portalmigrationstag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -594,7 +594,7 @@ backend: name: "portal-maintenance" image: name: "docker.io/tractusx/portal-maintenance-service" - portalmaintenancetag: v1.8.0 + portalmaintenancetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -613,7 +613,7 @@ backend: name: "notification-service" image: name: "docker.io/tractusx/portal-notification-service" - notificationservicetag: v1.8.0 + notificationservicetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -641,7 +641,7 @@ backend: name: "services-service" image: name: "docker.io/tractusx/portal-services-service" - servicesservicetag: v1.8.0 + servicesservicetag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -722,7 +722,7 @@ backend: name: "provisioning-migrations" image: name: "docker.io/tractusx/portal-provisioning-migrations" - provisioningmigrationstag: v1.8.0 + provisioningmigrationstag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. @@ -739,7 +739,7 @@ backend: name: "processes-worker" image: name: "docker.io/tractusx/portal-processes-worker" - processesworkertag: v1.8.0 + processesworkertag: v1.8.1 pullPolicy: "IfNotPresent" # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user. # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. diff --git a/consortia/argocd-app-templates/appsetup-beta.yaml b/consortia/argocd-app-templates/appsetup-beta.yaml index 9ed1955c6..65cd32038 100644 --- a/consortia/argocd-app-templates/appsetup-beta.yaml +++ b/consortia/argocd-app-templates/appsetup-beta.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-1.8.0 + targetRevision: portal-1.8.1 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/consortia/argocd-app-templates/appsetup-int.yaml index 794d04ce6..35f1dc2d1 100644 --- a/consortia/argocd-app-templates/appsetup-int.yaml +++ b/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-1.8.0 + targetRevision: portal-1.8.1 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/appsetup-pen.yaml b/consortia/argocd-app-templates/appsetup-pen.yaml index 3277acf57..a2be88da6 100644 --- a/consortia/argocd-app-templates/appsetup-pen.yaml +++ b/consortia/argocd-app-templates/appsetup-pen.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-1.8.0 + targetRevision: portal-1.8.1 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/appsetup-stable.yaml b/consortia/argocd-app-templates/appsetup-stable.yaml index de2d36749..6f6fd754f 100644 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ b/consortia/argocd-app-templates/appsetup-stable.yaml @@ -29,7 +29,7 @@ spec: source: path: '' repoURL: 'https://eclipse-tractusx.github.io/charts/dev' - targetRevision: 1.8.0 + targetRevision: 1.8.1 plugin: env: - name: HELM_VALUES diff --git a/consortia/argocd-app-templates/appsetup-upgrade.yaml b/consortia/argocd-app-templates/appsetup-upgrade.yaml index 0541e371e..830b3237d 100644 --- a/consortia/argocd-app-templates/appsetup-upgrade.yaml +++ b/consortia/argocd-app-templates/appsetup-upgrade.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-1.8.0 + targetRevision: portal-1.8.1 plugin: env: - name: AVP_SECRET