From 7707239128da2ab377359972c4616c3fe70f11da Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Tue, 15 Oct 2024 18:19:28 -0400
Subject: [PATCH] feat(sonarr): try to fix sonarr

---
 .../download/sonarr/app/helm-release.yaml     |  53 +++++----
 .../apps/download/sonarr/app/secret.sops.yaml | 105 ++++++++++--------
 2 files changed, 86 insertions(+), 72 deletions(-)

diff --git a/kubernetes/main/apps/download/sonarr/app/helm-release.yaml b/kubernetes/main/apps/download/sonarr/app/helm-release.yaml
index 64c0bfb..65672d5 100644
--- a/kubernetes/main/apps/download/sonarr/app/helm-release.yaml
+++ b/kubernetes/main/apps/download/sonarr/app/helm-release.yaml
@@ -18,22 +18,21 @@ spec:
   values:
     controllers:
       main:
-        pod:
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 10000
-            runAsGroup: 10000
-            fsGroup: 10000
-            fsGroupChangePolicy: OnRootMismatch
+        initContainers:
+          init-db:
+            image:
+              repository: ghcr.io/onedr0p/postgres-init
+              tag: 16
+            envFrom: &envFrom
+              - secretRef:
+                  name: sonarr-secret
 
         containers:
           sonarr:
             image:
               repository: ghcr.io/onedr0p/sonarr-develop
               tag: 4.0.9.2457
-            envFrom:
-            - secretRef:
-                name: sonarr-secret
+            envFrom: *envFrom
             env:
               TZ: America/New_York
               SONARR__APP__INSTANCENAME: Sonarr
@@ -44,9 +43,7 @@ spec:
               SONARR__LOG__LEVEL: info
               SONARR__SERVER__PORT: &port 8989
               SONARR__UPDATE__BRANCH: develop
-              SONARR__POSTGRES__HOST: postgresql.database.svc
-              SONARR__POSTGRES__PORT: "5432"
-              SONARR__POSTGRES__MAINDB: sonarr_main
+              
             probes:
               liveness: &probes
                 enabled: true
@@ -90,6 +87,25 @@ spec:
                 name: sonarr-secret
                 key: SONARR__AUTH__APIKEY
 
+    defaultPodOptions:
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 10000
+        runAsGroup: 10000
+        fsGroup: 10000
+        fsGroupChangePolicy: OnRootMismatch
+
+    service:
+      main:
+        controller: main
+
+        ports:
+          http:
+            port: *port
+          metrics:
+            port: *metricsPort
+            protocol: HTTP
+
     ingress:
       main:
         annotations:
@@ -105,17 +121,6 @@ spec:
               identifier: main
               port: http
 
-    service:
-      main:
-        controller: main
-
-        ports:
-          http:
-            port: *port
-          metrics:
-            port: *metricsPort
-            protocol: HTTP
-    
     persistence:
       config:
         existingClaim: sonarr
diff --git a/kubernetes/main/apps/download/sonarr/app/secret.sops.yaml b/kubernetes/main/apps/download/sonarr/app/secret.sops.yaml
index 934db64..9a109c5 100644
--- a/kubernetes/main/apps/download/sonarr/app/secret.sops.yaml
+++ b/kubernetes/main/apps/download/sonarr/app/secret.sops.yaml
@@ -4,69 +4,78 @@ metadata:
     name: sonarr-secret
     namespace: download
 stringData:
-    SONARR__AUTH__APIKEY: ENC[AES256_GCM,data:Z0TKYOp2veBJ/ctC3z1ooj/b8J1p7ewUWX7ItIFWcpA=,iv:oY+k9x+BZxsGW5oAmNncApU+6M6YUx1q+pXDMldsg0M=,tag:lBJHGeSHw8IKS2nSFP/0aA==,type:str]
-    SONARR__POSTGRES__USER: ENC[AES256_GCM,data:vdcAhdIh,iv:tCRA3HFh6G7GUPpt5jFuqunaSRFiD90+b857vrt7tys=,tag:k02ojbFwZi6iufAOP2Fvjg==,type:str]
-    SONARR__POSTGRES__PASSWORD: ENC[AES256_GCM,data:0uqO/FMm3b/DXtthjBLI7HXoujqpjCvs66yTbzuAiDM=,iv:E/FP0rDmFQPlAM00hOGR3lB4WW22W7XezSKYGfStUGM=,tag:cC+IOkw6Oqzz8iFoTrZq1Q==,type:str]
+    SONARR__AUTH__APIKEY: ENC[AES256_GCM,data:wH/QrhslJ4NJ/hnsfceyn/B5gpeMSoG0zgVuoZjTaLE=,iv:ERxDsNOrN02JtPJoov52HIqk2te4XdzfsNPig2d0388=,tag:hHlY2seNVjWQQAaLR/AlPA==,type:str]
+    SONARR__POSTGRES__HOST: ENC[AES256_GCM,data:ZRO0EknQXPDl0vMp9F0E3cYHb177W2s=,iv:Qz91I05FWi+a1XqnELubeZ1laXqEiKqVy0HcV/yMk7o=,tag:LBE6HQNGWNb26wahvd4z1w==,type:str]
+    SONARR__POSTGRES__PORT: ENC[AES256_GCM,data:1d58CA==,iv:vpFv8u41johBC+DAoDkPTWbU17F+cFNsQwGw3dPSGkQ=,tag:ey4qKtXps8LwtRvpDfmWCQ==,type:str]
+    SONARR__POSTGRES__MAINDB: ENC[AES256_GCM,data:cTZ1/Ke0wAYDaZ4=,iv:mDWKt86DgnDKyNTdFXKmpisJJZOxwuCwhxBi11GlkLM=,tag:FJ4oxcyB4msTrl0MkI2Y3A==,type:str]
+    SONARR__POSTGRES__USER: ENC[AES256_GCM,data:+9kAfF9B,iv:bRCPZL/GtFdAwmxRi/2djNY4yaR4WDO3yz0GAA28vTM=,tag:gODcSMkuUFvdiG0CX6eOiQ==,type:str]
+    SONARR__POSTGRES__PASSWORD: ENC[AES256_GCM,data:56i8fbmSSw20s5tlO0bmjAjM0GbgEa4/xBP/kxV9CJs=,iv:8aVi7zXO7lPaQtywcz7TFuhjfzF78FepGnWY8zpJVOc=,tag:MhQfl71bsOOAp/CtA4wrpw==,type:str]
+    INIT_POSTGRES_DBNAME: ENC[AES256_GCM,data:IawAiQ8t5XA1usI=,iv:wTBsEte7iAoh1zK2G6fZDvmd3Ek0On4MlJqUq7JYjQc=,tag:78fLARKLMUEegE9nekHVTQ==,type:str]
+    INIT_POSTGRES_HOST: ENC[AES256_GCM,data:iVfDgOtTw9ZShmi+Y8Qf3kKaVqTMfCk=,iv:qSA/pUuX6i97YYBzITSsk8cndUJKyFzR12IcWbUT3LE=,tag:SD4emsW3RTtp64L0b92qQg==,type:str]
+    INIT_POSTGRES_PORT: ENC[AES256_GCM,data:s3DpOA==,iv:z5/0iwgEFSjC3e3yKmBvqfsz8AQWFo//VnkEp7BKmQc=,tag:BJix79TRREN2DgDRZ5xY7w==,type:str]
+    INIT_POSTGRES_USER: ENC[AES256_GCM,data:5fBNl8Eu,iv:6diK59WCNWot0UPjB3yPSXFeGHJyqQCRvJP45qjYj44=,tag:PBX2riRM/fRt3FgvcuA6bw==,type:str]
+    INIT_POSTGRES_PASS: ENC[AES256_GCM,data:6Zz3WsH+cTWZcUE1A5iOFxV/dZKPpzJ5ES6isxJNuCQ=,iv:wYsim1QM0HLKRtGhx55bBMh38CzmRIb6NK4rHzLT43A=,tag:2oNe85hrb7SWOYjjEq+S2A==,type:str]
+    INIT_POSTGRES_SUPER_PASS: ENC[AES256_GCM,data:B1u4JcKnMbNoFY67SSPJIrOlP0EexqH0A01HZWWoLhA=,iv:KUg8iyDhFBumEnb5ILgjIyjZ9hfbkpVq1Bayzci2ujA=,tag:nRpAV2+GLGEgRCVkisqJ6w==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-10-15T21:30:43Z"
-    mac: ENC[AES256_GCM,data:cX94qYBsvl4+cUOrEI6xSpHY/mlQAvk4d6Q5KyRE1QaqX/pau0zJEzczaF4j9UvWGfl7dm5xuR0mrSldwRBg6M/lA6B8xxIACXaCNxdDBj2pmwOCROi6v78BLtB5P7E8Y+wwoQzVxEQQnOQDIFQJ/mMmy+D6a9BmJ5ulneEeouc=,iv:aZf9GZXAOeU3Z3oq2rQ1P6fW8TMKVHwJXjn2CpZHNjg=,tag:wK0iU+FRJylxmYl5qcq4xg==,type:str]
+    lastmodified: "2024-10-15T22:13:12Z"
+    mac: ENC[AES256_GCM,data:anliTRQzhNy4iy5244g/di36HwXe3bwfFzxpFnVN0MxKwCqprAQioOtHxZXzFVxv8SbHNDwAKzEnC3oGze12SC/+SOYhQHloWKCLHt5J1pCTt0UFKfd0k83wahDkhmn/WcqsOfDlFxrp8yv/hrEqx7oJ4o83ZA2TW9/6CaKXY+c=,iv:QPpITIy7teyH9FKj9I+Jkv7sUg1t5kFW19J6Si9ZfH4=,tag:v+ZPT+OP5QG2UbDGR59DWg==,type:str]
     pgp:
-        - created_at: "2024-10-15T21:30:43Z"
+        - created_at: "2024-10-15T22:13:12Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAwAAAAAAAAAAAQ/+J4pyPCDaePFBF+1IgYzwaefDpRFAkP0kNzHObPZL1vUD
-            4GM3dQTqN8Ay8NoBAasq/dNKzDSjOvMTShZO2YXQJoA8019Q6yZhgc+l1B7bnB+W
-            6tDz5Rtlu+gbJWngvyLFkUhFCmOQ6UyQHKPpC2iObrNj3Rb9ZxxxVTCRa2n6/2g3
-            Bp2lRAIESK/cWxmQbus8PZnzphIAmfwEijot5tQjQy7Virhz4xMiqbxvuWowA2zk
-            X5PY5dHv+l7p+3Ckr7qbOGA/oAxbvFvL3hzLlE0xYj6sXdgWY5a5yqXhbxDtSQ8u
-            rT0QxtDtt3lPie0e4w+f/cxNURw4yitb7IzGFhwvyPi+7eRfzgAaQHndffFv9RM8
-            26la2JeamyXCQgUOJF7EGBD6Ix6fZJE8mHF80yerlC27unZ75Rac7ckxq9GYpKia
-            tdyrU8OrV+f9uUdEyNCeD6wuZrxuKyyL6f+zQs6uj+zzaLYg3/p8iZLgT5HsxBLs
-            dMRVnCEvCWyYd9OJrOLVld9qrvbmuypLuPOUQpTYt9WrC5SxfMPkQQYNnXEGcI0K
-            n2s4eSv4tFOQw4xjRH4hl1H678faXen83F9ScOXWyHpqE54fFCCMAJV6NXMWKByv
-            9l/Rz81+J8kd1wQ4+CcJslsVM06XpwEPPRM9xunxwxPWB2wZQYCF9mQitRmnIliF
-            AgwDAAAAAAAAAAABD/0YtuvVooC7OW45KsL7rJwRMJOryjkJmffl5ocjyU6aicQw
-            MRjD+d8xa3WUsVbCnSYHQATpAltPrKLybi1MpneRk3j7b6kAz8iJaawEcgTUiM3H
-            h6SjtrwCpjNSI7RN3eRAUyxDtdrrvR5P1ynfmMHUWnuQjXlYcBZqtnA/THWOIGnC
-            joEixpi7e2RlAUzFuG2+Mlux2nLdtO+YcGI2ta9qHHp1O1+46HxvYO982dFRTuLq
-            VAHJcdROw1eNBCvwK2n27mKBMo9kfQMLrcUyO8PZqZyxEIimsHM4aQbYp8NvxAtx
-            LuveKR3s60VjC7gHIqfWJw/fqPlv73V/ONwwruC/2WSzZSfZ0C1Z7LPJt84wqbXz
-            7+t7St0R+u4cJ+Vim/XXRpTQOX+xnfO3UZu9Nwszm144uWdkt/5L9zGGLPnYBmPy
-            eAfhcSz7S0xe9qBM1LWXQHqQ3U1U0cSlizE87oYrJgfYCRQ4CsT3MOWEhwfFpd9E
-            wLLXOgCLiFIw77OUBNa4Rcg/v6oYrHKf2UKklOtt6QrqcnVnZT2l2bTUaWupD0Rl
-            lq0/sadpV8FsYtIS1EQ6j7EVvAOZNEdC6L090CQ7bnPiwQyHdS3b6J49RE55TcOP
-            n743wfZNcmqEeV0ooUkGoW6r5q0jvaUBrTbVpJszktps9uBybO5qgqobjdexUtRo
-            AQkCEIda5ST1hWg6TgORmRI2cHqUdw+b4dMy74l3a1RZpBPHyKPbP9e7J98BGm7C
-            XAyNC9vgDwjfp+BwHzPjfA3KtXZDjg2Gu5PFU3cdWWlWhLSreG1+mtsjWjXGAKq+
-            GN4DyUYIF60=
-            =DCkn
+            hQIMAwAAAAAAAAAAAQ//cFHS3uCUlFYdR4lvSL99yUonFt+NB4h36TQII7xSc6hq
+            GfOhP+sKeEVNrLmU8InPQrbWg2vDz0C2w2mk2BQPVh+cuGBf51gZIW5tpS7ja+Rd
+            I6zUJE4kzvVUuQerVgG8DtXEunhp7zlWpC2Z/8sTON+UxyQIq1bXjrqFwqeGSWUY
+            PlHR3sqRfkIURd/Ube2C2aRohhTlH3ExOh44czoO19cwE85qk1AW/4LAQfObjbVp
+            2NXfPouuZB6pmUfqAJgEcnP1uvf6IF0Kx+8lKYa3WrpGYPdb0qSp6QHEwtyGkPIG
+            ARuAsTzW4tKk8AFrf4NoTOKohoQp0uomY9bTSudfubyLb66aPdRSQyvZ71cH87xs
+            Ec7PRGNYOi2bcDjns74kpZXmtJdi+esJ9gaw1knZBB+DJSeyXhORR2nX2GPfUc0n
+            SJL+cbe2Btkz/Z9q6jJs9UYI4D9ETFKCGRGNTXZ1EPRt8pvAvNd5bW3I8zDIL2Ny
+            G24A90O3d0j6q0d1hRowvOF/JpTeNPuO11jDfmMQrk1tx8Uk01DBO5KSI1sduPvw
+            kl5PGnSr1l0Ybh+KMJWFgeBV4EhOKmrrBt5CzGPs55YMDm7CXOltEi19ov4gHHKn
+            +R1sipGDGfkmMAYBpqvu5yRZLUaDsjls+eMMraVO0GGeiyJlecs+8apt4mVJSvmF
+            AgwDAAAAAAAAAAABEADWb3b/55DMvhqESfwtgtOlMZRlP+tHmDqxYc6PfugjGfJn
+            KBfVr/k2w7hrpM0PBPMeYjgSj8QZYPIJg9kGOnHGT7w+CNeXJvsbmDdEBJeJXwge
+            O8m03BIh5zQBF2jldqbXV4IM/g8DkiXdDbSRTGen78KItZL6Mij7KNTyWmzunyHK
+            l2bqbId8ggUrkUNBdcFtEgKCTPv/SJdKy9bQD7eDWUeRVCZ38GqtIZPvGwlSaB0s
+            dp0D1hmevml3l95x2q1MAMRW7yp61kLhH2y6MjxIuGAyAKbipT5UXWys59A2hrlM
+            n5AlqfGWVVjfmhWODfvpP/2PE01Hpxcd+gsEZg3Ut7PC0SnG73rSzyZ87Q27NlVk
+            D6skwOycM2/qabuZvWS0rHfqZumqXJL7mrVyqtdPf9+N+ol8quBkYxEqWtoQ+ABJ
+            3MFulZx8Wi41dNmVupn9qdVwL/aY+7A9sLEWtdQooamsdx5c3XhjoChtkCkRYEHL
+            awHCBPmGp+O8suxJCVI+O00R5MNRsES37WIF7m4glxDOvROIFpeJkw9Gdgkq+qtj
+            JrztEHfIXgmH1tgcH8SWZ7RyZm2EMw1LR9krDEbP2sOUIDH0IuG368i9OotX/osF
+            ohcbm/l3WynwdRGozwnRXz6wLNbPM/4+bmBFBn8xIyokPXY4Xr/XuptnBl/IZtRo
+            AQkCEK1YCERp6PPlryv/M9vOfOiHDZue4EXTb/fgY55SGfaDpMGTK2/jCmDDluqA
+            EKRN2dRQqDfXnE6gH8ZpuBvBBv/Z++xv3I7C/vAfc5t8z4QRsaQFE+P/zYU00f6s
+            iQqH9sMrTks=
+            =pXbd
             -----END PGP MESSAGE-----
           fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD
-        - created_at: "2024-10-15T21:30:43Z"
+        - created_at: "2024-10-15T22:13:12Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAwAAAAAAAAAAAQ//bqiURh1qRFK0fbL6E7UlU9wIw0Q2jkGQ+FF4gYKTTTtr
-            XdBS+CTBYLlTTpEGMMCSRJJsfOAXVUVRzpgopDt8Imhckqdx4/+I9VVsd6urEkOA
-            MyYXaKc2dY9rQjFj4kKB0vcEJ+tqZ8BrpMktUdt+3/g8QdgTWEfzv2inKi2OsrHQ
-            RevUJpM2FgBjR6f+JbsrbnOuEfYw0B9uD6otBre88HM2uECfEvuu+jMtPbA3X4YZ
-            J7UcmEsiH5oHxIFXNBvJiRQJycbrXwMWaU8m6IkbuADua2dcjsu9kYvPyM5OB1xX
-            f/3UIUa+UFTgS47GadXV/r8Voychp8mo9KflmY+7A66oxnmBo3hSYj83vBKiK+QP
-            qL78M9OSITicDeLYidDRUg5f+J3Ybc9O9duj5w8O/bS4LXWkD8B+9wiytbL80gkV
-            SU8TIat0f0U52ygZH72F60hdXsHoFTfUVD61nrtbIUwDTsS0A6se/5leXrI+23uq
-            boJU5Sz/Q0vzybOUeFjKU40r23D1mYsBqxDoD6LoMwAuZjd//T6yx5ZIVdp8kE5s
-            MMycUsDLAy7jmbsZvG2QmRgaRiTKvKLcvrWeYLrGHsrcExO5sbDDzLjeC61B3tSb
-            X3GUVg+9aOPPoUVB/COG1554F4l2Bbq9aYA9/Uw1tFZGWC9WjCRa3z/HMQQHm4vU
-            aAEJAhAgzTiHxfIdJmKQxVlkdME8Orw11Xo3hdbee9j9qx75+TkPifuNSkUIxKon
-            ufOAcIGDynnUpqD/xStmwCqS3uqpVEy6PGIfXTls34+nLPDWJ4wQ71P3v3kSHLYY
-            Q7jW3gYe3ohw
-            =xHcO
+            hQIMAwAAAAAAAAAAARAAuUR8Z9PShQnQ1iq0yGln4z0ktuM5r3eKM8nMsmKXDtjk
+            GPPYXBdqTkB83cxquMd6+GMEE5NzNDVFzsyLG7K07f9Ui+n0rx24St4ZX8gluUwW
+            DMTqVskrGYtB6QABxSHIiErPiZZEgqfGW5NVwwamUYcH0UXFuT2miUan/L7fNjGq
+            nHe0qsFOBmGpGier1bS4UrhW578jCzrlZvxl3S2RBzIgFH58xleJyVFURJXhb3u3
+            8E99aVqBYBybUS5gCkW9Kee1h2tCxKADp6ShLNjrcjyy773fX2QoBxq8spNl9bTC
+            eL4/XQwOQrsXdyhcUzTSTov9f2C8aGsY7+tSsI1cUnJjtvc/NvZ8Hk/Xa6hNcnS4
+            8FbbSAfxw4TLl4zvoJsniWaGsnVkBUkzdYFviWHA2BwQLv7H1oEUSkvdtRH5pmXQ
+            vvy3xfbJOfN762gbQR9L9MqxZ7pfF5s8YkfuSsYdc8UT4tRn6Bdsl11tTNLndujh
+            HKn2T+kD2tAw4nLsXaJyZWlHvfEm3332HgyvccL2nKh5xIO1rmNCDNvZtclLhFTb
+            pGh502rEaXyEtyHUiRcqaD9tfPiwZwZoEzWfmq+wdMLc8wP5rHdrtmTOu8i7Vu5+
+            a2RPJ/vwbiLlu4olKW/AsuDjCZr/5zrHFF0ypu8iik4svl/vanYAgzsWNHsurebU
+            aAEJAhDL/Wju015ltfk8xdmpdV0jBcuJCdgwgmqFFEZJYJ3A898OJdJJKACoG+nR
+            C16xIvshSO2a6Z3hpz2NHb8Id4TLaRxn8ELVlvSCGAENtTqhM3yP/KVmz7s4CWrH
+            6UUjIEuCzTXq
+            =kE3a
             -----END PGP MESSAGE-----
           fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D
     encrypted_regex: ^(data|stringData)$