From 3a6387a9bfefd038e79807aad58c4e67ec399287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= <samip5@users.noreply.github.com>
Date: Fri, 5 Apr 2024 08:08:46 +0300
Subject: [PATCH] Fixing templates for additionalContainers definitions.

---
 charts/apps/piped/Chart.yaml                      | 4 ++--
 charts/apps/piped/README.md                       | 4 ++--
 charts/apps/piped/templates/backend/lib/_pod.tpl  | 5 +++--
 charts/apps/piped/templates/frontend/lib/_pod.tpl | 5 +++--
 charts/apps/piped/templates/ytproxy/lib/_pod.tpl  | 5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml
index 774ffd8..c86cba0 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: 5.0.2
+version: 5.1.0
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -28,4 +28,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |-
     - kind: fixed
-      description: ytproxy env variable template
+      description: Pod templates for addionalContainers values.
diff --git a/charts/apps/piped/README.md b/charts/apps/piped/README.md
index b0c56cf..2851c95 100644
--- a/charts/apps/piped/README.md
+++ b/charts/apps/piped/README.md
@@ -1,6 +1,6 @@
 # piped
 
-![Version: 5.0.2](https://img.shields.io/badge/Version-5.0.2-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 5.1.0](https://img.shields.io/badge/Version-5.1.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.
 
@@ -125,4 +125,4 @@ The following table contains an overview of available values and their descripti
 </details>
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
\ No newline at end of file
diff --git a/charts/apps/piped/templates/backend/lib/_pod.tpl b/charts/apps/piped/templates/backend/lib/_pod.tpl
index 84597ed..310b97a 100644
--- a/charts/apps/piped/templates/backend/lib/_pod.tpl
+++ b/charts/apps/piped/templates/backend/lib/_pod.tpl
@@ -62,9 +62,10 @@ initContainers:
   {{- end }}
 containers:
   {{- include "backend.controller.mainContainer" . | nindent 2 }}
-  {{- with .Values.additionalContainers }}
+  {{- if .Values.backend.additionalContainers }}
     {{- $additionalContainers := list }}
-    {{- range $name, $container := . }}
+    {{- range $index, $key :=  (keys .Values.backend.additionalContainers | uniq | sortAlpha) }}
+    {{- $container := get $.Values.backend.initContainers $key }}
       {{- if not $container.name -}}
         {{- $_ := set $container "name" $name }}
       {{- end }}
diff --git a/charts/apps/piped/templates/frontend/lib/_pod.tpl b/charts/apps/piped/templates/frontend/lib/_pod.tpl
index 7cf2e45..5c37aa3 100644
--- a/charts/apps/piped/templates/frontend/lib/_pod.tpl
+++ b/charts/apps/piped/templates/frontend/lib/_pod.tpl
@@ -62,9 +62,10 @@ initContainers:
   {{- end }}
 containers:
   {{- include "frontend.controller.mainContainer" . | nindent 2 }}
-  {{- with .Values.additionalContainers }}
+  {{- if .Values.frontend.additionalContainers }}
     {{- $additionalContainers := list }}
-    {{- range $name, $container := . }}
+    {{- range $index, $key :=  (keys .Values.frontend.additionalContainers | uniq | sortAlpha) }}
+    {{- $container := get $.Values.frontend.additionalContainers $key }}
       {{- if not $container.name -}}
         {{- $_ := set $container "name" $name }}
       {{- end }}
diff --git a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
index aaa884c..9ab1702 100644
--- a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
+++ b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
@@ -62,9 +62,10 @@ initContainers:
   {{- end }}
 containers:
   {{- include "ytproxy.controller.mainContainer" . | nindent 2 }}
-  {{- with .Values.additionalContainers }}
+  {{- if .Values.ytproxy.additionalContainers }}
     {{- $additionalContainers := list }}
-    {{- range $name, $container := . }}
+    {{- range $index, $key :=  (keys .Values.ytproxy.additionalContainers | uniq | sortAlpha) }}
+    {{- $container := get $.Values.ytproxy.additionalContainers $key }}
       {{- if not $container.name -}}
         {{- $_ := set $container "name" $name }}
       {{- end }}