From ea687c004084ec0bfd14d89977444adbc091c0f2 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Fri, 2 Feb 2024 14:50:10 +0100 Subject: [PATCH 1/3] feat(impl):[#370] catena x envs --- charts/irs-environments/dev/values.yaml | 11 +++++++++-- charts/irs-environments/dil/values.yaml | 11 +++++++++-- charts/irs-environments/ess/values.yaml | 15 +++++++++------ charts/irs-environments/int/values.yaml | 16 +++++++++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/charts/irs-environments/dev/values.yaml b/charts/irs-environments/dev/values.yaml index 0a32ecf1a2..da7c5834cb 100644 --- a/charts/irs-environments/dev/values.yaml +++ b/charts/irs-environments/dev/values.yaml @@ -45,9 +45,16 @@ irs-helm: minioUser: minioPassword: oauth2: - clientId: - clientSecret: clientTokenUri: + semantics: + clientId: + clientSecret: + discovery: + clientId: + clientSecret: + bpdm: + clientId: + clientSecret: edc: submodel: request: diff --git a/charts/irs-environments/dil/values.yaml b/charts/irs-environments/dil/values.yaml index 806933b7ae..2afe4ef00a 100644 --- a/charts/irs-environments/dil/values.yaml +++ b/charts/irs-environments/dil/values.yaml @@ -26,9 +26,16 @@ irs-helm: minioUser: minioPassword: oauth2: - clientId: - clientSecret: clientTokenUri: + semantics: + clientId: + clientSecret: + discovery: + clientId: + clientSecret: + bpdm: + clientId: + clientSecret: edc: controlplane: apikey: diff --git a/charts/irs-environments/ess/values.yaml b/charts/irs-environments/ess/values.yaml index 12329a6d05..79a16c00f8 100644 --- a/charts/irs-environments/ess/values.yaml +++ b/charts/irs-environments/ess/values.yaml @@ -35,13 +35,16 @@ irs-helm: minioUser: minioPassword: oauth2: - clientId: - clientSecret: clientTokenUri: - portal: - oauth2: - clientId: - clientSecret: + semantics: + clientId: + clientSecret: + discovery: + clientId: + clientSecret: + bpdm: + clientId: + clientSecret: ess: edc: host: "https://irs-ess-provider-controlplane.int.demo.catena-x.net" diff --git a/charts/irs-environments/int/values.yaml b/charts/irs-environments/int/values.yaml index 40f73b4aa0..b50a23910b 100644 --- a/charts/irs-environments/int/values.yaml +++ b/charts/irs-environments/int/values.yaml @@ -35,14 +35,16 @@ irs-helm: minioUser: minioPassword: oauth2: - clientId: - clientSecret: clientTokenUri: - jwkSetUri: - portal: - oauth2: - clientId: - clientSecret: + semantics: + clientId: + clientSecret: + discovery: + clientId: + clientSecret: + bpdm: + clientId: + clientSecret: edc: submodel: request: From 6ef8ef8bba10197fb89ce84751049107c7c0de1f Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Wed, 7 Feb 2024 11:55:38 +0100 Subject: [PATCH 2/3] feat(impl):[#370] update irs helm chart version --- charts/irs-environments/dev/Chart.yaml | 2 +- charts/irs-environments/dil/Chart.yaml | 2 +- charts/irs-environments/ess/Chart.yaml | 2 +- charts/irs-environments/int/Chart.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/irs-environments/dev/Chart.yaml b/charts/irs-environments/dev/Chart.yaml index 77024b360b..09ae28edbb 100644 --- a/charts/irs-environments/dev/Chart.yaml +++ b/charts/irs-environments/dev/Chart.yaml @@ -19,7 +19,7 @@ version: 1.0.6 dependencies: - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.13.0 + version: 6.14.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc version: 0.5.3 diff --git a/charts/irs-environments/dil/Chart.yaml b/charts/irs-environments/dil/Chart.yaml index 41c8688839..77c441fd27 100644 --- a/charts/irs-environments/dil/Chart.yaml +++ b/charts/irs-environments/dil/Chart.yaml @@ -19,7 +19,7 @@ version: 1.0.6 dependencies: - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.13.0 + version: 6.14.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc version: 0.5.3 diff --git a/charts/irs-environments/ess/Chart.yaml b/charts/irs-environments/ess/Chart.yaml index 28784a2395..3b2db1dee9 100644 --- a/charts/irs-environments/ess/Chart.yaml +++ b/charts/irs-environments/ess/Chart.yaml @@ -19,7 +19,7 @@ version: 1.0.0 dependencies: - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.13.0 + version: 6.14.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc version: 0.5.3 diff --git a/charts/irs-environments/int/Chart.yaml b/charts/irs-environments/int/Chart.yaml index 969f3d2867..84de26bf02 100644 --- a/charts/irs-environments/int/Chart.yaml +++ b/charts/irs-environments/int/Chart.yaml @@ -19,7 +19,7 @@ version: 1.0.4 dependencies: - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.13.0 + version: 6.14.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc version: 0.5.3 From 032f16fe737ef62a380f7d6d55e5fda269de40af Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Wed, 7 Feb 2024 13:02:14 +0100 Subject: [PATCH 3/3] feat(impl):[#370] fix discovery config --- charts/irs-environments/dev/values.yaml | 4 +++- charts/irs-environments/dil/values.yaml | 3 ++- charts/irs-environments/ess/values.yaml | 3 ++- charts/irs-environments/int/values.yaml | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/irs-environments/dev/values.yaml b/charts/irs-environments/dev/values.yaml index da7c5834cb..3bac62c52d 100644 --- a/charts/irs-environments/dev/values.yaml +++ b/charts/irs-environments/dev/values.yaml @@ -35,9 +35,11 @@ irs-helm: controlPlane3: http://irs-provider3-tractusx-connector-controlplane:8080/api/check/liveness digitalTwinRegistry: url: https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 - discoveryFinderUrl: https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search shellDescriptorTemplate: /shell-descriptors/{aasIdentifier} lookupShellsTemplate: /lookup/shells?assetIds={assetIds} + discovery: + discoveryFinderUrl: https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search + semanticshub: url: https://semantics.int.demo.catena-x.net/hub/api/v1/models bpdm: diff --git a/charts/irs-environments/dil/values.yaml b/charts/irs-environments/dil/values.yaml index 2afe4ef00a..5c584aee5b 100644 --- a/charts/irs-environments/dil/values.yaml +++ b/charts/irs-environments/dil/values.yaml @@ -86,10 +86,11 @@ irs-helm: digitalTwinRegistry: descriptorEndpoint: "https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0/shell-descriptors/{aasIdentifier}" shellLookupEndpoint: "https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0/lookup/shells?assetIds={assetIds}" - discoveryFinderUrl: "https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search" shellDescriptorTemplate: "/shell-descriptors/{aasIdentifier}" lookupShellsTemplate: "/lookup/shells?assetIds={assetIds}" type: "decentral" + discovery: + discoveryFinderUrl: "https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search" semanticshub: url: "https://semantics.int.demo.catena-x.net/hub/api/v1/models" diff --git a/charts/irs-environments/ess/values.yaml b/charts/irs-environments/ess/values.yaml index 79a16c00f8..eea2afeb94 100644 --- a/charts/irs-environments/ess/values.yaml +++ b/charts/irs-environments/ess/values.yaml @@ -24,9 +24,10 @@ irs-helm: secretName: tls-secret digitalTwinRegistry: url: https://irs-aas-registry-ess.int.demo.catena-x.net/semantics/registry - discoveryFinderUrl: https://irs-ess-discovery-mock.int.demo.catena-x.net/api/administration/connectors/discovery/search shellDescriptorTemplate: /shell-descriptors/{aasIdentifier} lookupShellsTemplate: /lookup/shells?assetIds={assetIds} + discovery: + discoveryFinderUrl: https://irs-ess-discovery-mock.int.demo.catena-x.net/api/administration/connectors/discovery/search semanticshub: url: https://semantics.int.demo.catena-x.net/hub/api/v1/models pageSize: "200" diff --git a/charts/irs-environments/int/values.yaml b/charts/irs-environments/int/values.yaml index b50a23910b..8f7d13ec98 100644 --- a/charts/irs-environments/int/values.yaml +++ b/charts/irs-environments/int/values.yaml @@ -24,9 +24,10 @@ irs-helm: secretName: tls-secret digitalTwinRegistry: url: https://semantics.int.demo.catena-x.net/registry - discoveryFinderUrl: https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search shellDescriptorTemplate: /shell-descriptors/{aasIdentifier} lookupShellsTemplate: /lookup/shells?assetIds={assetIds} + discovery: + discoveryFinderUrl: https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search semanticshub: url: https://semantics.int.demo.catena-x.net/hub/api/v1/models pageSize: "200"