update qbittorent to app template 3.0.4

jalim · Mar 30, 2024 · 9d53f8b · 9d53f8b
1 parent 960083f
commit 9d53f8b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 75 deletions.
diff --git a/kubernetes/main/apps/default/qbittorrent/app/gatus.yaml b/kubernetes/main/apps/default/qbittorrent/app/gatus.yaml
diff --git a/kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -20,28 +20,33 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   dependsOn:
     - name: rook-ceph-cluster
       namespace: rook-ceph
     - name: volsync
       namespace: storage
   values:
     controllers:
-      main:
+      qbittorrent:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/onedr0p/qbittorrent
               tag: 4.6.4@sha256:85f185207a81ec03e84b8302db06f1694c533c99e0efdb2acf0316d554d332e3
             env:
               TZ: Australia/Perth
               QBITTORRENT__PORT: &port 80
               QBITTORRENT__BT_PORT: &bittorrentPort 50410
+              QBT_Application__MemoryWorkingSetLimit:
+                valueFrom:
+                  resourceFieldRef:
+                    containerName: app
+                    resource: limits.memory
+                    divisor: 1Mi
               QBT_Preferences__WebUI__AlternativeUIEnabled: false
               QBT_Preferences__WebUI__AuthSubnetWhitelistEnabled: true
               QBT_Preferences__WebUI__AuthSubnetWhitelist: |-
@@ -66,8 +71,6 @@ spec:
                   timeoutSeconds: 1
                   failureThreshold: 3
               readiness: *probes
-              startup:
-                enabled: false
             securityContext:
               allowPrivilegeEscalation: false
               readOnlyRootFilesystem: true
@@ -85,39 +88,32 @@ spec:
             fsGroupChangePolicy: OnRootMismatch
             supplementalGroups: [10000]
     service:
-      main:
-        ports:
-          http:
-            port: *port
-      bittorrent:
-        controller: main
+      app:
+        controller: qbittorrent
         type: LoadBalancer
         annotations:
           io.cilium/lb-ipam-ips: 10.88.0.23
         ports:
+          http:
+            port: *port
           bittorrent:
             enabled: true
             port: *bittorrentPort
             protocol: TCP
     ingress:
-      main:
-        enabled: true
+      app:
         className: internal
         hosts:
           - host: &host qb.lumu.au
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
-          - hosts:
-              - *host
+          - hosts: [*host]
     persistence:
       config:
-        enabled: true
         existingClaim: qbittorrent
       media:
-        type: nfs
-        server: 10.1.2.205
-        path: /mnt/dead/media
+        existingClaim: media
diff --git a/kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml b/kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml
@@ -3,8 +3,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./helmrelease.yaml
-  - ./gatus.yaml
+  # - ./helmrelease.yaml
+  - ../../../../templates/gatus/guarded
   - ../../../../templates/volsync
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/kubernetes/main/apps/default/qbittorrent/ks.yaml b/kubernetes/main/apps/default/qbittorrent/ks.yaml
@@ -28,13 +28,17 @@ spec:
       VOLSYNC_STORAGECLASS: ceph-filesystem
       VOLSYNC_SNAPSHOTCLASS: csi-ceph-filesystem
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-qbittorrent-tools
+  name: &app qbittorrent-tools
   namespace: flux-system
 spec:
+  targetNamespace: default
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
   path: ./kubernetes/main/apps/default/qbittorrent/tools
   prune: true
   sourceRef:

diff --git a/kubernetes/main/apps/default/qbittorrent/tools/helmrelease.yaml b/kubernetes/main/apps/default/qbittorrent/tools/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -20,14 +20,13 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   dependsOn:
     - name: qbittorrent
       namespace: default
   values:
     controllers:
-      main:
-        enabled: false
       tagging:
         type: cronjob
         cronjob: &cronJobSpec
@@ -116,7 +115,7 @@ spec:
           securityContext: *securityContext
       reannounce:
         containers:
-          main:
+          app:
             image: *image
             env: *env
             args: [
@@ -128,17 +127,7 @@ spec:
             resources: *resources
         pod:
           securityContext: *securityContext
-    service:
-      main:
-        enabled: false
     persistence:
-      # config-file:
-      #   type: configMap
-      #   name: qbittorrent-tools-configmap
-      #   globalMounts:
-      #     - path: /config/config.yaml
-      #       subPath: config.yaml
-      #       readOnly: true
       secret-file:
         type: secret
         name: qbtools-secret

diff --git a/kubernetes/main/apps/default/qbittorrent/tools/kustomization.yaml b/kubernetes/main/apps/default/qbittorrent/tools/kustomization.yaml
@@ -6,12 +6,3 @@ namespace: default
 resources:
   - ./helmrelease.yaml
   - ./qbtools.secret.sops.yaml
-
-# configMapGenerator:
-#   - name: qbittorrent-tools-configmap
-#     files:
-#       - config.yaml=./resources/config.yaml
-# generatorOptions:
-#   disableNameSuffixHash: true
-#   annotations:
-#     kustomize.toolkit.fluxcd.io/substitute: disabled