From 34a1b85bd38f71936530f213473f0cb58e1d5387 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Tue, 19 Mar 2024 15:47:56 +0100 Subject: [PATCH 01/18] feature: #636 udpate registry from 0.3.22 to 0.4.9-RC2 --- charts/connector/aasregistry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/connector/aasregistry/Chart.yaml b/charts/connector/aasregistry/Chart.yaml index aee49dcbd4..88aded3b1d 100644 --- a/charts/connector/aasregistry/Chart.yaml +++ b/charts/connector/aasregistry/Chart.yaml @@ -28,5 +28,5 @@ appVersion: 0.0.1 dependencies: - name: registry - version: 0.3.22 + version: 0.4.9-RC2 repository: https://eclipse-tractusx.github.io/sldt-digital-twin-registry From cc551efb854634f85fba700bf30288ed751edad5 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 09:24:20 +0100 Subject: [PATCH 02/18] feature: 636 udpate registry from 0.3.22 to 0.4.9-RC2 --- charts/connector/aasregistry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/connector/aasregistry/Chart.yaml b/charts/connector/aasregistry/Chart.yaml index 88aded3b1d..5f9d6367b5 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 + - name: digital-twin-registry version: 0.4.9-RC2 repository: https://eclipse-tractusx.github.io/sldt-digital-twin-registry From 21a2363185efaac2ca2c2ea3348691ed22514933 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 15:47:19 +0100 Subject: [PATCH 03/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index a393efa18f..566b906d11 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -50,3 +50,5 @@ registry: requests: cpu: 200m memory: 1Gi + ingress: + enabled: true From bc5a1878c7f69426f0246c849840d97ded9d73e4 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 15:57:58 +0100 Subject: [PATCH 04/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 3 +++ charts/connector/aasregistry/values.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index f732cb3dad..1a92eb9640 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -54,3 +54,6 @@ registry: requests: cpu: 200m memory: 2Gi + + ingress: + enabled: true diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index 566b906d11..e04556e627 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -50,5 +50,6 @@ registry: requests: cpu: 200m memory: 1Gi + ingress: enabled: true From d29be3dfee3827c38b58806d30e02a508a388580 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 16:12:19 +0100 Subject: [PATCH 05/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 10 ++++++++++ charts/connector/aasregistry/values.yaml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 1a92eb9640..8ecc97aa42 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -57,3 +57,13 @@ registry: ingress: enabled: true + tls: true + urlPrefix: /semantics/registry + className: nginx + annotations: + cert-manager.io/cluster-issuer: selfsigned-cluster-issuer + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index e04556e627..9de0dabe4f 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -53,3 +53,13 @@ registry: ingress: enabled: true + tls: true + urlPrefix: /semantics/registry + className: nginx + annotations: + cert-manager.io/cluster-issuer: selfsigned-cluster-issuer + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry From 84a357d082fe3edf5b24c716041a90a8883a22c2 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 16:37:35 +0100 Subject: [PATCH 06/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 24 ++++++++++---------- charts/connector/aasregistry/values.yaml | 24 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 8ecc97aa42..06a85534a7 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -55,15 +55,15 @@ registry: cpu: 200m memory: 2Gi - ingress: - enabled: true - tls: true - urlPrefix: /semantics/registry - className: nginx - annotations: - cert-manager.io/cluster-issuer: selfsigned-cluster-issuer - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-credentials: "true" - nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry +ingress: + enabled: true + tls: true + urlPrefix: /semantics/registry + className: nginx + annotations: + cert-manager.io/cluster-issuer: selfsigned-cluster-issuer + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index 9de0dabe4f..662b1a8ee8 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -51,15 +51,15 @@ registry: cpu: 200m memory: 1Gi - ingress: - enabled: true - tls: true - urlPrefix: /semantics/registry - className: nginx - annotations: - cert-manager.io/cluster-issuer: selfsigned-cluster-issuer - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-credentials: "true" - nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry +ingress: + enabled: true + tls: true + urlPrefix: /semantics/registry + className: nginx + annotations: + cert-manager.io/cluster-issuer: selfsigned-cluster-issuer + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry From 6fa8291f4870b3675e7287f7b782fab5a9c3e362 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 20 Mar 2024 16:51:18 +0100 Subject: [PATCH 07/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 57 +++++-------------- charts/connector/aasregistry/values.yaml | 58 +++++--------------- 2 files changed, 30 insertions(+), 85 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 06a85534a7..5873a8bd46 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -16,36 +16,22 @@ # # SPDX-License-Identifier: Apache-2.0 ############################################################### - +nameOverride: "Registry-dev" +fullnameOverride: "Registry-dev" registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi - - registry: - authentication: false - idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry.dev.demo.catena-x.net - ingress: - enabled: true - 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" + authentication: false + idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central + host: trace-x-registry.dev.demo.catena-x.net + ingress: + enabled: true + 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: @@ -54,16 +40,3 @@ registry: requests: cpu: 200m memory: 2Gi - -ingress: - enabled: true - tls: true - urlPrefix: /semantics/registry - className: nginx - annotations: - cert-manager.io/cluster-issuer: selfsigned-cluster-issuer - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-credentials: "true" - nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index 662b1a8ee8..a54cef330f 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -19,47 +19,19 @@ ############################################################### registry: - enableKeycloak: false - postgresql: - primary: - persistence: - enabled: true - size: 1Gi - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi + authentication: false + idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central + host: trace-x-registry.dev.demo.catena-x.net + ingress: + enabled: true + tls: true + className: nginx + urlPrefix: /semantics/registry - registry: - authentication: false - idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry.dev.demo.catena-x.net - ingress: - enabled: true - tls: true - className: nginx - urlPrefix: /semantics/registry - - resources: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 200m - memory: 1Gi - -ingress: - enabled: true - tls: true - urlPrefix: /semantics/registry - className: nginx - annotations: - cert-manager.io/cluster-issuer: selfsigned-cluster-issuer - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-credentials: "true" - nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry + resources: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 200m + memory: 1Gi From 3246ed099e9e6bd2a56c551dec095496d439e609 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 07:37:52 +0100 Subject: [PATCH 08/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 5873a8bd46..888248467e 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -18,25 +18,26 @@ ############################################################### nameOverride: "Registry-dev" fullnameOverride: "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 - ingress: - enabled: true - 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" +digital-twin-registry: + registry: + authentication: false + idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central + host: trace-x-registry.dev.demo.catena-x.net + ingress: + enabled: true + 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: 1500m - memory: 2Gi - requests: - cpu: 200m - memory: 2Gi + resources: + limits: + cpu: 1500m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi From 25e66b0340c876cffb2d5630637a2f1db50dc40a Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 08:17:48 +0100 Subject: [PATCH 09/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 888248467e..3652c20a08 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -23,6 +23,9 @@ digital-twin-registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central host: trace-x-registry.dev.demo.catena-x.net + dataSource: + user: default-user + password: password ingress: enabled: true tls: true From ea75ebce8ff9a7a77a1da61556a5669dbf8ce675 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 08:32:41 +0100 Subject: [PATCH 10/18] feature: 636 enable ingress for registry --- charts/connector/aasregistry/values-dev.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 3652c20a08..f3b2859ac2 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -23,9 +23,6 @@ digital-twin-registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central host: trace-x-registry.dev.demo.catena-x.net - dataSource: - user: default-user - password: password ingress: enabled: true tls: true @@ -44,3 +41,15 @@ digital-twin-registry: 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 From 78d6270eb94ffe37aa5472cf301c5d1b97feb845 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 10:49:45 +0100 Subject: [PATCH 11/18] feature: 636 update to registry version 0.4.9 --- charts/connector/aasregistry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/connector/aasregistry/Chart.yaml b/charts/connector/aasregistry/Chart.yaml index 5f9d6367b5..b9d91a7bf1 100644 --- a/charts/connector/aasregistry/Chart.yaml +++ b/charts/connector/aasregistry/Chart.yaml @@ -28,5 +28,5 @@ appVersion: 0.0.1 dependencies: - name: digital-twin-registry - version: 0.4.9-RC2 + version: 0.4.9 repository: https://eclipse-tractusx.github.io/sldt-digital-twin-registry From 9e3978ec3204053c33ad2d298ce15574f0fdaa0f Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 13:51:48 +0100 Subject: [PATCH 12/18] feature: 636 add name override --- charts/connector/aasregistry/values-dev.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index f3b2859ac2..e2193bccdd 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -16,9 +16,10 @@ # # SPDX-License-Identifier: Apache-2.0 ############################################################### -nameOverride: "Registry-dev" -fullnameOverride: "Registry-dev" + digital-twin-registry: + nameOverride: "Registry-dev" + fullnameOverride: "Registry-dev" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central From b0c77a8791b7dc4025a769ba3dc7953df834b683 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 13:57:08 +0100 Subject: [PATCH 13/18] feature: 636 add name override --- charts/connector/aasregistry/values-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index e2193bccdd..1ac48a0fe2 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -18,8 +18,8 @@ ############################################################### digital-twin-registry: - nameOverride: "Registry-dev" - fullnameOverride: "Registry-dev" + nameOverride: "tracex-registry-dev" + fullnameOverride: "tracex-registry-dev" registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central From 74b15a2f0617e5d898586b213a645a5e3dc52ab0 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 21 Mar 2024 14:08:13 +0100 Subject: [PATCH 14/18] feature: 636 registry values for all environments --- .../connector/aasregistry/values-e2e-a.yaml | 46 ++++++++-------- .../connector/aasregistry/values-e2e-b.yaml | 45 ++++++++-------- .../connector/aasregistry/values-int-a.yaml | 47 ++++++++-------- .../connector/aasregistry/values-int-b.yaml | 46 ++++++++-------- charts/connector/aasregistry/values-test.yaml | 45 ++++++++-------- charts/connector/aasregistry/values.yaml | 53 +++++++++++++------ 6 files changed, 154 insertions(+), 128 deletions(-) diff --git a/charts/connector/aasregistry/values-e2e-a.yaml b/charts/connector/aasregistry/values-e2e-a.yaml index 33b655a1c2..e6fc10a85b 100644 --- a/charts/connector/aasregistry/values-e2e-a.yaml +++ b/charts/connector/aasregistry/values-e2e-a.yaml @@ -18,25 +18,14 @@ # 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 - host: trace-x-registry-e2e-a.dev.demo.catena-x.net + host: trace-x-registry.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -48,11 +37,22 @@ 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 diff --git a/charts/connector/aasregistry/values-e2e-b.yaml b/charts/connector/aasregistry/values-e2e-b.yaml index 8a154ceb86..ec26daeaa2 100644 --- a/charts/connector/aasregistry/values-e2e-b.yaml +++ b/charts/connector/aasregistry/values-e2e-b.yaml @@ -18,25 +18,14 @@ # 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 - host: trace-x-registry-e2e-b.dev.demo.catena-x.net + host: trace-x-registry.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -48,10 +37,22 @@ 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 diff --git a/charts/connector/aasregistry/values-int-a.yaml b/charts/connector/aasregistry/values-int-a.yaml index b3d822a1b4..cb9ac44909 100644 --- a/charts/connector/aasregistry/values-int-a.yaml +++ b/charts/connector/aasregistry/values-int-a.yaml @@ -17,24 +17,14 @@ # 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 - host: trace-x-registry-int-a.int.demo.catena-x.net + host: trace-x-registry.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -46,11 +36,22 @@ 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 diff --git a/charts/connector/aasregistry/values-int-b.yaml b/charts/connector/aasregistry/values-int-b.yaml index e043ccd25d..c57f6e857a 100644 --- a/charts/connector/aasregistry/values-int-b.yaml +++ b/charts/connector/aasregistry/values-int-b.yaml @@ -17,24 +17,14 @@ # 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 - host: trace-x-registry-int-b.int.demo.catena-x.net + host: trace-x-registry.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -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 diff --git a/charts/connector/aasregistry/values-test.yaml b/charts/connector/aasregistry/values-test.yaml index 30690941f6..d8faf69a80 100644 --- a/charts/connector/aasregistry/values-test.yaml +++ b/charts/connector/aasregistry/values-test.yaml @@ -17,25 +17,14 @@ # 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 - host: trace-x-registry-test.dev.demo.catena-x.net + host: trace-x-registry.dev.demo.catena-x.net ingress: enabled: true tls: true @@ -47,10 +36,22 @@ 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 diff --git a/charts/connector/aasregistry/values.yaml b/charts/connector/aasregistry/values.yaml index a54cef330f..5053c1f12a 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -18,20 +18,41 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -registry: - authentication: false - idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry.dev.demo.catena-x.net - ingress: - enabled: true - tls: true - className: nginx - urlPrefix: /semantics/registry - 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 + host: trace-x-registry.dev.demo.catena-x.net + ingress: + enabled: true + 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: 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 From ca3b713ad69027ed7f1e00be99bb68fd52803376 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 28 Mar 2024 12:57:12 +0100 Subject: [PATCH 15/18] helm: #636 fix registry hosts --- charts/connector/aasregistry/values-dev.yaml | 2 +- charts/connector/aasregistry/values-e2e-a.yaml | 2 +- charts/connector/aasregistry/values-e2e-b.yaml | 2 +- charts/connector/aasregistry/values-int-a.yaml | 2 +- charts/connector/aasregistry/values-int-b.yaml | 2 +- charts/connector/aasregistry/values-test.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 1ac48a0fe2..13e98c7fde 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -23,7 +23,7 @@ digital-twin-registry: 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 diff --git a/charts/connector/aasregistry/values-e2e-a.yaml b/charts/connector/aasregistry/values-e2e-a.yaml index e6fc10a85b..c29c0c7fa9 100644 --- a/charts/connector/aasregistry/values-e2e-a.yaml +++ b/charts/connector/aasregistry/values-e2e-a.yaml @@ -25,7 +25,7 @@ digital-twin-registry: 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-e2e-a.dev.demo.catena-x.net ingress: enabled: true tls: true diff --git a/charts/connector/aasregistry/values-e2e-b.yaml b/charts/connector/aasregistry/values-e2e-b.yaml index ec26daeaa2..03581fca13 100644 --- a/charts/connector/aasregistry/values-e2e-b.yaml +++ b/charts/connector/aasregistry/values-e2e-b.yaml @@ -25,7 +25,7 @@ digital-twin-registry: 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-e2e-b.dev.demo.catena-x.net ingress: enabled: true tls: true diff --git a/charts/connector/aasregistry/values-int-a.yaml b/charts/connector/aasregistry/values-int-a.yaml index cb9ac44909..fc1603155b 100644 --- a/charts/connector/aasregistry/values-int-a.yaml +++ b/charts/connector/aasregistry/values-int-a.yaml @@ -24,7 +24,7 @@ digital-twin-registry: 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-int-a.dev.demo.catena-x.net ingress: enabled: true tls: true diff --git a/charts/connector/aasregistry/values-int-b.yaml b/charts/connector/aasregistry/values-int-b.yaml index c57f6e857a..6dc72d441d 100644 --- a/charts/connector/aasregistry/values-int-b.yaml +++ b/charts/connector/aasregistry/values-int-b.yaml @@ -24,7 +24,7 @@ digital-twin-registry: 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-int-b.dev.demo.catena-x.net ingress: enabled: true tls: true diff --git a/charts/connector/aasregistry/values-test.yaml b/charts/connector/aasregistry/values-test.yaml index d8faf69a80..1f7fd0af0a 100644 --- a/charts/connector/aasregistry/values-test.yaml +++ b/charts/connector/aasregistry/values-test.yaml @@ -24,7 +24,7 @@ digital-twin-registry: 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-test.dev.demo.catena-x.net ingress: enabled: true tls: true From c1c63072f7386f950ea9d211e238fccefecdd3db Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 28 Mar 2024 13:01:14 +0100 Subject: [PATCH 16/18] helm: #636 fix registry hosts --- charts/connector/aasregistry/values-int-a.yaml | 2 +- charts/connector/aasregistry/values-int-b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/connector/aasregistry/values-int-a.yaml b/charts/connector/aasregistry/values-int-a.yaml index fc1603155b..33036a0675 100644 --- a/charts/connector/aasregistry/values-int-a.yaml +++ b/charts/connector/aasregistry/values-int-a.yaml @@ -24,7 +24,7 @@ digital-twin-registry: registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry-int-a.dev.demo.catena-x.net + host: trace-x-registry-int-a.int.demo.catena-x.net ingress: enabled: true tls: true diff --git a/charts/connector/aasregistry/values-int-b.yaml b/charts/connector/aasregistry/values-int-b.yaml index 6dc72d441d..36a5c9897a 100644 --- a/charts/connector/aasregistry/values-int-b.yaml +++ b/charts/connector/aasregistry/values-int-b.yaml @@ -24,7 +24,7 @@ digital-twin-registry: registry: authentication: false idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central - host: trace-x-registry-int-b.dev.demo.catena-x.net + host: trace-x-registry-int-b.int.demo.catena-x.net ingress: enabled: true tls: true From e120ac75fb2f83b1e2e33838b421b7565d22776e Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Tue, 2 Apr 2024 16:41:00 +0200 Subject: [PATCH 17/18] helm: #636 update values --- charts/connector/aasregistry/values-dev.yaml | 1 + charts/connector/aasregistry/values-e2e-a.yaml | 1 + charts/connector/aasregistry/values-e2e-b.yaml | 1 + charts/connector/aasregistry/values-int-a.yaml | 1 + charts/connector/aasregistry/values-int-b.yaml | 1 + charts/connector/aasregistry/values-test.yaml | 1 + charts/connector/aasregistry/values.yaml | 1 + 7 files changed, 7 insertions(+) diff --git a/charts/connector/aasregistry/values-dev.yaml b/charts/connector/aasregistry/values-dev.yaml index 13e98c7fde..dd0190ed40 100644 --- a/charts/connector/aasregistry/values-dev.yaml +++ b/charts/connector/aasregistry/values-dev.yaml @@ -54,3 +54,4 @@ digital-twin-registry: 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 c29c0c7fa9..465c321bbf 100644 --- a/charts/connector/aasregistry/values-e2e-a.yaml +++ b/charts/connector/aasregistry/values-e2e-a.yaml @@ -56,3 +56,4 @@ digital-twin-registry: 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 03581fca13..43b2cdca48 100644 --- a/charts/connector/aasregistry/values-e2e-b.yaml +++ b/charts/connector/aasregistry/values-e2e-b.yaml @@ -56,3 +56,4 @@ digital-twin-registry: 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 33036a0675..16fe5e72ea 100644 --- a/charts/connector/aasregistry/values-int-a.yaml +++ b/charts/connector/aasregistry/values-int-a.yaml @@ -55,3 +55,4 @@ digital-twin-registry: 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 36a5c9897a..628492d49a 100644 --- a/charts/connector/aasregistry/values-int-b.yaml +++ b/charts/connector/aasregistry/values-int-b.yaml @@ -55,4 +55,5 @@ digital-twin-registry: 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 1f7fd0af0a..a693d722ae 100644 --- a/charts/connector/aasregistry/values-test.yaml +++ b/charts/connector/aasregistry/values-test.yaml @@ -55,3 +55,4 @@ digital-twin-registry: 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 5053c1f12a..8d2bf3a2ab 100644 --- a/charts/connector/aasregistry/values.yaml +++ b/charts/connector/aasregistry/values.yaml @@ -56,3 +56,4 @@ digital-twin-registry: username: default-user password: password database: default-database + existingSecret: secret-dtr-postgres-init From 6133fc67725671379ef1677897aa7c4e4b00a589 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 3 Apr 2024 14:42:25 +0200 Subject: [PATCH 18/18] helm: #636 update IRS Helm --- charts/traceability-foss/charts/backend/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/traceability-foss/charts/backend/Chart.yaml b/charts/traceability-foss/charts/backend/Chart.yaml index 0e18b1b28b..08daf283b8 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