feat: enable volsync for dendrite

moved logs to /var/log/dendrite, will have to migrate data from hostpath to the pvc
2024-10-16 21:19:17 -04:00 · 2024-10-16 21:19:17 -04:00 · 51bf76fe3a
parent ed3c9ac733
commit 51bf76fe3a
12 changed files with 277 additions and 240 deletions
--- a/kubernetes/common/templates/volsync/backup-creds.sops.yaml
+++ b/kubernetes/common/templates/volsync/backup-creds.sops.yaml
@ -0,0 +1,75 @@
+apiVersion: v1
+kind: Secret
+metadata:
+    name: ${APP}-volsync-b2-secret
+    namespace: download
+type: Opaque
+stringData:
+    RESTIC_REPOSITORY: ENC[AES256_GCM,data:fD+WoMqJVuaLdpUovcN98OmNubwbDDqTyMKS+Dg+kaDIZk7W+8K0mUYx9yQewHFyX6g/W7WAHQ==,iv:FQhrAqzrKSUJFpGkyzAnFbJnvOvTxx2RndMiGv8tioI=,tag:mAGaKqc0FwVmqWTVYeXC8w==,type:str]
+    RESTIC_PASSWORD: ENC[AES256_GCM,data:2tultkWOa0Av0mLMZgUyISazuMRqX8uCSXQ46DJZvd0=,iv:oIT7KwKsgJvRiatzMgViFJnLjtwmMMuvH9JPR8NT53E=,tag:ZdrRD0EC6cYsfebU2bCcww==,type:str]
+    AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:14KDBFy9QFEWkQrOx3RAjMvwUhC3sp2h7w==,iv:lhU1oQG+yOJkWQp9KlFcfHtbutYQ6JDOYThVLQxGb4o=,tag:wYGlH9GUWMsgfYXkvIXCnw==,type:str]
+    AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:S0yY7ih7QgXtsGsT0U/N0WR+EWsB4b/564/TgkSFrA==,iv:bPy1qOPqbKokDdqEGyo2A1Z4iE4mvBEoLKS4kvIyYS4=,tag:+e0iigli9Japbr8Yawst1Q==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-10-17T01:06:29Z"
+    mac: ENC[AES256_GCM,data:rh+lZR7eV5u9LJT0YTLhb1A53/7hvxzFu3hz+IrhL9OYAjImLIq8lqgxpsmfZUIO0yhNY71O8SbA+XUk40NDppa4gmAKjGlJypGqBkZn3l18KdbTW/LXUAaNMWVJU9r1sK3uxjzv5jVqP45PPjHCqSxDyXHqSW0IjDkGjrApUgg=,iv:VbT/8fl+cVW56Ux+8SeS7JLCz4SdLcRibw7iZaUpYxg=,tag:2A5eVfRL3sh5tCVxyWc1iQ==,type:str]
+    pgp:
+        - created_at: "2024-10-17T01:06:29Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAwAAAAAAAAAAARAAxzPM3P/Fhmb97TQ27w3Vm7JfDfU7NyPx6QKiAD7h0529
+            6W3UIjDHIkJy1/MlWW8m5DgM/q9uPfm03Lf8Dpj89Fp0abr8Eqje4URpE6wbLK1X
+            KaqZhheVGT+V/NJt1BJsX8u88DrBOBJS8K5zZUv0sdcxQrYbpHBeuJvdKuaDAgTi
+            mtsV0kNwbIStyaEhRGM/oVc9fXc19t29R3yTdTAnNQyC2J352b5yHtdHb3qaUdm+
+            MnyNOR4F02tNMUbaMWBTAQMwZ23hcl/23nQpkyf19ypTckhTIZRZrUEPm+4oR2uX
+            GzWBwJQIgTQPsh+Pf5/Dxc8nrVMMBNCJoO2k4IHqJiPTtv3Vc+3wPioe5/DPbJ6b
+            h/PRc6P+ob5ZdYN+lkIL76PnkhaWkdVn34F2Vaqfrep7PwkY+WQ6wdu08Nmr5Jak
+            Ku6DMlxNiCC5cn4/oElrbCYGYPXU+NnnIqNnp8PhMwgMf1AJtMEo2/wcMx+u5BfS
+            DGijLzPmShIaY46kKzoxfEulEO5dOTULFwz8qLi/n95sHCldnkm8BB+lli9GmesK
+            2IkT6LQgPniOZa0Y4K7TWIZTP3zujfXvMR9jo6JEFhXbaNHHoculUd0bzdlIBZ8z
+            /T8UapFuYgT1dTqsBpfnPmHgsUYNqzA7i69afWTLcQEd+3kKaAuxjdgaiRLcLoqF
+            AgwDAAAAAAAAAAABD/9DHc0HFIaUaLhO+wnJGiLJzIZLDEKcY3eGgNxBxsfojWyo
+            Lqsu88r7iNEhCr3aLuCkzzl89AsUvMDc9q+73w4rZuAoZLzCiEK/y3JAagWZIg5b
+            zCv3nO6xeO+90x53+KxXmQOgIHhECejC+W9HI2Zf0dWIytz6h5jhkLXwZ46I1K8w
+            DWODfHKm1wEs/rmM0lpW7/BGcmn0IO8FBSZx0+Z6LAwOqhAL02atjBbJEOVdM6YY
+            mAxhdP5L3Gs/uV1Q+8brJMqem0PeqHg27pdHvg1MX2Ex8EYscUnSnXFNqp4eQI/b
+            QJI60nf07oBpES8eypHS6JM5eoeRB/ZKhQ1oItnyQeWudEiNBiTzHko254EESlEy
+            umQKwIvlhlh+061RA/wcKw4sNGhiggNmsyYMrICj8H5jamWGbtuqFqCPZl+Brel4
+            JuR3A2nqrrHmchOaqEjrZRpr3Ms2kFvvH+8epEBWrtEGMIQGskL3TF7xDF1tGJHe
+            BxyWjdilcwGnpUJk2XCnv2QxmOkZL4H5WuhGpPC7zRZAEnKCg+bD/y7ZSaPL7s7/
+            SaeeWWt/4WXgNGbaetxvgk/e1Kl8iaeM+aKEzBupotHag7G7Q3kESy14s2Oi99ZL
+            GRhRXsVT5ykwCUa137wgAgT1ApmjHM87+4yExak/V5b9qrw+oRdcf3QnTdtSHtRo
+            AQkCEHJgWf9AXqUuD2HUc8F6VMGSZ7dxEkj6M7UP8+0yHYZ1DmlZfAWNtMH/JwKI
+            /8vS+5d68GhnykdrL2B5VJBEdjlUbqY26ntermrRPxyUdmoVi/5pVlUzZUndQPIm
+            aO4jWhxRSQ8=
+            =AsUJ
+            -----END PGP MESSAGE-----
+          fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD
+        - created_at: "2024-10-17T01:06:29Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAwAAAAAAAAAAARAAleAV2WTlA9Jkdu0VcRnMgeDCcRAH+8H3LwZajjcZyc8W
+            q3O1UcdFs5KpdLFozNhSrR844NsF4osK39EpVgJSeZhia9fGJPcLnmMs0CGthygw
+            mOYunrDaSzaQoWR0g+tffNoLku83oYgSi+iWBqZHJpaumk11IH2Mi9rbw5pe9wK5
+            FmZDl0pqNXO916LwkdBY5aeh0bGXuAkMccHDICcSAR9DrvmynW4sTyutNlH3By0m
+            U/PW6CMunVosnr3LXR9w0hwhNFqU/OQ4jdHB9+Q79QRKTsxS1cB4oBoNL8t86MIQ
+            Fat5vef/oLJcfDqpUORLHwLe7qAq9oItecA1kvGRI4Rit5dOeV3DarwgqYxa73kM
+            4UvHA/OCKzMLJI5SEedOiCYOXZBW2OUkhnH5kUZuGA+Fsjor8Dd08BPbT8uIRfKv
+            WarCyCHYLqq7cBl9opvt4/+RZcQKPiLt0q4CoE3eI8FQVQ3R4zOWMR1UEK3xWnfT
+            az61v99QW3XQKFVRRBW8AQV1eQuJPIzaV5nZ47bKCkA5sHSZQU6WDKX7WUK7P/Ah
+            XqbDgZoMHc9FpWIynDLguTKtA1tSTew/XamyKl6QE0AGtIcusCJin0dze3a/hB1k
+            9O+Ls5TljKsb4KDmw3147yJV9ji7IYSWpIEjjhw2nJ6rSVzlIloyFIh6j0Dkj3HU
+            aAEJAhCfV22ss9YGW4KgATl4yzzbdonzjmzkeNuuqUe9N9+7XGjBQ+YBUu4Aq2B9
+            bOVJZ7fVFvp2+VWt9kA4ExaRRiFs8lRR15KUaGuD2uf93NQKprYAha2EXtf4Agel
+            3QMo7sTwMiSe
+            =dfWL
+            -----END PGP MESSAGE-----
+          fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D
+    encrypted_regex: ^(data|stringData)$
+    version: 3.9.1
--- a/kubernetes/common/templates/volsync/kustomization.yaml
+++ b/kubernetes/common/templates/volsync/kustomization.yaml
@ -2,6 +2,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- ./backup-creds.sops.yaml
+- ./minio-creds.sops.yaml
 - ./pvc.yaml
 - ./minio.yaml
 - ./b2.yaml
--- a/kubernetes/common/templates/volsync/minio-creds.sops.yaml
+++ b/kubernetes/common/templates/volsync/minio-creds.sops.yaml
@ -0,0 +1,75 @@
+apiVersion: v1
+kind: Secret
+metadata:
+    name: ${APP}-volsync-secret
+    namespace: download
+type: Opaque
+stringData:
+    RESTIC_REPOSITORY: ENC[AES256_GCM,data:/Vt1pnLmskB+8n14lKy8YRaPrfm3SEyox9u8DTnKi8Yw/FjjtBVhe1+N1uhLNDdF,iv:nfN8jfE+9EyKuV5FBb2br1pBNLD0hr+OyILhg19d3T4=,tag:lT3y1Ues8u7CZxq00QNCaA==,type:str]
+    RESTIC_PASSWORD: ENC[AES256_GCM,data:Es2nPq1hMur6XNrWuKD1M1P8Kvm5Ca62SEr4Pn4/sqs=,iv:74Dx97JJdwm05FqWq3oyNEeWAbKImUmhuiQb9mMJ+gk=,tag:AxrUoljuBR+qukgryKMuDg==,type:str]
+    AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:KALSPVO5k56Ey1Ik1XOulA==,iv:+Frc2NdijlEuE4z9A6KU7XqbJkXywOaSSvHsD+SOZ0c=,tag:CfF/VZnGuOV9KKxcA84Dgw==,type:str]
+    AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:iS9mLDFSWosQEs5oOKHbmPGWrgGqLsBOdSKeBWARh8g=,iv:FnP23ZAgQtEZL04Efyrv+P/FQNCsoljdt1DX5qq+K70=,tag:dnC/IeR+YuKCpiEiODH/Jw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-10-17T01:06:37Z"
+    mac: ENC[AES256_GCM,data:BnVNXscWxxUtzre9Br8QcRreFP5URHrt0BvuxY31x8q/RTEECTJWlYYBqblFdhLT1pok6E7JWTriap3p3HKfvTCi67F9/r5EpmHyr4gJZ20jLo8b4C9uRjRaTIKIjPDOGe94H6WaHUKXo5I1XxYrMHMvFJPmXZkSZfBbWuufkio=,iv:2ZXXOlJhlctthmM53jtBxkNaYOeCLYqveZwcg6b4t6I=,tag:wqVyBHu5OAEZwjnGD19YQw==,type:str]
+    pgp:
+        - created_at: "2024-10-17T01:06:37Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAwAAAAAAAAAAAQ/9FVRD6fuiq1kxNXOqMf2qfmIWltl5goFMyn7I5bs/5MnQ
+            GU9Uw1QQUoRd7aHZcdkSqRgXzs23xaGW2SJH2kVMBJRbQcVKfVUlSYnYg2AzqvSH
+            Z7ONFlMiQvfzPZIsM/Tb8xe5UC9k1E//w+AJy8+/xwPxHlWNtYg4lvHoZl7LzdDh
+            ErwjrhXYRc8mNzYOqeRwBl3QUjU/KFkefc/3wwVOPhkMfzuZTmlVxQKswoYA+utS
+            r8PmlIgM34GG4bl+YSKVJ+odyJ492IDR8u7XTOpt4W/fpfDZGV6Y1+Ns8eUvxvtP
+            ymLfubrn4l/RWbcayuTcg3VxWRCNjdzDB22rfmIWfJGMXuJospaKkJChvqKfl8GS
+            dXbhw8+nPVuTe3u8pvrkEfxEFVhKl6Pf5MMEcLgbXTNYK2sq0fVHeT32vKi+7ofE
+            8FIZU9WFZI2Wc3tPvOumQsKJYE6UveoeflkVlIt8VU+1mdd6hlJO27BlWwuwhkJi
+            CTr/nQtDdwKh4ctfd+tESLT2f86uBYsasOaNzaiY3eD2MkchVpHPWHYJzLc07mJW
+            X10WZHtUIhyybcrkg3UqW4bVcZQi8+jbRfTNC9NgG+TEmNGaaf5N4PAp5bOOZbvf
+            pqOiC6W9e/hMCpfoonnZrhuODX3PwVx9IP2c1Fh6X4wN1iWabAghEoDXWBm6xNCF
+            AgwDAAAAAAAAAAABEADbQoLCgH03roQKEvcP9yMJ9O9F3TSjZ347tAIpMgD1uCBg
+            qiYFWX2CYhR3G7gYFOrI9CMAe80TDXRF/O7xIU3O7KjFKsZpuSyCKCHcWJomnRgb
+            JWVPsQZuN5oAZGtAgjF+d6HruPR1hBhLA0Tdv73o2rBteMx3XZZCTLUx8DzMbeCx
+            QJASMrAQQy5s0vycDiB7lPfQ9nQfXJVawRr26sdmvCHxlSS22IZOZLYAUWAGGH+V
+            NOjvp+z1LWrmIZULzIih2FpHMZUSaM0+NoIDu3FZi7o52+6mPCXchztGMV6B/epe
+            x/3WCkZXwcvnTPnmw1qZUZ0iqjr9VwzzYl9jdwPHdXvtMBDmbWl3zey+ArUEAYpB
+            aOTJHKOyeSE2lIIBpg9nkXLBFEumrvNPCqjGu4ti6Jo68JkIl53/PEV+RcrUzO5+
+            DYkOANR5/88cWVh71N6Sd+kRqP3HpO9mX/HWTYpKa3eP12qPlOUkbo245P5CE6s/
+            x4SFA4kQRritic2XmfinY8zgYx79BHZ+g1bCR2WAbKBQZmAB8q4VeZbSQcQPNwpj
+            xuWNFspldeZPUHfg0HRcXO+kBtB0nva6qKS2q7lu+aN95E+giz3iimv0JA3nC04z
+            x++qR4nxE5LRqx2iz2rqINguK4CggZDCvVSTRAAzKuPGuk/rkxaF2UaHZoc0XNRo
+            AQkCEMMaW4l8dyXi+iOh6QF3sDhWLemXsIYFVnMs14OmhYJv4863/uignL9VzQrF
+            uZF5WMVDnHGkjX/rfAV7HSJerotRzZotAzX0iOJ1dmAiIm2ypQHBq8xtC1RPPlXG
+            W7eI8JW1rMw=
+            =ul6l
+            -----END PGP MESSAGE-----
+          fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD
+        - created_at: "2024-10-17T01:06:37Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAwAAAAAAAAAAARAAsRcolQgwprswqBCQNNozgfkVR+ff6g7vom0DAfogWOxY
+            E5VtlZ/KKVam2aZnjzmRl3BABNSbsj9QEqkR84Ju8yZc8XtGwfGpPzLgmg2b1e+z
+            2aIWyLDLCIUGvxVnFvEDfQ81/8m5BetnsdJUOl1pMm6VW5DaM3WOxjBxjdkszHli
+            y2dknUcAH6NTUtI6V2D7mk+j9pTvLFXMN3yoS/ytQTZ/QoeEMLVW2BqBK3Ra8NL/
+            zR44YTAbE88SUYDqpX5HWrsab27V90QZl8nDtqlDCu6PenzGgPYSOro6iejPJw7q
+            JaNOz6h4ePlufrXu2D56fCr9UhAmW/KRb68B6WkujHdPSCEwbcmwEvPfsmPTQtCz
+            cRKQHd0fcrlBvlnhvlJBO3Sxgo/IYPosp7QTs66bsrwbbkBToAWInJdyzQQWwuRL
+            7a/fxIXUk6Pb5QT4R+j8Cj4BknWT8Hz5D4KVe7jbYtp3OhCZFxQQ0e998xs1d9M4
+            8xOPuasuG6+P0272tUHh6iULAOvGY3alva2tQ/aPhGs1MWYTYtU1kKgqP6P7cpMa
+            +SF6CH9cyDQLbKQPXWDfC0wYmzg77k8Zf57bihZ6yIqEHKUmspD98djonPT/h/CO
+            TFvDYrrGu8MxauB2sXe+BeNu7CGrRScccG7X2fsAW9Iss3bjPJh7P18SwvPaNm/U
+            aAEJAhDroVYvPdwJgeO7Mu4YaznW3Ozzv4S8SSWoGNAefu4cDMCAbJ3MPXM8nGUo
+            CaBTY681CLp53XljtEW4rcyGJkb1XQEWcbl+Luax/EW1ctW8Uue0xgtSq6VGfIwQ
+            N3To3tOi0krL
+            =WOSj
+            -----END PGP MESSAGE-----
+          fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D
+    encrypted_regex: ^(data|stringData)$
+    version: 3.9.1
--- a/kubernetes/main/apps/default/dendrite/app/config.sops.yaml
+++ b/kubernetes/main/apps/default/dendrite/app/config.sops.yaml
--- a/kubernetes/main/apps/default/dendrite/app/helm-release.yaml
+++ b/kubernetes/main/apps/default/dendrite/app/helm-release.yaml
@ -69,20 +69,25 @@ spec:
        globalMounts:
          - path: /etc/dendrite

-      searchindex:
-        type: hostPath
-        hostPath: /mnt/MainPool/Kubernetes/matrix/searchindex
+      data:
+        existingClaim: dendrite
        globalMounts:
-          - path: /var/dendrite/searchindex
+          - /var/dendrite

-      media-store:
-        type: hostPath
-        hostPath: /mnt/MainPool/Kubernetes/matrix/media
-        globalMounts:
-          - path: /var/dendrite/media_store
-
-      jetstream:
-        type: hostPath
-        hostPath: /mnt/MainPool/Kubernetes/matrix/jetstream
-        globalMounts:
-          - path: /var/dendrite/jetstream
+#      searchindex:
+#        type: hostPath
+#        hostPath: /mnt/MainPool/Kubernetes/matrix/searchindex
+#        globalMounts:
+#          - path: /var/dendrite/searchindex
+#
+#      media-store:
+#        type: hostPath
+#        hostPath: /mnt/MainPool/Kubernetes/matrix/media
+#        globalMounts:
+#          - path: /var/dendrite/media_store
+#
+#      jetstream:
+#        type: hostPath
+#        hostPath: /mnt/MainPool/Kubernetes/matrix/jetstream
+#        globalMounts:
+#          - path: /var/dendrite/jetstream
--- a/kubernetes/main/apps/default/dendrite/app/kustomization.yaml
+++ b/kubernetes/main/apps/default/dendrite/app/kustomization.yaml
@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- ../../../../../common/templates/volsync
 - ./config.sops.yaml
 - ./helm-release.yaml
--- a/kubernetes/main/apps/default/dendrite/config.sops.yaml
+++ b/kubernetes/main/apps/default/dendrite/config.sops.yaml
--- a/kubernetes/main/apps/default/dendrite/ks.yaml
+++ b/kubernetes/main/apps/default/dendrite/ks.yaml
@ -0,0 +1,31 @@
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app dendrite
+  namespace: flux-system
+spec:
+  timeout: 5m
+  interval: 10m
+  targetNamespace: download
+  path: ./kubernetes/main/apps/default/dendrite/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-cluster
+  decryption:
+    provider: sops
+    secretRef:
+      name: sops-gpg
+  dependsOn:
+    - name: openebs
+    - name: openebs-sc
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: cluster-settings
+      - kind: Secret
+        name: cluster-secrets
+    substitute:
+      APP: *app
+      VOLSYNC_CAPACITY: 20Gi
--- a/kubernetes/main/apps/default/kustomization.yaml
+++ b/kubernetes/main/apps/default/kustomization.yaml
@ -8,6 +8,6 @@ resources:
 - ./huginn
 - ../../../common/apps/exim/ks.yaml
 - ./well-known-site
- ./dendrite
+- ./dendrite/ks.yaml
 - ./ganymede
 - ./piwigo
--- a/kubernetes/main/apps/download/radarr/app/backup-creds.sops.yaml
+++ b/kubernetes/main/apps/download/radarr/app/backup-creds.sops.yaml
@ -1,75 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: radarr-volsync-b2-secret
-    namespace: download
-type: Opaque
-stringData:
-    RESTIC_REPOSITORY: ENC[AES256_GCM,data:+veFT1W3b3seqmzYobKCeWbG6ENvg4Ldggq5Vr87x3l/IS+ZpNoUg4LvORbA4Bc=,iv:iNyL+43KLbTVcyyrHiZADht0/2e9xjlNmz6Su5alrsM=,tag:OzLJHB4JKZtudbF15SQqHg==,type:str]
-    RESTIC_PASSWORD: ENC[AES256_GCM,data:e1Ji5tLyO+D83LTrCX0Vn2ElbvZ5zjzwmfqukwhm4yI=,iv:s8MtgLlI4zw/tR9/BipWKSjJb3YkawNAoAfYTSnVssE=,tag:nRn5KViI/ap0NHQ/KbDZrQ==,type:str]
-    AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:HqlLzU1aRhxs6jPVFPJwC2VvJJKT2se0YQ==,iv:rxkIrlwPz+SpeJzySUqlac36H2UF4aXJPWOieStvVAA=,tag:piy0i2GJ27RdB52f1HN9Pw==,type:str]
-    AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:Sc8p4PCOtpedx4RCwiPBokMf6VZK2AIEhqlFWJLMxQ==,iv:WcSlztDPaJ74DOYvLNdMys8qvGcU75hB6ah75BwqS6I=,tag:clEW+2no+iyauPxA9Nogcw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-10-13T22:45:06Z"
-    mac: ENC[AES256_GCM,data:Ah819y/70by3PifAVnUxD4Fo0RDvSRB2z85zjmNJe2WMye4OLBY31kfdtG+ExM6wnO5SlRX8MVWxqMHRuR2wDdj1jZ0JauhVEOjffftQ1gVWZDoDPmQPYycDIk6/M+Go/1hh744CGACddxDeLGecnsgYqqXCEMUdOn9V8+7WZwk=,iv:FxVGayNbqsOC/CV0FuEnNhdpuOcUZ57BwqN0u/3KOW8=,tag:DsFqasdTw7yg8Ox2zSL9kw==,type:str]
-    pgp:
-        - created_at: "2024-10-13T22:45:06Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAwAAAAAAAAAAAQ/9ElsB9yOzGtSZLfjScPCE7XE9xLfVnZqzWtBQBzpXf9rC
-            AvA9bvFI6nUCHnJ8amqAKIeijm8pAiMdVFuKtDOqAbJm6R5H0c6xs0bWzN0K1c5Z
-            wXECLpgf9x+aDQGSAwu7lJTuuSvunDYY2AxzId5N2l294U8LMHX9tP3mmKr/Yp88
-            mwIfHZyl+2V6RhCBpaSfOcpz+9267Ktgzb6jhkq3kIBJKAAxGVZsGRjSjTlGP6Oo
-            NvpMZ7sWNAcVTG30lHcL2idzXNPC1VHuRoMiJeBvKT8kkv2AIibfN+Aw278TcmXk
-            FXdcgzvctUHkf/gKkPzLn5Bt337mEQbaqdvIbwXLggFI/KgXuNWGWDKLALme10Mt
-            t3XaEoag62HrgvXK2W5WMfuy4lfGzhuM0sdbN2nvR5xEwxSst4fmOBZYmWAdsq9s
-            VkHyPNvPTjJ5/0k7rvyZoy1V131l8GPplf5ZQUxvcF6VFxQsuKv1YQKxcVUE6ye4
-            SrxRhh2fOZUANSiNeh71HRXFfFrwenY/wsM/pmnEXplocAiL5PbNFPQVBrsQ31SC
-            rj50oqdTc7Evwn/CI/SyNB9qdt/huEKL7Yxw8zCm51xh6Wd1k/4KDwW+ACz51ObO
-            Uu21Dyug3ww2Fced2ZyB412z6cJVYGWI7vFYco2X66XCj/Cdfk2EbkcPLPSKxeSF
-            AgwDAAAAAAAAAAABD/9x+giHppcxPjHOeBg4EmXIPLDP7wDvIURBMVFpQLPs1vVY
-            82xfD+GkQyYTvEsaUXy1ts4KaIEYZ7Zc/P1KnsKzDomjPs22fJXxE37YbJqfok2H
-            O1aUfx85g3fLgL7kFf2ASIG1g+NPaiyGH0Z59w1gMv5ag1qQkWCmg1iLWNtngE9F
-            ELnS/DXtNbxOcOB5LfgahdVIkXhfiwl8NPcPgdPq0Pm2n8ckmQTWHLcK/tQ7Es0y
-            6sNx3ofAYfAk1SfZOFxq4yrBNt/hvC+jRkSXHh5G9zcfeoKmH6rptzTw6N980sTv
-            PiyU8TSeccq0+tyz6ZlMmuGQeThTgTZ3Nwxo/JUGlDqw8DYm7ch0Q8EN1JN/rJM6
-            wjxlBGZlH4jIhovSkwgv4X+spQB6kIsZR91M+ZECuvp5tlT5bfHXYkLw/wPilrCS
-            cVXBpIB9vr9fd6Rb2p8U/EJ+AV+fb1UsaBRVkPhDNgOGK7npYeyL8Aoc4IA0oQue
-            TyJKVyyueeUvIJ4X60ho/6DTqn7OIWw0frVshZ7cw73WbT1KSJQGFX+U+Q2Laxj/
-            1zUNyNi2bqHnIn81Yo7aqgiKxXJhUnmV2Ky1EbyZ2aZbjoWVmz2IwO2AJXIO1MpA
-            CjijpJBEI/w9Y54LtGxREZB4cRBB0wiJoXNcMMsQYOxVLQ6oyh0t5vQi5lY6DtRo
-            AQkCECjduK5Lcsdtn+uNenCrDoIArYdDaWyIitEP7MEzMOxTySNbFLrVB2ufovOc
-            ikh61nMtBjjw0cX+rNha1MDQRQxo7eakDhUm/1D3dOmUxoc2sJ/++kBl6qA9OnG/
-            Wo1Ic6rcgl0=
-            =pHI2
-            -----END PGP MESSAGE-----
-          fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD
-        - created_at: "2024-10-13T22:45:06Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAwAAAAAAAAAAAQ/9HbXhN5NSTcWa5g8C12QP1recnZryBwNh2AJdhRmdZS8R
-            SRZcBzhMm02zoToKSqjy4aYMIoJk6ZShVdtheh4uYxQXI8M6a/CTcurNot+taD96
-            D8iK5GXsIM+mriorCZZhgJK0n9n3oUSp2kMSOyzXzm/Cl24yG+vvbEur3JOh4Tic
-            GogkE6oeyytf6/YeGYtgvRXbsaFD1tRoUrTvzeYkOPL+ii66CDIbVgzOsAyGbg/P
-            DSu0ME9TVCeg+8w0RP/TAnvnsmTP6Pt/fDl+QPJcm7ysqKWkrmxb3pxuIQ3p3Epf
-            qWKxkjqf0GOXf9rzArL1l4my/tzXJyiobuq2felSJUZ4KvWyqRSQeTWuncKQQhVT
-            xK2tBZQDzpRvXugZ1Pu9kTqhhFa9A3T5gR5NTbzyfQraMfzGAHO08vKOYPN/LMgi
-            7hHfnP2tG++zKfvKhaAPMWvW/1TOzxgyHDDOjNwHRaXH4NuuYfEmy+vgcnq2Vohh
-            ej1q+ke5qSDuG6KMAkxq0PcUwD8H8zbJv7VR/QlnL51aauMIVCmqoUUd8i3SZhJV
-            4gskUMjVvSYpq3tdOyAMwfP0c4BI0Ft7ldX7zithfGiNfCKngyrMXEzaRnKx95/n
-            p26pvJudVXBOt7T4MyFSYbH5rlqgnVLehFn/IJS4QUhgC8pAlcc0f2vLJUkZ9n/U
-            aAEJAhDnzLrepQGdEqdiLU4WtLUCd5VPGEk7ROuUe7H3N3f4x5bQHhhjJnNvdjf/
-            DNZ0Jmc7glBUjp+hY8NfhkV2KcpDOmJ7OgSiS+fdAAsLyYuLoDupINpvKU8KHl3N
-            InfTWfiVu02S
-            =zhN+
-            -----END PGP MESSAGE-----
-          fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D
-    encrypted_regex: ^(data|stringData)$
-    version: 3.9.1
--- a/kubernetes/main/apps/download/radarr/app/kustomization.yaml
+++ b/kubernetes/main/apps/download/radarr/app/kustomization.yaml
@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-#- ./backup-creds.sops.yaml
-#- ./minio-creds.sops.yaml
 #- ../../../../../common/templates/volsync
 - ./pvc.yaml
 - ./secret.sops.yaml
--- a/kubernetes/main/apps/download/radarr/app/minio-creds.sops.yaml
+++ b/kubernetes/main/apps/download/radarr/app/minio-creds.sops.yaml
@ -1,75 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: radarr-volsync-secret
-    namespace: download
-type: Opaque
-stringData:
-    RESTIC_REPOSITORY: ENC[AES256_GCM,data:ebolBMyKUaVKCE4oqtXn8tbgwVM+OG5W/oCNiIEy/dZuUOYUW/3kcP8qPcQ/TP+j,iv:MdfKuDIcOMIu7gKnT8nwAAqA8FXH0qIVGumW7XabnHM=,tag:NFCrjnVgKXHbXNDPqwa8LA==,type:str]
-    RESTIC_PASSWORD: ENC[AES256_GCM,data:OWRCCNHPe7izcDDyr1Df/78XSduQ1KmGrtIoC5iz5Hg=,iv:KPaOpeZbFS4Hg8RLYNf7+26OkHwAfcVqHgZmWwv9R1A=,tag:gOamlt5e3MUQ9b+CeSwTbw==,type:str]
-    AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:kzoeP5dV2DBk+VL/31B6sg==,iv:MeQdxt82dWNsvl+OSTnKS+g9zmkwBQxXFlBa813o818=,tag:V2YxoFj3lz4FtGAWutbyFA==,type:str]
-    AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:AibU/3Xgi/7qCxXkhdoOlzuN3ETDXg8bvNIg1IjQsfs=,iv:N6U1xM+HDPPHXDRLqY0BIC2ire9ZgN9g68Te8PObRt8=,tag:F8DRJiS4VUX19xO8RhZhEg==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-10-13T23:24:58Z"
-    mac: ENC[AES256_GCM,data:+BAe3tCH1ZRYvOpktR6Sz4mHkQfNNjso2v70vMGUDgy0hgjkKR/AlvDcHJY6kf5kMoUVEBluPeQ58TVJuCMiXJhTgadTNRes4KPgW1Bm+/QR+TqGsvQYaSkT0YAj3EeUrFfXGU+VGgU/Pf+XE5oM8uqZG9Z3fwS6gZzCFy/JeiY=,iv:jHwrSLB4i9FG9gd4hYO8y+pH/FXhCKxgi3DGw8raSwc=,tag:rJ1sR1FdWcaFcfCOoInSfw==,type:str]
-    pgp:
-        - created_at: "2024-10-13T23:24:58Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAwAAAAAAAAAAAQ/+K49WTFNnaDigRZz3RtzJsvuQisVxVBsEG7rUNuIfAtRx
-            AxvmmbhZ97LAwpEcGsXv7uo7HhINX3xNeuLPt77U6lvrWyPDrHwDQKoLEcYpkEBw
-            9NXsReKpyvSa1VP9hoIBhvd3+qoeb7rSgp+qWUWgGmvp/MM5GULI8gN0FV/pE85D
-            fIRd1nbZ6LcGC/gwIO4LgKuFg71V79RVuxFDNWHuyJUvaGnI2up4IFseDXDkfQHg
-            iA386/fzxtMBKrGcveEBFVXWZ4D3G9cacTSrknOfSnD8oGCzNoUArueOjpLvjx6n
-            s6lfQarI75kcAclMYwxFINjSBf7VCIkTvYLlUAUaitcbIVQNEUVKAUrosSc7gKEI
-            lkCty3WCZqRHy5hWIGZpR6tlYSEzqB5GGhBKYnrYn16RtSOXLw37Dl7AzjOB7aOf
-            u5sge6ssPk5zQ0cb2rxBVTN8KJJNh1eFSKBYCmeTjzfG7LGQWJLvp5HWXiGCF+OF
-            6aiUnovEQrr3oNyVQ6oWBM36085hRUM3Gt/AhNaY9anixTYGNHgJO8uQ2HyTSP2p
-            AK69FFXbTAyYcxP5nZbNWctD3PyrhHM6QcqSH0lltZJiDEb6wIhk6c9zzDydDjuG
-            SzzGEWMqeqwu39eYW5Nfovd0IcZjVbC+jAnwwXWzP/tFutcM/OtI2Kpb8njLvLGF
-            AgwDAAAAAAAAAAABEACgTSOriPJ3jzfAGHyeqxHWFLtbBSMfdugXT4T74HNItkoY
-            9pHOzox9CgOpyvslMdJtcUgt4TtNmp1bOWCm4JRKG0mlF4zWjV8hjQa+pIzuHSTg
-            0SuQ+DqG8NelA94zr+H/jJVSSvhJUrv2GWTNsrZ44OGPY6moxhD67YO/2hiApafs
-            p8ololtBzxkdDoOJRjrgusoEOCxEW6AJOZV2Ckl4zWba7YyWQFV9mVUfmulcwNUS
-            7KTFC0nQB1cRYM8Z682W5VAcxzPvoonPfJBdQUTQmfhCtT9W2yN0QtDOOM+oNJ2K
-            OXaDwYspvpUb4A53fGKew7oJArDxxI1bDSmyMzq+vHRmQutmiDOxAj6KH8F0ya5y
-            n7aq4Npas0EPhtu6g8x5NK8TjEmiTn3rkAg0cXwfWuBR+B8ERzSwQGKyHlwBZc2s
-            E2E+N9A1Dgf/I4CtxHB4wZWHPGCiCaQBrxXwr/rTvcLvKH+mWon3S0G3mtF4SEJA
-            vIjSuDiE2o+X9BVdtODN4GUmVCj9QlBLy9l39REhL48T+5+pVVcsNOSlxV33nOyJ
-            Ci0WwmrIZOIHp8Y7Hh4k1uouoaWthHUSwc1DXo6HMfshoWzx6bINtzgErSOc7qTM
-            9ULjGQEOQ9AydZJdV+EGBlBNnC8FDGE1z31OmgAYKz0Tdg3Vmvblni3juzr1E9Ro
-            AQkCEDowXU0V0rKHx7n6ryYIW8u+f97RpQKiBvbYDS+4UvvyseFfSYBrRktp7jOK
-            mDfsaR4rAqSWvaOBg++8i/FTvdeiYoyjM3+CS+EoSt8e1fZS8zXAK9y+vC4VAAgF
-            +WWYmy4iQ9c=
-            =IkMC
-            -----END PGP MESSAGE-----
-          fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD
-        - created_at: "2024-10-13T23:24:58Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAwAAAAAAAAAAARAAiOhijUf04+HMMqZluNZdp7yP4yavnr5jQinHDGSAJirr
-            +Q/YI1gmWzEsQQ6rBuzDxr+tjObW+M9o9xBTDeb1NC3bfu4+JV9qQMFP6fcj9UGs
-            HKji1jDFObhK1rg8FZaVTkxUL71ofZCxNo+IMo6PI8/uhJNdJ/EwrdnF08azWavI
-            2YsO1pcPCdoW4lvxyuqOxk4ge0zK8su3+uzEBz6sxq6jjWs1970E+ib5nA1KsDsV
-            wjMsb2SFCcxtDzsi1JTaNiHMvuXl08h3ORsRshG/MlOIDI5o52Nf5RS5Efnjwf4Y
-            AhQgpNoxNdN8xHzLrnCTxN2LJh0Z3BRzKtgWOHU7aO+YJsrXMWsr7dRHf6YUltJS
-            RJ+plFusYdoOozfuko+tksz9a6AlWLu9ieLNKnTZuWqqDD4Uy0YLR4DIIPU6+P+k
-            86i5klGgBpkB3y5U+nXoWJ/8dBsXOaaxPp/zpB4ttJv2ggC29fDBnf2bVgKo1TP5
-            mMMzHoFmJcjPo5DXiazCiViPoJDGUyUPhNKNM72atQDCCArVmlIQbE1LUIAhhaBJ
-            Cigmb0kIWpHKEBQ8nK2UlGMo8hfy1GKivIAgTSomsI/KLSBt0YeefnWd0kHK7OIX
-            VnBwPFNLuw9OHDFPTX1M8Dk/iT1J/ACvpbctOZyesSB42fMPjgeh3ZtYzJXoiezU
-            aAEJAhDyA9q1f+2syN92xpqwMdpew3K5l+xzdUHIjjdxL6XzugJRqyuQee6wCxVj
-            GTaS8Bsnx7fg6b/jwxXVPDfE7fv74jJ29CgfzWLXxc8GH47hp9VhQDBq3CqceraG
-            z7N/bgAze6sz
-            =5cXr
-            -----END PGP MESSAGE-----
-          fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D
-    encrypted_regex: ^(data|stringData)$
-    version: 3.9.1