From 389c7142bc9c51e41c72027fa418a7035e8fea60 Mon Sep 17 00:00:00 2001 From: Johannes Zahn Date: Mon, 4 Mar 2024 11:45:38 +0100 Subject: [PATCH 1/5] Update plan.md --- concept/plan.md | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/concept/plan.md b/concept/plan.md index d4a8de6c..17d8df09 100644 --- a/concept/plan.md +++ b/concept/plan.md @@ -15,12 +15,12 @@ Complete list of content of the umbrella helm chart 1. Shared Services 1. :white_check_mark: Portal incl. IDP - 2. Discovery Services - 3. Semantic Hub - 4. GDPM - 5. Vault? - 6. SD-Factory -2. Industry Core + 2. :white_check_mark: Discovery Services + 3. Semantic Hub (to be prepared) + 4. GDPM (Product Ticket: https://github.com/eclipse-tractusx/bpdm/issues/738 ) + 5. SD-Factory (Ready for integration) + 6. MIW (Review current Helm Chart) +2. Industry Core (Ready for integration --> https://github.com/eclipse-tractusx/tractus-x-umbrella/pull/53) 1. Data Provider 1 1. EDC 2. Submodel Server @@ -125,22 +125,28 @@ Assosiation: * Charts for Discovery finders will be added to shared Services * [x] cleanup of Repo -> @Gabor --> 29.01 * [x] BPN selection for IDP -* [ ] Helm Test Timout investigation/ Bigger Github Runner @Gabor +* [x] Helm Test Timout investigation/ Bigger Github Runner @Gabor * [x] @Evelyn: Check for Helm Test in Helm Chart --> leads to timeout during deployment * [x] @Jaro: Status Data Provider --> currently ongoing. First Helm chart exists. Challanges with namespaces of using same chart 3 times with namespaces, for example databases * [x] @Jaro: Build a SubmodelServer--> used the existing one of IRS Team * [x] @Jaro: dDTR Version ( support from @Tuna ) -* [ ] @Tuna: Discovery Service Helm PR +* [x] @Tuna: Discovery Service Helm PR * [x] @Johannes: BPDM Status * [x] @Johannes: SD-Factory --> https://github.com/eclipse-tractusx/sd-factory/issues/91 * [x] Awareness to Open Planning regarding E2E vs. tutorials * [x] setup Helm/Folder structure * [x] Define Helm setup * [x] Define Helm how to seed data --> f.e. vs. vs. -* [ ] collect Seeding/Test data +* [x] collect Seeding/Test data * [x] BPN's * [x] Trace-X Testdata - * [ ] Current Testdatafile + * [x] Current Testdatafile * [ ] Documentation (e.g. OpenApi / Swagger, Insomnia Collection, Tutorials-> E2E Documentation, Step-By-Step Guide) * [ ] @Evelyn: Setup new Environment for definition of Companies +* [ ] @Jaro & @Evelyn: Have a look on the MIW Helm Chart +* [ ] @Jaro: EDC Chat to clarify on secrets via configuration to reduce the Vault as ressource +* [ ] @Garbor: Update of TRG's +* [ ] @Johannes: Status BusinessApps Helm Chart +* [ ] @All: Ingress discussions & Testing configuration +* [ ] @All: TLS Setup From 7228345b79dd3454fb74a79661167c65067c6470 Mon Sep 17 00:00:00 2001 From: Tomasz Barwicki Date: Wed, 6 Mar 2024 12:46:51 +0100 Subject: [PATCH 2/5] chore: update .tractusx --- .tractusx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.tractusx b/.tractusx index 57a7c0ad..e08b17a6 100644 --- a/.tractusx +++ b/.tractusx @@ -16,10 +16,10 @@ # # SPDX-License-Identifier: Apache-2.0 ############################################################### -product: "e2e-testing" -leadingRepository: "https://github.com/eclipse-tractusx/e2e-testing" +product: "tractus-x-umbrella" +leadingRepository: "https://github.com/eclipse-tractusx/tractus-x-umbrella" repoCategory: "support" repositories: - - name: "e2e-testing" + - name: "tractus-x-umbrella" usage: "The repository is the homebase for all e2e test automation efforts at Eclipse Tractus-X." - url: "https://github.com/eclipse-tractusx/e2e-testing" + url: "https://github.com/eclipse-tractusx/tractus-x-umbrella" From be747d934d7348f0fb01d59c03be0e5a427425f8 Mon Sep 17 00:00:00 2001 From: Johannes Zahn Date: Mon, 11 Mar 2024 11:55:38 +0100 Subject: [PATCH 3/5] Update plan.md --- concept/plan.md | 1 + 1 file changed, 1 insertion(+) diff --git a/concept/plan.md b/concept/plan.md index 17d8df09..7cc45000 100644 --- a/concept/plan.md +++ b/concept/plan.md @@ -150,3 +150,4 @@ Assosiation: * [ ] @Johannes: Status BusinessApps Helm Chart * [ ] @All: Ingress discussions & Testing configuration * [ ] @All: TLS Setup +* [ ] Tractus-X Community Days From 75405ff65e7e9d567cc18172a3716a20048ee155 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Tue, 12 Mar 2024 11:23:19 +0100 Subject: [PATCH 4/5] feat: add sd-factory (#56) --- charts/umbrella/Chart.yaml | 6 +++++- charts/umbrella/values.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index e93fc877..3291c0a4 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/e2e-testing type: application -version: 0.4.1 +version: 0.5.0 dependencies: # # TODO: update edc components to R23.12 @@ -66,3 +66,7 @@ dependencies: name: bpndiscovery repository: https://eclipse-tractusx.github.io/charts/dev version: 0.2.2 + - condition: sdfactory.enabled + name: sdfactory + repository: https://eclipse-tractusx.github.io/charts/dev + version: 2.1.12 diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml index 7b6ef66e..39f8f11f 100644 --- a/charts/umbrella/values.yaml +++ b/charts/umbrella/values.yaml @@ -188,3 +188,31 @@ discoveryfinder: initialDelaySeconds: 200 postgresql: nameOverride: "discoveryfinder-postgresql" + +sdfactory: + enabled: true + secret: + # -- JWK Set URI + jwkSetUri: "https://centralidp.example.org/auth/realms/CX-Central/protocol/openid-connect/certs" + # -- Custodian wallet client id + clientId: "" + # -- Custodian wallet client secret + clientSecret: "" + # -- Keycloak URL + authServerUrl: "https://centralidp.example.org/auth" + # -- Keycloak Realm detail + realm: "" + # -- Keycloak Resource detail + resource: "" + # -- Details for Custodian wallet URI + custodianWalletUri: "" + # -- Details for Clearing House URI + clearingHouseUri: "" + # -- Details for Clearing House URL + clearingHouseServerUrl: "" + # -- Details for Clearing House Realm + clearingHouseRealm: "" + # -- Details for Clearing House Client ID + clearingHouseClientId: "" + # -- Details for Clearing House Client Secret + clearingHouseClientSecret: "" From 61f53314f88fedeb769062b867c96e4c63859537 Mon Sep 17 00:00:00 2001 From: Johannes Zahn Date: Mon, 18 Mar 2024 12:23:30 +0100 Subject: [PATCH 5/5] Update plan.md --- concept/plan.md | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/concept/plan.md b/concept/plan.md index 7cc45000..ec463893 100644 --- a/concept/plan.md +++ b/concept/plan.md @@ -17,16 +17,18 @@ Complete list of content of the umbrella helm chart 1. :white_check_mark: Portal incl. IDP 2. :white_check_mark: Discovery Services 3. Semantic Hub (to be prepared) - 4. GDPM (Product Ticket: https://github.com/eclipse-tractusx/bpdm/issues/738 ) - 5. SD-Factory (Ready for integration) - 6. MIW (Review current Helm Chart) -2. Industry Core (Ready for integration --> https://github.com/eclipse-tractusx/tractus-x-umbrella/pull/53) - 1. Data Provider 1 + 4. GDPM + (Product Ticket: https://github.com/eclipse-tractusx/bpdm/issues/738 ) + (Issue: https://github.com/eclipse-tractusx/bpdm/issues/795) + 5. :white_check_mark: SD-Factory + 6. MIW & Vault (PR: https://github.com/eclipse-tractusx/tractus-x-umbrella/pull/57) +2. :white_check_mark: Industry Core (Ready for integration --> https://github.com/eclipse-tractusx/tractus-x-umbrella/pull/53) + 1. :white_check_mark: Data Provider 1 1. EDC 2. Submodel Server 3. Registry - 2. Data Provider 2 - 3. Data Provider 3 + 2. :white_check_mark: Data Provider 2 + 3. :white_check_mark: Data Provider 3 3. Business Applications 1. Trace-X A 2. Trace-X B @@ -143,11 +145,12 @@ Assosiation: * [x] Current Testdatafile * [ ] Documentation (e.g. OpenApi / Swagger, Insomnia Collection, Tutorials-> E2E Documentation, Step-By-Step Guide) -* [ ] @Evelyn: Setup new Environment for definition of Companies -* [ ] @Jaro & @Evelyn: Have a look on the MIW Helm Chart -* [ ] @Jaro: EDC Chat to clarify on secrets via configuration to reduce the Vault as ressource -* [ ] @Garbor: Update of TRG's -* [ ] @Johannes: Status BusinessApps Helm Chart +* [ ] @Evelyn: Setup new Environment for definition of Companies -> conducting when the components are integrated +* [x] @Jaro & @Evelyn: Have a look on the MIW Helm Chart +* [x] @Jaro: EDC Chat to clarify on secrets via configuration to reduce the Vault as ressource +* [ ] @Garbor: Update of TRG's 5.0.5 -> see also https://github.com/eclipse-tractusx/eclipse-tractusx.github.io/pull/755 +* [x] @Johannes: Status BusinessApps Helm Chart * [ ] @All: Ingress discussions & Testing configuration * [ ] @All: TLS Setup * [ ] Tractus-X Community Days +* [ ] @All: update components to 24.03 Release