From a52fb2b85dab22b5bab619625ec9b0292d8f8dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Fri, 21 Jul 2023 05:31:29 +0300 Subject: [PATCH] backend: Better secret var naming --- charts/apps/piped/Chart.yaml | 6 ++---- charts/apps/piped/README.md | 8 ++++---- charts/apps/piped/templates/backend/configmap.yaml | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml index c39f376..717ee6c 100644 --- a/charts/apps/piped/Chart.yaml +++ b/charts/apps/piped/Chart.yaml @@ -10,7 +10,7 @@ sources: - https://github.com/TeamPiped/piped-proxy keywords: - streaming -version: 2.8.0 +version: 3.0.0 appVersion: latest kubeVersion: ">=1.22.0-0" maintainers: @@ -28,6 +28,4 @@ dependencies: annotations: artifacthub.io/changes: |- - kind: changed - description: Backend configmap was changed to not require driver_class nor dialect but rather specify them by default. - - kind: fixed - description: Backend configmap wasn't getting feed retention correctly passed. + description: Backend configmap secret fetching uses now DB_USERNAME and DB_PASSWORD keys. diff --git a/charts/apps/piped/README.md b/charts/apps/piped/README.md index 22991b1..c0e99e2 100644 --- a/charts/apps/piped/README.md +++ b/charts/apps/piped/README.md @@ -1,6 +1,6 @@ # piped -![Version: 2.8.0](https://img.shields.io/badge/Version-2.8.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) +![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) Piped is an alternative privacy-friendly YouTube frontend which is efficient by design. @@ -160,7 +160,7 @@ helm install piped TeamPiped/piped -f values.yaml ## Changelog -### Version 2.8.0 +### Version 3.0.0 #### Added @@ -168,11 +168,11 @@ N/A #### Changed -* Backend configmap was changed to not require driver_class nor dialect but rather specify them by default. +* Backend configmap secret fetching uses now DB_USERNAME and DB_PASSWORD keys. #### Fixed -* Backend configmap wasn't getting feed retention correctly passed. +N/A ## Support diff --git a/charts/apps/piped/templates/backend/configmap.yaml b/charts/apps/piped/templates/backend/configmap.yaml index 04ca4ec..38d4643 100644 --- a/charts/apps/piped/templates/backend/configmap.yaml +++ b/charts/apps/piped/templates/backend/configmap.yaml @@ -66,8 +66,8 @@ data: 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" "database.username" ) -}} - hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.password") -}} + 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") -}} {{- end }} {{- else if .Values.postgresql.enabled }} hibernate.connection.url: jdbc:postgresql://piped-postgresql/{{ .Values.postgresql.auth.database}}