Merge pull request #1096 from catenax-ng/helm/636-update-registry

feature: #636 udpate registry from 0.3.22 to 0.4.9-RC2
eclipse-tractusx · Apr 5, 2024 · 7e4ffa0 · 7e4ffa0
2 parents 11ddaed + 6133fc6
commit 7e4ffa0
Show file tree

Hide file tree

Showing 9 changed files with 172 additions and 154 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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