Merge pull request #1204 from catenax-ng/helm/778-update-edc-to-0.7.0

helm: #778 update edc version
eclipse-tractusx · May 2, 2024 · d5ffa4d · d5ffa4d
2 parents 6bb101a + cc45e86
commit d5ffa4d
Show file tree

Hide file tree

Showing 16 changed files with 221 additions and 34 deletions.
diff --git a/charts/connector/edc-provider/Chart.yaml b/charts/connector/edc-provider/Chart.yaml
@@ -38,7 +38,7 @@ dependencies:
   - condition: tractusx-connector.enabled
     name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
-    version: 0.5.3
+    version: 0.7.0
   - condition: edc-postgresql.enabled
     alias: edc-postgresql
     name: postgresql

diff --git a/charts/connector/edc-provider/values-dev.yaml b/charts/connector/edc-provider/values-dev.yaml
@@ -2,6 +2,14 @@ tractusx-connector:
   participant:
     id: BPNL00000003CML1
   enabled: true
+
+  iatp:
+    sts:
+      oauth:
+        client:
+          id: <path:traceability-foss/data/dev/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-dev-a-provider
+
   controlplane:
     ingresses:
       - enabled: true
@@ -16,15 +24,6 @@ tractusx-connector:
         tls:
           enabled: true
           secretName: tls-secret
-    ssi:
-      miw:
-        url: <path:traceability-foss/data/dev/edc-provider/wallet#ssi.miw.url>
-        authorityId: <path:traceability-foss/data/dev/edc-provider/wallet#ssi.miw.authorityId>
-      oauth:
-        tokenurl: <path:traceability-foss/data/dev/edc-provider/wallet#ssi.oauth.tokenurl>
-        client:
-          id: <path:traceability-foss/data/dev/edc-provider/wallet#ssi.oauth.client.id> # sa676
-          secretAlias: edc-miw-keycloak-secret-dev-a-provider
 
     resources:
       limits:
@@ -35,6 +34,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-edc-dev-consumer-private
+      verifier:
+        publickey_alias: daps-cert-edc-dev-consumer-public
     ingresses:
       - enabled: true
         hostname: "trace-x-edc-dataplane.dev.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values-e2e-a.yaml b/charts/connector/edc-provider/values-e2e-a.yaml
@@ -2,6 +2,18 @@ tractusx-connector:
   participant:
     id: BPNL00000003CML1
   enabled: true
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/e2e-a/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/e2e-a/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/e2e-a/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/e2e-a/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-e2e-a-provider
+
   controlplane:
     ingresses:
       - enabled: true
@@ -36,6 +48,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-edc-e2e-a-consumer-private
+      verifier:
+        publickey_alias: daps-cert-edc-e2e-a-consumer-public
     ingresses:
       - enabled: true
         hostname: "trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values-e2e-b.yaml b/charts/connector/edc-provider/values-e2e-b.yaml
@@ -2,6 +2,19 @@ tractusx-connector:
   participant:
     id: BPNL00000003CNKC
   enabled: true
+
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/e2e-b/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/e2e-b/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/e2e-b/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/e2e-b/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-e2e-b-provider
+
   controlplane:
     ingresses:
       - enabled: true
@@ -36,6 +49,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-edc-e2e-b-consumer-private
+      verifier:
+        publickey_alias: daps-cert-edc-e2e-b-consumer-public
     ingresses:
       - enabled: true
         hostname: "trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values-int-a.yaml b/charts/connector/edc-provider/values-int-a.yaml
@@ -4,6 +4,18 @@ tractusx-connector:
   fullnameOverride: "tx-edc-provider-int-a"
   participant:
     id: BPNL00000003CML1
+
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/int-a/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/int-a/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/int-a/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/int-a/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-int-a
   controlplane:
     ingresses:
       - enabled: true
@@ -40,6 +52,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-key-int-a
+      verifier:
+        publickey_alias: daps-cert-int-a
     ingresses:
       - enabled: true
         hostname: "trace-x-edc-int-a-dataplane.int.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values-int-b.yaml b/charts/connector/edc-provider/values-int-b.yaml
@@ -2,6 +2,19 @@ tractusx-connector:
   enabled: true
   participant:
     id: BPNL00000003CNKC
+
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/int-b/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/int-b/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/int-b/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/int-b/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-int-b
+
   controlplane:
     ingresses:
       - enabled: true
@@ -38,6 +51,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-key-int-b
+      verifier:
+        publickey_alias: daps-cert-int-b
     ingresses:
       - enabled: true
         hostname: "trace-x-edc-int-b-dataplane.int.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values-test.yaml b/charts/connector/edc-provider/values-test.yaml
@@ -2,6 +2,18 @@ tractusx-connector:
   participant:
     id: BPNL00000003CNKC
   enabled: true
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/dev-b/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/dev-b/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/dev-b/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/dev-b/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-dev-b-provider
+
   controlplane:
     ingresses:
       - enabled: true
@@ -16,15 +28,6 @@ tractusx-connector:
         tls:
           enabled: true
           secretName: tls-secret
-    ssi:
-      miw:
-        url: <path:traceability-foss/data/dev-b/edc-provider/wallet#ssi.miw.url>
-        authorityId: <path:traceability-foss/data/dev-b/edc-provider/wallet#ssi.miw.authorityId>
-      oauth:
-        tokenurl: <path:traceability-foss/data/dev-b/edc-provider/wallet#ssi.oauth.tokenurl>
-        client:
-          id: <path:traceability-foss/data/dev-b/edc-provider/wallet#ssi.oauth.client.id> # sa672
-          secretAlias: edc-miw-keycloak-secret-dev-b-provider
 
     resources:
       limits:
@@ -35,6 +38,11 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: tracex-dev-daps-cert-provider-key
+      verifier:
+        publickey_alias: tracex-dev-daps-cert-provider
     ingresses:
       - enabled: true
         hostname: "trace-x-test-edc-dataplane.dev.demo.catena-x.net"

diff --git a/charts/connector/edc-provider/values.yaml b/charts/connector/edc-provider/values.yaml
@@ -9,6 +9,18 @@ tractusx-connector:
   backendService:
     httpProxyTokenReceiverUrl: "https://traceability.dev.demo.catena-x.net/api/callback/endpoint-data-reference"
 
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/dev/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/dev/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/dev/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/dev/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-dev-a-provider
+
   controlplane:
     ingresses:
       - enabled: false
@@ -22,16 +34,13 @@ tractusx-connector:
         tls:
           enabled: true
           secretName: tls-secret
-    ssi:
-      miw:
-        url: <path:traceability-foss/data/dev/edc/wallet#ssi.miw.url>
-        authorityId: <path:traceability-foss/data/dev/edc/wallet#ssi.miw.authorityId>
-      oauth:
-        tokenurl: <path:traceability-foss/data/dev/edc/wallet#ssi.oauth.tokenurl>
-        client:
-          id: <path:traceability-foss/data/dev/edc/wallet#ssi.oauth.client.id>
-          secretAlias: edc-miw-keycloak-secret
 
+    bdrs:
+      # time that a cached BPN/DID resolution map is valid in seconds, default is 10 min
+      cache_validity_seconds: 600
+      server:
+        # URL of the BPN/DID Resolution Service - required:
+        url: <path:traceability-foss/data/dev/iatp#bdrsUrl>
     endpoints:
       # -- default api for health checks, should not be added to any ingress
       default:
@@ -88,6 +97,18 @@ tractusx-connector:
         memory: 1.5Gi
 
   dataplane:
+    token:
+      refresh:
+        expiry_seconds: 300
+        expiry_tolerance_seconds: 10
+        # optional URL that can be provided where clients go to refresh tokens.
+        refresh_endpoint:
+      signer:
+        # alias under which the private key is stored in the vault (JWK or PEM format)
+        privatekey_alias:
+      verifier:
+        # alias under which the public key is stored in the vault, that belongs to the private key ("privatekey_alias", JWK or PEM format)
+        publickey_alias:
     ingresses:
       - enabled: false
         annotations:

diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml
@@ -46,7 +46,7 @@ dependencies:
     condition: irs-helm.enabled
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
-    version: 0.5.3
+    version: 0.7.0
     condition: tractusx-connector.enabled
   - name: postgresql
     alias: edc-postgresql

diff --git a/charts/traceability-foss/values-base.yaml b/charts/traceability-foss/values-base.yaml
@@ -407,6 +407,18 @@ tractusx-connector:
     # Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
 
   dataplane:
+    token:
+      refresh:
+        expiry_seconds: 300
+        expiry_tolerance_seconds: 10
+        # optional URL that can be provided where clients go to refresh tokens.
+        refresh_endpoint:
+      signer:
+        # alias under which the private key is stored in the vault (JWK or PEM format)
+        privatekey_alias:
+      verifier:
+        # alias under which the public key is stored in the vault, that belongs to the private key ("privatekey_alias", JWK or PEM format)
+        publickey_alias:
     ingresses:
       - enabled: true
         hostname: 'CHANGE_ME'

diff --git a/charts/traceability-foss/values-dev.yaml b/charts/traceability-foss/values-dev.yaml
@@ -303,7 +303,17 @@ tractusx-connector:
   fullnameOverride: *edc_name
   participant:
     id: *bpn
-
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/dev/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/dev/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/dev/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/dev/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-dev-a-provider
   controlplane:
     ingresses:
       - enabled: true
@@ -332,6 +342,11 @@ tractusx-connector:
         authKey: *edc_api_key
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: daps-cert-edc-dev-consumer-private
+      verifier:
+        publickey_alias: daps-cert-edc-dev-consumer-public
     ingresses:
       - enabled: true
         hostname: *edc_dataplane_hostname

diff --git a/charts/traceability-foss/values-e2e-a.yaml b/charts/traceability-foss/values-e2e-a.yaml
@@ -304,7 +304,17 @@ tractusx-connector:
   fullnameOverride: *edc_name
   participant:
     id: *bpn
-
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/e2e-a/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/e2e-a/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/e2e-a/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/e2e-a/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-e2e-a-provider
   controlplane:
     ingresses:
       - enabled: true

diff --git a/charts/traceability-foss/values-e2e-b.yaml b/charts/traceability-foss/values-e2e-b.yaml
@@ -304,6 +304,18 @@ tractusx-connector:
   participant:
     id: *bpn
 
+  iatp:
+    # Decentralized IDentifier
+    id: <path:traceability-foss/data/e2e-b/iatp#DID>
+    sts:
+      dim:
+        url: <path:traceability-foss/data/e2e-b/iatp#dimUrl>
+      oauth:
+        token_url: <path:traceability-foss/data/e2e-b/iatp#iatp.oauth.tokenurl>
+        client:
+          id: <path:traceability-foss/data/e2e-b/iatp#dimClientId>
+          secret_alias: edc-miw-keycloak-secret-e2e-b-provider
+
   controlplane:
     ingresses:
       - enabled: true