From bd03b50610956ff6170e3944d645b1ae9672c0b4 Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Tue, 28 Feb 2023 01:45:54 -0500
Subject: [PATCH] BREAKING CHANGE fix(lidarr) add gui option to select auth
 (#6346)

* fix(lidarr) add gui option to select auth

* set default auth to Forms

* add postgres support and auth option to gui

* add dependency

* Update charts/stable/lidarr/questions.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* fix postgres

* Delete _secrets.tpl

* fix chart and values

* Update charts/stable/lidarr/templates/common.yaml

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>

---------

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Co-authored-by: Xstar97 <Xstar97@users.noreply.github.com>
Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
---
 charts/stable/lidarr/Chart.yaml            |  7 ++++--
 charts/stable/lidarr/questions.yaml        | 22 ++++++++++++++++++
 charts/stable/lidarr/templates/common.yaml |  7 +++++-
 charts/stable/lidarr/values.yaml           | 26 +++++++++++++++++++---
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml
index 8f0e225738a..9c2721cbcee 100644
--- a/charts/stable/lidarr/Chart.yaml
+++ b/charts/stable/lidarr/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
 deprecated: false
 description: Looks and smells like Sonarr but made for music
 home: https://truecharts.org/charts/stable/lidarr
@@ -20,10 +24,9 @@ maintainers:
 name: lidarr
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/lidarr
-  - https://ghcr.io/onedr0p/lidarr-develop
   - https://github.com/Lidarr/Lidarr
 type: application
-version: 13.0.15
+version: 14.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/lidarr/questions.yaml b/charts/stable/lidarr/questions.yaml
index b84cd8d50f4..9e710194562 100644
--- a/charts/stable/lidarr/questions.yaml
+++ b/charts/stable/lidarr/questions.yaml
@@ -8,6 +8,28 @@ questions:
 # Include{replicas}
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
+  - variable: env
+    group: App Configuration
+    label: Image Environment
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: LIDARR__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/lidarr/templates/common.yaml b/charts/stable/lidarr/templates/common.yaml
index c1a366e1cf0..90075b16b37 100644
--- a/charts/stable/lidarr/templates/common.yaml
+++ b/charts/stable/lidarr/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/lidarr/values.yaml b/charts/stable/lidarr/values.yaml
index 3802e63e65b..f698cd11e9a 100644
--- a/charts/stable/lidarr/values.yaml
+++ b/charts/stable/lidarr/values.yaml
@@ -1,17 +1,31 @@
 image:
   repository: tccr.io/truecharts/lidarr
   pullPolicy: IfNotPresent
-  tag: 1.1.3.2982@sha256:52eaa5e0605e67b7847b41089c8ad06c4d0eb82ab956e4e0faa8dc2f7a0f70a2
+  tag: 1.1.3.2982@sha256:0f635e1c21c6e6ef8a67f246b3e7f1ca3409f1f08bf8d2006abfaa89da55d534
 
 securityContext:
   readOnlyRootFilesystem: false
 
+env:
+  LIDARR__PORT: "{{ .Values.service.main.ports.main.port }}"
+  LIDARR__AUTHENTICATION_METHOD: ""
+  LIDARR__POSTGRES_PORT: 5432
+  LIDARR__POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+  LIDARR__POSTGRES_MAIN_DB: "{{ .Values.postgresql.postgresqlDatabase }}"
+  LIDARR__POSTGRES_HOST:
+    secretKeyRef:
+      name: dbcreds
+      key: plainhost
+  LIDARR__POSTGRES_PASSWORD:
+    secretKeyRef:
+      name: dbcreds
+      key: postgresql-password
+
 service:
   main:
     ports:
       main:
         port: 8686
-        targetPort: 8686
 
 probes:
   liveness:
@@ -37,7 +51,13 @@ probes:
 persistence:
   config:
     enabled: true
-    mountPath: "/config"
+    mountPath: /config
+
+postgresql:
+  enabled: true
+  existingSecret: dbcreds
+  postgresqlDatabase: lidarr
+  postgresqlUsername: lidarr
 
 portal:
   enabled: true