From f00ec038ecf40f3fd92ec00001dd5b2590ee0b41 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Mon, 8 Apr 2024 15:30:12 +0200 Subject: [PATCH 1/4] chore(charts):[#358] Update EDC to 0.7.0-rc1 --- charts/connector/edc-provider/Chart.yaml | 2 +- .../connector/edc-provider/values-dev-1.yaml | 19 ++-- .../connector/edc-provider/values-dev-2.yaml | 19 ++-- .../connector/edc-provider/values-dev-3.yaml | 19 ++-- charts/connector/edc-provider/values-ess.yaml | 19 ++-- charts/connector/edc-provider/values.yaml | 99 ++++++------------- charts/irs-environments/dev/Chart.yaml | 2 +- charts/irs-environments/dev/values.yaml | 61 +++++------- charts/irs-environments/int/Chart.yaml | 2 +- charts/irs-environments/int/values.yaml | 52 ++++------ charts/irs-environments/pen/Chart.yaml | 2 +- charts/irs-environments/pen/values.yaml | 53 +++++----- 12 files changed, 141 insertions(+), 208 deletions(-) diff --git a/charts/connector/edc-provider/Chart.yaml b/charts/connector/edc-provider/Chart.yaml index 9a706e5f25..b94202690f 100644 --- a/charts/connector/edc-provider/Chart.yaml +++ b/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-rc1 - 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 d05000412c..cbb88aabae 100644 --- a/charts/connector/edc-provider/values-dev-1.yaml +++ b/charts/connector/edc-provider/values-dev-1.yaml @@ -1,12 +1,12 @@ tractusx-connector: - - controlplane: - # SSI configuration - ssi: + iatp: + sts: oauth: client: id: - 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 diff --git a/charts/connector/edc-provider/values-dev-2.yaml b/charts/connector/edc-provider/values-dev-2.yaml index 24698de704..216a017cbc 100644 --- a/charts/connector/edc-provider/values-dev-2.yaml +++ b/charts/connector/edc-provider/values-dev-2.yaml @@ -1,12 +1,12 @@ tractusx-connector: - - controlplane: - # SSI configuration - ssi: + iatp: + sts: oauth: client: id: - 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 diff --git a/charts/connector/edc-provider/values-dev-3.yaml b/charts/connector/edc-provider/values-dev-3.yaml index d533f4825f..01a66d811c 100644 --- a/charts/connector/edc-provider/values-dev-3.yaml +++ b/charts/connector/edc-provider/values-dev-3.yaml @@ -1,12 +1,12 @@ tractusx-connector: - - controlplane: - # SSI configuration - ssi: + iatp: + sts: oauth: client: id: - 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 diff --git a/charts/connector/edc-provider/values-ess.yaml b/charts/connector/edc-provider/values-ess.yaml index ff83dd6d06..84b8e73d5a 100644 --- a/charts/connector/edc-provider/values-ess.yaml +++ b/charts/connector/edc-provider/values-ess.yaml @@ -1,12 +1,12 @@ tractusx-connector: - - controlplane: - # SSI configuration - ssi: + iatp: + sts: oauth: client: id: - 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: diff --git a/charts/connector/edc-provider/values.yaml b/charts/connector/edc-provider/values.yaml index b224c147ad..1118e0dd0f 100644 --- a/charts/connector/edc-provider/values.yaml +++ b/charts/connector/edc-provider/values.yaml @@ -5,62 +5,32 @@ tractusx-connector: participant: id: - controlplane: - # SSI configuration - ssi: - miw: - url: - authorityId: + iatp: + # Decentralized IDentifier + id: + sts: + dim: + url: oauth: tokenurl: client: id: - secretAlias: edc-test-miw-keycloak-secret + secret_alias: edc-test-miw-keycloak-secret + + controlplane: ingresses: - enabled: false + 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: + endpoints: - # -- default api for health checks, should not be added to any ingress - default: - port: 8080 - path: /api - # -- data management api, used by internal users, can be added to an ingress and must not be internet facing management: - port: 8081 - path: /management - # -- authentication key, must be attached to each 'X-Api-Key' request header authKey: - # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not - control: - port: 8083 - path: /control - # -- ids api, used for inter connector communication and must be internet facing - protocol: - port: 8084 - path: /api/v1/dsp - # -- metrics api, used for application metrics, must not be internet facing - metrics: - port: 9090 - path: /metrics - # -- observability api with unsecured access, must not be internet facing - observability: - port: 8085 - # -- observability api, provides /health /readiness and /liveness endpoints - path: /observability - # -- allow or disallow insecure access, i.e. access without authentication - insecure: true - - internationalDataSpaces: - id: TXDC - description: Tractus-X Eclipse IDS Data Space Connector - title: "" - maintainer: "" - curator: "" - catalogId: TXDC-Catalog - - # Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - 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: @@ -78,27 +48,18 @@ tractusx-connector: ingresses: - enabled: false - endpoints: - default: - port: 8080 - path: /api - public: - port: 8081 - path: /api/public - control: - port: 8083 - path: /api/dataplane/control - observability: - port: 8085 - path: /observability - insecure: true - metrics: - port: 9090 - path: /metrics - - # Explicitly declared url for reaching the public api (e.g. if ingresses not used) - url: - public: "" + 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: resources: limits: @@ -108,10 +69,6 @@ tractusx-connector: cpu: 200m memory: 512Mi - # URL where the EndpointDataReference callback will be sent to - backendService: - httpProxyTokenReceiverUrl: "" - ################################ # EDC Vault/DAPS Configuration # ################################ diff --git a/charts/irs-environments/dev/Chart.yaml b/charts/irs-environments/dev/Chart.yaml index 5b8a2113c8..9c49976069 100644 --- a/charts/irs-environments/dev/Chart.yaml +++ b/charts/irs-environments/dev/Chart.yaml @@ -22,7 +22,7 @@ dependencies: version: 6.16.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc - version: 0.5.3 + version: 0.7.0-rc1 - 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 31c7a6fec8..0a83c61919 100644 --- a/charts/irs-environments/dev/values.yaml +++ b/charts/irs-environments/dev/values.yaml @@ -134,17 +134,18 @@ tractusx-connector: participant: id: - controlplane: - # SSI configuration - ssi: - miw: - url: - authorityId: + iatp: + id: + sts: + dim: + url: oauth: tokenurl: client: id: - secretAlias: miw-dev-keycloak-secret + secret_alias: miw-dev-keycloak-secret + + controlplane: ingresses: - enabled: true hostname: "irs-consumer-controlplane.dev.demo.catena-x.net" @@ -159,29 +160,16 @@ tractusx-connector: enabled: true secretName: tls-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: + endpoints: - # -- data management api, used by internal users, can be added to an ingress and must not be internet facing management: - port: 8081 - path: /management 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 - path: /api/v1/dsp - # -- observability api with unsecured access, must not be internet facing - observability: - port: 8085 - path: /observability # -- observability api, provides /health /readiness and /liveness endpoints - insecure: true # -- allow or disallow insecure access, i.e. access without authentication - - internationalDataSpaces: - id: TXDC - description: Tractus-X Eclipse IDS Data Space Connector - title: "" - maintainer: "" - curator: "" - catalogId: TXDC-Catalog resources: limits: @@ -206,14 +194,13 @@ tractusx-connector: enabled: true secretName: tls-secret - endpoints: - public: - port: 8081 - path: /api/public - observability: - port: 8085 - path: /observability - insecure: true + token: + signer: + # alias under which the private key is stored in the vault (JWK or PEM format) + privatekey_alias: irs-dev-daps-cert-consumer-key + 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: irs-dev-daps-cert-consumer resources: limits: @@ -223,10 +210,6 @@ tractusx-connector: cpu: 100m memory: 512Mi - # URL where the EndpointDataReference callback will be sent to - backendService: - httpProxyTokenReceiverUrl: "http://irs-dev-irs-helm:8181/internal/endpoint-data-reference" - ################################ # EDC Vault/DAPS Configuration # ################################ diff --git a/charts/irs-environments/int/Chart.yaml b/charts/irs-environments/int/Chart.yaml index d4962f1291..fcfa51708f 100644 --- a/charts/irs-environments/int/Chart.yaml +++ b/charts/irs-environments/int/Chart.yaml @@ -22,7 +22,7 @@ dependencies: version: 6.16.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc - version: 0.5.3 + version: 0.7.0-rc1 - condition: postgresql.enabled alias: edc-postgresql name: postgresql diff --git a/charts/irs-environments/int/values.yaml b/charts/irs-environments/int/values.yaml index 8f7d13ec98..12d7a956ac 100644 --- a/charts/irs-environments/int/values.yaml +++ b/charts/irs-environments/int/values.yaml @@ -108,22 +108,21 @@ irs-helm: tractusx-connector: install: postgresql: false - daps: false vault: false participant: id: - controlplane: - # SSI configuration - ssi: - miw: - url: - authorityId: + iatp: + id: + sts: + dim: + url: oauth: tokenurl: client: id: - secretAlias: miw-int-keycloak-secret + secret_alias: miw-int-keycloak-secret + controlplane: ingresses: - enabled: true hostname: "irs-consumer-controlplane.int.demo.catena-x.net" @@ -138,24 +137,16 @@ tractusx-connector: enabled: true secretName: tls-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: + endpoints: - # -- data management api, used by internal users, can be added to an ingress and must not be internet facing management: - port: 8081 - path: /management 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 - path: /api/v1/dsp - - internationalDataSpaces: - id: TXDC - description: Tractus-X Eclipse IDS Data Space Connector - title: "IRS INT Consumer EDC" - maintainer: "" - curator: "" - catalogId: TXDC-Catalog resources: limits: @@ -187,10 +178,13 @@ tractusx-connector: enabled: true secretName: tls-secret - endpoints: - public: - port: 8081 - path: /api/public + token: + signer: + # alias under which the private key is stored in the vault (JWK or PEM format) + privatekey_alias: irs-int-daps-key + 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: irs-int-daps-cert resources: limits: @@ -200,10 +194,6 @@ tractusx-connector: cpu: 200m memory: 512Mi - # URL where the EndpointDataReference callback will be sent to - backendService: - httpProxyTokenReceiverUrl: "http://app-irs-int-irs-helm:8181/internal/endpoint-data-reference" - ################################ # EDC Vault/DAPS Configuration # ################################ diff --git a/charts/irs-environments/pen/Chart.yaml b/charts/irs-environments/pen/Chart.yaml index 89de53d398..badcb04174 100644 --- a/charts/irs-environments/pen/Chart.yaml +++ b/charts/irs-environments/pen/Chart.yaml @@ -22,7 +22,7 @@ dependencies: version: 6.16.0 - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc - version: 0.5.3 + version: 0.7.0-rc1 - condition: postgresql.enabled alias: edc-postgresql name: postgresql diff --git a/charts/irs-environments/pen/values.yaml b/charts/irs-environments/pen/values.yaml index 85fbd48369..356683306c 100644 --- a/charts/irs-environments/pen/values.yaml +++ b/charts/irs-environments/pen/values.yaml @@ -76,22 +76,22 @@ irs-helm: tractusx-connector: install: postgresql: false - daps: false vault: false participant: id: - controlplane: - # SSI configuration - ssi: - miw: - url: - authorityId: + iatp: + id: + sts: + dim: + url: oauth: tokenurl: client: id: - secretAlias: miw-pen-keycloak-secret + secret_alias: miw-pen-keycloak-secret + + controlplane: ingresses: - enabled: true hostname: "irs-consumer-controlplane-pen.int.demo.catena-x.net" @@ -106,24 +106,16 @@ tractusx-connector: enabled: true secretName: tls-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: + endpoints: - # -- data management api, used by internal users, can be added to an ingress and must not be internet facing management: - port: 8081 - path: /management 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 - path: /api/v1/dsp - - internationalDataSpaces: - id: TXDC - description: Tractus-X Eclipse IDS Data Space Connector - title: "IRS PEN Consumer EDC" - maintainer: "" - curator: "" - catalogId: TXDC-Catalog resources: limits: @@ -148,10 +140,13 @@ tractusx-connector: enabled: true secretName: tls-secret - endpoints: - public: - port: 8081 - path: /api/public + token: + signer: + # alias under which the private key is stored in the vault (JWK or PEM format) + privatekey_alias: irs-int-daps-key + 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: irs-int-daps-cert resources: limits: @@ -161,10 +156,6 @@ tractusx-connector: cpu: 200m memory: 512Mi - # URL where the EndpointDataReference callback will be sent to - backendService: - httpProxyTokenReceiverUrl: "http://app-irs-pen-irs-helm:8181/internal/endpoint-data-reference" - ################################ # EDC Vault/DAPS Configuration # ################################ From 244918bf6cbd6f37c6249a0681dfdfd115e3fa13 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Fri, 19 Apr 2024 09:32:50 +0200 Subject: [PATCH 2/4] chore(charts): Add Chart for Vault --- charts/connector/vault/.helmignore | 23 +++++++++++++++++++++++ charts/connector/vault/Chart.yaml | 29 +++++++++++++++++++++++++++++ charts/connector/vault/values.yaml | 16 ++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 charts/connector/vault/.helmignore create mode 100644 charts/connector/vault/Chart.yaml create mode 100644 charts/connector/vault/values.yaml diff --git a/charts/connector/vault/.helmignore b/charts/connector/vault/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/charts/connector/vault/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/connector/vault/Chart.yaml b/charts/connector/vault/Chart.yaml new file mode 100644 index 0000000000..45af65d84c --- /dev/null +++ b/charts/connector/vault/Chart.yaml @@ -0,0 +1,29 @@ +apiVersion: v2 +name: vault +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# 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: "1.16.0" + +dependencies: + - name: vault + version: 0.20.0 + repository: https://helm.releases.hashicorp.com \ No newline at end of file diff --git a/charts/connector/vault/values.yaml b/charts/connector/vault/values.yaml new file mode 100644 index 0000000000..b5621ec3d7 --- /dev/null +++ b/charts/connector/vault/values.yaml @@ -0,0 +1,16 @@ +vault: + injector: + enabled: false + server: + dev: + enabled: true + devRootToken: "" + ingress: + enabled: true + hosts: + - host: irs-vault.dev.demo.catena-x.net + paths: [ ] + tls: + - secretName: tls-secret + hosts: + - irs-vault.dev.demo.catena-x.net \ No newline at end of file From 1507b7fa09c6a2b78838ba4e7ecde31e421abbd8 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Fri, 19 Apr 2024 10:30:26 +0200 Subject: [PATCH 3/4] chore(charts): Add test values --- .../connector/edc-provider/values-test1.yaml | 72 +++++++++++++++++++ .../connector/edc-provider/values-test2.yaml | 72 +++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 charts/connector/edc-provider/values-test1.yaml create mode 100644 charts/connector/edc-provider/values-test2.yaml diff --git a/charts/connector/edc-provider/values-test1.yaml b/charts/connector/edc-provider/values-test1.yaml new file mode 100644 index 0000000000..2b6a916acf --- /dev/null +++ b/charts/connector/edc-provider/values-test1.yaml @@ -0,0 +1,72 @@ +tractusx-connector: + install: + postgresql: true + vault: false + + iatp: + sts: + oauth: + client: + id: + 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: "" + 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" diff --git a/charts/connector/edc-provider/values-test2.yaml b/charts/connector/edc-provider/values-test2.yaml new file mode 100644 index 0000000000..033a880a69 --- /dev/null +++ b/charts/connector/edc-provider/values-test2.yaml @@ -0,0 +1,72 @@ +tractusx-connector: + install: + postgresql: true + vault: false + + iatp: + sts: + oauth: + client: + id: + 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: "" + 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" From 7a28a01f741affb50465bea5f99f928da9b8be6e Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Fri, 19 Apr 2024 12:34:50 +0200 Subject: [PATCH 4/4] chore(charts): Add test values --- charts/connector/edc-provider/Chart.yaml | 2 +- charts/connector/edc-provider/values-test1.yaml | 2 ++ charts/connector/edc-provider/values-test2.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/connector/edc-provider/Chart.yaml b/charts/connector/edc-provider/Chart.yaml index b94202690f..bcc7d0fa9a 100644 --- a/charts/connector/edc-provider/Chart.yaml +++ b/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.7.0-rc1 + version: 0.7.0 - condition: postgresql.enabled alias: edc-postgresql name: postgresql diff --git a/charts/connector/edc-provider/values-test1.yaml b/charts/connector/edc-provider/values-test1.yaml index 2b6a916acf..8175c3de27 100644 --- a/charts/connector/edc-provider/values-test1.yaml +++ b/charts/connector/edc-provider/values-test1.yaml @@ -1,3 +1,5 @@ +postgresql: + enabled: false tractusx-connector: install: postgresql: true diff --git a/charts/connector/edc-provider/values-test2.yaml b/charts/connector/edc-provider/values-test2.yaml index 033a880a69..c538b78ae7 100644 --- a/charts/connector/edc-provider/values-test2.yaml +++ b/charts/connector/edc-provider/values-test2.yaml @@ -1,3 +1,5 @@ +postgresql: + enabled: false tractusx-connector: install: postgresql: true