From fcaf921a1a8e5945ad9617c77baaf984034c43bb Mon Sep 17 00:00:00 2001 From: Carlos Diez Date: Wed, 6 Nov 2024 09:56:37 +0100 Subject: [PATCH 1/7] chore: Update BPDM version --- charts/umbrella/Chart.yaml | 4 ++-- charts/umbrella/values.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index edfb27a..2e525e0 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.0 +version: 2.0.1 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: @@ -76,7 +76,7 @@ dependencies: - name: bpdm condition: bpdm.enabled repository: https://eclipse-tractusx.github.io/charts/dev - version: 5.0.3 + version: 5.1.0 # TX Data Consumer 1 - name: tx-data-provider alias: dataconsumerOne diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml index 1daaca3..ace9446 100644 --- a/charts/umbrella/values.yaml +++ b/charts/umbrella/values.yaml @@ -944,6 +944,9 @@ bpdm: paths: - path: "/orchestrator(/|$)(.*)" pathType: "ImplementationSpecific" + postgres: + enabled: false + fullnameOverride: bpdm-postgres applicationConfig: server: # App should take the x-forward-header-prefix into account for Swagger-UI and redirects to work correctly From c44750d2beb8bfcbb85d51129f030815c03bf208 Mon Sep 17 00:00:00 2001 From: Carlos Diez <137300347+CDiezRodriguez@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:54:37 +0100 Subject: [PATCH 2/7] Update Chart version --- charts/umbrella/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index c227b47..11848d2 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.1 +version: 2.0.2 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: From 7f79f517a30c61cbac38f40514706ba2973d22d9 Mon Sep 17 00:00:00 2001 From: Carlos Diez <137300347+CDiezRodriguez@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:54:13 +0100 Subject: [PATCH 3/7] Update Chart version --- charts/umbrella/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index a27d2eb..7b61c21 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.2 +version: 2.0.3 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: From 84dde82926f72bc40f3f768acc2e0f75f410999e Mon Sep 17 00:00:00 2001 From: Carlos Diez <137300347+CDiezRodriguez@users.noreply.github.com> Date: Fri, 8 Nov 2024 08:42:10 +0100 Subject: [PATCH 4/7] Update Chart version --- charts/umbrella/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 7b61c21..0b9f5b9 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.3 +version: 2.0.4 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: From 285d6ee5eecbcbe764967af26c00c2910f225a03 Mon Sep 17 00:00:00 2001 From: Carlos Diez <137300347+CDiezRodriguez@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:27:06 +0100 Subject: [PATCH 5/7] Update Chart version --- charts/umbrella/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 413d181..760b51e 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.4 +version: 2.0.5 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: From 9d6225f2d23cfecb8cca24799f270ad4ace30bcc Mon Sep 17 00:00:00 2001 From: Carlos Diez Date: Thu, 14 Nov 2024 16:33:19 +0100 Subject: [PATCH 6/7] chore: Update BPDM version 2 part --- charts/umbrella/values.yaml | 44 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml index c275851..3c36d48 100644 --- a/charts/umbrella/values.yaml +++ b/charts/umbrella/values.yaml @@ -826,6 +826,8 @@ bpdm: # App should take the x-forward-header-prefix into account for Swagger-UI and redirects to work correctly forward-headers-strategy: "FRAMEWORK" bpdm: + datasource: + host: umbrella-bpdm-postgres bpn: # This Gate has no owner restriction as other companies can write into the Gate under their own tenant owner-bpn-l: @@ -848,10 +850,10 @@ bpdm: client: pool: registration: - client-id: *bpdmAdminClientId + client-id: "sa-cl7-cx-1" orchestrator: registration: - client-id: *bpdmAdminClientId + client-id: "sa-cl25-cx-3" applicationSecrets: spring: datasource: @@ -861,10 +863,10 @@ bpdm: client: orchestrator: registration: - client-secret: *bpdmAdminClientSecret + client-secret: "changeme" pool: registration: - client-secret: *bpdmAdminClientSecret + client-secret: "changeme" # Configures the central business partner Pool bpdm-pool: @@ -888,6 +890,8 @@ bpdm: # App should take the x-forward-header-prefix into account for Swagger-UI and redirects to work correctly forward-headers-strategy: "FRAMEWORK" bpdm: + datasource: + host: umbrella-bpdm-postgres security: # App's API is authenticated over Central-IDP auth-server-url: "http://centralidp.tx.test/auth" @@ -902,13 +906,13 @@ bpdm: client: orchestrator: registration: - client-id: *bpdmAdminClientId + client-id: "sa-cl25-cx-2" applicationSecrets: bpdm: client: orchestrator: registration: - client-secret: *bpdmAdminClientSecret + client-secret: "changeme" spring: datasource: # Set the password of the postgres BPDM user here (Currently, BPDM can't deal with random initial passwords) @@ -935,26 +939,16 @@ bpdm: # App should take the x-forward-header-prefix into account for Swagger-UI and redirects to work correctly forward-headers-strategy: "FRAMEWORK" bpdm: + datasource: + host: umbrella-bpdm-postgres security: auth-server-url: "http://centralidp.tx.test/auth" realm: "CX-Central" - # The Central-IDP does not yet have dedicated Orchestrator permissions - # Therefore, we just reuse the permissions from the Pool for now - # Basically it is saying: If you would be able to write into the Pool directly, - # you are also able to create golden record tasks which eventually will write data into the Pool - # (We are stricter with the permissions now than we will have to be when using dedicated permissions) - client-id: "Cl7-CX-BPDM" - permissions: - createTask: "write_partner" - readTask: "write_partner" - reservation: - clean: "write_partner" - cleanAndSync: "write_partner" - poolSync: "write_partner" - result: - clean: "write_partner" - cleanAndSync: "write_partner" - poolSync: "write_partner" + applicationSecrets: + spring: + datasource: + # Set the password of the postgres BPDM user here (Currently, BPDM can't deal with random initial passwords) + password: *bpdmPostgresPassword # This installs a dummy cleaning service which performs rudimentary cleaning operations in order to realize the golden record process bpdm-cleaning-service-dummy: @@ -968,13 +962,13 @@ bpdm: provider: issuer-uri: "http://centralidp.tx.test/auth/realms/CX-Central" registration: - client-id: *bpdmAdminClientId + client-id: "sa-cl25-cx-1" applicationSecrets: bpdm: client: orchestrator: registration: - client-secret: *bpdmAdminClientSecret + client-secret: "changeme" dataconsumerOne: enabled: false From aa239e0ddc6981233620712c7deddd9a3be69c94 Mon Sep 17 00:00:00 2001 From: Carlos Diez Date: Fri, 15 Nov 2024 12:39:21 +0100 Subject: [PATCH 7/7] chore: Apply changes based on the last comment --- charts/umbrella/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml index 3c36d48..b95d378 100644 --- a/charts/umbrella/values.yaml +++ b/charts/umbrella/values.yaml @@ -852,6 +852,7 @@ bpdm: registration: client-id: "sa-cl7-cx-1" orchestrator: + base-url: http://umbrella-bpdm-orchestrator registration: client-id: "sa-cl25-cx-3" applicationSecrets: @@ -905,6 +906,7 @@ bpdm: # We will reuse the general BPDM admin technical user to establish connection between the services client: orchestrator: + base-url: http://umbrella-bpdm-orchestrator registration: client-id: "sa-cl25-cx-2" applicationSecrets: @@ -944,6 +946,7 @@ bpdm: security: auth-server-url: "http://centralidp.tx.test/auth" realm: "CX-Central" + client-id: "Cl7-CX-BPDM" applicationSecrets: spring: datasource: @@ -959,6 +962,7 @@ bpdm: # We reuse the general BPDM admin technical user to establish connection between the services client: orchestrator: + base-url: http://umbrella-bpdm-orchestrator provider: issuer-uri: "http://centralidp.tx.test/auth/realms/CX-Central" registration: