From 1bb362f205bddd7ae77304c7a7e2549d175aa277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Wed, 19 Apr 2023 01:53:54 +0300 Subject: [PATCH] Clean up pod templates and fix templating. There were multiple pod templates that were not using values due to how it is structured, now they do work. --- charts/apps/piped/Chart.yaml | 8 ++-- charts/apps/piped/README.md | 10 ++--- .../apps/piped/templates/backend/lib/_pod.tpl | 40 +++++++++---------- .../piped/templates/frontend/lib/_pod.tpl | 40 +++++++++---------- .../apps/piped/templates/ytproxy/lib/_pod.tpl | 28 ++++++------- charts/apps/piped/values.yaml | 18 +++++++++ 6 files changed, 81 insertions(+), 63 deletions(-) diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml index d953502..eb05d4c 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.0.2 +version: 2.1.0 appVersion: latest kubeVersion: ">=1.22.0-0" maintainers: @@ -27,6 +27,6 @@ dependencies: annotations: artifacthub.io/changes: |- - kind: fixed - description: Allow specifying of resource limits. - - kind: changed - description: Added a config validator for frontend. + description: Pod templates that were not getting things from values + - kind: added + description: Recommended resource limits were added to values, but are not enabled by default to make it concise decision to the user. diff --git a/charts/apps/piped/README.md b/charts/apps/piped/README.md index 62fd7c1..584111d 100644 --- a/charts/apps/piped/README.md +++ b/charts/apps/piped/README.md @@ -1,6 +1,6 @@ # piped -![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) +![Version: 2.1.0](https://img.shields.io/badge/Version-2.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. @@ -160,19 +160,19 @@ helm install piped TeamPiped/piped -f values.yaml ## Changelog -### Version 2.0.2 +### Version 2.1.0 #### Added -N/A +* Recommended resource limits were added to values, but are not enabled by default to make it concise decision to the user. #### Changed -* Added a config validator for frontend. +N/A #### Fixed -* Allow specifying of resource limits. +* Pod templates that were not getting things from values ## Support diff --git a/charts/apps/piped/templates/backend/lib/_pod.tpl b/charts/apps/piped/templates/backend/lib/_pod.tpl index b396696..156f022 100644 --- a/charts/apps/piped/templates/backend/lib/_pod.tpl +++ b/charts/apps/piped/templates/backend/lib/_pod.tpl @@ -2,50 +2,50 @@ The pod definition included in the controller. */ -}} {{- define "backend.controller.pod" -}} - {{- with .Values.imagePullSecrets }} + {{- with .Values.backend.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} {{- end }} serviceAccountName: {{ include "backend.names.serviceAccountName" . }} automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} - {{- with .Values.podSecurityContext }} + {{- with .Values.backend.podSecurityContext }} securityContext: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.priorityClassName }} + {{- with .Values.backend.priorityClassName }} priorityClassName: {{ . }} {{- end }} - {{- with .Values.runtimeClassName }} + {{- with .Values.backend.runtimeClassName }} runtimeClassName: {{ . }} {{- end }} - {{- with .Values.schedulerName }} + {{- with .Values.backend.schedulerName }} schedulerName: {{ . }} {{- end }} - {{- with .Values.hostNetwork }} + {{- with .Values.backend.hostNetwork }} hostNetwork: {{ . }} {{- end }} - {{- with .Values.hostname }} + {{- with .Values.backend.hostname }} hostname: {{ . }} {{- end }} - {{- if .Values.dnsPolicy }} -dnsPolicy: {{ .Values.dnsPolicy }} - {{- else if .Values.hostNetwork }} + {{- if .Values.backend.dnsPolicy }} +dnsPolicy: {{ .Values.backend.dnsPolicy }} + {{- else if .Values.backend.hostNetwork }} dnsPolicy: ClusterFirstWithHostNet {{- else }} dnsPolicy: ClusterFirst {{- end }} - {{- with .Values.dnsConfig }} + {{- with .Values.backend.dnsConfig }} dnsConfig: {{- toYaml . | nindent 2 }} {{- end }} -enableServiceLinks: {{ .Values.enableServiceLinks }} +enableServiceLinks: {{ .Values.backend.enableServiceLinks }} {{- with .Values.termination.gracePeriodSeconds }} terminationGracePeriodSeconds: {{ . }} {{- end }} - {{- if .Values.initContainers }} + {{- if .Values.backend.initContainers }} initContainers: {{- $initContainers := list }} - {{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }} + {{- range $index, $key := (keys .Values.backend.initContainers | uniq | sortAlpha) }} {{- $container := get $.Values.initContainers $key }} {{- if not $container.name -}} {{- $_ := set $container "name" $key }} @@ -82,27 +82,27 @@ containers: volumes: {{- nindent 2 . }} {{- end }} - {{- with .Values.hostAliases }} + {{- with .Values.backend.hostAliases }} hostAliases: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.nodeSelector }} + {{- with .Values.backend.nodeSelector }} nodeSelector: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.affinity }} + {{- with .Values.backend.affinity }} affinity: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.topologySpreadConstraints }} + {{- with .Values.backend.topologySpreadConstraints }} topologySpreadConstraints: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.tolerations }} + {{- with .Values.backend.tolerations }} tolerations: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.resources }} + {{- with .Values.backend.resources }} resources: {{- toYaml . | nindent 2 }} {{- end }} diff --git a/charts/apps/piped/templates/frontend/lib/_pod.tpl b/charts/apps/piped/templates/frontend/lib/_pod.tpl index 6443511..4f125b1 100644 --- a/charts/apps/piped/templates/frontend/lib/_pod.tpl +++ b/charts/apps/piped/templates/frontend/lib/_pod.tpl @@ -2,50 +2,50 @@ The pod definition included in the controller. */ -}} {{- define "frontend.controller.pod" -}} - {{- with .Values.imagePullSecrets }} + {{- with .Values.frontend.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} {{- end }} serviceAccountName: {{ include "frontend.names.serviceAccountName" . }} automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} - {{- with .Values.podSecurityContext }} + {{- with .Values.frontend.podSecurityContext }} securityContext: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.priorityClassName }} + {{- with .Values.frontend.priorityClassName }} priorityClassName: {{ . }} {{- end }} - {{- with .Values.runtimeClassName }} + {{- with .Values.frontend.runtimeClassName }} runtimeClassName: {{ . }} {{- end }} - {{- with .Values.schedulerName }} + {{- with .Values.frontend.schedulerName }} schedulerName: {{ . }} {{- end }} - {{- with .Values.hostNetwork }} + {{- with .Values.frontend.hostNetwork }} hostNetwork: {{ . }} {{- end }} - {{- with .Values.hostname }} + {{- with .Values.frontend.hostname }} hostname: {{ . }} {{- end }} - {{- if .Values.dnsPolicy }} -dnsPolicy: {{ .Values.dnsPolicy }} - {{- else if .Values.hostNetwork }} + {{- if .Values.frontend.dnsPolicy }} +dnsPolicy: {{ .Values.frontend.dnsPolicy }} + {{- else if .Values.frontend.hostNetwork }} dnsPolicy: ClusterFirstWithHostNet {{- else }} dnsPolicy: ClusterFirst {{- end }} - {{- with .Values.dnsConfig }} + {{- with .Values.frontend.dnsConfig }} dnsConfig: {{- toYaml . | nindent 2 }} {{- end }} -enableServiceLinks: {{ .Values.enableServiceLinks }} +enableServiceLinks: {{ .Values.frontend.enableServiceLinks }} {{- with .Values.termination.gracePeriodSeconds }} terminationGracePeriodSeconds: {{ . }} {{- end }} - {{- if .Values.initContainers }} + {{- if .Values.frontend.initContainers }} initContainers: {{- $initContainers := list }} - {{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }} + {{- range $index, $key := (keys .Values.frontend.initContainers | uniq | sortAlpha) }} {{- $container := get $.Values.initContainers $key }} {{- if not $container.name -}} {{- $_ := set $container "name" $key }} @@ -78,27 +78,27 @@ containers: {{- end }} {{- tpl (toYaml $additionalContainers) $ | nindent 2 }} {{- end }} - {{- with .Values.hostAliases }} + {{- with .Values.frontend.hostAliases }} hostAliases: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.nodeSelector }} + {{- with .Values.frontend.nodeSelector }} nodeSelector: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.affinity }} + {{- with .Values.frontend.affinity }} affinity: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.topologySpreadConstraints }} + {{- with .Values.frontend.topologySpreadConstraints }} topologySpreadConstraints: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.tolerations }} + {{- with .Values.frontend.tolerations }} tolerations: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.resources }} + {{- with .Values.frontend.resources }} resources: {{- toYaml . | nindent 2 }} {{- end }} diff --git a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl index 10cc56f..ba357d8 100644 --- a/charts/apps/piped/templates/ytproxy/lib/_pod.tpl +++ b/charts/apps/piped/templates/ytproxy/lib/_pod.tpl @@ -2,50 +2,50 @@ The pod definition included in the controller. */ -}} {{- define "ytproxy.controller.pod" -}} - {{- with .Values.imagePullSecrets }} + {{- with .Values.ytproxy.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} {{- end }} serviceAccountName: {{ include "ytproxy.names.serviceAccountName" . }} automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} - {{- with .Values.podSecurityContext }} + {{- with .Values.ytproxy.podSecurityContext }} securityContext: {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.priorityClassName }} + {{- with .Values.ytproxy.priorityClassName }} priorityClassName: {{ . }} {{- end }} - {{- with .Values.runtimeClassName }} + {{- with .Values.ytproxy.runtimeClassName }} runtimeClassName: {{ . }} {{- end }} - {{- with .Values.schedulerName }} + {{- with .Values.ytproxy.schedulerName }} schedulerName: {{ . }} {{- end }} - {{- with .Values.hostNetwork }} + {{- with .Values.ytproxy.hostNetwork }} hostNetwork: {{ . }} {{- end }} - {{- with .Values.hostname }} + {{- with .Values.ytproxy.hostname }} hostname: {{ . }} {{- end }} - {{- if .Values.dnsPolicy }} -dnsPolicy: {{ .Values.dnsPolicy }} - {{- else if .Values.hostNetwork }} + {{- if .Values.ytproxy.dnsPolicy }} +dnsPolicy: {{ .Values.ytproxy.dnsPolicy }} + {{- else if .Values.ytproxy.hostNetwork }} dnsPolicy: ClusterFirstWithHostNet {{- else }} dnsPolicy: ClusterFirst {{- end }} - {{- with .Values.dnsConfig }} + {{- with .Values.ytproxy.dnsConfig }} dnsConfig: {{- toYaml . | nindent 2 }} {{- end }} -enableServiceLinks: {{ .Values.enableServiceLinks }} +enableServiceLinks: {{ .Values.ytproxy.enableServiceLinks }} {{- with .Values.termination.gracePeriodSeconds }} terminationGracePeriodSeconds: {{ . }} {{- end }} - {{- if .Values.initContainers }} + {{- if .Values.ytproxy.initContainers }} initContainers: {{- $initContainers := list }} - {{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }} + {{- range $index, $key := (keys .Values.ytproxy.initContainers | uniq | sortAlpha) }} {{- $container := get $.Values.initContainers $key }} {{- if not $container.name -}} {{- $_ := set $container "name" $key }} diff --git a/charts/apps/piped/values.yaml b/charts/apps/piped/values.yaml index 1b6df28..4e903c3 100644 --- a/charts/apps/piped/values.yaml +++ b/charts/apps/piped/values.yaml @@ -48,6 +48,12 @@ frontend: - -c - "sed -i s/pipedapi.kavin.rocks/$BACKEND_HOSTNAME/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g 'daemon off;'" + #resources: + # requests: + # memory: 32Mi + # limits: + # memory: 128Mi + backend: enabled: true service: @@ -105,6 +111,12 @@ backend: # -- image pull policy pullPolicy: IfNotPresent + #resources: + # requests: + # memory: 500Mi + # limits: + # memory: 1500Mi + ytproxy: enabled: true service: @@ -131,6 +143,12 @@ ytproxy: # -- image pull policy pullPolicy: IfNotPresent + #resources: + # requests: + # memory: 32Mi + # limits: + # memory: 500Mi + ingress: main: enabled: true