Skip to content

Commit

Permalink
feat: upgrade keycloak instances, portal and issuer to R24.12
Browse files Browse the repository at this point in the history
as well as update and fix documentation
#186
#185
#187
  • Loading branch information
evegufy committed Jan 16, 2025
1 parent 7653fa0 commit 1b5d583
Show file tree
Hide file tree
Showing 7 changed files with 3,045 additions and 2,898 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ After the installation, you can refer to the [user guides and tutorials sections

The versions of the [integrated components](/docs/user/installation/README.md#available-components) correspond to the **overarching [Release 24.08](https://github.com/eclipse-tractusx/tractus-x-release/blob/24.08/CHANGELOG.md#2408---2024-08-05)**.

Be aware that the **upgrade to the overarching [Release 24.12](https://github.com/eclipse-tractusx/tractus-x-release/blob/24.12/CHANGELOG.md#2412---2024-12-02) is in progress** and some components have already been upgraded.

## Purpose

The Umbrella Chart is intended for:
Expand Down
10 changes: 5 additions & 5 deletions charts/umbrella/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ sources:
- https://github.com/eclipse-tractusx/tractus-x-umbrella

type: application
version: 2.0.13
version: 2.1.0

# when adding or updating versions of dependencies, also update list under /docs/user/installation/README.md
dependencies:
# portal
- condition: portal.enabled
name: portal
repository: https://eclipse-tractusx.github.io/charts/dev
version: 2.2.0
version: 2.3.0
# cx-iam
- condition: centralidp.enabled
name: centralidp
repository: https://eclipse-tractusx.github.io/charts/dev
version: 4.0.0-alpha.2
version: 4.0.1
- condition: sharedidp.enabled
name: sharedidp
repository: https://eclipse-tractusx.github.io/charts/dev
version: 4.0.0-alpha.1
version: 4.0.1
# discovery-finder
- condition: discoveryfinder.enabled
name: discoveryfinder
Expand All @@ -66,7 +66,7 @@ dependencies:
- name: ssi-credential-issuer
condition: ssi-credential-issuer.enabled
repository: https://eclipse-tractusx.github.io/charts/dev
version: 1.1.0
version: 1.2.0
# semantic-hub
- condition: semantic-hub.enabled
name: semantic-hub
Expand Down
156 changes: 78 additions & 78 deletions charts/umbrella/templates/configmap-portal-testdata-seeding.yaml

Large diffs are not rendered by default.

180 changes: 91 additions & 89 deletions charts/umbrella/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ portal:
dimWrapper:
baseAddress: "http://ssi-dim-wallet-stub.tx.test"
apiPath: "/api/dim"
tokenAddress: "http://someiam.tx.test/realms/example/protocol/openid-connect/token"
decentralIdentityManagementAuthAddress: "http://ssi-dim-wallet-stub.tx.test/api/sts"
sdfactoryAddress: "http://sdfactory.tx.test"
clearinghouseAddress: "http://validation.tx.test"
clearinghouseTokenAddress: "http://keycloak.tx.test/realms/example/protocol/openid-connect/token"
clearinghouseTokenAddress: "http://someiam.tx.test/realms/example/protocol/openid-connect/token"
issuerComponentAddress: "http://ssi-credential-issuer.tx.test"
frontend:
ingress:
Expand Down Expand Up @@ -208,91 +209,92 @@ portal:
password: ""
portalmigrations:
seeding:
testData:
seedTestData:
enabled: true
configMap: "portal-testdata"
filename: "test"
companies:
# BPN is retrieved from participant id of the dataconsumerOne
dataconsumerOne:
name: "BPN_OEM_C"
connectorUrl: "http://dataconsumer-1-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM C Connector"
# BPN is retrieved from participant id of the tx-data-provider
tx-data-provider:
name: "BPN_OEM_A"
connectorUrl: "http://dataprovider-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM A Connector"
# BPN is retrieved from participant id of the dataconsumerTwo
dataconsumerTwo:
name: "BPN_OEM_B"
connectorUrl: "http://dataconsumer-2-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM B Connector"
company4:
name: "BPN_IRS_TEST"
bpn: "BPNL00000003AWSS"
connectorUrl: "http://company4-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN IRS TEST Connector"
company5:
name: "BPN_N_TIER_A"
bpn: "BPNL00000003B0Q0"
connectorUrl: "http://company5-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN N TIER A Connector"
company6:
name: "BPN_TRACEX_A_SITE_A"
bpn: "BPNS0000000008ZZ"
connectorUrl: "http://company6-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX A SITE A Connector"
company7:
name: "BPN_TRACEX_B"
bpn: "BPNL00000003CNKC"
connectorUrl: "http://company7-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX B Connector"
company8:
name: "BPN_DISMANTLER"
bpn: "BPNL00000003B6LU"
connectorUrl: "http://company8-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN DISMANTLER Connector"
company9:
name: "BPN_TRACEX_A"
bpn: "BPNL00000003CML1"
connectorUrl: "http://company9-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX A Connector"
company10:
name: "BPN_TRACEX_B_SITE_A"
bpn: "BPNS00000008BDFH"
connectorUrl: "http://company10-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX B SITE A Connector"
company11:
name: "BPN_TIER_A"
bpn: "BPNL00000003B2OM"
connectorUrl: "http://company11-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER A Connector"
company12:
name: "BPN_TIER_C"
bpn: "BPNL00000003CSGV"
connectorUrl: "http://company12-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER C Connector"
company13:
name: "BPN_TIER_B"
bpn: "BPNL00000003B5MJ"
connectorUrl: "http://company13-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER B Connector"
company14:
name: "BPN_SUB_TIER_B"
bpn: "BPNL00000003AXS3"
connectorUrl: "http://company14-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER B Connector"
company15:
name: "BPN_SUB_TIER_A"
bpn: "BPNL00000003B3NX"
connectorUrl: "http://company15-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER A Connector"
company16:
name: "BPN_SUB_TIER_C"
bpn: "BPNL00000000BJTL"
connectorUrl: "http://company16-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER C Connector"
useOwnConfigMap:
configMap: "portal-testdata"
filename: "test"
companies:
# BPN is retrieved from participant id of the dataconsumerOne
dataconsumerOne:
name: "BPN_OEM_C"
connectorUrl: "http://dataconsumer-1-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM C Connector"
# BPN is retrieved from participant id of the tx-data-provider
tx-data-provider:
name: "BPN_OEM_A"
connectorUrl: "http://dataprovider-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM A Connector"
# BPN is retrieved from participant id of the dataconsumerTwo
dataconsumerTwo:
name: "BPN_OEM_B"
connectorUrl: "http://dataconsumer-2-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN OEM B Connector"
company4:
name: "BPN_IRS_TEST"
bpn: "BPNL00000003AWSS"
connectorUrl: "http://company4-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN IRS TEST Connector"
company5:
name: "BPN_N_TIER_A"
bpn: "BPNL00000003B0Q0"
connectorUrl: "http://company5-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN N TIER A Connector"
company6:
name: "BPN_TRACEX_A_SITE_A"
bpn: "BPNS0000000008ZZ"
connectorUrl: "http://company6-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX A SITE A Connector"
company7:
name: "BPN_TRACEX_B"
bpn: "BPNL00000003CNKC"
connectorUrl: "http://company7-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX B Connector"
company8:
name: "BPN_DISMANTLER"
bpn: "BPNL00000003B6LU"
connectorUrl: "http://company8-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN DISMANTLER Connector"
company9:
name: "BPN_TRACEX_A"
bpn: "BPNL00000003CML1"
connectorUrl: "http://company9-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX A Connector"
company10:
name: "BPN_TRACEX_B_SITE_A"
bpn: "BPNS00000008BDFH"
connectorUrl: "http://company10-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TRACEX B SITE A Connector"
company11:
name: "BPN_TIER_A"
bpn: "BPNL00000003B2OM"
connectorUrl: "http://company11-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER A Connector"
company12:
name: "BPN_TIER_C"
bpn: "BPNL00000003CSGV"
connectorUrl: "http://company12-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER C Connector"
company13:
name: "BPN_TIER_B"
bpn: "BPNL00000003B5MJ"
connectorUrl: "http://company13-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN TIER B Connector"
company14:
name: "BPN_SUB_TIER_B"
bpn: "BPNL00000003AXS3"
connectorUrl: "http://company14-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER B Connector"
company15:
name: "BPN_SUB_TIER_A"
bpn: "BPNL00000003B3NX"
connectorUrl: "http://company15-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER A Connector"
company16:
name: "BPN_SUB_TIER_C"
bpn: "BPNL00000000BJTL"
connectorUrl: "http://company16-controlplane.tx.test/api/v1/dsp"
connectorName: "BPN SUB TIER C Connector"
logging:
default: "Debug"
provisioning:
Expand Down Expand Up @@ -395,7 +397,7 @@ centralidp:
# uncomment the following line for tls
# initContainers:
# - name: init-certs
# image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1
# image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0
# imagePullPolicy: IfNotPresent
# command: ["/bin/bash"]
# args:
Expand Down Expand Up @@ -552,7 +554,7 @@ centralidp:
bpn: BPNL00000000BJTL
initContainer:
image:
name: docker.io/tractusx/umbrella-init-container:1.1.0-init
name: docker.io/tractusx/umbrella-init-container:2.0.0-init
pullPolicy: IfNotPresent

sharedidp:
Expand Down Expand Up @@ -589,7 +591,7 @@ sharedidp:
# uncomment the following line for tls
# initContainers:
# - name: init-certs
# image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1
# image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0
# imagePullPolicy: IfNotPresent
# command: ["/bin/bash"]
# args:
Expand Down Expand Up @@ -1390,7 +1392,7 @@ pgadmin4:
enabled: false
env:
email: [email protected]
password: tractusxpgdamin4
password: tractusxpgadmin4
persistentVolume:
enabled: false
ingress:
Expand Down
8 changes: 4 additions & 4 deletions docs/user/installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ This guide provides instructions to install the Umbrella Chart and its predefine

The currently available components are following:

- [portal](https://github.com/eclipse-tractusx/portal/tree/portal-2.0.0)
- [centralidp](https://github.com/eclipse-tractusx/portal-iam/tree/v4.0.0-alpha.2)
- [sharedidp](https://github.com/eclipse-tractusx/portal-iam/tree/v4.0.0-alpha.1)
- [portal](https://github.com/eclipse-tractusx/portal/tree/portal-2.3.0)
- [centralidp](https://github.com/eclipse-tractusx/portal-iam/tree/v4.0.1)
- [sharedidp](https://github.com/eclipse-tractusx/portal-iam/tree/v4.0.1)
- [bpndiscovery](https://github.com/eclipse-tractusx/sldt-bpn-discovery/tree/bpndiscovery-0.2.2)
- [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.21)
- [managed-identity-wallet](https://github.com/eclipse-tractusx/managed-identity-wallet/tree/v0.4.0)
- [semantic-hub](https://github.com/eclipse-tractusx/sldt-semantic-hub/tree/semantic-hub-0.2.2)
- [ssi credential issuer](https://github.com/eclipse-tractusx/ssi-credential-issuer/tree/v1.0.0)
- [ssi credential issuer](https://github.com/eclipse-tractusx/ssi-credential-issuer/tree/v1.2.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.7.1), [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.7.1), [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.7.1), [vault](https://github.com/hashicorp/vault-helm/tree/v0.20.0))
Expand Down
5 changes: 3 additions & 2 deletions docs/user/network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This guide provides instructions to configure the network setup required for running the Umbrella Chart in a Kubernetes cluster.

## Enable Ingress
## Enabled Ingresses

To enable ingress for local access, use the following command with Minikube:

Expand Down Expand Up @@ -48,9 +48,10 @@ The following ingresses are configured and available:
- [Business Partners Pool](http://business-partners.tx.test/pool)
- [Business Partners Orchestrator](http://business-partners.tx.test/orchestrator)
- [BDRS Server](http://bdrs-server.tx.test)
- [SSI Credential Issuer](http://ssi-credential-issuer.tx.test/api/issuer/swagger/index.html)
- [SSI DIM Wallet Stub](http://ssi-dim-wallet-stub.tx.test)
- [IATP Mock](http://iatpmock.tx.test)
- [pgAdmin4](http://pgadmin4.tx.test)
- [SSI DIM Wallet Stub](http://ssi-dim-wallet-stub.tx.test)

## DNS Resolution Setup

Expand Down
Loading

0 comments on commit 1b5d583

Please sign in to comment.