From 7eb1089917d3a73987ce6207ded16722d65b72a9 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 10 Jul 2024 15:59:27 +0200 Subject: [PATCH] chore: remove obsolete centralidp database configuration (#355) https://github.com/eclipse-tractusx/portal/issues/351 --- .../templates/deployment-backend-administration.yaml | 4 ---- .../templates/deployment-backend-notification.yaml | 4 ---- charts/portal/templates/secret-backend-keycloak.yaml | 2 -- charts/portal/values.yaml | 9 --------- consortia/argocd-app-templates/appsetup-stable.yaml | 2 -- consortia/environments/values-beta.yaml | 2 -- consortia/environments/values-dev.yaml | 2 -- consortia/environments/values-int.yaml | 2 -- consortia/environments/values-pen.yaml | 3 --- consortia/environments/values-rc.yaml | 2 -- 10 files changed, 32 deletions(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index 7ab54498d..f874dc2cf 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -95,10 +95,6 @@ spec: secretKeyRef: name: "{{ .Values.backend.keycloak.secret }}" key: "central-db-password" - - name: "DATABASEACCESS__KEYCLOAK__CONNECTIONSTRING" - value: "Server={{ .Values.backend.keycloak.central.dbConnection.host }};Database={{ .Values.backend.keycloak.central.dbConnection.database }};Port={{ .Values.backend.keycloak.central.dbConnection.port }};User Id={{ .Values.backend.keycloak.central.dbConnection.user }};Password=$(KEYCLOAK_CENTRAL_PASSWORD);Ssl Mode={{ .Values.backend.keycloak.central.dbConnection.sslMode }};" - - name: "DATABASEACCESS__KEYCLOAK__DATABASESCHEMA" - value: "{{ .Values.backend.keycloak.central.dbConnection.schema }}" - 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 index 39ac94549..d37cf65f3 100644 --- a/charts/portal/templates/deployment-backend-notification.yaml +++ b/charts/portal/templates/deployment-backend-notification.yaml @@ -84,10 +84,6 @@ spec: secretKeyRef: name: "{{ .Values.backend.keycloak.secret }}" key: "central-db-password" - - name: "DATABASEACCESS__KEYCLOAK__CONNECTIONSTRING" - value: "Server={{ .Values.backend.keycloak.central.dbConnection.host }};Database={{ .Values.backend.keycloak.central.dbConnection.database }};Port={{ .Values.backend.keycloak.central.dbConnection.port }};User Id={{ .Values.backend.keycloak.central.dbConnection.user }};Password=$(KEYCLOAK_CENTRAL_PASSWORD);Ssl Mode={{ .Values.backend.keycloak.central.dbConnection.sslMode }};" - - name: "DATABASEACCESS__KEYCLOAK__DATABASESCHEMA" - value: "{{ .Values.backend.keycloak.central.dbConnection.schema }}" - name: "HEALTHCHECKS__0__PATH" value: "{{ .Values.backend.healthChecks.startup.path}}" {{- if .Values.backend.notification.healthChecks.startup.tags }} diff --git a/charts/portal/templates/secret-backend-keycloak.yaml b/charts/portal/templates/secret-backend-keycloak.yaml index 8a08ce332..ca345a9e6 100644 --- a/charts/portal/templates/secret-backend-keycloak.yaml +++ b/charts/portal/templates/secret-backend-keycloak.yaml @@ -32,13 +32,11 @@ data: # if secret exists, use value provided from values file (to cover update scenario) or existing value from secret # use data map instead of stringData to prevent base64 encoding of already base64-encoded existing value from secret # use index function for secret keys with hyphen otherwise '$secret.data.secretKey' works too - central-db-password: {{ ( .Values.backend.keycloak.central.dbConnection.password | b64enc ) | default ( index $secret.data "central-db-password" ) | quote }} central-client-secret: {{ ( .Values.backend.keycloak.central.clientSecret | b64enc ) | default ( index $secret.data "central-client-secret" ) | quote }} shared-client-secret: {{ ( .Values.backend.keycloak.shared.clientSecret | b64enc ) | default ( index $secret.data "shared-client-secret" ) | quote }} {{ else -}} stringData: # if secret doesn't exist, use provided value from values file or generate a random one - central-db-password: {{ .Values.backend.keycloak.central.dbConnection.password | default ( randAlphaNum 32 ) | quote }} central-client-secret: {{ .Values.backend.keycloak.central.clientSecret | default ( randAlphaNum 32 ) | quote }} shared-client-secret: {{ .Values.backend.keycloak.shared.clientSecret | default ( randAlphaNum 32 ) | quote }} {{ end }} diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index f290a3ada..17606e04e 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -253,15 +253,6 @@ backend: clockSkew: "00:05:00" refreshInterval: "00:00:30" tokenPath: "/auth/realms/CX-Central/protocol/openid-connect/token" - dbConnection: - host: "centralidp-postgresql-primary" - port: 5432 - user: "kccentral" - database: "iamcentralidp" - # -- Password for the kccentral username. Secret-key 'central-db-password'. - password: "" - schema: "public" - sslMode: "Disable" # -- Flag if the api should be used with an leading /auth path useAuthTrail: true shared: diff --git a/consortia/argocd-app-templates/appsetup-stable.yaml b/consortia/argocd-app-templates/appsetup-stable.yaml index c521e3d27..ba4f80df4 100644 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ b/consortia/argocd-app-templates/appsetup-stable.yaml @@ -125,8 +125,6 @@ spec: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-beta.yaml b/consortia/environments/values-beta.yaml index fc849c3ab..7549e5266 100644 --- a/consortia/environments/values-beta.yaml +++ b/consortia/environments/values-beta.yaml @@ -119,8 +119,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml index 8d129d569..7c61d2278 100644 --- a/consortia/environments/values-dev.yaml +++ b/consortia/environments/values-dev.yaml @@ -122,8 +122,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml index 126ba8be2..267c505fa 100644 --- a/consortia/environments/values-int.yaml +++ b/consortia/environments/values-int.yaml @@ -120,8 +120,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml index cf12cc3c6..d96ac5b35 100644 --- a/consortia/environments/values-pen.yaml +++ b/consortia/environments/values-pen.yaml @@ -120,9 +120,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - host: "centralidp-pen-postgresql-primary" - password: "" shared: clientId: "" clientSecret: "" diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml index 3ff5afa99..a4edd5274 100644 --- a/consortia/environments/values-rc.yaml +++ b/consortia/environments/values-rc.yaml @@ -122,8 +122,6 @@ backend: central: clientId: "" clientSecret: "" - dbConnection: - password: "" shared: clientId: "" clientSecret: ""