Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(portal): remove obsolete centralidp database configuration #355

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions charts/portal/templates/deployment-backend-notification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 0 additions & 2 deletions charts/portal/templates/secret-backend-keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 0 additions & 9 deletions charts/portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions consortia/argocd-app-templates/appsetup-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ spec:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/stable/keycloak#central-client-secret>"
dbConnection:
password: "<path:portal/data/stable/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/stable/keycloak#shared-client-secret>"
Expand Down
2 changes: 0 additions & 2 deletions consortia/environments/values-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ backend:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/beta/keycloak#central-client-secret>"
dbConnection:
password: "<path:portal/data/beta/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/beta/keycloak#shared-client-secret>"
Expand Down
2 changes: 0 additions & 2 deletions consortia/environments/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ backend:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/dev/keycloak#central-client-secret>"
dbConnection:
password: "<path:portal/data/dev/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/dev/keycloak#shared-client-secret>"
Expand Down
2 changes: 0 additions & 2 deletions consortia/environments/values-int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ backend:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/int/keycloak#central-client-secret>"
dbConnection:
password: "<path:portal/data/int/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/int/keycloak#shared-client-secret>"
Expand Down
3 changes: 0 additions & 3 deletions consortia/environments/values-pen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ backend:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/pen/keycloak#central-client-secret>"
dbConnection:
host: "centralidp-pen-postgresql-primary"
password: "<path:portal/data/pen/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/pen/keycloak#shared-client-secret>"
Expand Down
2 changes: 0 additions & 2 deletions consortia/environments/values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ backend:
central:
clientId: "<path:portal/data/keycloak#central-client-id>"
clientSecret: "<path:portal/data/dev/keycloak#central-client-secret>"
dbConnection:
password: "<path:portal/data/dev/keycloak#central-db-password>"
shared:
clientId: "<path:portal/data/keycloak#shared-client-id>"
clientSecret: "<path:portal/data/dev/keycloak#shared-client-secret>"
Expand Down