From ccb8b2726554d0ddc2198574b3d3b21fc4dd8108 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Tue, 28 Feb 2023 03:30:54 -0500 Subject: [PATCH] BREAKING CHANGE feat(prowlarr) add gui option to disable auth and postgres support (#6343) * fix(prowlarr) set gui option for auth * bump * set default auth to Forms * _sectrets.tpl * add the secrets.tpl to templates dir * postgres support * Update charts/stable/prowlarr/templates/_secret.tpl Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/prowlarr/templates/_secret.tpl Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/prowlarr/templates/_secret.tpl Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/prowlarr/values.yaml Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/prowlarr/questions.yaml Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/prowlarr/templates/_secret.tpl Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> * Update charts/stable/prowlarr/templates/_secret.tpl Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> * Update charts/stable/prowlarr/templates/_secret.tpl Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> * port * Update charts/stable/prowlarr/questions.yaml Signed-off-by: Kjeld Schouten-Lebbing * fix postgres, use secretKeyRef * Delete _secret.tpl * Update charts/stable/prowlarr/templates/common.yaml Co-authored-by: Kjeld Schouten-Lebbing Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> * update values and chart --------- Signed-off-by: Xstar97 Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Kjeld Schouten-Lebbing Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Co-authored-by: Xstar97 Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Kjeld Schouten-Lebbing --- charts/stable/prowlarr/Chart.yaml | 7 ++++-- charts/stable/prowlarr/questions.yaml | 23 ++++++++++++++++- charts/stable/prowlarr/templates/common.yaml | 7 +++++- charts/stable/prowlarr/values.yaml | 26 +++++++++++++++++--- 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml index 21dcdf28e88..a59232759da 100644 --- a/charts/stable/prowlarr/Chart.yaml +++ b/charts/stable/prowlarr/Chart.yaml @@ -4,6 +4,10 @@ dependencies: - name: common repository: https://library-charts.truecharts.org version: 11.1.2 + - condition: postgresql.enabled + name: postgresql + repository: https://charts.truecharts.org/ + version: 11.0.18 description: Indexer manager/proxy built on the popular arr net base stack to integrate with your various PVR apps. home: https://truecharts.org/charts/stable/prowlarr icon: https://truecharts.org/img/hotlink-ok/chart-icons/prowlarr.png @@ -19,10 +23,9 @@ maintainers: name: prowlarr sources: - https://github.com/truecharts/charts/tree/master/charts/stable/prowlarr - - https://ghcr.io/onedr0p/prowlarr-develop - https://github.com/Prowlarr/Prowlarr - https://github.com/k8s-at-home/container-images -version: 8.0.27 +version: 9.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/prowlarr/questions.yaml b/charts/stable/prowlarr/questions.yaml index be435663a35..5ae67a6fc40 100644 --- a/charts/stable/prowlarr/questions.yaml +++ b/charts/stable/prowlarr/questions.yaml @@ -8,7 +8,28 @@ questions: # Include{replicas} # Include{replica1} # Include{controllerExpertExtraArgs} - # Docker specific env + - variable: env + group: App Configuration + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: PROWLARR__AUTHENTICATION_METHOD + label: Auth Method + description: Sets the auth method. + schema: + type: string + default: "" + enum: + - value: "" + description: In-App Setting + - value: External + description: External/None + - value: Basic + description: Basic + - value: Forms + description: Forms # Include{containerConfig} # Include{serviceRoot} - variable: main diff --git a/charts/stable/prowlarr/templates/common.yaml b/charts/stable/prowlarr/templates/common.yaml index c1a366e1cf0..90075b16b37 100644 --- a/charts/stable/prowlarr/templates/common.yaml +++ b/charts/stable/prowlarr/templates/common.yaml @@ -1 +1,6 @@ -{{ include "tc.common.loader.all" . }} +{{/* Make sure all variables are set properly */}} +{{- include "tc.common.loader.init" . }} + + +{{/* Render the templates */}} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/prowlarr/values.yaml b/charts/stable/prowlarr/values.yaml index 80c5f29a028..432e0ce696c 100644 --- a/charts/stable/prowlarr/values.yaml +++ b/charts/stable/prowlarr/values.yaml @@ -1,22 +1,42 @@ image: repository: tccr.io/truecharts/prowlarr - tag: 1.3.1.2796@sha256:e9d90ff7367ebbad0c45e9a39ee2cafad70109b962c523a9a2291fd9d620443b + tag: 1.3.1.2796@sha256:64a815f6eb0ec4d553c3797413a520fa40d0ac1e137a1b11c685e21e32d66764 pullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: false +env: + PROWLARR__PORT: "{{ .Values.service.main.ports.main.port }}" + PROWLARR__AUTHENTICATION_METHOD: "" + PROWLARR__POSTGRES_PORT: 5432 + PROWLARR__POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" + PROWLARR__POSTGRES_MAIN_DB: "{{ .Values.postgresql.postgresqlDatabase }}" + PROWLARR__POSTGRES_HOST: + secretKeyRef: + name: dbcreds + key: plainhost + PROWLARR__POSTGRES_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password + service: main: ports: main: port: 9696 - targetPort: 9696 persistence: config: enabled: true - mountPath: "/config" + mountPath: /config + +postgresql: + enabled: true + existingSecret: dbcreds + postgresqlDatabase: prowlarr + postgresqlUsername: prowlarr portal: enabled: true