Merge pull request #384 from eclipse-tractusx/merge/rc-branch

chore: merge release-candidate in main
eclipse-tractusx · Jul 24, 2024 · 2dd369d · 2dd369d
2 parents bbe6adc + cf93705
commit 2dd369d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 14 deletions.
diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml
@@ -90,11 +90,6 @@ spec:
           value: "{{ .Values.backend.administration.basePath }}"
         - name: "DATABASEACCESS__PORTAL__DATABASESCHEMA"
           value: "{{ .Values.backend.dbConnection.schema }}"
-        - name: "KEYCLOAK_CENTRAL_PASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.keycloak.secret }}"
-              key: "central-db-password"
         - name: "APPLICATIONCHECKLIST__BPDM__BASEADDRESS"
           value: "{{ .Values.bpdm.portalGateAddress }}{{ .Values.bpdm.portalGateApiPath }}"
         - name: "APPLICATIONCHECKLIST__BPDM__CLIENTID"

diff --git a/charts/portal/templates/deployment-backend-notification.yaml b/charts/portal/templates/deployment-backend-notification.yaml
@@ -79,11 +79,6 @@ spec:
         {{- end }}
         - name: "DATABASEACCESS__PORTAL__DATABASESCHEMA"
           value: "{{ .Values.backend.dbConnection.schema }}"
-        - name: "KEYCLOAK_CENTRAL_PASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.keycloak.secret }}"
-              key: "central-db-password"
         - name: "HEALTHCHECKS__0__PATH"
           value: "{{ .Values.backend.healthChecks.startup.path}}"
         {{- if .Values.backend.notification.healthChecks.startup.tags }}

diff --git a/environments/consortia/helm-values/values-dev.yaml b/environments/consortia/helm-values/values-dev.yaml
@@ -261,7 +261,7 @@ backend:
       universalResolverAddress: "https://dev.uniresolver.io/"
       encryptionConfigs:
         index0:
-          encryptionKey: "<path:portal/data/dev/encryption-keys#dim-encryption-key0>"
+          encryptionKey: "<path:portal/data/dev/processes-worker#dim-encryption-key0>"
     issuerComponent:
       clientId: "<path:portal/data/processes-worker#issuercomponent-client-id>"
       clientSecret: "<path:portal/data/dev/processes-worker#issuercomponent-client-secret>"

diff --git a/environments/consortia/helm-values/values-int.yaml b/environments/consortia/helm-values/values-int.yaml
@@ -261,7 +261,7 @@ backend:
       universalResolverAddress: "https://dev.uniresolver.io/"
       encryptionConfigs:
         index0:
-          encryptionKey: "<path:portal/data/int/encryption-keys#dim-encryption-key0>"
+          encryptionKey: "<path:portal/data/int/processes-worker#dim-encryption-key0>"
     issuerComponent:
       clientId: "<path:portal/data/processes-worker#issuercomponent-client-id>"
       clientSecret: "<path:portal/data/int/processes-worker#issuercomponent-client-secret>"

diff --git a/environments/consortia/helm-values/values-rc.yaml b/environments/consortia/helm-values/values-rc.yaml
@@ -261,7 +261,7 @@ backend:
       universalResolverAddress: "https://dev.uniresolver.io/"
       encryptionConfigs:
         index0:
-          encryptionKey: "<path:portal/data/dev/encryption-keys#dim-encryption-key0>"
+          encryptionKey: "<path:portal/data/dev/processes-worker#dim-encryption-key0>"
     issuerComponent:
       clientId: "<path:portal/data/processes-worker#issuercomponent-client-id>"
       clientSecret: "<path:portal/data/dev/processes-worker#issuercomponent-client-secret>"

diff --git a/environments/helm-values/values-int.yaml b/environments/helm-values/values-int.yaml
@@ -166,7 +166,7 @@ backend:
         - name: "HEALTHCHECKS__0__TAGS__2"
           value: "provisioningdb"
     swaggerEnabled: true
-    issuerdid: "did:web:tbd"
+    issuerdid: "did:web:portal-backend.int.catena-x.net:api:administration:staticdata:did:BPNL00000003CRHK"
     serviceAccount:
       encryptionConfigs:
         index0: