Merge pull request 'tmp/refactor-30' (#5608) from tmp/refactor-30 into main

Reviewed-on: #5608

clusters/cl01tl/helm/bazarr/Chart.yaml

@@ -26,4 +26,4 @@ dependencies:
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/bazarr.png
 # renovate: datasource=github-releases depName=linuxserver/docker-bazarr
-appVersion: 1.5.6
+appVersion: v1.5.6-ls342

clusters/cl01tl/helm/gitea/Chart.yaml

@@ -14,6 +14,7 @@ sources:
   - https://hub.docker.com/r/gitea/gitea
   - https://hub.docker.com/r/renovate/renovate
   - https://hub.docker.com/r/d3fk/s3cmd/
+  - https://hub.docker.com/_/busybox
   - https://gitea.com/gitea/helm-chart
   - https://gitea.com/gitea/helm-actions
   - https://github.com/meilisearch/meilisearch-kubernetes/tree/main/charts/meilisearch

clusters/cl01tl/helm/prowlarr/Chart.yaml

@@ -4,14 +4,15 @@ version: 1.0.0
 description: Prowlarr
 keywords:
   - prowlarr
-  - servarr
   - trackers
-home: https://wiki.alexlebens.dev/s/7f963158-15fd-4eb5-b3ac-8a3aeb79613a
+  - servarr
+home: https://docs.alexlebens.dev/applications/prowlarr/
 sources:
   - https://github.com/Prowlarr/Prowlarr
   - https://github.com/linuxserver/docker-prowlarr
   - https://github.com/linuxserver/docker-prowlarr/pkgs/container/prowlarr
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/volsync-target
 maintainers:
   - name: alexlebens
 dependencies:
@@ -24,5 +25,5 @@ dependencies:
     version: 0.8.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/prowlarr.png
-# renovate: datasource=github-releases depName=Prowlarr/Prowlarr
+# renovate: datasource=github-releases depName=linuxserver/docker-prowlarr
-appVersion: 2.3.0
+appVersion: 2.3.5.5327-ls141

clusters/cl01tl/helm/prowlarr/values.yaml

@@ -4,31 +4,22 @@ prowlarr:
       type: deployment
       replicas: 1
       strategy: Recreate
-      revisionHistoryLimit: 3
       pod:
         securityContext:
           runAsUser: 568
           runAsGroup: 568
-          fsGroup: 568
-          fsGroupChangePolicy: OnRootMismatch
-          supplementalGroups:
-            - 44
-            - 100
-            - 109
-            - 65539
       containers:
         main:
           image:
             repository: ghcr.io/linuxserver/prowlarr
-            tag: 2.3.0@sha256:9ef5d8bf832edcacb6082f9262cb36087854e78eb7b1c3e1d4375056055b2d82
+            tag: 2.3.5.5327-ls141@sha256:35f48abb3e976fcf077fae756866c582e4a90f8b24810ae4067b3558f7cdbbdf
-            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: US/Central
+              value: America/Chicago
           resources:
             requests:
               cpu: 10m
-              memory: 256Mi
+              memory: 200Mi
   service:
     main:
       controller: main
@@ -36,7 +27,6 @@ prowlarr:
         http:
           port: 80
           targetPort: 9696
-          protocol: HTTP
   route:
     main:
       kind: HTTPRoute
@@ -49,11 +39,8 @@ prowlarr:
         - prowlarr.alexlebens.net
       rules:
         - backendRefs:
-            - group: ''
+            - name: prowlarr
-              kind: Service
-              name: prowlarr
               port: 80
-              weight: 100
           matches:
             - path:
                 type: PathPrefix
@@ -64,7 +51,6 @@ prowlarr:
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi
-      retain: true
       advancedMounts:
         main:
           main:
@@ -75,13 +61,6 @@ volsync-target-config:
   moverSecurityContext:
     runAsUser: 568
     runAsGroup: 568
-    fsGroup: 568
-    fsGroupChangePolicy: OnRootMismatch
-    supplementalGroups:
-      - 44
-      - 100
-      - 109
-      - 65539
   local:
     enabled: true
     schedule: 56 8 * * *

clusters/cl01tl/helm/qbittorrent/Chart.yaml

@@ -4,21 +4,24 @@ version: 1.0.0
 description: qBittorrent
 keywords:
   - qbittorrent
-  - downloads
   - torrent
-  - vpn
+home: https://docs.alexlebens.dev/applications/prowlarr/
-  - metrics
-home: https://wiki.alexlebens.dev/s/832cd960-0ae1-4637-873a-d83c4c24b911
 sources:
   - https://github.com/qbittorrent/qBittorrent
   - https://github.com/qdm12/gluetun
   - https://github.com/esanchezm/prometheus-qbittorrent-exporter
   - https://github.com/StuffAnThings/qbit_manage
-  - https://docs.linuxserver.io/images/docker-qbittorrent/
+  - https://github.com/caronc/apprise
+  - https://github.com/autobrr/qui
+  - https://github.com/linuxserver/docker-qbittorrent/pkgs/container/qbittorrent
   - https://github.com/qdm12/gluetun/pkgs/container/gluetun
   - https://hub.docker.com/r/esanchezm/prometheus-qbittorrent-exporter
   - https://github.com/stuffanthings/qbit_manage/pkgs/container/qbit_manage
+  - https://github.com/caronc/apprise-api/pkgs/container/apprise
+  - https://github.com/autobrr/qui/pkgs/container/qui
+  - https://hub.docker.com/_/busybox
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/volsync-target
 maintainers:
   - name: alexlebens
 dependencies:
@@ -40,4 +43,4 @@ dependencies:
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/qbittorrent.png
 # renovate: datasource=github-releases depName=qbittorrent/qBittorrent
-appVersion: 5.1.4
+appVersion: 5.1.4-r2-ls448

clusters/cl01tl/helm/qbittorrent/templates/config-map.yaml

@@ -287,16 +287,16 @@ data:
       - '**/*_unpackerred'
       max_orphaned_files_to_delete: 50
 
-    # apprise:
+    apprise:
-    #   api_url: http://localhost:8000/notify
+      api_url: http://localhost:8000
-    #   notify_url: ""
+      notify_url: http://apprise:8000
-    #
+
-    # webhooks:
+    webhooks:
-    #   error: apprise
+      error: apprise
-    #   run_start: apprise
+      run_start: apprise
-    #   run_end: apprise
+      run_end: apprise
-    #   function:
+      function:
-    #     rem_orphaned: apprise
+        rem_orphaned: apprise
-    #     cleanup_dirs: apprise
+        cleanup_dirs: apprise
-    #     tag_tracker_error:
+        tag_tracker_error: apprise
-    #     share_limits:
+        share_limits: apprise

clusters/cl01tl/helm/qbittorrent/templates/external-secret.yaml

@@ -14,31 +14,19 @@ spec:
   data:
     - secretKey: private-key
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /airvpn/conf/cl01tl
-        metadataPolicy: None
         property: private-key
     - secretKey: preshared-key
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /airvpn/conf/cl01tl
-        metadataPolicy: None
         property: preshared-key
     - secretKey: addresses
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /airvpn/conf/cl01tl
-        metadataPolicy: None
         property: addresses
     - secretKey: input-ports
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /airvpn/conf/cl01tl
-        metadataPolicy: None
         property: input-ports
 
 ---
@@ -58,10 +46,7 @@ spec:
   data:
     - secretKey: ntfy-url
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/qbittorrent/qbit-manage
-        metadataPolicy: None
         property: ntfy-url
 
 ---
@@ -81,15 +66,9 @@ spec:
   data:
     - secretKey: secret
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /authentik/oidc/qui
-        metadataPolicy: None
         property: secret
     - secretKey: client
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /authentik/oidc/qui
-        metadataPolicy: None
         property: client

clusters/cl01tl/helm/qbittorrent/values.yaml

@@ -4,8 +4,12 @@ qbittorrent:
       type: deployment
       replicas: 1
       strategy: Recreate
-      revisionHistoryLimit: 3
       pod:
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+          fsGroup: 1000
+          fsGroupChangePolicy: OnRootMismatch
         affinity:
           podAntiAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
@@ -20,14 +24,9 @@ qbittorrent:
         init-sysctl:
           image:
             repository: busybox
-            tag: 1.37.0
+            tag: 1.37.0@sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e
-            pullPolicy: IfNotPresent
           securityContext:
             privileged: True
-          resources:
-            requests:
-              cpu: 10m
-              memory: 128Mi
           command:
             - /bin/sh
           args:
@@ -39,15 +38,14 @@ qbittorrent:
         qbittorrent:
           image:
             repository: ghcr.io/linuxserver/qbittorrent
-            tag: 5.1.4@sha256:855e5f4805ac218f406a5ae989a62a77e03f7e5f70128335b7970550a58c96e1
+            tag: 5.1.4-r2-ls448@sha256:a89108b1bf43de072a35a59a3ee41b97b564538faae5cbb3f6c803aa7f5fd9f7
-            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: US/Central
+              value: America/Chicago
             - name: PUID
-              value: "1000"
+              value: 1000
             - name: PGID
-              value: "1000"
+              value: 1000
             - name: UMASK_SET
               value: "002"
             - name: WEBUI_PORT
@@ -60,7 +58,6 @@ qbittorrent:
           image:
             repository: ghcr.io/qdm12/gluetun
             tag: v3.41.1@sha256:1a5bf4b4820a879cdf8d93d7ef0d2d963af56670c9ebff8981860b6804ebc8ab
-            pullPolicy: IfNotPresent
           lifecycle:
             postStart:
               exec:
@@ -127,13 +124,10 @@ qbittorrent:
               devic.es/tun: "1"
             requests:
               devic.es/tun: "1"
-              cpu: 10m
-              memory: 64Mi
         exporter:
           image:
             repository: esanchezm/prometheus-qbittorrent-exporter
-            tag: v1.6.0
+            tag: v1.6.0@sha256:482df65e7f39f2c0a65f32693e6d5f930edf7b244589a60e446ccc5ee6d17211
-            pullPolicy: IfNotPresent
           env:
             - name: QBITTORRENT_HOST
               value: localhost
@@ -143,27 +137,17 @@ qbittorrent:
               value: "9022"
             - name: EXPORTER_LOG_LEVEL
               value: INFO
-          resources:
-            requests:
-              cpu: 10m
-              memory: 64Mi
     qbit-manage:
       type: deployment
       annotations:
         reloader.stakater.com/auto: "true"
       replicas: 1
       strategy: Recreate
-      revisionHistoryLimit: 3
       initContainers:
         init-copy-config:
           image:
             repository: busybox
-            tag: 1.37.0
+            tag: 1.37.0@sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e
-            pullPolicy: IfNotPresent
-          resources:
-            requests:
-              cpu: 10m
-              memory: 128Mi
           command:
             - /bin/sh
             - -ec
@@ -173,11 +157,11 @@ qbittorrent:
         qbit-manage:
           image:
             repository: ghcr.io/stuffanthings/qbit_manage
-            tag: v4.7.0
+            tag: v4.7.0@sha256:8786f2efc6fb8e26281f09bf6c5d0004e2d2420fd4781af0aed123ae01558e21
             pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: US/Central
+              value: America/Chicago
             - name: QBT_SCHEDULE
               value: 0 * * * *
             - name: QBT_STARTUP_DELAY
@@ -191,19 +175,18 @@ qbittorrent:
           resources:
             requests:
               cpu: 10m
-              memory: 64Mi
+              memory: 280Mi
         apprise-api:
           image:
-            repository: caronc/apprise
+            repository: ghcr.io/caronc/apprise
-            tag: v1.3.3
+            tag: v1.3.3@sha256:4bfeac268ba87b8e08e308c9aa0182fe99e9501ec464027afc333d1634e65977
-            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: US/Central
+              value: America/Chicago
             - name: PGID
-              value: "1000"
+              value: 1000
             - name: PUID
-              value: "1000"
+              value: 1000
             - name: APPRISE_STORAGE_MODE
               value: memory
             - name: APPRISE_STATEFUL_MODE
@@ -215,21 +198,19 @@ qbittorrent:
                 secretKeyRef:
                   name: qbittorrent-qbit-manage-config
                   key: ntfy-url
-          resources:
-            requests:
-              cpu: 10m
-              memory: 128Mi
     qui:
       type: deployment
       replicas: 1
       strategy: Recreate
-      revisionHistoryLimit: 3
+      pod:
+        securityContext:
+          fsGroup: 1000
+          fsGroupChangePolicy: OnRootMismatch
       containers:
         qui:
           image:
             repository: ghcr.io/autobrr/qui
-            tag: v1.15.0
+            tag: v1.15.0@sha256:da33f8c850f7d6f1bfaee26b9553b21411e872639d54193906fa2cec51af1d0f
-            pullPolicy: IfNotPresent
           env:
             - name: QUI__METRICS_ENABLED
               value: true
@@ -258,7 +239,7 @@ qbittorrent:
           resources:
             requests:
               cpu: 10m
-              memory: 128Mi
+              memory: 70Mi
   service:
     main:
       controller: main
@@ -267,33 +248,27 @@ qbittorrent:
         http:
           port: 8080
           targetPort: 8080
-          protocol: HTTP
         health:
           port: 9999
           targetPort: 9999
-          protocol: HTTP
         metrics:
           port: 9022
           targetPort: 9022
-          protocol: HTTP
     qbit-manage:
       controller: qbit-manage
       ports:
         apprise:
           port: 80
           targetPort: 8181
-          protocol: HTTP
     qui:
       controller: qui
       ports:
         http:
           port: 80
           targetPort: 7476
-          protocol: HTTP
         metrics:
           port: 9074
           targetPort: 9074
-          protocol: HTTP
   serviceMonitor:
     main:
       selector:
@@ -340,11 +315,8 @@ qbittorrent:
         - qbittorrent.alexlebens.net
       rules:
         - backendRefs:
-            - group: ''
+            - name: qbittorrent
-              kind: Service
-              name: qbittorrent
               port: 8080
-              weight: 100
           matches:
             - path:
                 type: PathPrefix
@@ -360,11 +332,8 @@ qbittorrent:
         - qui.alexlebens.net
       rules:
         - backendRefs:
-            - group: ''
+            - name: qbittorrent-qui
-              kind: Service
-              name: qbittorrent-qui
               port: 80
-              weight: 100
           matches:
             - path:
                 type: PathPrefix
@@ -401,7 +370,6 @@ qbittorrent:
       storageClass: ceph-filesystem
       accessMode: ReadWriteMany
       size: 1Gi
-      retain: true
       advancedMounts:
         main:
           qbittorrent:
@@ -416,7 +384,6 @@ qbittorrent:
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 1Gi
-      retain: true
       advancedMounts:
         qbit-manage:
           init-copy-config:
@@ -430,7 +397,6 @@ qbittorrent:
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 1Gi
-      retain: true
       advancedMounts:
         qui:
           qui: