Skip to content

[release-2.1] chore: Updating DB password key when postgresql.auth.username is customized #639

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 4 commits into from
Oct 13, 2026
Merged

[release-2.1] chore: Updating DB password key when postgresql.auth.username is customized #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf9f32f
chore: Updating DB password key when postgresql.auth.username is cust…
OpinionatedHeron Oct 13, 2026
7af4ff7
Merge branch 'release-2.1' into cherry-pick-628-to-release-2.1
rm3l Oct 13, 2026
94c30ea
Merge branch 'release-2.1' into cherry-pick-628-to-release-2.1
OpinionatedHeron Oct 13, 2026
c83aabb
Bumbping chart version
OpinionatedHeron Oct 13, 2026
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
2 changes: 1 addition & 1 deletion charts/rhdh/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: redhat-developer-hub
type: application
version: 3.4.8
version: 3.4.9
appVersion: 2.1.0
annotations:
artifacthub.io/category: integration-delivery
Expand Down
4 changes: 2 additions & 2 deletions charts/rhdh/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# RHDH Helm Chart for OpenShift and Kubernetes

![Version: 3.4.8](https://img.shields.io/badge/Version-3.4.8-informational?style=flat-square)
![Version: 3.4.9](https://img.shields.io/badge/Version-3.4.9-informational?style=flat-square)
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

A Helm chart for deploying Red Hat Developer Hub, which is a Red Hat supported version of Backstage.
Expand Down Expand Up @@ -36,7 +36,7 @@ For the **Generally Available** version of this chart, see:
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart

helm install my-rhdh redhat-developer/redhat-developer-hub --version 3.4.8
helm install my-rhdh redhat-developer/redhat-developer-hub --version 3.4.9
```

## Introduction
Expand Down
2 changes: 1 addition & 1 deletion charts/rhdh/templates/_backstage-pod-template.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ spec:
valueFrom:
secretKeyRef:
name: {{ include "rhdh.postgresql.secretName" . }}
key: {{ include "rhdh.postgresql.adminPasswordKey" . }}
key: {{ include "rhdh.postgresql.passwordKey" . }}
{{- else if .Values.externalDatabase.host }}
- name: POSTGRES_HOST
value: {{ .Values.externalDatabase.host | quote }}
Expand Down
12 changes: 12 additions & 0 deletions charts/rhdh/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,18 @@ Returns the PostgreSQL admin password key.
{{- end -}}
{{- end -}}

{{/*
Returns the PostgreSQL user password key.
Uses the admin key when username is "postgres" (default).
*/}}
{{- define "rhdh.postgresql.passwordKey" -}}
{{- if eq (.Values.postgresql.auth.username | default "postgres") "postgres" -}}
{{- include "rhdh.postgresql.adminPasswordKey" . -}}
{{- else -}}
{{- (((((.Values).postgresql).auth).secretKeys).userPasswordKey) | default "password" -}}
{{- end -}}
{{- end -}}

{{/*
Returns the PostgreSQL hostname.
When postgresql.enabled is false, returns externalDatabase.host.
Expand Down
Loading