diff --git a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml index a0369764a..1e7522ba1 100644 --- a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml +++ b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -27,13 +27,38 @@ spec: uninstall: keepHistory: false values: - image: - repository: ghcr.io/onedr0p/qbittorrent - tag: 4.6.0@sha256:cb6259df3be61a5108bc4f85b09a523fc4b250589ca9b315ef927cbdf779afb6 - env: - TZ: "${TIMEZONE}" - QBITTORRENT__PORT: &port 8080 - QBITTORRENT__BT_PORT: &port-bt 58462 + defaultPodOptions: + securityContext: + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + fsGroupChangePolicy: OnRootMismatch + controllers: + main: + type: statefulset + containers: + main: + image: + repository: ghcr.io/onedr0p/qbittorrent + tag: 4.6.0@sha256:cb6259df3be61a5108bc4f85b09a523fc4b250589ca9b315ef927cbdf779afb6 + env: + TZ: "${TIMEZONE}" + QBITTORRENT__PORT: &port 8080 + QBITTORRENT__BT_PORT: &port-bt 58462 + resources: + requests: + cpu: 500m + memory: 1Gi + limits: + memory: 8Gi + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /config service: main: ports: @@ -41,6 +66,7 @@ spec: port: *port bittorent: enabled: true + controller: main type: LoadBalancer loadBalancerIP: "${CLUSTER_LB_QBITTORRENT}" ports: @@ -53,57 +79,35 @@ spec: ingress: main: enabled: true - ingressClassName: "nginx" + className: "nginx" annotations: - nginx.ingress.kubernetes.io/configuration-snippet: | - proxy_hide_header "x-webkit-csp"; - proxy_hide_header "content-security-policy"; - proxy_hide_header "X-Frame-Options"; - proxy_set_header Accept-Encoding ""; - sub_filter '' ''; - sub_filter_once on; hajimari.io/icon: mdi:download hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host - podSecurityContext: - runAsUser: 568 - runAsGroup: 568 - fsGroup: 568 - fsGroupChangePolicy: "OnRootMismatch" - supplementalGroups: - - 100 persistence: - config: - enabled: true - existingClaim: qbittorrent-config - mountPath: /config downloads: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/downloads - mountPath: /mnt/storage/downloads + globalMounts: + - path: /mnt/storage/downloads music-qbittorrent: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/music/.qbittorrent - mountPath: /mnt/storage/music/.qbittorrent + globalMounts: + - path: /mnt/storage/music/.qbittorrent video-qbittorrent: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/video/.qbittorrent - mountPath: /mnt/storage/video/.qbittorrent - resources: - requests: - cpu: 500m - memory: 1Gi - limits: - memory: 8Gi + globalMounts: + - path: /mnt/storage/video/.qbittorrent diff --git a/kubernetes/apps/default/qbittorrent/app/kustomization.yaml b/kubernetes/apps/default/qbittorrent/app/kustomization.yaml index 281c4c516..775552846 100644 --- a/kubernetes/apps/default/qbittorrent/app/kustomization.yaml +++ b/kubernetes/apps/default/qbittorrent/app/kustomization.yaml @@ -8,4 +8,3 @@ resources: - ./helmrelease.yaml - ./jobs - ./volsync.yaml - - ./volume.yaml diff --git a/kubernetes/apps/default/qbittorrent/app/volsync.yaml b/kubernetes/apps/default/qbittorrent/app/volsync.yaml index 615f90bc3..c103e3f78 100644 --- a/kubernetes/apps/default/qbittorrent/app/volsync.yaml +++ b/kubernetes/apps/default/qbittorrent/app/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: qbittorrent namespace: default spec: - sourcePVC: qbittorrent-config + sourcePVC: config-qbittorrent-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/qbittorrent/app/volume.yaml b/kubernetes/apps/default/qbittorrent/app/volume.yaml deleted file mode 100644 index b6ea7403b..000000000 --- a/kubernetes/apps/default/qbittorrent/app/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-config - namespace: default - labels: - app.kubernetes.io/name: &name qbittorrent - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 1Gi