From 7ef0f91785486a9547874e498973a32407df2e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Sat, 29 Mar 2025 12:49:24 +0200 Subject: [PATCH] fix: Update environment variable templating for backend and frontend init-containers (#141) Fixes #109 --- charts/apps/piped/Chart.yaml | 8 +++++--- charts/apps/piped/templates/backend/lib/_pod.tpl | 2 +- charts/apps/piped/templates/frontend/lib/_pod.tpl | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml index 7f234c1..7aa6043 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: 7.2.4 +version: 7.3.0 appVersion: latest kubeVersion: ">=1.26.0-0" maintainers: @@ -27,5 +27,7 @@ dependencies: condition: postgresql.enabled annotations: artifacthub.io/changes: |- - - kind: changed - description: Updated image for `ytproxy` from latest@sha256:880b1117b6087e32b82c0204a96210fb87de61a874a3a2681361cc6d905e4d0e to latest@sha256:53575a0aa0f5ea81f66f6f43d4c74333559efd62c99c21588dfee0aacbab2265 + - kind: fixed + description: templating of environment variables for backend init-containers. + - kind: fixed + description: templating of environment variables for frontend init-containers. diff --git a/charts/apps/piped/templates/backend/lib/_pod.tpl b/charts/apps/piped/templates/backend/lib/_pod.tpl index d219831..8427142 100644 --- a/charts/apps/piped/templates/backend/lib/_pod.tpl +++ b/charts/apps/piped/templates/backend/lib/_pod.tpl @@ -52,7 +52,7 @@ initContainers: {{- end }} {{- if $container.env -}} {{- $_ := set $ "ObjectValues" (dict "env" $container.env) -}} - {{- $newEnv := fromYaml (include "common.controller.env_vars" $) -}} + {{- $newEnv := fromYaml (include "backend.controller.env_vars" $) -}} {{- $_ := unset $.ObjectValues "env" -}} {{- $_ := set $container "env" $newEnv.env }} {{- end }} diff --git a/charts/apps/piped/templates/frontend/lib/_pod.tpl b/charts/apps/piped/templates/frontend/lib/_pod.tpl index 372c868..b3bfb6f 100644 --- a/charts/apps/piped/templates/frontend/lib/_pod.tpl +++ b/charts/apps/piped/templates/frontend/lib/_pod.tpl @@ -52,7 +52,7 @@ initContainers: {{- end }} {{- if $container.env -}} {{- $_ := set $ "ObjectValues" (dict "env" $container.env) -}} - {{- $newEnv := fromYaml (include "common.controller.env_vars" $) -}} + {{- $newEnv := fromYaml (include "frontend.controller.env_vars" $) -}} {{- $_ := unset $.ObjectValues "env" -}} {{- $_ := set $container "env" $newEnv.env }} {{- end }}