TeamPiped-mirror/Piped-Kubernetes
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Kubernetes.git synced 2024-08-14 23:57:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow overriding of secret keys for database

Browse source 
Increment Chart version
This commit is contained in:
Gabriel Simmer 2024-01-23 15:49:50 +00:00 • committed by Gabriel Simmer
parent d0cf6a9a09
commit 50c7d96774
No known key found for this signature in database
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
charts/apps/piped/Chart.yaml
View file

@ -10,7 +10,7 @@ sources:
- https://github.com/TeamPiped/piped-proxy
keywords:
- streaming
version: 4.1.2
version: 5.0.0
appVersion: latest
kubeVersion: ">=1.22.0-0"
maintainers:
@ -28,4 +28,4 @@ dependencies:
annotations:
artifacthub.io/changes: |-
- kind: changed
description: Upgraded `postgresql` chart dependency to version 13.2.27
description: Change database values configuration to allow overriding of secret keys for database

6
charts/apps/piped/templates/backend/configmap.yaml
View file

@ -65,9 +65,9 @@ data:
hibernate.connection.username: {{.Values.backend.config.database.username }}
hibernate.connection.password: {{.Values.backend.config.database.password }}
{{ end }}
{{- if .Values.backend.config.database.secret }}
hibernate.connection.username: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "DB_USERNAME" ) }}
hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "DB_PASSWORD") }}
{{- if and (.Values.backend.config.database.secret) (.Values.backend.config.database.secret.name) }}
hibernate.connection.username: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret.name "Key" (.Values.backend.config.database.secret.username | default "DB_USERNAME")) }}
hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret.name "Key" (.Values.backend.config.database.secret.password | default "DB_PASSWORD")) }}
{{- end }}
{{- else if .Values.postgresql.enabled }}
hibernate.connection.url: jdbc:postgresql://piped-postgresql/{{ .Values.postgresql.auth.database}}

6
charts/apps/piped/values.yaml
View file

@ -99,7 +99,11 @@ backend:
# password: changeme
# Please only provide the secret name (it should already exist),
# it should only include database.username and database.password as others will be taken from above.
# secret: secret-name
# secret:
# name: secret-name
# Optionally grab differently named keys
# username: DB_USERNAME
# password: DB_PASSWORD
image: