From 5f7c2bb26b37da3471e9004c8a0680cc567004f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksa=20Siri=C5=A1ki?=
 <31509435+aleksasiriski@users.noreply.github.com>
Date: Tue, 2 May 2023 22:03:27 +0200
Subject: [PATCH] ytproxy bug and resources

fixed missing .ytproxy in pod template and fixed resources
---
 charts/apps/piped/Chart.yaml                     |  2 +-
 .../piped/templates/backend/lib/_container.tpl   |  4 ++++
 charts/apps/piped/templates/backend/lib/_pod.tpl |  4 ----
 .../piped/templates/frontend/lib/_container.tpl  |  4 ++++
 .../apps/piped/templates/frontend/lib/_pod.tpl   |  4 ----
 .../piped/templates/ytproxy/lib/_container.tpl   |  4 ++++
 charts/apps/piped/templates/ytproxy/lib/_pod.tpl | 16 ++++++----------
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml
index 5a3a538..46fa392 100644
--- a/charts/apps/piped/Chart.yaml
+++ b/charts/apps/piped/Chart.yaml
@@ -9,7 +9,7 @@ sources:
   - https://github.com/TeamPiped/piped-proxy
 keywords:
   - streaming
-version: 2.3.0
+version: 2.4.0
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 maintainers:
diff --git a/charts/apps/piped/templates/backend/lib/_container.tpl b/charts/apps/piped/templates/backend/lib/_container.tpl
index 1c3317e..318942d 100644
--- a/charts/apps/piped/templates/backend/lib/_container.tpl
+++ b/charts/apps/piped/templates/backend/lib/_container.tpl
@@ -3,6 +3,10 @@
 - name: {{ include "backend.names.fullname" . }}
   image: {{ printf "%s:%s" .Values.backend.image.repository (default .Chart.AppVersion .Values.backend.image.tag) | quote }}
   imagePullPolicy: {{ .Values.backend.image.pullPolicy }}
+  {{- with .Values.backend.resources }}
+  resources:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.backend.command }}
   command:
     {{- if kindIs "string" . }}
diff --git a/charts/apps/piped/templates/backend/lib/_pod.tpl b/charts/apps/piped/templates/backend/lib/_pod.tpl
index 156f022..b9b2601 100644
--- a/charts/apps/piped/templates/backend/lib/_pod.tpl
+++ b/charts/apps/piped/templates/backend/lib/_pod.tpl
@@ -102,8 +102,4 @@ topologySpreadConstraints:
 tolerations:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.backend.resources }}
-resources:
-   {{- toYaml . | nindent 2 }}
-  {{- end }}
 {{- end -}}
diff --git a/charts/apps/piped/templates/frontend/lib/_container.tpl b/charts/apps/piped/templates/frontend/lib/_container.tpl
index 0995de6..ddb3c32 100644
--- a/charts/apps/piped/templates/frontend/lib/_container.tpl
+++ b/charts/apps/piped/templates/frontend/lib/_container.tpl
@@ -3,6 +3,10 @@
 - name: {{ include "frontend.names.fullname" . }}
   image: {{ printf "%s:%s" .Values.frontend.image.repository (default .Chart.AppVersion .Values.frontend.image.tag) | quote }}
   imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
+  {{- with .Values.frontend.resources }}
+  resources:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.frontend.command }}
   command:
     {{- if kindIs "string" . }}
diff --git a/charts/apps/piped/templates/frontend/lib/_pod.tpl b/charts/apps/piped/templates/frontend/lib/_pod.tpl
index 4f125b1..9a2e30d 100644
--- a/charts/apps/piped/templates/frontend/lib/_pod.tpl
+++ b/charts/apps/piped/templates/frontend/lib/_pod.tpl
@@ -98,8 +98,4 @@ topologySpreadConstraints:
 tolerations:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.frontend.resources }}
-resources:
-   {{- toYaml . | nindent 2 }}
-  {{- end }}
 {{- end -}}
diff --git a/charts/apps/piped/templates/ytproxy/lib/_container.tpl b/charts/apps/piped/templates/ytproxy/lib/_container.tpl
index 7ad863c..1c8b866 100644
--- a/charts/apps/piped/templates/ytproxy/lib/_container.tpl
+++ b/charts/apps/piped/templates/ytproxy/lib/_container.tpl
@@ -3,6 +3,10 @@
 - name: {{ include "ytproxy.names.fullname" . }}
   image: {{ printf "%s:%s" .Values.ytproxy.image.repository (default .Chart.AppVersion .Values.ytproxy.image.tag) | quote }}
   imagePullPolicy: {{ .Values.ytproxy.image.pullPolicy }}
+  {{- with .Values.ytproxy.resources }}
+  resources:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.ytproxy.command }}
   command:
     {{- if kindIs "string" . }}
diff --git a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
index ba357d8..155e6f1 100644
--- a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
+++ b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl
@@ -82,28 +82,24 @@ containers:
 volumes:
     {{- nindent 2 . }}
   {{- end }}
-  {{- with .Values.hostAliases }}
+  {{- with .Values.ytproxy.hostAliases }}
 hostAliases:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.nodeSelector }}
+  {{- with .Values.ytproxy.nodeSelector }}
 nodeSelector:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.affinity }}
+  {{- with .Values.ytproxy.affinity }}
 affinity:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.topologySpreadConstraints }}
+  {{- with .Values.ytproxy.topologySpreadConstraints }}
 topologySpreadConstraints:
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.tolerations }}
+  {{- with .Values.ytproxy.tolerations }}
 tolerations:
     {{- toYaml . | nindent 2 }}
-    {{- end -}}
-    {{- with .Values.resources }}
-resources:
-   {{- toYaml . | nindent 2 }}
-  {{- end }}
+  {{- end -}}
 {{- end -}}