Merge pull request 'feat: refactor apps' (#5629) from tmp/refactor-36 into main

Reviewed-on: #5629

clusters/cl01tl/helm/seerr/values.yaml

@@ -3,7 +3,7 @@ seerr-chart:
     registry: ghcr.io
     repository: seerr-team/seerr
     tag: v3.1.0
-    sha: sha256:b35ba0461c4a1033d117ac1e5968fd4cbe777899e4cbfbdeaf3d10a42a0eb7e9
+    sha: b35ba0461c4a1033d117ac1e5968fd4cbe777899e4cbfbdeaf3d10a42a0eb7e9
   config:
     persistence:
       size: 5Gi

clusters/cl01tl/helm/slskd/Chart.yaml

@@ -4,15 +4,14 @@ version: 1.0.0
 description: slskd
 keywords:
   - slskd
-  - soularr
+  - soulseek
-  - lidarr
+home: https://docs.alexlebens.dev/applications/slskd/
-  - music
-home: https://wiki.alexlebens.dev/s/ea931f86-1e70-480c-8002-64380b267cd7
 sources:
   - https://github.com/slskd/slskd
-  - https://github.com/mrusse/soularr
+  - https://github.com/qdm12/gluetun
-  - https://hub.docker.com/r/slskd/slskd
+  - https://github.com/slskd/slskd/pkgs/container/slskd
-  - https://hub.docker.com/r/mrusse08/soularr
+  - https://github.com/qdm12/gluetun/pkgs/container/gluetun
+  - https://hub.docker.com/_/busybox
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
 maintainers:
   - name: alexlebens

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

@@ -14,34 +14,9 @@ spec:
   data:
     - secretKey: slskd.yml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/slskd/config
-        metadataPolicy: None
-        property: slskd.yml
 
----
+        property: slskd.yml
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: soularr-config-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: soularr-config-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: config.ini
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /cl01tl/slskd/soularr
-        metadataPolicy: None
-        property: config.ini
 
 ---
 apiVersion: external-secrets.io/v1
@@ -60,29 +35,17 @@ 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

clusters/cl01tl/helm/slskd/values.yaml

@@ -4,8 +4,10 @@ slskd:
       type: deployment
       replicas: 1
       strategy: Recreate
-      revisionHistoryLimit: 3
       pod:
+        securityContext:
+          fsGroup: 1000
+          fsGroupChangePolicy: OnRootMismatch
         affinity:
           podAntiAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
@@ -20,14 +22,9 @@ slskd:
         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,11 +36,10 @@ slskd:
         main:
           image:
             repository: slskd/slskd
-            tag: 0.24.5
+            tag: 0.24.5@sha256:17ef977563be206f3b5932080b1e23883b2cb39dc9010640f6f39b4eaec887e3
-            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: US/Central
+              value: America/Chicago
             - name: PUID
               value: 1000
             - name: PGID
@@ -53,12 +49,11 @@ slskd:
           resources:
             requests:
               cpu: 100m
-              memory: 512Mi
+              memory: 330Mi
         gluetun:
           image:
             repository: ghcr.io/qdm12/gluetun
             tag: v3.41.1@sha256:1a5bf4b4820a879cdf8d93d7ef0d2d963af56670c9ebff8981860b6804ebc8ab
-            pullPolicy: IfNotPresent
           lifecycle:
             postStart:
               exec:
@@ -125,36 +120,6 @@ slskd:
               devic.es/tun: "1"
             requests:
               devic.es/tun: "1"
-              cpu: 10m
-              memory: 128Mi
-    soularr:
-      type: deployment
-      replicas: 0
-      strategy: Recreate
-      revisionHistoryLimit: 3
-      pod:
-        securityContext:
-          fsGroup: 1000
-          fsGroupChangePolicy: OnRootMismatch
-      containers:
-        main:
-          image:
-            repository: mrusse08/soularr
-            tag: latest@sha256:69bc29f2072d6256c30f94fb1a0bfe8034c197791a2103d87f15ef1761347ce9
-            pullPolicy: IfNotPresent
-          env:
-            - name: TZ
-              value: US/Central
-            - name: PUID
-              value: 1000
-            - name: PGID
-              value: 1000
-            - name: SCRIPT_INTERVAL
-              value: 300
-          resources:
-            requests:
-              cpu: 10m
-              memory: 256Mi
   service:
     main:
       controller: main
@@ -162,7 +127,6 @@ slskd:
         http:
           port: 5030
           targetPort: 5030
-          protocol: HTTP
   serviceMonitor:
     main:
       selector:
@@ -187,11 +151,8 @@ slskd:
         - slskd.alexlebens.net
       rules:
         - backendRefs:
-            - group: ''
+            - name: slskd
-              kind: Service
-              name: slskd
               port: 5030
-              weight: 100
           matches:
             - path:
                 type: PathPrefix
@@ -208,17 +169,6 @@ slskd:
               readOnly: true
               mountPropagation: None
               subPath: slskd.yml
-    soularr-config:
-      enabled: true
-      type: secret
-      name: soularr-config-secret
-      advancedMounts:
-        soularr:
-          main:
-            - path: /data/config.ini
-              readOnly: true
-              mountPropagation: None
-              subPath: config.ini
     data:
       existingClaim: slskd-nfs-storage
       advancedMounts:
@@ -226,7 +176,3 @@ slskd:
           main:
             - path: /mnt/store
               readOnly: false
-        soularr:
-          main:
-            - path: /mnt/store
-              readOnly: false