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

fix(values): consistent usage of postgresql.adminPasswordKey #44

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion charts/backstage/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ sources:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.20.0
version: 2.20.1
4 changes: 2 additions & 2 deletions charts/backstage/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2367,8 +2367,8 @@
"name": "POSTGRESQL_ADMIN_PASSWORD",
"valueFrom": {
"secretKeyRef": {
"key": "postgres-password",
"name": "{{- include \"janus-idp.postgresql.secretName\" . }}"
"key": "{{- include \"postgresql.adminPasswordKey\" . }}",
"name": "{{- include \"postgresql.v1.secretName\" . }}"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions charts/backstage/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ upstream:
- name: POSTGRESQL_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
key: postgres-password
name: '{{- include "janus-idp.postgresql.secretName" . }}'
key: '{{- include "postgresql.adminPasswordKey" . }}'
name: '{{- include "postgresql.v1.secretName" . }}'
Copy link
Author

@muja muja Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using this helper here changes the name property from rhdh-chart-postgresql to rhdh-chart-backstage. Is that a breaking change / problem?

args:
# This additional `app-config`` file is generated by the initContainer below, and contains the merged configuration of installed dynamic plugins.
- '--config'
Expand Down Expand Up @@ -234,7 +234,7 @@ upstream:
- name: POSTGRESQL_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
key: postgres-password
key: '{{- include "postgresql.adminPasswordKey" . }}'
name: '{{- include "postgresql.v1.secretName" . }}'
ingress:
host: "{{ .Values.global.host }}"
Expand Down
Loading