From 78f5707aac6c7804f698216809298e22b90618d4 Mon Sep 17 00:00:00 2001 From: bart Date: Fri, 30 Oct 2026 08:17:49 +0100 Subject: [PATCH] feat(slskd): add slskd deployment, service, pvc and migration scripts --- README.md | 16 +++++ cleanup_old_slskd.sh | 58 ++++++++++++++++++ k8s/kustomization.yaml | 1 + k8s/slskd/deployment.yaml | 115 +++++++++++++++++++++++++++++++++++ k8s/slskd/kustomization.yaml | 7 +++ k8s/slskd/pvc.yaml | 15 +++++ k8s/slskd/service.yaml | 25 ++++++++ migrate_slskd_to_cluster.sh | 112 ++++++++++++++++++++++++++++++++++ 8 files changed, 349 insertions(+) create mode 100755 cleanup_old_slskd.sh create mode 100644 k8s/slskd/deployment.yaml create mode 100644 k8s/slskd/kustomization.yaml create mode 100644 k8s/slskd/pvc.yaml create mode 100644 k8s/slskd/service.yaml create mode 100755 migrate_slskd_to_cluster.sh diff --git a/README.md b/README.md index 84b2720..588d333 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ De HTPC omgeving omvat onder andere de volgende diensten: | **Bazarr** | `6767` | Ondertitelbeheer en synchronisatie | | **Jackett / Prowlarr** | `9117` / `9696` | Torrent- en usenet indexer proxy | | **SABnzbd / Transmission** | `8080` / `9091` | Downloadclients voor media-acquisitie (BitTorrent peer-poort `53662`) | +| **slskd** | `5030` / `50300` | Soulseek peer-to-peer client en web daemon (HTTP: `5030`, Soulseek listen: `50300`) | --- @@ -67,3 +68,18 @@ De BitTorrent daemon (`transmission`) draait als pod in de `htpc` namespace: - **Dataopslag**: PersistentVolumeClaim `transmission-config` (10Gi, `local-path` op `/datadisk/infra/pv`), gemigreerd vanuit `/var/www/.config/transmission-daemon` met behoud van alle torrents, resume-bestanden en instellingen. - **Mediaopslag**: HostPath `/datadisk` en `/mnt/mp3` zodat `/datadisk/upload/finished` en `/datadisk/upload/incomplete` identiek zijn voor Transmission, Radarr, Sonarr en Lidarr. - **Netwerk**: Web UI / RPC op poort `9091` (ClusterIP + HostPort `9091`) en BitTorrent peer-poort `53662` (TCP & UDP, ClusterIP + HostPort `53662`). + +### slskd +De Soulseek daemon (`slskd`) draait als pod in de `htpc` namespace: + +- **Dataopslag**: PersistentVolumeClaim `slskd-config` (10Gi, `local-path` op `/datadisk/infra/pv`), gemigreerd vanuit `/var/www/.local/share/slskd` via een init-container (inclusief `slskd.yml`, SQLite databases en state). +- **Mediaopslag**: HostPath `/datadisk` gemount op `/datadisk` (voor `/datadisk/upload/slskd`, `/datadisk/upload/incomplete` en `/datadisk/htpc/mp3`) en `/mnt/mp3` gemount op `/mnt/mp3`. +- **Netwerk**: Web UI op poort `5030` (ClusterIP + HostPort `5030`), optioneel HTTPS op poort `5031` en Soulseek listen poort `50300` (ClusterIP + HostPort `50300`). +- **Migratie & Opruimen**: + ```bash + # Migratie uitvoeren (maakt backup in /storage/backups/, stopt host service, start pod): + ./migrate_slskd_to_cluster.sh + + # Oude host bestanden en service opruimen: + ./cleanup_old_slskd.sh + ``` diff --git a/cleanup_old_slskd.sh b/cleanup_old_slskd.sh new file mode 100755 index 0000000..96bb5bf --- /dev/null +++ b/cleanup_old_slskd.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +# ============================================================================== +# Opruimen van oude standalone slskd installatie op vmserver (10.2.0.4) +# ============================================================================== +set -euo pipefail + +CLUSTER_HOST="10.2.0.4" +SSH_USER="bart" + +COLOR_GREEN="\033[0;32m" +COLOR_YELLOW="\033[1;33m" +COLOR_RED="\033[0;31m" +COLOR_BLUE="\033[0;34m" +COLOR_RESET="\033[0m" + +log_info() { echo -e "${COLOR_GREEN}[INFO]${COLOR_RESET} $1"; } +log_step() { echo -e "\n${COLOR_BLUE}==>${COLOR_RESET} ${COLOR_GREEN}$1${COLOR_RESET}"; } +log_warn() { echo -e "${COLOR_YELLOW}[WARN]${COLOR_RESET} $1"; } + +echo "========================================================================" +echo " OPRUIMEN OUDE STANDALONE SLSKD OP ${CLUSTER_HOST}" +echo "========================================================================" +echo "Dit stopt en verwijdert de oude standalone bestanden op ${CLUSTER_HOST}:" +echo " - /etc/systemd/system/slskd.service" +echo " - /datadisk/slskd (oude binaries en frontend bestanden)" +echo " - /var/www/.local/share/slskd (data is gemigreerd naar K8s PVC & backup in /storage/backups/)" +echo "========================================================================" +echo "" + +read -p "Weet je zeker dat je de oude standalone slskd bestanden wilt verwijderen? (j/N): " -r CONFIRM +if [[ ! "$CONFIRM" =~ ^[jJyY]$ ]]; then + log_info "Opruimen geannuleerd." + exit 0 +fi + +log_step "Verwijderen van systemd service en programmabestanden op ${CLUSTER_HOST}..." +ssh -t "${SSH_USER}@${CLUSTER_HOST}" " + echo '--> Stoppen en uitschakelen van slskd.service...' + sudo systemctl stop slskd 2>/dev/null || true + sudo systemctl disable slskd 2>/dev/null || true + sudo rm -f /etc/systemd/system/slskd.service + sudo systemctl daemon-reload + sudo systemctl reset-failed 2>/dev/null || true + + echo '--> Verwijderen van /datadisk/slskd...' + sudo rm -rf /datadisk/slskd + + echo '--> Verwijderen van /var/www/.local/share/slskd...' + sudo rm -rf /var/www/.local/share/slskd + sudo rm -rf /var/www/.local/slskd 2>/dev/null || true + + echo '--> Opslagruimte controleren...' + df -h / /datadisk /storage +" + +echo "" +log_info "De oude standalone slskd is succesvol opgeruimd!" +echo "Alle verkeer naar slskd loopt nu direct via de Kubernetes pod." diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml index d9d97f0..f937603 100644 --- a/k8s/kustomization.yaml +++ b/k8s/kustomization.yaml @@ -9,5 +9,6 @@ resources: - sonarr - lidarr - transmission + - slskd diff --git a/k8s/slskd/deployment.yaml b/k8s/slskd/deployment.yaml new file mode 100644 index 0000000..2f1166c --- /dev/null +++ b/k8s/slskd/deployment.yaml @@ -0,0 +1,115 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: slskd + namespace: htpc + labels: + app.kubernetes.io/name: slskd + app.kubernetes.io/part-of: htpc +spec: + replicas: 1 + strategy: + type: Recreate + selector: + matchLabels: + app: slskd + template: + metadata: + labels: + app: slskd + app.kubernetes.io/name: slskd + app.kubernetes.io/part-of: htpc + spec: + nodeSelector: + kubernetes.io/hostname: vmserver + initContainers: + - name: migrate-config + image: slskd/slskd:latest + imagePullPolicy: IfNotPresent + command: + - /bin/bash + - -c + - | + if [ ! -f /app/slskd.yml ] && [ -f /host-config/slskd.yml ]; then + echo "Migrating slskd config and databases from host..." + cp -a /host-config/* /app/ + fi + chown -R 33:33 /app + volumeMounts: + - name: config + mountPath: /app + - name: host-config + mountPath: /host-config + readOnly: true + containers: + - name: slskd + image: slskd/slskd:latest + imagePullPolicy: IfNotPresent + env: + - name: PUID + value: "33" + - name: PGID + value: "33" + - name: SLSKD_UMASK + value: "0002" + - name: SLSKD_APP_DIR + value: "/app" + - name: SLSKD_REMOTE_CONFIGURATION + value: "true" + ports: + - name: http + containerPort: 5030 + hostPort: 5030 + protocol: TCP + - name: https + containerPort: 5031 + hostPort: 5031 + protocol: TCP + - name: slsk-listen + containerPort: 50300 + hostPort: 50300 + protocol: TCP + resources: + requests: + cpu: 100m + memory: 256Mi + limits: + cpu: 2000m + memory: 2Gi + volumeMounts: + - name: config + mountPath: /app + - name: datadisk + mountPath: /datadisk + - name: mnt-mp3 + mountPath: /mnt/mp3 + livenessProbe: + httpGet: + path: /health + port: 5030 + initialDelaySeconds: 45 + periodSeconds: 20 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: /health + port: 5030 + initialDelaySeconds: 15 + periodSeconds: 10 + timeoutSeconds: 5 + volumes: + - name: config + persistentVolumeClaim: + claimName: slskd-config + - name: host-config + hostPath: + path: /var/www/.local/share/slskd + type: DirectoryOrCreate + - name: datadisk + hostPath: + path: /datadisk + type: Directory + - name: mnt-mp3 + hostPath: + path: /mnt/mp3 + type: Directory diff --git a/k8s/slskd/kustomization.yaml b/k8s/slskd/kustomization.yaml new file mode 100644 index 0000000..48bc1a4 --- /dev/null +++ b/k8s/slskd/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - pvc.yaml + - service.yaml + - deployment.yaml diff --git a/k8s/slskd/pvc.yaml b/k8s/slskd/pvc.yaml new file mode 100644 index 0000000..9127c07 --- /dev/null +++ b/k8s/slskd/pvc.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: slskd-config + namespace: htpc + labels: + app.kubernetes.io/name: slskd + app.kubernetes.io/part-of: htpc +spec: + accessModes: + - ReadWriteOnce + storageClassName: local-path + resources: + requests: + storage: 10Gi diff --git a/k8s/slskd/service.yaml b/k8s/slskd/service.yaml new file mode 100644 index 0000000..6395251 --- /dev/null +++ b/k8s/slskd/service.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +kind: Service +metadata: + name: slskd + namespace: htpc + labels: + app.kubernetes.io/name: slskd + app.kubernetes.io/part-of: htpc +spec: + type: ClusterIP + ports: + - port: 5030 + targetPort: 5030 + protocol: TCP + name: http + - port: 5031 + targetPort: 5031 + protocol: TCP + name: https + - port: 50300 + targetPort: 50300 + protocol: TCP + name: slsk-listen + selector: + app: slskd diff --git a/migrate_slskd_to_cluster.sh b/migrate_slskd_to_cluster.sh new file mode 100755 index 0000000..86096fe --- /dev/null +++ b/migrate_slskd_to_cluster.sh @@ -0,0 +1,112 @@ +#!/usr/bin/env bash +# ============================================================================== +# slskd Migration Script: Host Service -> Kubernetes Cluster (htpc namespace) +# ============================================================================== +set -euo pipefail + +CLUSTER_HOST="10.2.0.4" +SSH_USER="bart" +HTPC_NS="htpc" +BACKUP_DIR="/storage/backups" +DATE_STR=$(date +%Y-%m-%d) +KUBECONFIG_PATH="${KUBECONFIG:-$HOME/.kube/config_vmserver}" + +COLOR_GREEN="\033[0;32m" +COLOR_YELLOW="\033[1;33m" +COLOR_RED="\033[0;31m" +COLOR_BLUE="\033[0;34m" +COLOR_RESET="\033[0m" + +log_info() { echo -e "${COLOR_GREEN}[INFO]${COLOR_RESET} $1"; } +log_step() { echo -e "\n${COLOR_BLUE}==>${COLOR_RESET} ${COLOR_GREEN}$1${COLOR_RESET}"; } +log_warn() { echo -e "${COLOR_YELLOW}[WARN]${COLOR_RESET} $1"; } +log_err() { echo -e "${COLOR_RED}[ERROR]${COLOR_RESET} $1"; } + +echo "========================================================================" +echo " SLSKD MIGRATIE NAAR KUBERNETES CLUSTER (NAMESPACE: ${HTPC_NS})" +echo "========================================================================" +echo "Bron: slskd.service op ${CLUSTER_HOST}" +echo "Config: /var/www/.local/share/slskd" +echo "Doel: K8s Pod in namespace '${HTPC_NS}' op ${CLUSTER_HOST}" +echo "Poorten: Web (5030/5031), Soulseek Listen (50300)" +echo "========================================================================" +echo "" + +read -p "Weet je zeker dat je de slskd migratie naar Kubernetes wilt starten? (j/N): " -r CONFIRM +if [[ ! "$CONFIRM" =~ ^[jJyY]$ ]]; then + log_info "Migratie geannuleerd." + exit 0 +fi + +# ------------------------------------------------------------------------------ +# STAP 1: PRE-FLIGHT CHECKS +# ------------------------------------------------------------------------------ +log_step "1. Pre-flight checks uitvoeren..." + +log_info "Verbinding testen naar host (${CLUSTER_HOST})..." +ssh -o BatchMode=yes -o ConnectTimeout=5 "${SSH_USER}@${CLUSTER_HOST}" "true" || { + log_err "Kan niet verbinden met host (${CLUSTER_HOST}) via SSH." + exit 1 +} + +log_info "Controleren van KUBECONFIG verbinding..." +KUBECONFIG="${KUBECONFIG_PATH}" kubectl get nodes | grep -q "vmserver" || { + log_err "Kan vmserver node niet bereiken via kubectl (KUBECONFIG=${KUBECONFIG_PATH})!" + exit 1 +} + +# ------------------------------------------------------------------------------ +# STAP 2: RESERVEKOPIE MAKEN VAN SLSKD DATA & CONFIG +# ------------------------------------------------------------------------------ +log_step "2. Reservekopie maken van /var/www/.local/share/slskd op ${CLUSTER_HOST}..." +ssh -t "${SSH_USER}@${CLUSTER_HOST}" " + sudo mkdir -p '${BACKUP_DIR}' + if [ -d '/var/www/.local/share/slskd' ]; then + echo 'Inpakken van slskd data naar ${BACKUP_DIR}/slskd_backup_${DATE_STR}.tar.gz...' + sudo tar -czf '${BACKUP_DIR}/slskd_backup_${DATE_STR}.tar.gz' -C /var/www/.local/share slskd + echo 'Backup gereed:' + ls -lh '${BACKUP_DIR}/slskd_backup_${DATE_STR}.tar.gz' + else + echo 'Geen /var/www/.local/share/slskd gevonden, backup overgeslagen.' + fi +" + +# ------------------------------------------------------------------------------ +# STAP 3: STANDALONE SLSKD SERVICE STOPPEN OP DE HOST +# ------------------------------------------------------------------------------ +log_step "3. Standalone slskd.service stoppen op ${CLUSTER_HOST}..." +ssh -t "${SSH_USER}@${CLUSTER_HOST}" " + echo '--> Stoppen van slskd.service...' + sudo systemctl stop slskd +" + +# ------------------------------------------------------------------------------ +# STAP 4: KUBERNETES MANIFESTS TOEPASSEN +# ------------------------------------------------------------------------------ +log_step "4. Kubernetes manifests toepassen..." +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +KUBECONFIG="${KUBECONFIG_PATH}" kubectl apply -k "${SCRIPT_DIR}/k8s/" + +log_info "Wachten op succesvolle uitrol van slskd pod..." +KUBECONFIG="${KUBECONFIG_PATH}" kubectl rollout status deployment/slskd -n "${HTPC_NS}" --timeout=180s + +# ------------------------------------------------------------------------------ +# STAP 5: VERIFICATIE +# ------------------------------------------------------------------------------ +log_step "5. Verificatie van endpoints..." +sleep 5 + +log_info "Health endpoint testen via host (poort 5030)..." +ssh -o BatchMode=yes "${SSH_USER}@${CLUSTER_HOST}" "curl -I -s http://127.0.0.1:5030/health" | head -n 1 + +log_info "Web UI root testen via host..." +ssh -o BatchMode=yes "${SSH_USER}@${CLUSTER_HOST}" "curl -I -s http://127.0.0.1:5030/" | head -n 1 + +echo "" +echo "========================================================================" +log_info "SLSKD MIGRATIE SUCCESVOL AFGEROND!" +echo "slskd draait nu als pod in Kubernetes namespace '${HTPC_NS}'." +echo "Configuratie en databases zijn bewaard in PersistentVolume slskd-config." +echo "Web UI bereikbaar op: http://10.2.0.4:5030/" +echo "Host service uitschakelen / opruimen kan via: ./cleanup_old_slskd.sh" +echo "========================================================================"