diff --git a/charts/connector/aasregistry/Chart.yaml b/charts/connector/aasregistry/Chart.yaml index aee49dcbd4..b9d91a7bf1 100644 --- a/charts/connector/aasregistry/Chart.yaml +++ b/charts/connector/aasregistry/Chart.yaml @@ -27,6 +27,6 @@ version: 0.0.1 appVersion: 0.0.1 dependencies: - - name: registry - version: 0.3.22 + - name: digital-twin-registry + version: 0.4.9 repository: https://eclipse-tractusx.github.io/sldt-digital-twin-registry diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index f732cb3dad..dd0190ed40 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -17,25 +17,13 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi - +digital-twin-registry: + nameOverride: "tracex-registry-dev" + fullnameOverride: "tracex-registry-dev" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry.dev.demo.catena-x.net + host: trace-x-registry-dev.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -47,10 +35,23 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-dev-postgres-init diff --git a/charts/connector/aasregistry/values-e2e-a.yaml b/charts/connector/aasregistry/values-e2e-a.yaml index 33b655a1c2..465c321bbf 100644 --- a/charts/connector/aasregistry/values-e2e-a.yaml +++ b/charts/connector/aasregistry/values-e2e-a.yaml @@ -18,21 +18,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi +digital-twin-registry: + nameOverride: "tracex-registry-e2e-a" + fullnameOverride: "tracex-registry-e2e-a" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -48,11 +37,23 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi - + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-e2ea-postgres-init diff --git a/charts/connector/aasregistry/values-e2e-b.yaml b/charts/connector/aasregistry/values-e2e-b.yaml index 8a154ceb86..43b2cdca48 100644 --- a/charts/connector/aasregistry/values-e2e-b.yaml +++ b/charts/connector/aasregistry/values-e2e-b.yaml @@ -18,21 +18,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi +digital-twin-registry: + nameOverride: "tracex-registry-e2e-b" + fullnameOverride: "tracex-registry-e2e-b" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -48,10 +37,23 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-e2eb-postgres-init diff --git a/charts/connector/aasregistry/values-int-a.yaml b/charts/connector/aasregistry/values-int-a.yaml index b3d822a1b4..16fe5e72ea 100644 --- a/charts/connector/aasregistry/values-int-a.yaml +++ b/charts/connector/aasregistry/values-int-a.yaml @@ -17,20 +17,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 800m - memory: 1Gi - requests: - cpu: 400m - memory: 1Gi + +digital-twin-registry: + nameOverride: "tracex-registry-int-a" + fullnameOverride: "tracex-registry-int-a" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -46,11 +36,23 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi - + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-inta-postgres-init diff --git a/charts/connector/aasregistry/values-int-b.yaml b/charts/connector/aasregistry/values-int-b.yaml index e043ccd25d..628492d49a 100644 --- a/charts/connector/aasregistry/values-int-b.yaml +++ b/charts/connector/aasregistry/values-int-b.yaml @@ -17,20 +17,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 800m - memory: 1Gi - requests: - cpu: 400m - memory: 1Gi + +digital-twin-registry: + nameOverride: "tracex-registry-int-b" + fullnameOverride: "tracex-registry-int-b" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -46,11 +36,24 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-intb-postgres-init diff --git a/charts/connector/aasregistry/values-test.yaml b/charts/connector/aasregistry/values-test.yaml index 30690941f6..a693d722ae 100644 --- a/charts/connector/aasregistry/values-test.yaml +++ b/charts/connector/aasregistry/values-test.yaml @@ -17,21 +17,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi +digital-twin-registry: + nameOverride: "tracex-registry-test" + fullnameOverride: "tracex-registry-test" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -47,10 +36,23 @@ registry: nginx.ingress.kubernetes.io/rewrite-target: /$2 nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-test-postgres-init diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index a393efa18f..8d2bf3a2ab 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -18,21 +18,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi +digital-twin-registry: + nameOverride: "tracex-registry" + fullnameOverride: "tracex-registry" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central @@ -42,11 +31,29 @@ registry: tls: true className: nginx urlPrefix: /semantics/registry + annotations: + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + postgresql: + primary: + persistence: + enabled: true + size: 1Gi + service: + ports: + postgresql: 5432 + auth: + username: default-user + password: password + database: default-database + existingSecret: secret-dtr-postgres-init diff --git a/charts/traceability-foss/charts/backend/Chart.yaml b/charts/traceability-foss/charts/backend/Chart.yaml index 6f74d87f40..c80205da49 100644 --- a/charts/traceability-foss/charts/backend/Chart.yaml +++ b/charts/traceability-foss/charts/backend/Chart.yaml @@ -33,7 +33,7 @@ dependencies: condition: pgadmin4.enabled - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.9.1 + version: 6.18.0 condition: irs-helm.enabled - name: irs-edc-consumer repository: https://eclipse-tractusx.github.io/item-relationship-service