🐛 NetBox: Fix auth failure for PostgreSQL (#11)

When initializing NetBox, an authentication failure for the PostgreSQL database connection occurs. Make sure to use the right username and password. --------- Co-authored-by: Evelyn Alicke <[email protected]>
chaosdorf · Jul 22, 2023 · bb3825c · bb3825c
1 parent e224cb7
commit bb3825c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/charts/netbox/templates/_helpers.tpl b/charts/netbox/templates/_helpers.tpl
@@ -105,7 +105,7 @@ Name of the key in Secret that contains the PostgreSQL password
 */}}
 {{- define "netbox.postgresql.secretKey" -}}
 {{- if .Values.postgresql.enabled -}}
-postgresql-password
+password
 {{- else if .Values.externalDatabase.existingSecretName -}}
 {{ .Values.externalDatabase.existingSecretKey }}
 {{- else -}}

diff --git a/charts/netbox/templates/configmap.yaml b/charts/netbox/templates/configmap.yaml
@@ -59,8 +59,8 @@ data:
     DATABASE:
       {{ if .Values.postgresql.enabled -}}
       HOST: {{ include "netbox.postgresql.fullname" . | quote }}
-      USER: {{ .Values.postgresql.postgresqlUsername | quote }}
-      NAME: {{ .Values.postgresql.postgresqlDatabase | quote }}
+      USER: {{ .Values.postgresql.auth.username| quote }}
+      NAME: {{ .Values.postgresql.auth.database | quote }}
       PORT: {{ .Values.postgresql.service.port | int }}
       {{- else -}}
       HOST: {{ .Values.externalDatabase.host | quote }}

diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
@@ -301,8 +301,12 @@ postgresql:
   # under externalDatabase
   enabled: true
 
-  postgresqlUsername: netbox
-  postgresqlDatabase: netbox
+  service:
+    port: 5432
+
+  auth:
+    username: netbox
+    database: netbox
 
 ## External database settings
 # These are used if postgresql.enabled is false, and are ignored otherwise