From 10c12fd51457b413be9363efac2811f09e9ec1d8 Mon Sep 17 00:00:00 2001
From: Zee Aslam <zeet6613@gmail.com>
Date: Sun, 6 Aug 2023 14:59:50 -0400
Subject: [PATCH] (arr) change order of some envsubt

---
 cluster/apps/downloads/whisparr/helm-release.yaml      | 10 +++++++---
 .../apps/media/books/readarr-audio/helm-release.yaml   |  9 ++++++---
 cluster/apps/media/books/readarr/helm-release.yaml     |  9 ++++++---
 cluster/apps/media/lidarr/helm-release.yaml            |  2 ++
 cluster/apps/media/prowlarr/helm-release.yaml          |  9 ++++++---
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/cluster/apps/downloads/whisparr/helm-release.yaml b/cluster/apps/downloads/whisparr/helm-release.yaml
index 0527d90acd..566cbc8070 100644
--- a/cluster/apps/downloads/whisparr/helm-release.yaml
+++ b/cluster/apps/downloads/whisparr/helm-release.yaml
@@ -26,6 +26,12 @@ spec:
       namespace: rook-ceph
     - name: vpn-gateway
       namespace: vpn-gateway
+  valuesFrom:
+    - kind: Secret
+      name: *app
+      valuesKey: WHISPARR__API_KEY
+      targetPath: env.WHISPARR__API_KEY
+      optional: false
   values:
     controller:
       type: statefulset
@@ -39,9 +45,7 @@ spec:
       WHISPARR__INSTANCE_NAME: Whisparr
       WHISPARR__PORT: &port 80
       WHISPARR__LOG_LEVEL: info
-    envFrom:
-      - secretRef:
-          name: *app
+      WHISPARR__AUTHENTICATION_METHOD: None
     service:
       main:
         ports:
diff --git a/cluster/apps/media/books/readarr-audio/helm-release.yaml b/cluster/apps/media/books/readarr-audio/helm-release.yaml
index 11d042e987..0aa6868440 100644
--- a/cluster/apps/media/books/readarr-audio/helm-release.yaml
+++ b/cluster/apps/media/books/readarr-audio/helm-release.yaml
@@ -24,6 +24,12 @@ spec:
   dependsOn:
     - name: rook-ceph-cluster
       namespace: rook-ceph
+  valuesFrom:
+    - kind: Secret
+      name: *app
+      valuesKey: READARR__API_KEY
+      targetPath: env.READARR__API_KEY
+      optional: false
   values:
     image:
       repository: ghcr.io/onedr0p/readarr-nightly
@@ -35,9 +41,6 @@ spec:
       READARR__PORT: &port 80
       READARR__LOG_LEVEL: info
       READARR__AUTHENTICATION_METHOD: None
-    envFrom:
-      - secretRef:
-          name: *app
     service:
       main:
         ports:
diff --git a/cluster/apps/media/books/readarr/helm-release.yaml b/cluster/apps/media/books/readarr/helm-release.yaml
index b556e68a3b..01bc25f620 100644
--- a/cluster/apps/media/books/readarr/helm-release.yaml
+++ b/cluster/apps/media/books/readarr/helm-release.yaml
@@ -24,6 +24,12 @@ spec:
   dependsOn:
     - name: rook-ceph-cluster
       namespace: rook-ceph
+  valuesFrom:
+    - kind: Secret
+      name: *app
+      valuesKey: READARR__API_KEY
+      targetPath: env.READARR__API_KEY
+      optional: false
   values:
     image:
       repository: ghcr.io/onedr0p/readarr-nightly
@@ -36,9 +42,6 @@ spec:
       READARR__LOG_LEVEL: info
       READARR__AUTHENTICATION_METHOD: None
       READARR__APPLICATION_URL: readarr.${XYZ_DOMAIN}
-    envFrom:
-      - secretRef:
-          name: *app
     service:
       main:
         ports:
diff --git a/cluster/apps/media/lidarr/helm-release.yaml b/cluster/apps/media/lidarr/helm-release.yaml
index e6fc238e58..c8c0ebadf6 100644
--- a/cluster/apps/media/lidarr/helm-release.yaml
+++ b/cluster/apps/media/lidarr/helm-release.yaml
@@ -27,6 +27,8 @@ spec:
       remediateLastFailure: true
 
   values:
+    controller:
+      type: statefulset
     image:
       repository: ghcr.io/onedr0p/lidarr
       tag: 1.2.6.3313@sha256:24dccd066c58ae3fea202198ab5b2f0bd3c1cef51db9b95ae25574d999201cce
diff --git a/cluster/apps/media/prowlarr/helm-release.yaml b/cluster/apps/media/prowlarr/helm-release.yaml
index 446fe04205..92ffd52f85 100644
--- a/cluster/apps/media/prowlarr/helm-release.yaml
+++ b/cluster/apps/media/prowlarr/helm-release.yaml
@@ -22,6 +22,12 @@ spec:
   upgrade:
     remediation:
       retries: 5
+  valuesFrom:
+    - kind: Secret
+      name: *app
+      valuesKey: PROWLARR__API_KEY
+      targetPath: env.PROWLARR__API_KEY
+      optional: false
   values:
     global:
       nameOverride: *app
@@ -50,9 +56,6 @@ spec:
       #     secretKeyRef:
       #       name: prowlarr-postgres
       #       key: POSTGRES_PASSWORD
-    envFrom:
-      - secretRef:
-          name: *app
     service:
       main:
         ports: