Merge pull request 'feat: change mount path' (#6092) from tmp/slskd-10 into main

Reviewed-on: #6092

.gitea/workflows/renovate.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:43.129.0@sha256:e4abd88d1d6326fe8a702b38c5ee76487d94b455ba4f305bd904521aba9f5a08
+    container: ghcr.io/renovatebot/renovate:43.132.0@sha256:fc54bbc724d1924fa72c331729eefb5acd1385a9ce30617b0264a7fb4b8878da
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

clusters/cl01tl/helm/gitea/Chart.yaml

@@ -56,4 +56,4 @@ dependencies:
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/gitea.png
 # renovate: datasource=github-releases depName=go-gitea/gitea
-appVersion: 1.25.5
+appVersion: 1.26.0

clusters/cl01tl/helm/gitea/values.yaml

@@ -194,7 +194,7 @@ gitea-actions:
       registry: docker.io
       repository: gitea/act_runner
       # renovate: datasource=docker depName=gitea/act_runner
-      tag: 0.4.0@sha256:e7364b8252e74d5eb047abe64c98a856da37d9dad848af51e011b249206b36ba
+      tag: 0.4.1@sha256:696a59b51ad3d149521e3beb0229d5fb88f87295e1616f940199793274415b56
       extraVolumeMounts:
         - name: workspace-vol
           mountPath: /workspace

clusters/cl01tl/helm/music-grabber/Chart.yaml

@@ -24,4 +24,4 @@ dependencies:
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/music-grabber.png
 # renovate: datasource=docker depName=g33kphr33k/musicgrabber
-appVersion: 2.6.4
+appVersion: 2.6.5

clusters/cl01tl/helm/music-grabber/values.yaml

@@ -12,7 +12,7 @@ music-grabber:
         main:
           image:
             repository: g33kphr33k/musicgrabber
-            tag: 2.6.4@sha256:e54d4b7abb395cd95ed4d9c9c8ca230ea789620484da148cc128b3981577c066
+            tag: 2.6.5@sha256:5d276415a764a56955207ae41fe2df3341a152812fdf8a87e7c0b7e4e1fb681d
           env:
             - name: MUSIC_DIR
               value: /mnt/store/Music Grabber/

clusters/cl01tl/helm/rclone/Chart.yaml

@@ -20,4 +20,4 @@ dependencies:
     version: 4.6.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/rclone.png
 # renovate: datasource=github-releases depName=rclone/rclone
-appVersion: v1.73.4
+appVersion: v1.73.5

clusters/cl01tl/helm/rclone/values.yaml

@@ -12,7 +12,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:directus-assets
@@ -90,7 +90,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:karakeep-assets
@@ -168,7 +168,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:talos-backups
@@ -239,7 +239,7 @@ rclone:
         prune:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - delete
             - dest:talos-backups
@@ -287,7 +287,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:web-assets
@@ -365,7 +365,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:postgres-backups
@@ -440,7 +440,7 @@ rclone:
         prune:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - delete
             - dest:postgres-backups
@@ -488,7 +488,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:ntfy-attachments
@@ -566,7 +566,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:openbao-backups
@@ -637,7 +637,7 @@ rclone:
         prune:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - delete
             - dest:openbao-backups
@@ -685,7 +685,7 @@ rclone:
         sync:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - sync
             - src:openbao-backups
@@ -756,7 +756,7 @@ rclone:
         prune:
           image:
             repository: rclone/rclone
-            tag: 1.73.4@sha256:654f6517c7aaec7e377690b2caf7c272dbe5f3b8200afbc14a00df6b4a9aa6ef
+            tag: 1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96
           args:
             - delete
             - dest:openbao-backups-6e088aad5fad110b

clusters/cl01tl/helm/site-profile/values.yaml

@@ -10,7 +10,7 @@ site-profile:
         main:
           image:
             repository: harbor.alexlebens.net/images/site-profile
-            tag: 3.18.2@sha256:8deb9624b2564fabd1f5cc6822306fd198b245858317be2d9ab4ca044ae3ded5
+            tag: 3.18.4@sha256:3fb32ba981a059c1203c8716140bff20cc6484a90ec8694f8ac0604ac456c7f8
           resources:
             requests:
               cpu: 10m

clusters/cl01tl/helm/slskd/Chart.yaml

@@ -22,4 +22,4 @@ dependencies:
     version: 4.6.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/slskd.png
 # renovate: datasource=github-releases depName=slskd/slskd
-appVersion: 0.24.5
+appVersion: 0.25.0

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

@@ -1,51 +1,66 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: slskd-config-secret
+  name: airvpn-wireguard-conf
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: slskd-config-secret
+    app.kubernetes.io/name: airvpn-wireguard-conf
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
-    - secretKey: slskd.yml
+    - secretKey: conf
       remoteRef:
-        key: /cl01tl/slskd/config
-
-        property: slskd.yml
+        key: /airvpn/config
+        property: conf
+    - secretKey: private-key
+      remoteRef:
+        key: /airvpn/config
+        property: private-key
+    - secretKey: preshared-key
+      remoteRef:
+        key: /airvpn/config
+        property: preshared-key
+    - secretKey: addresses
+      remoteRef:
+        key: /airvpn/config
+        property: addresses
+    - secretKey: input-ports
+      remoteRef:
+        key: /airvpn/config
+        property: input-ports
 
 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: slskd-wireguard-conf
+  name: protonvpn-wireguard-conf
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: slskd-wireguard-conf
+    app.kubernetes.io/name: protonvpn-wireguard-conf
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
+    - secretKey: conf
+      remoteRef:
+        key: /protonvpn/config
+        property: conf
+    - secretKey: email
+      remoteRef:
+        key: /protonvpn/config
+        property: email
+    - secretKey: password
+      remoteRef:
+        key: /protonvpn/config
+        property: password
     - secretKey: private-key
       remoteRef:
-        key: /airvpn/conf/cl01tl
+        key: /protonvpn/config
         property: private-key
-    - secretKey: preshared-key
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: preshared-key
-    - secretKey: addresses
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: addresses
-    - secretKey: input-ports
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: input-ports

clusters/cl01tl/helm/slskd/templates/secret-provider-class.yaml

@@ -0,0 +1,19 @@
+apiVersion: secrets-store.csi.x-k8s.io/v1
+kind: SecretProviderClass
+metadata:
+  name: slskd-config-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: slskd-config-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  provider: openbao
+  parameters:
+    baoAddress: "http://openbao-internal.openbao:8200"
+    roleName: slskd
+    objects: |
+      - objectName: slskd.yml
+        fileName: slskd.yml
+        secretPath: secret/data/cl01tl/slskd/config
+        secretKey: slskd.yml

clusters/cl01tl/helm/slskd/values.yaml

@@ -4,6 +4,8 @@ slskd:
       type: deployment
       replicas: 1
       strategy: Recreate
+      serviceAccount:
+        name: slskd
       pod:
         securityContext:
           fsGroup: 1000
@@ -36,7 +38,7 @@ slskd:
         main:
           image:
             repository: slskd/slskd
-            tag: 0.24.5@sha256:17ef977563be206f3b5932080b1e23883b2cb39dc9010640f6f39b4eaec887e3
+            tag: 0.25.0@sha256:6a91991c05b7cbbe4e3dcc1f5e10f88d00a68f7ad2ef8a820b79496441b9b78c
           env:
             - name: TZ
               value: America/Chicago
@@ -46,6 +48,8 @@ slskd:
               value: 1000
             - name: SLSKD_UMASK
               value: 000
+            - name: SLSKD_CONFIG
+              value: /config/slskd.yml
           resources:
             requests:
               cpu: 100m
@@ -60,29 +64,14 @@ slskd:
                 command: ["/bin/sh", "-c", "(ip rule del table 51820; ip -6 rule del table 51820) || true"]
           env:
             - name: VPN_SERVICE_PROVIDER
-              value: airvpn
+              value: protonvpn
             - name: VPN_TYPE
               value: wireguard
             - name: WIREGUARD_PRIVATE_KEY
               valueFrom:
                 secretKeyRef:
-                  name: slskd-wireguard-conf
+                  name: protonvpn-wireguard-conf
                   key: private-key
-            - name: WIREGUARD_PRESHARED_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: slskd-wireguard-conf
-                  key: preshared-key
-            - name: WIREGUARD_ADDRESSES
-              valueFrom:
-                secretKeyRef:
-                  name: slskd-wireguard-conf
-                  key: addresses
-            - name: FIREWALL_VPN_INPUT_PORTS
-              valueFrom:
-                secretKeyRef:
-                  name: slskd-wireguard-conf
-                  key: input-ports
             - name: FIREWALL_OUTBOUND_SUBNETS
               value: 192.168.1.0/24,10.244.0.0/16
             - name: FIREWALL_INPUT_PORTS
@@ -159,13 +148,17 @@ slskd:
                 value: /
   persistence:
     slskd-config:
-      enabled: true
-      type: secret
-      name: slskd-config-secret
+      type: custom
+      volumeSpec:
+        csi:
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: slskd-config-secret
       advancedMounts:
         main:
           main:
-            - path: /app/slskd.yml
+            - path: /config/slskd.yml
               readOnly: true
               mountPropagation: None
               subPath: slskd.yml

clusters/cl01tl/helm/traefik/values.yaml

@@ -45,9 +45,6 @@ traefik:
       entryPoints: ["websecure"]
   updateStrategy:
     type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-      maxSurge: 1
   providers:
     kubernetesCRD:
       allowCrossNamespace: true

hosts/ps10rp/gitea/compose.yaml

@@ -33,7 +33,7 @@ services:
             - postgresql18:/var/lib/postgresql
 
     gitea:
-        image: gitea/gitea:1.25.5@sha256:f846d26a4fc389c5806a580a765e00bfdd1fd181e6f2060da98ea2669d914472
+        image: gitea/gitea:1.26.0@sha256:af07b88edbb2173d20932f9c75ebcf4e61d7d5c2d6a7ab5cc6b97cba28aea352
         container_name: gitea
         depends_on:
             - postgresql