From 44770f5922ac75c14d35896da7405bfb6836add7 Mon Sep 17 00:00:00 2001
From: Danyel <vcs@danyel.io>
Date: Fri, 20 Sep 2024 09:24:12 +0200
Subject: [PATCH] fix(values): consistent usage of postgresql.adminPasswordKey

---
 charts/backstage/Chart.yaml         | 2 +-
 charts/backstage/values.schema.json | 4 ++--
 charts/backstage/values.yaml        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
index 9c29550..b6767b0 100644
--- a/charts/backstage/Chart.yaml
+++ b/charts/backstage/Chart.yaml
@@ -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
diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
index b073291..e381b9e 100644
--- a/charts/backstage/values.schema.json
+++ b/charts/backstage/values.schema.json
@@ -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\" . }}"
                                         }
                                     }
                                 }
diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
index b05d8ef..60b7453 100644
--- a/charts/backstage/values.yaml
+++ b/charts/backstage/values.yaml
@@ -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" . }}'
     args:
       # This additional `app-config`` file is generated by the initContainer below, and contains the merged configuration of installed dynamic plugins.
       - '--config'
@@ -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 }}"