Skip to content

Commit

Permalink
build: merge release into main #421
Browse files Browse the repository at this point in the history
Reviewed-By: Martin Rohrmeier <[email protected]>
  • Loading branch information
Phil91 authored Sep 2, 2024
2 parents a1d1073 + 6427c8c commit 7e778ff
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 54 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart.

## 2.2.0-RC3

### Change

* changed to new container images
* portal-backend: v2.2.0-RC3
* portal-frontend: v2.2.0-RC2
* portal-backend:
* added config value for self description documents in the processes worker [#419](https://github.com/eclipse-tractusx/portal/pull/419)

## 2.2.0-RC2

### Change
Expand Down
2 changes: 1 addition & 1 deletion charts/localdev/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- condition: portal.enabled
name: portal
repository: file://../portal
version: 2.2.0-RC2
version: 2.2.0-RC3
- condition: centralidp.enabled
name: centralidp
repository: https://eclipse-tractusx.github.io/charts/dev
Expand Down
53 changes: 28 additions & 25 deletions charts/localdev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,33 @@ This chart also sets up an additional [postgresql](https://artifacthub.io/packag

For detailed information about the default configuration values, please have a look at the [Values table](#values) and/or [Values file](./values.yaml).

- [Usage](#usage)
- [Cluster setup](#cluster-setup)
- [Linux and Mac](#cluster-setup-linux-and-mac)
- [Cluster Setup Windows](#cluster-setup-windows)
- [Minikube](#minikube)
- [Docker Desktop integrated Kubernetes](#docker-desktop-integrated-kubernetes)
- [Network Setup](#network-setup)
- [Minikube Addons](#minikube-addons)
- [Docker Desktop integrated Kubernetes Ingress Controller](#docker-desktop-integrated-kubernetes-ingress-controller)
- [Linux and Mac](#network-setup-on-linux-and-mac)
- [Additional Network Setup for Mac](#additional-network-setup-for-mac)
- [Windows/wsl2 with NTLM-proxy](#network-setup-on-windowswsl2-with-ntlm-proxy)
- [px-proxy](#px-proxy)
- [DNS-resolution in Windows](#dns-resolution-in-windows)
- [DNS-resolution in wsl2](#dns-resolution-in-wsl2)
- [Proxy-setup in wsl2](#proxy-setup-in-wsl2)
- [Install](#install)
- [Use released chart](#use-released-chart)
- [Use local repository](#use-local-repository)
- [Perform first login](#perform-first-login)
- [Database Access](#database-access)
- [Keycloak Admin Console](#keycloak-admin-console)
- [Uninstall](#uninstall)
- [Prepare self-signed TLS setup (Optional)](#prepare-self-signed-tls-setup-optional)
- [Setup of CX Portal \& IAM for local development](#setup-of-cx-portal--iam-for-local-development)
- [Usage](#usage)
- [Cluster Setup](#cluster-setup)
- [Cluster Setup Linux and Mac](#cluster-setup-linux-and-mac)
- [Cluster Setup Windows](#cluster-setup-windows)
- [Minikube](#minikube)
- [Docker Desktop integrated Kubernetes](#docker-desktop-integrated-kubernetes)
- [Network Setup](#network-setup)
- [Minikube Addons](#minikube-addons)
- [Docker Desktop integrated Kubernetes Ingress Controller](#docker-desktop-integrated-kubernetes-ingress-controller)
- [Network Setup on Linux and Mac](#network-setup-on-linux-and-mac)
- [Additional Network Setup for Mac](#additional-network-setup-for-mac)
- [Network Setup on Windows/wsl2 with NTLM-proxy](#network-setup-on-windowswsl2-with-ntlm-proxy)
- [px-proxy](#px-proxy)
- [DNS-resolution in Windows](#dns-resolution-in-windows)
- [DNS-resolution in wsl2](#dns-resolution-in-wsl2)
- [Proxy-setup in wsl2](#proxy-setup-in-wsl2)
- [Install](#install)
- [Use released chart](#use-released-chart)
- [Use local repository](#use-local-repository)
- [Perform first login](#perform-first-login)
- [Database Access](#database-access)
- [Keycloak Admin Console](#keycloak-admin-console)
- [Uninstall](#uninstall)
- [Prepare self-signed TLS setup (Optional)](#prepare-self-signed-tls-setup-optional)
- [Requirements](#requirements)
- [Values](#values)

## Usage

Expand Down Expand Up @@ -564,7 +567,7 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi

| Repository | Name | Version |
|------------|------|---------|
| file://../portal | portal | 2.2.0-RC2 |
| file://../portal | portal | 2.2.0-RC3 |
| https://charts.bitnami.com/bitnami | postgresportal(postgresql) | 12.12.x |
| https://eclipse-tractusx.github.io/charts/dev | centralidp | 3.0.0 |
| https://eclipse-tractusx.github.io/charts/dev | sharedidp | 3.0.0 |
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
apiVersion: v2
name: portal
type: application
version: 2.2.0-RC2
appVersion: 2.2.0-RC2
version: 2.2.0-RC3
appVersion: 2.2.0-RC3
description: Helm chart for Catena-X Portal
home: https://github.com/eclipse-tractusx/portal
sources:
Expand Down
28 changes: 14 additions & 14 deletions charts/portal/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Helm chart for Catena-X Portal

![Version: 2.2.0-RC2](https://img.shields.io/badge/Version-2.2.0--RC2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0-RC2](https://img.shields.io/badge/AppVersion-2.2.0--RC2-informational?style=flat-square)
![Version: 2.2.0-RC3](https://img.shields.io/badge/Version-2.2.0--RC3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0-RC3](https://img.shields.io/badge/AppVersion-2.2.0--RC3-informational?style=flat-square)

This helm chart installs the Portal application which consists of

* [portal-frontend (v2.2.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.2.0-RC1),
* [portal-frontend (v2.2.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.2.0-RC2),
* [portal-frontend-registration (v2.0.1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1),
* [portal-assets (v2.1.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0) and
* [portal-backend (v2.2.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.2.0-RC2).
* [portal-backend (v2.2.0-RC3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.2.0-RC3).

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:
Expand Down Expand Up @@ -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.2.0-RC2
version: 2.2.0-RC3
```
## Requirements
Expand Down Expand Up @@ -87,7 +87,7 @@ 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.2.0-RC1"` | |
| frontend.portal.image.portaltag | string | `"v2.2.0-RC2"` | |
| 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. |
Expand Down Expand Up @@ -148,7 +148,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.2.0-RC2"` | |
| backend.registration.image.registrationservicetag | string | `"v2.2.0-RC3"` | |
| 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. |
Expand All @@ -175,7 +175,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.2.0-RC2"` | |
| backend.administration.image.administrationservicetag | string | `"v2.2.0-RC3"` | |
| 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. |
Expand Down Expand Up @@ -240,7 +240,7 @@ dependencies:
| backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"[email protected]"` | 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.2.0-RC2"` | |
| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v2.2.0-RC3"` | |
| 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. |
Expand Down Expand Up @@ -323,7 +323,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.2.0-RC2"` | |
| backend.portalmigrations.image.portalmigrationstag | string | `"v2.2.0-RC3"` | |
| 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 | `""` | |
Expand All @@ -333,14 +333,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 | `"v2.2.0-RC2"` | |
| backend.portalmaintenance.image.portalmaintenancetag | string | `"v2.2.0-RC3"` | |
| 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.2.0-RC2"` | |
| backend.notification.image.notificationservicetag | string | `"v2.2.0-RC3"` | |
| 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. |
Expand All @@ -350,7 +350,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.2.0-RC2"` | |
| backend.services.image.servicesservicetag | string | `"v2.2.0-RC3"` | |
| 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. |
Expand Down Expand Up @@ -395,13 +395,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.2.0-RC2"` | |
| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v2.2.0-RC3"` | |
| 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.2.0-RC2"` | |
| backend.processesworker.image.processesworkertag | string | `"v2.2.0-RC3"` | |
| 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"` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

This helm chart installs the Portal application which consists of

* [portal-frontend (v2.2.0-RC1)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.2.0-RC1),
* [portal-frontend (v2.2.0-RC2)](https://github.com/eclipse-tractusx/portal-frontend/tree/v2.2.0-RC2),
* [portal-frontend-registration (v2.0.1)](https://github.com/eclipse-tractusx/portal-frontend-registration/tree/v2.0.1),
* [portal-assets (v2.1.0)](https://github.com/eclipse-tractusx/portal-assets/tree/v2.1.0) and
* [portal-backend (v2.2.0-RC2)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.2.0-RC2).
* [portal-backend (v2.2.0-RC3)](https://github.com/eclipse-tractusx/portal-backend/tree/v2.2.0-RC3).

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:
Expand Down
2 changes: 2 additions & 0 deletions charts/portal/templates/cronjob-backend-processes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,8 @@ spec:
value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
- name: "APPLICATIONCREATION_USEDIMWALLET"
value: "{{ .Values.backend.useDimWallet }}"
- name: "SELFDESCRIPTIONCREATIONPROCESS__SELFDESCRIPTIONDOCUMENTURL"
value: "{{ .Values.portalBackendAddress }}{{ .Values.backend.administration.connectors.selfDescriptionDocumentPath }}"
ports:
- name: http
containerPort: {{ .Values.portContainer }}
Expand Down
18 changes: 9 additions & 9 deletions charts/portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ backend:
name: "registration-service"
image:
name: "docker.io/tractusx/portal-registration-service"
registrationservicetag: df8be4a73cd12888f9a410eada400c019b6157ed
registrationservicetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- Pull secrets for private docker registry
pullSecrets: []
Expand Down Expand Up @@ -348,7 +348,7 @@ backend:
name: "administration-service"
image:
name: "docker.io/tractusx/portal-administration-service"
administrationservicetag: df8be4a73cd12888f9a410eada400c019b6157ed
administrationservicetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- Pull secrets for private docker registry
pullSecrets: []
Expand Down Expand Up @@ -468,7 +468,7 @@ backend:
name: "marketplace-app-service"
image:
name: "docker.io/tractusx/portal-marketplace-app-service"
appmarketplaceservicetag: df8be4a73cd12888f9a410eada400c019b6157ed
appmarketplaceservicetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- Pull secrets for private docker registry
pullSecrets: []
Expand Down Expand Up @@ -602,7 +602,7 @@ backend:
name: "portal-migrations"
image:
name: "docker.io/tractusx/portal-portal-migrations"
portalmigrationstag: df8be4a73cd12888f9a410eada400c019b6157ed
portalmigrationstag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- We recommend to review the default resource limits as this should a conscious choice.
resources:
Expand All @@ -626,7 +626,7 @@ backend:
name: "portal-maintenance"
image:
name: "docker.io/tractusx/portal-maintenance-service"
portalmaintenancetag: df8be4a73cd12888f9a410eada400c019b6157ed
portalmaintenancetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- We recommend to review the default resource limits as this should a conscious choice.
resources:
Expand All @@ -644,7 +644,7 @@ backend:
name: "notification-service"
image:
name: "docker.io/tractusx/portal-notification-service"
notificationservicetag: df8be4a73cd12888f9a410eada400c019b6157ed
notificationservicetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- Pull secrets for private docker registry
pullSecrets: []
Expand Down Expand Up @@ -673,7 +673,7 @@ backend:
name: "services-service"
image:
name: "docker.io/tractusx/portal-services-service"
servicesservicetag: df8be4a73cd12888f9a410eada400c019b6157ed
servicesservicetag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- Pull secrets for private docker registry
pullSecrets: []
Expand Down Expand Up @@ -755,7 +755,7 @@ backend:
name: "provisioning-migrations"
image:
name: "docker.io/tractusx/portal-provisioning-migrations"
provisioningmigrationstag: 4c39a2f172246690587d48f23932af0f07dac6b7
provisioningmigrationstag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- We recommend to review the default resource limits as this should a conscious choice.
resources:
Expand All @@ -771,7 +771,7 @@ backend:
name: "processes-worker"
image:
name: "docker.io/tractusx/portal-processes-worker"
processesworkertag: df8be4a73cd12888f9a410eada400c019b6157ed
processesworkertag: v2.2.0-RC3
pullPolicy: "IfNotPresent"
# -- We recommend to review the default resource limits as this should a conscious choice.
resources:
Expand Down
2 changes: 1 addition & 1 deletion environments/argocd-app-templates/appsetup-int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
source:
path: charts/portal
repoURL: 'https://github.com/eclipse-tractusx/portal.git'
targetRevision: portal-2.2.0-RC2
targetRevision: portal-2.2.0-RC3
plugin:
env:
- name: AVP_SECRET
Expand Down

0 comments on commit 7e778ff

Please sign in to comment.