chore: add dataconsumerTwo

disabled by default

charts/umbrella/Chart.yaml

@@ -65,14 +65,20 @@ dependencies:
     repository: https://eclipse-tractusx.github.io/charts/dev
     version: 0.4.0
     condition: managed-identity-wallet.enabled
-    # TX Data Consumer
+    # TX Data Consumer 1
   - name: tx-data-provider
-    alias: dataconsumer
-    version: 0.0.2
+    alias: dataconsumerOne
+    version: 0.0.3
     repository: https://eclipse-tractusx.github.io/charts/dev
-    condition: dataconsumer.enabled
+    condition: dataconsumerOne.enabled
     # TX Data Providers
   - name: tx-data-provider
-    version: 0.0.2
+    version: 0.0.3
     repository: https://eclipse-tractusx.github.io/charts/dev
     condition: tx-data-provider.enabled
+    # TX Data Consumer 2
+  - name: tx-data-provider
+    alias: dataconsumerTwo
+    version: 0.0.3
+    repository: https://eclipse-tractusx.github.io/charts/dev
+    condition: dataconsumerTwo.enabled

charts/umbrella/README.md

@@ -176,8 +176,9 @@ The currently available components are following:
 - [discoveryfinder](https://github.com/eclipse-tractusx/sldt-discovery-finder/tree/discoveryfinder-0.2.2)
 - [sdfactory](https://github.com/eclipse-tractusx/sd-factory/tree/sdfactory-2.1.12)
 - [managed-identity-wallet](https://github.com/eclipse-tractusx/managed-identity-wallet/tree/v0.4.0)
-- [dataconsumer](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/tx-data-provider) ([tractusx-edc](https://github.com/eclipse-tractusx/tractusx-edc/tree/0.5.3), [vault](https://github.com/hashicorp/vault-helm/tree/v0.20.0))
+- [dataconsumerOne](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/tx-data-provider) ([tractusx-edc](https://github.com/eclipse-tractusx/tractusx-edc/tree/0.5.3), [vault](https://github.com/hashicorp/vault-helm/tree/v0.20.0))
 - [tx-data-provider](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/tx-data-provider) ([tractusx-edc](https://github.com/eclipse-tractusx/tractusx-edc/tree/0.5.3), [digital-twin-registry](https://github.com/eclipse-tractusx/sldt-digital-twin-registry/tree/digital-twin-registry-0.4.5), [vault](https://github.com/hashicorp/vault-helm/tree/v0.20.0), [simple-data-backend](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/simple-data-backend))
+- [dataconsumerTwo](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/tx-data-provider) ([tractusx-edc](https://github.com/eclipse-tractusx/tractusx-edc/tree/0.5.3), [vault](https://github.com/hashicorp/vault-helm/tree/v0.20.0))
 
 > :warning:
 >
@@ -205,10 +206,19 @@ Or choose to install one of the predefined subsets (currently in focus of the **
 
 ```bash
 helm install \
-  --set centralidp.enabled=true,managed-identity-wallet.enabled=true,dataconsumer.enabled=true,tx-data-provider.enabled=true \
+  --set centralidp.enabled=true,managed-identity-wallet.enabled=true,dataconsumerOne.enabled=true,tx-data-provider.enabled=true \
   umbrella tractusx-dev/umbrella \
   --namespace umbrella
 ```
+Optional:
+
+Enable `dataconsumerTwo` at upgrade:
+
+```bash
+helm install \
+  --set centralidp.enabled=true,managed-identity-wallet.enabled=true,dataconsumerOne.enabled=true,tx-data-provider.enabled=true,dataconsumerTwo.enabled=true \
+  umbrella tractusx-dev/umbrella \
+  --namespace umbrella
 
 **Portal**
 
@@ -259,6 +269,19 @@ Or choose to install one of the predefined subsets (currently in focus of the **
 helm install -f values-adopter-data-exchange.yaml umbrella . --namespace umbrella
 ```
 
+Optional:
+
+Enable `dataconsumerTwo` by setting it true in `values-adopter-data-exchange.yaml` and then executing an upgrade:
+
+```bash
+dataconsumerTwo:
+  enabled: true
+```
+
+```bash
+helm upgrade -f values-adopter-data-exchange.yaml umbrella . --namespace umbrella
+```
+
 **Portal**
 
 ```bash

charts/umbrella/values-adopter-data-exchange.yaml

@@ -65,7 +65,7 @@ managed-identity-wallet:
   #     persistence:
   #       enabled: true
 
-dataconsumer:
+dataconsumerOne:
   enabled: true
   secrets:
     edc-miw-keycloak-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
@@ -86,7 +86,7 @@ dataconsumer:
           authKey: TEST1
       ingresses:
         - enabled: true
-          hostname: "dataconsumer-controlplane.tx.test"
+          hostname: "dataconsumer-1-controlplane.tx.test"
           endpoints:
             - default
             - protocol
@@ -96,7 +96,7 @@ dataconsumer:
     dataplane:
       ingresses:
         - enabled: true
-          hostname: "dataconsumer-dataplane.tx.test"
+          hostname: "dataconsumer-1-dataplane.tx.test"
           endpoints:
             - default
             - public
@@ -152,3 +152,46 @@ tx-data-provider:
   #     primary:
   #       persistence:
   #         enabled: true
+
+dataconsumerTwo:
+  enabled: false
+  secrets:
+    edc-miw-keycloak-secret: tPwy4exxH1sXBRQouobSA2nNVaaPuwCs
+  tractusx-connector:
+    participant:
+      id: BPNL00000003AVTH
+    controlplane:
+      ssi:
+        miw:
+          url: http://managed-identity-wallets.tx.test
+          authorityId: BPNL00000003CRHK
+        oauth:
+          tokenurl: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest03
+      endpoints:
+        management:
+          authKey: TEST3
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-controlplane.tx.test"
+          endpoints:
+            - default
+            - protocol
+            - management
+          tls:
+            enabled: false
+    dataplane:
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-dataplane.tx.test"
+          endpoints:
+            - default
+            - public
+          tls:
+            enabled: false
+    # -- uncomment the following for persistance
+    # postgresql:
+    #   primary:
+    #     persistence:
+    #       enabled: true

charts/umbrella/values.yaml

@@ -619,14 +619,14 @@ managed-identity-wallet:
       nginx.ingress.kubernetes.io/cors-allow-methods: GET
       nginx.ingress.kubernetes.io/enable-cors: "true"
 
-dataconsumer:
+dataconsumerOne:
   enabled: false
   seedTestdata: false
-  nameOverride: dataconsumer
+  nameOverride: dataconsumer-1
   secrets:
     edc-miw-keycloak-secret: changeme  # TODO switch to existing user
   tractusx-connector:
-    nameOverride: dataconsumer-edc
+    nameOverride: dataconsumer-1-edc
     participant:
       id: BPNL000000000000
     controlplane:
@@ -644,7 +644,7 @@ dataconsumer:
           authKey: TEST1
       ingresses:
         - enabled: true
-          hostname: "dataconsumer-controlplane.tx.test"
+          hostname: "dataconsumer-1-controlplane.tx.test"
           endpoints:
             - default
             - protocol
@@ -655,27 +655,27 @@ dataconsumer:
     dataplane:
       ingresses:
         - enabled: true
-          hostname: "dataconsumer-dataplane.tx.test"
+          hostname: "dataconsumer-1-dataplane.tx.test"
           endpoints:
             - default
             - public
           className: "nginx"
           tls:
             enabled: false
     postgresql:
-      nameOverride: dataconsumer-db
-      jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-dataconsumer-db:5432/edc"
+      nameOverride: dataconsumer-1-db
+      jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-dataconsumer-1-db:5432/edc"
     vault:
       hashicorp:
-        url: http://edc-dataconsumer-vault:8200
+        url: http://edc-dataconsumer-1-vault:8200
       secretNames:
         transferProxyTokenSignerPrivateKey: tokenSignerPrivateKey
         transferProxyTokenSignerPublicKey: tokenSignerPublicKey
         transferProxyTokenEncryptionAesKey: tokenEncryptionAesKey
 
   vault:
-    nameOverride: edc-dataconsumer-vault
-    fullnameOverride: edc-dataconsumer-vault
+    nameOverride: edc-dataconsumer-1-vault
+    fullnameOverride: edc-dataconsumer-1-vault
     enabled: true
     server:
       postStart: []
@@ -766,3 +766,70 @@ tx-data-provider:
     nameOverride: dataprovider-submodelserver
     ingress:
       enabled: false
+
+dataconsumerTwo:
+  enabled: false
+  seedTestdata: false
+  nameOverride: dataconsumer-2
+  secrets:
+    edc-miw-keycloak-secret: changeme  # TODO switch to existing user
+  tractusx-connector:
+    nameOverride: dataconsumer-2-edc
+    participant:
+      id: BPNL000000000000
+    controlplane:
+      ssi:
+        miw:
+          url: http://managed-identity-wallets.tx.test
+          authorityId: BPNL00000003CRHK
+        oauth:
+          tokenurl: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: *miw_client
+            secretAlias: edc-miw-keycloak-secret
+      endpoints:
+        management:
+          authKey: TEST1
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-controlplane.tx.test"
+          endpoints:
+            - default
+            - protocol
+            - management
+          className: "nginx"
+          tls:
+            enabled: false
+    dataplane:
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-dataplane.tx.test"
+          endpoints:
+            - default
+            - public
+          className: "nginx"
+          tls:
+            enabled: false
+    postgresql:
+      nameOverride: dataconsumer-2-db
+      jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-dataconsumer-2-db:5432/edc"
+    vault:
+      hashicorp:
+        url: http://edc-dataconsumer-2-vault:8200
+      secretNames:
+        transferProxyTokenSignerPrivateKey: tokenSignerPrivateKey
+        transferProxyTokenSignerPublicKey: tokenSignerPublicKey
+        transferProxyTokenEncryptionAesKey: tokenEncryptionAesKey
+
+  vault:
+    nameOverride: edc-dataconsumer-2-vault
+    fullnameOverride: edc-dataconsumer-2-vault
+    enabled: true
+    server:
+      postStart: []
+
+  digital-twin-registry:
+    enabled: false
+
+  simple-data-backend:
+    enabled: false