chore(charts):[#358] Update EDC to 0.7.0-rc1

charts/connector/edc-provider/Chart.yaml

@@ -25,7 +25,7 @@ appVersion: "0.5.0"
 dependencies:
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
-    version: 0.5.3
+    version: 0.7.0
   - condition: postgresql.enabled
     alias: edc-postgresql
     name: postgresql

charts/connector/edc-provider/values-dev-1.yaml

@@ -1,12 +1,12 @@
 tractusx-connector:
-
-  controlplane:
-    # SSI configuration
-    ssi:
+  iatp:
+    sts:
       oauth:
         client:
           id: <path:traceability-irs/data/dev/controlplane#ssi.oauth.client.id.provider1>
-          secretAlias: dev-provider1-miw-secret
+          secret_alias: dev-provider1-miw-secret
+
+  controlplane:
     ingresses:
       - enabled: true
         hostname: "irs-provider-controlplane.dev.demo.catena-x.net"
@@ -22,6 +22,12 @@ tractusx-connector:
           secretName: tls-secret
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: irs-dev-daps-cert-provider-key
+      verifier:
+        publickey_alias: irs-dev-daps-cert-provider
+
     ingresses:
       - enabled: true
         hostname: "irs-provider-dataplane.dev.demo.catena-x.net"
@@ -36,9 +42,6 @@ tractusx-connector:
           enabled: true
           secretName: tls-secret
 
-  backendService:
-    httpProxyTokenReceiverUrl: "https://irs-submodel-server.dev.demo.catena-x.net/data/endpoint-data-reference-provider1"
-
   vault:
     secretNames:
       transferProxyTokenSignerPrivateKey: irs-dev-daps-cert-provider-key

charts/connector/edc-provider/values-dev-2.yaml

@@ -1,12 +1,12 @@
 tractusx-connector:
-
-  controlplane:
-    # SSI configuration
-    ssi:
+  iatp:
+    sts:
       oauth:
         client:
           id: <path:traceability-irs/data/dev/controlplane#ssi.oauth.client.id.provider2>
-          secretAlias: dev-provider2-miw-secret
+          secret_alias: dev-provider2-miw-secret
+
+  controlplane:
     ingresses:
       - enabled: true
         hostname: "irs-provider-controlplane2.dev.demo.catena-x.net"
@@ -22,6 +22,12 @@ tractusx-connector:
           secretName: tls-secret
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: dev-provider2-key
+      verifier:
+        publickey_alias: dev-provider2-cert
+
     ingresses:
       - enabled: true
         hostname: "irs-provider-dataplane2.dev.demo.catena-x.net"
@@ -36,9 +42,6 @@ tractusx-connector:
           enabled: true
           secretName: tls-secret
 
-  backendService:
-    httpProxyTokenReceiverUrl: "https://irs-submodel-server.dev.demo.catena-x.net/data/endpoint-data-reference-provider2"
-
   vault:
     secretNames:
       transferProxyTokenSignerPrivateKey: dev-provider2-key

charts/connector/edc-provider/values-dev-3.yaml

@@ -1,12 +1,12 @@
 tractusx-connector:
-
-  controlplane:
-    # SSI configuration
-    ssi:
+  iatp:
+    sts:
       oauth:
         client:
           id: <path:traceability-irs/data/dev/controlplane#ssi.oauth.client.id.provider3>
-          secretAlias: dev-provider3-miw-secret
+          secret_alias: dev-provider3-miw-secret
+
+  controlplane:
     ingresses:
       - enabled: true
         hostname: "irs-provider-controlplane3.dev.demo.catena-x.net"
@@ -22,6 +22,12 @@ tractusx-connector:
           secretName: tls-secret
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: dev-provider3-key
+      verifier:
+        publickey_alias: dev-provider3-cert
+
     ingresses:
       - enabled: true
         hostname: "irs-provider-dataplane3.dev.demo.catena-x.net"
@@ -36,9 +42,6 @@ tractusx-connector:
           enabled: true
           secretName: tls-secret
 
-  backendService:
-    httpProxyTokenReceiverUrl: "https://irs-submodel-server.dev.demo.catena-x.net/data/endpoint-data-reference-provider3"
-
   vault:
     secretNames:
       transferProxyTokenSignerPrivateKey: dev-provider3-key

charts/connector/edc-provider/values-ess.yaml

@@ -1,12 +1,12 @@
 tractusx-connector:
-
-  controlplane:
-    # SSI configuration
-    ssi:
+  iatp:
+    sts:
       oauth:
         client:
           id: <path:traceability-irs/data/ess/controlplane#ssi.oauth.client.id.provider>
-          secretAlias: miw-ess-provider-keycloak-secret
+          secret_alias: miw-ess-provider-keycloak-secret
+
+  controlplane:
     ingresses:
       - enabled: true
         hostname: "irs-ess-provider-controlplane.int.demo.catena-x.net"
@@ -30,6 +30,12 @@ tractusx-connector:
         memory: 1Gi
 
   dataplane:
+    token:
+      signer:
+        privatekey_alias: irs-dev-daps-cert-provider-key
+      verifier:
+        publickey_alias: irs-dev-daps-cert-provider
+
     ingresses:
       - enabled: true
         hostname: "irs-ess-provider-dataplane.int.demo.catena-x.net"
@@ -52,9 +58,6 @@ tractusx-connector:
         cpu: 100m
         memory: 512Mi
 
-  backendService:
-    httpProxyTokenReceiverUrl: "https://irs-ess-submodel-server.int.demo.catena-x.net/data/endpoint-data-reference-provider1"
-
   vault:
     hashicorp:
       healthCheck:

charts/connector/edc-provider/values-test1.yaml

@@ -0,0 +1,74 @@
+postgresql:
+  enabled: false
+tractusx-connector:
+  install:
+    postgresql: true
+    vault: false
+
+  iatp:
+    sts:
+      oauth:
+        client:
+          id: <path:traceability-irs/data/dev/controlplane#ssi.oauth.client.id.provider1>
+          secret_alias: dim-secret-dev
+
+  controlplane:
+    ingresses:
+      - enabled: true
+        hostname: "irs-test1-cp.dev.demo.catena-x.net"
+        annotations:
+          nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+          nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+          nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+        endpoints:
+          - protocol
+          - management
+        tls:
+          enabled: true
+          secretName: tls-secret
+
+  dataplane:
+    token:
+      signer:
+        privatekey_alias: irs-dev-daps-cert-provider-key
+      verifier:
+        publickey_alias: irs-dev-daps-cert-provider
+
+    ingresses:
+      - enabled: true
+        hostname: "irs-test1-dp.dev.demo.catena-x.net"
+        annotations:
+          nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+          nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+          nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+        endpoints:
+          - public
+        className: "nginx"
+        tls:
+          enabled: true
+          secretName: tls-secret
+
+  vault:
+    hashicorp:
+      url: "https://irs-vault.demo.catena-x.net"
+      token: "<path:traceability-irs/data/vault#vaultToken>"
+      timeout: 30
+    secretNames:
+      transferProxyTokenSignerPrivateKey: irs-dev-daps-cert-provider-key
+      transferProxyTokenSignerPublicKey: irs-dev-daps-cert-provider
+      transferProxyTokenEncryptionAesKey: test-edc-encryption-key
+
+  postgresql:
+    nameOverride: edc-test-postgresql
+    primary:
+      persistence:
+        enabled: false
+        size: 1Gi
+    auth:
+      database: edc
+      username: testuser
+      postgresPassword: testpass
+      password: testpass
+    username: testuser
+    password: testpass
+    jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-edc-test-postgresql:5432/edc"

charts/connector/edc-provider/values-test2.yaml

@@ -0,0 +1,74 @@
+postgresql:
+  enabled: false
+tractusx-connector:
+  install:
+    postgresql: true
+    vault: false
+
+  iatp:
+    sts:
+      oauth:
+        client:
+          id: <path:traceability-irs/data/dev/controlplane#ssi.oauth.client.id.provider1>
+          secret_alias: dim-secret-dev
+
+  controlplane:
+    ingresses:
+      - enabled: true
+        hostname: "irs-test2-cp.dev.demo.catena-x.net"
+        annotations:
+          nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+          nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+          nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+        endpoints:
+          - protocol
+          - management
+        tls:
+          enabled: true
+          secretName: tls-secret
+
+  dataplane:
+    token:
+      signer:
+        privatekey_alias: irs-dev-daps-cert-provider-key
+      verifier:
+        publickey_alias: irs-dev-daps-cert-provider
+
+    ingresses:
+      - enabled: true
+        hostname: "irs-test2-dp.dev.demo.catena-x.net"
+        annotations:
+          nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+          nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+          nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+        endpoints:
+          - public
+        className: "nginx"
+        tls:
+          enabled: true
+          secretName: tls-secret
+
+  vault:
+    hashicorp:
+      url: "https://irs-vault.demo.catena-x.net"
+      token: "<path:traceability-irs/data/vault#vaultToken>"
+      timeout: 30
+    secretNames:
+      transferProxyTokenSignerPrivateKey: irs-dev-daps-cert-provider-key
+      transferProxyTokenSignerPublicKey: irs-dev-daps-cert-provider
+      transferProxyTokenEncryptionAesKey: test-edc-encryption-key
+
+  postgresql:
+    nameOverride: edc-test2-postgresql
+    primary:
+      persistence:
+        enabled: false
+        size: 1Gi
+    auth:
+      database: edc
+      username: testuser
+      postgresPassword: testpass
+      password: testpass
+    username: testuser
+    password: testpass
+    jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-edc-test2-postgresql:5432/edc"