diff --git a/charts/connector/edc-provider/Chart.yaml b/charts/connector/edc-provider/Chart.yaml index d8ee662e74..ecfa5d8b57 100644 --- a/charts/connector/edc-provider/Chart.yaml +++ b/charts/connector/edc-provider/Chart.yaml @@ -20,12 +20,12 @@ version: 2.0.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.4.1" +appVersion: "0.5.0" dependencies: - name: tractusx-connector - repository: https://eclipse-tractusx.github.io/charts/dev - version: 0.4.1 + repository: https://eclipse-tractusx.github.io/tractusx-edc + version: 0.5.0 - condition: postgresql.enabled alias: edc-postgresql name: postgresql diff --git a/charts/connector/edc-provider/values-dev-1.yaml b/charts/connector/edc-provider/values-dev-1.yaml index b6592752bc..10ec6c4046 100644 --- a/charts/connector/edc-provider/values-dev-1.yaml +++ b/charts/connector/edc-provider/values-dev-1.yaml @@ -1,6 +1,4 @@ tractusx-connector: - participant: - id: BPNL00000003CRHK controlplane: ingresses: @@ -40,11 +38,6 @@ tractusx-connector: transferProxyTokenSignerPrivateKey: irs-dev-daps-cert-provider-key transferProxyTokenSignerPublicKey: irs-dev-daps-cert-provider transferProxyTokenEncryptionAesKey: test-edc-encryption-key - dapsPrivateKey: irs-dev-daps-cert-provider-key - dapsPublicKey: irs-dev-daps-cert-provider - - daps: - clientId: postgresql: jdbcUrl: "jdbc:postgresql://irs-provider-edc-postgresql-hl:5432/edc" diff --git a/charts/connector/edc-provider/values-dev-2.yaml b/charts/connector/edc-provider/values-dev-2.yaml index 09ed38fe1e..17bd832e1a 100644 --- a/charts/connector/edc-provider/values-dev-2.yaml +++ b/charts/connector/edc-provider/values-dev-2.yaml @@ -1,6 +1,4 @@ tractusx-connector: - participant: - id: BPNL00000003CRHK controlplane: ingresses: @@ -40,11 +38,6 @@ tractusx-connector: transferProxyTokenSignerPrivateKey: dev-provider2-key transferProxyTokenSignerPublicKey: dev-provider2-cert transferProxyTokenEncryptionAesKey: test-edc-encryption-key - dapsPrivateKey: dev-provider2-key - dapsPublicKey: dev-provider2-cert - - daps: - clientId: postgresql: jdbcUrl: "jdbc:postgresql://irs-provider2-edc-postgresql-hl:5432/edc" diff --git a/charts/connector/edc-provider/values-dev-3.yaml b/charts/connector/edc-provider/values-dev-3.yaml index 6a03386d01..8c94a57cd7 100644 --- a/charts/connector/edc-provider/values-dev-3.yaml +++ b/charts/connector/edc-provider/values-dev-3.yaml @@ -1,6 +1,4 @@ tractusx-connector: - participant: - id: BPNL00000003CRHK controlplane: ingresses: @@ -40,11 +38,6 @@ tractusx-connector: transferProxyTokenSignerPrivateKey: dev-provider3-key transferProxyTokenSignerPublicKey: dev-provider3-cert transferProxyTokenEncryptionAesKey: test-edc-encryption-key - dapsPrivateKey: dev-provider3-key - dapsPublicKey: dev-provider3-cert - - daps: - clientId: postgresql: jdbcUrl: "jdbc:postgresql://irs-provider3-edc-postgresql-hl:5432/edc" diff --git a/charts/connector/edc-provider/values-dev-test-provider.yaml b/charts/connector/edc-provider/values-dev-test-provider.yaml new file mode 100644 index 0000000000..9d2cc1640c --- /dev/null +++ b/charts/connector/edc-provider/values-dev-test-provider.yaml @@ -0,0 +1,49 @@ +tractusx-connector: + participant: + id: + + controlplane: + ingresses: + - enabled: true + hostname: "irs-provider-controlplane-test.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: + ingresses: + - enabled: true + hostname: "irs-provider-dataplane-test.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 + + backendService: + httpProxyTokenReceiverUrl: "https://irs-submodel-server.dev.demo.catena-x.net/data/endpoint-data-reference-provider-test" + + vault: + hashicorp: + healthCheck: + enabled: false + standbyOk: false + secretNames: + transferProxyTokenSignerPrivateKey: dev-provider3-key + transferProxyTokenSignerPublicKey: dev-provider3-cert + transferProxyTokenEncryptionAesKey: test-edc-encryption-key + + postgresql: + jdbcUrl: "jdbc:postgresql://irs-provider-test-edc-postgresql-hl:5432/edc" diff --git a/charts/connector/edc-provider/values-dev-test.yaml b/charts/connector/edc-provider/values-dev-test.yaml new file mode 100644 index 0000000000..9ffe1e3c37 --- /dev/null +++ b/charts/connector/edc-provider/values-dev-test.yaml @@ -0,0 +1,49 @@ +tractusx-connector: + participant: + id: + + controlplane: + ingresses: + - enabled: true + hostname: "irs-consumer-controlplane-test.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: + ingresses: + - enabled: true + hostname: "irs-consumer-dataplane-test.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 + + backendService: + httpProxyTokenReceiverUrl: "https://irs-submodel-server.dev.demo.catena-x.net/data/endpoint-data-reference-consumer-test" + + vault: + hashicorp: + healthCheck: + enabled: false + standbyOk: false + secretNames: + transferProxyTokenSignerPrivateKey: dev-provider3-key + transferProxyTokenSignerPublicKey: dev-provider3-cert + transferProxyTokenEncryptionAesKey: test-edc-encryption-key + + postgresql: + jdbcUrl: "jdbc:postgresql://irs-consumer-test-edc-postgresql-hl:5432/edc" diff --git a/charts/connector/edc-provider/values.yaml b/charts/connector/edc-provider/values.yaml index cd89e573ae..594a4445ff 100644 --- a/charts/connector/edc-provider/values.yaml +++ b/charts/connector/edc-provider/values.yaml @@ -1,12 +1,21 @@ tractusx-connector: install: postgresql: false - daps: false vault: false participant: - id: BPNL00000003CRHK + id: controlplane: + # SSI configuration + ssi: + miw: + url: + authorityId: + oauth: + tokenurl: + client: + id: + secretAlias: edc-test-miw-keycloak-secret ingresses: - enabled: false @@ -20,7 +29,7 @@ tractusx-connector: port: 8081 path: /management # -- authentication key, must be attached to each 'X-Api-Key' request header - authKey: "123456" + authKey: # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not control: port: 8083 @@ -53,6 +62,10 @@ tractusx-connector: url: ids: "" + # Files system has to be set to writeable for now since controlplane relies on temporary files to write SSI related things to + securityContext: + readOnlyRootFilesystem: false + resources: limits: cpu: 1 @@ -90,10 +103,10 @@ tractusx-connector: resources: limits: cpu: 500m - memory: 1Gi + memory: 512Mi requests: cpu: 500m - memory: 1Gi + memory: 512Mi # URL where the EndpointDataReference callback will be sent to backendService: @@ -117,15 +130,6 @@ tractusx-connector: transferProxyTokenSignerPrivateKey: transferProxyTokenSignerPublicKey: transferProxyTokenEncryptionAesKey: - dapsPrivateKey: - dapsPublicKey: - - daps: - url: "https://daps-irs.dev.demo.catena-x.net" - clientId: "" - paths: - jwks: /.well-known/jwks.json - token: /token ################################## # EDC Postgres Configuration # diff --git a/charts/irs-environments/dev/Chart.yaml b/charts/irs-environments/dev/Chart.yaml index 92e8acf247..7306947aa6 100644 --- a/charts/irs-environments/dev/Chart.yaml +++ b/charts/irs-environments/dev/Chart.yaml @@ -21,8 +21,8 @@ dependencies: repository: https://catenax-ng.github.io/tx-item-relationship-service version: 6.0.1 - name: tractusx-connector - repository: https://eclipse-tractusx.github.io/charts/dev - version: 0.4.1 + repository: https://eclipse-tractusx.github.io/tractusx-edc + version: 0.5.0 - condition: postgresql.enabled alias: edc-postgresql name: postgresql diff --git a/charts/irs-environments/dev/values.yaml b/charts/irs-environments/dev/values.yaml index 1e80a553c0..5248a0da92 100644 --- a/charts/irs-environments/dev/values.yaml +++ b/charts/irs-environments/dev/values.yaml @@ -76,16 +76,24 @@ irs-helm: enabled: true - tractusx-connector: install: postgresql: false - daps: false vault: false participant: - id: BPNL00000003CRHK + id: controlplane: + # SSI configuration + ssi: + miw: + url: + authorityId: + oauth: + tokenurl: + client: + id: + secretAlias: edc-test-miw-keycloak-secret ingresses: - enabled: true hostname: "irs-consumer-controlplane.dev.demo.catena-x.net" @@ -105,7 +113,7 @@ tractusx-connector: management: port: 8081 path: /management - authKey: "123456" # -- authentication key, must be attached to each 'X-Api-Key' request header + authKey: # -- authentication key, must be attached to each 'X-Api-Key' request header # -- protocol api, used for inter connector communication and must be internet facing protocol: port: 8084 @@ -124,18 +132,18 @@ tractusx-connector: curator: "" catalogId: TXDC-Catalog - # Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - url: - ids: "" - resources: limits: - cpu: 500m + cpu: 1.5 memory: 2Gi requests: cpu: 500m memory: 2Gi + # Files system has to be set to writeable for now since controlplane relies on temporary files to write SSI related things to + securityContext: + readOnlyRootFilesystem: false + dataplane: ingresses: - enabled: true @@ -163,10 +171,10 @@ tractusx-connector: resources: limits: cpu: 500m - memory: 1Gi + memory: 512Mi requests: cpu: 500m - memory: 1Gi + memory: 512Mi # URL where the EndpointDataReference callback will be sent to backendService: @@ -190,15 +198,6 @@ tractusx-connector: transferProxyTokenSignerPrivateKey: irs-dev-daps-cert-consumer-key transferProxyTokenSignerPublicKey: irs-dev-daps-cert-consumer transferProxyTokenEncryptionAesKey: test-edc-encryption-key - dapsPrivateKey: irs-dev-daps-cert-consumer-key - dapsPublicKey: irs-dev-daps-cert-consumer - - daps: - url: "https://daps-irs.dev.demo.catena-x.net" - clientId: - paths: - jwks: /.well-known/jwks.json - token: /token ################################## # EDC Postgres Configuration #