From 1f51a6c88489a7cf5867bfcb19256d9427191737 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Thu, 4 Jul 2024 11:46:28 -0500
Subject: [PATCH] Remove logdb, update push secret, and env vars.

---
 .../cluster/pushsecret.yaml                   |  6 +++---
 .../default/radarr/app/externalsecret.yaml    | 10 ++++++----
 .../apps/default/radarr/app/helmrelease.yaml  | 20 ++++++++-----------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/kubernetes/apps/database/crunchy-postgres-operator/cluster/pushsecret.yaml b/kubernetes/apps/database/crunchy-postgres-operator/cluster/pushsecret.yaml
index 8c47e56b..6f97f125 100644
--- a/kubernetes/apps/database/crunchy-postgres-operator/cluster/pushsecret.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/cluster/pushsecret.yaml
@@ -147,14 +147,14 @@ spec:
         secretKey: host
         remoteRef:
           remoteKey: radarr
-          property: RADARR__POSTGRES_HOST
+          property: RADARR_POSTGRES_HOST
     - match:
         secretKey: user
         remoteRef:
           remoteKey: radarr
-          property: RADARR__POSTGRES_USER
+          property: RADARR_POSTGRES_USER
     - match:
         secretKey: password
         remoteRef:
           remoteKey: radarr
-          property: RADARR__POSTGRES_PASSWORD
+          property: RADARR_POSTGRES_PASSWORD
diff --git a/kubernetes/apps/default/radarr/app/externalsecret.yaml b/kubernetes/apps/default/radarr/app/externalsecret.yaml
index 1e1c2382..77a9f69c 100644
--- a/kubernetes/apps/default/radarr/app/externalsecret.yaml
+++ b/kubernetes/apps/default/radarr/app/externalsecret.yaml
@@ -13,12 +13,14 @@ spec:
     template:
       engineVersion: v2
       data:
-        RADARR__API_KEY: "{{ .api_key }}"
+        RADARR__AUTH__APIKEY: "{{ .api_key }}"
         PUSHOVER_TOKEN: "{{ .radarr_token }}"
         PUSHOVER_USER_KEY: "{{ .userkey_jahanson }}"
-        RADARR__POSTGRES_HOST: "postgres-primary-real.database.svc"
-        RADARR__POSTGRES_USER: "{{ .RADARR__POSTGRES_USER }}"
-        RADARR__POSTGRES_PASSWORD: "{{ .RADARR__POSTGRES_PASSWORD }}"
+        RADARR__POSTGRES__HOST: "postgres-primary-real.database.svc"
+        RADARR__POSTGRES__PORT: "5432"
+        RADARR__POSTGRES__USER: "{{ .RADARR_POSTGRES_USER }}"
+        RADARR__POSTGRES__PASSWORD: "{{ .RADARR_POSTGRES_PASSWORD }}"
+        RADARR__POSTGRES__MAINDB: radarr_main
   dataFrom:
     - extract:
         key: pushover
diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml
index 4a4ab5f9..fb0a7bdf 100644
--- a/kubernetes/apps/default/radarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml
@@ -33,18 +33,14 @@ spec:
               repository: ghcr.io/onedr0p/radarr
               tag: 5.7.0.8882@sha256:67cf7fa3b10fbb9771ef11c62a215d50956a238c1a27b4195f19bdc92b796cc7
             env:
-              # Ref: https://github.com/Radarr/Radarr/issues/7030#issuecomment-1039689518
-              # Ref: https://github.com/dotnet/runtime/issues/9336
-              COMPlus_EnableDiagnostics: "0"
-              RADARR__AUTHENTICATION_METHOD: External
-              RADARR__AUTHENTICATION_REQUIRED: DisabledForLocalAddresses
-              RADARR__INSTANCE_NAME: Radarr
-              RADARR__PORT: &port 80
-              RADARR__LOG_LEVEL: info
-              RADARR__THEME: dark
-              RADARR__POSTGRES_PORT: "5432"
-              RADARR__POSTGRES_MAIN_DB: radarr_main
-              RADARR__POSTGRES_LOG_DB: radarr_logs
+              RADARR__APP__INSTANCENAME: Radarr
+              RADARR__APP__THEME: dark
+              RADARR__AUTH__METHOD: External
+              RADARR__AUTH__REQUIRED: DisabledForLocalAddresses
+              RADARR__LOG__DBENABLED: "False"
+              RADARR__LOG__LEVEL: info
+              RADARR__SERVER__PORT: &port 80
+              RADARR__UPDATE__BRANCH: develop
               TZ: America/Chicago
             envFrom:
               - secretRef: