18 changed files with 166 additions and 179 deletions
--- a/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml
+++ b/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -10,11 +10,12 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
        namespace: flux-system
+  maxHistory: 2
  install:
    remediation:
      retries: 3
@ -22,15 +23,17 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  values:
    controllers:
-      jellyfin:
+      main:
        type: statefulset
        annotations:
          reloader.stakater.com/auto: "true"
+        runtimeClassName: nvidia
        containers:
-          app:
+          main:
            image:
              repository: jellyfin/jellyfin
              tag: 10.8.13
@ -66,7 +69,6 @@ spec:
                nvidia.com/gpu: 1
                memory: 4Gi
        pod:
-          runtimeClassName: nvidia
          enableServiceLinks: false
          nodeSelector:
            nvidia.com/gpu.present: "true"
@ -77,13 +79,12 @@ spec:
            fsGroupChangePolicy: OnRootMismatch
            supplementalGroups: [44, 105, 10000]
    service:
-      app:
-        controller: jellyfin
+      main:
        ports:
          http:
            port: *port
    ingress:
-      app:
+      main:
        enabled: true
        className: external-nginx
        annotations:
@ -94,7 +95,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
@ -110,7 +111,7 @@ spec:
      media:
        enabled: true
        type: nfs
-        server: 10.1.1.12
-        path: /mnt/users/Media
+        server: 10.1.1.30
+        path: /mnt/Nahar/Media
        globalMounts:
          - path: /media
--- a/kubernetes/apps/default/maintainerr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/maintainerr/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -8,28 +8,21 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      interval: 30m
      sourceRef:
        kind: HelmRepository
        name: bjw-s
        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-      strategy: rollback
  interval: 30m
  values:
    controllers:
-      maintainerr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
+
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/jorenn92/maintainerr
              tag: 2.0.2@sha256:4e0f5199f09b8a1fc7d9933c1ecbf508b6d4f18b6f8d1e40bd0453dc14c80a5c
@ -41,21 +34,22 @@ spec:
                memory: 128Mi
              limits:
                memory: 1Gi
-        pod:
-          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
-            fsGroup: 1000
-            fsGroupChangePolicy: "OnRootMismatch"
+            pod:
+              securityContext:
+                runAsUser: ${APP_UID}
+                runAsGroup: ${APP_GID}
+                fsGroup: ${APP_GID}
+                fsGroupChangePolicy: "OnRootMismatch"
+
    service:
-      app:
-        controller: maintainerr
+      main:
        ports:
          http:
            port: 6246

    ingress:
-      app:
+      main:
+        enabled: true
        className: internal-nginx
        hosts:
          - host: &host "{{ .Release.Name }}.jahanson.tech"
@ -63,7 +57,7 @@ spec:
              - path: /
                pathType: Prefix
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/overseerr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/overseerr/app/helmrelease.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,7 +21,8 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: rook-ceph-cluster
      namespace: rook-ceph
@ -29,11 +30,11 @@ spec:
      namespace: volsync-system
  values:
    controllers:
-      overseerr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/sct/overseerr
              tag: 1.33.2@sha256:714ea6db2bc007a2262d112bef7eec74972eb33d9c72bddb9cbd98b8742de950
@ -73,12 +74,12 @@ spec:
            fsGroup: 568
            fsGroupChangePolicy: OnRootMismatch
    service:
-      app:
+      main:
        ports:
          http:
            port: *port
    ingress:
-      app:
+      main:
        enabled: true
        className: external-nginx
        annotations:
@ -90,7 +91,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,14 +21,15 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  values:
    controllers:
-      prowlarr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/prowlarr-develop
              tag: 1.14.3.4333@sha256:af90aa422bf142df26cf70aaebab5fd609f68cc5639ebfe643b4547fee8c76e3
@ -96,13 +97,12 @@ spec:
            fsGroup: 568
            fsGroupChangePolicy: OnRootMismatch
    service:
-      app:
-        controller: prowlarr
+      main:
        ports:
          http:
            port: *port
    ingress:
-      app:
+      main:
        enabled: true
        className: internal-nginx
        hosts:
@ -110,7 +110,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/radarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,17 +21,18 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: rook-ceph-cluster
      namespace: rook-ceph
  values:
    controllers:
-      radarr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/radarr
              tag: 5.3.6.8612@sha256:431f4d8da415645cd18359d0b704d4191f400eb57137ed3e5749774f3915c0a8
@ -102,7 +103,6 @@ spec:
            supplementalGroups: [10000]
    service:
      main:
-        controller: radarr
        ports:
          http:
            port: *port
@ -115,7 +115,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,7 +21,8 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: rook-ceph-cluster
      namespace: rook-ceph
@ -29,14 +30,14 @@ spec:
      namespace: volsync-system
  values:
    controllers:
-      recyclarr:
+      main:
        type: cronjob
        annotations:
          reloader.stakater.com/auto: "true"
        cronjob:
          schedule: "@daily"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/recyclarr/recyclarr
              tag: 6.0.2@sha256:02add40feae0569401b5020528e06419b47046723d0bb4bef1e82325e9eefdad
@ -65,8 +66,12 @@ spec:
            runAsNonRoot: true
            fsGroup: 568
            fsGroupChangePolicy: OnRootMismatch
+    service:
+      main:
+        enabled: false
    persistence:
      config:
+        enabled: true
        existingClaim: recyclarr
      config-file:
        type: configMap
--- a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,7 +21,8 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: rook-ceph-cluster
      namespace: rook-ceph
@ -29,11 +30,11 @@ spec:
      namespace: volsync-system
  values:
    controllers:
-      sabnzbd:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/sabnzbd
              tag: 4.2.3@sha256:fa8ddea45e56b0e36454c3c0eb30ff5521d90aeb5b35301656ae9236680be3a9
@ -84,13 +85,12 @@ spec:
            fsGroupChangePolicy: OnRootMismatch
            supplementalGroups: [10000]
    service:
-      app:
-        controller: sabnzbd
+      main:
        ports:
          http:
            port: *port
    ingress:
-      app:
+      main:
        enabled: true
        className: internal-nginx
        hosts:
@ -98,7 +98,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -28,11 +28,11 @@ spec:
      namespace: rook-ceph
  values:
    controllers:
-      sonarr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/sonarr
              tag: 4.0.2.1183@sha256:bbfcda0754272515ce12972924652699934074b46b11d27bc515c8ea5fb870f5
@ -102,8 +102,7 @@ spec:
            fsGroupChangePolicy: OnRootMismatch
            supplementalGroups: [10000]
    service:
-      app:
-        controller: sonarr
+      main:
        ports:
          http:
            port: *port
@ -116,7 +115,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/tautulli/app/helmrelease.yaml
+++ b/kubernetes/apps/default/tautulli/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,7 +21,8 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: rook-ceph-cluster
      namespace: rook-ceph
@ -29,11 +30,11 @@ spec:
      namespace: volsync-system
  values:
    controllers:
-      tautulli:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/tautulli
              tag: 2.13.4@sha256:b3000c0063cc4c0c6f2436fb7174f4bcfd8d91eca05206731edccb8b643ea570
@ -85,13 +86,12 @@ spec:
            fsGroup: 568
            fsGroupChangePolicy: OnRootMismatch
    service:
-      app:
-        controller: tautulli
+      main:
        ports:
          http:
            port: *port
    ingress:
-      app:
+      main:
        enabled: true
        className: external-nginx
        annotations:
@ -102,7 +102,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/default/unpackerr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/unpackerr/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,14 +21,15 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  values:
    controllers:
-       unpackerr:
+      main:
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/unpackerr/unpackerr
              tag: 0.13.1@sha256:04fcb43fa70e6db88331962760607842cdf19889e6d35d9d2fde0cf6a1550eaf
@ -59,20 +60,13 @@ spec:
            fsGroup: 568
            fsGroupChangePolicy: OnRootMismatch
    service:
-      app:
-        controller: unpackerr
+      main:
        ports:
          http:
            port: 5656
    serviceMonitor:
-      app:
-        serviceName: unpackerr
-        endpoints:
-          - port: http
-            scheme: http
-            path: /metrics
-            interval: 1m
-            scrapeTimeout: 10s
+      main:
+        enabled: true
    persistence:
      media:
        type: nfs
--- a/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml
+++ b/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -28,7 +28,7 @@ spec:
      create: false
      name: dragonfly-operator-controller-manager
    controllers:
-      dragonfly-operator:
+      main:
        containers:
          rbac-proxy:
            image:
@ -50,7 +50,7 @@ spec:
              limits:
                cpu: 500m
                memory: 128Mi
-          app:
+          main:
            image:
              repository: docker.dragonflydb.io/dragonflydb/operator
              tag: v1.1.1
@ -123,8 +123,7 @@ spec:
                matchLabels:
                  app.kubernetes.io/name: *app
    service:
-      app:
-        controller: dragonfly-operator
+      main:
        ports:
          http:
            port: *port
--- a/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,16 +21,17 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  values:
    controllers:
-      kubanetics:
+      main:
        type: cronjob
        cronjob:
          schedule: "@weekly"
          parallelism: 6 # Set to my total number of nodes
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/kubanetics
              tag: 2024.3.4@sha256:2dfb70e154b4d4cbd8b1f98f1647e4a96aa1fc084a7e07b2586e35f7fc743383
@ -60,6 +61,9 @@ spec:
              labelSelector:
                matchLabels:
                  app.kubernetes.io/name: *app
+    service:
+      main:
+        enabled: false
    persistence:
      procfs:
        type: hostPath
--- a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml
+++ b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,19 +21,20 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: ingress-nginx
      namespace: network
  values:
    controllers:
-      cloudflared:
+      main:
        replicas: 2
        strategy: RollingUpdate
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: docker.io/cloudflare/cloudflared
              tag: 2024.2.1@sha256:60e94a8669dccbe461b6913ce33ab759104334220b49042ec03cfca62a2f01e7
@ -86,20 +87,13 @@ spec:
                matchLabels:
                  app.kubernetes.io/name: *app
    service:
-      app:
-        controller: cloudflared
+      main:
        ports:
          http:
            port: *port
    serviceMonitor:
-      app:
-        serviceName: cloudflared
-        endpoints:
-          - port: http
-            scheme: http
-            path: /metrics
-            interval: 1m
-            scrapeTimeout: 10s
+      main:
+        enabled: true
    persistence:
      config:
        enabled: true
--- a/kubernetes/apps/network/echo-server/app/helmrelease.yaml
+++ b/kubernetes/apps/network/echo-server/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -10,25 +10,18 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      interval: 30m
      sourceRef:
        kind: HelmRepository
        name: bjw-s
        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      strategy: rollback
-      retries: 3
+
  values:
    controllers:
-      echo-server:
+      main:
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/mendhak/http-https-echo
              tag: "31"
@ -38,14 +31,13 @@ spec:
              LOG_IGNORE_PATH: "/healthz"

    service:
-      app:
-        controller: echo-server
+      main:
        ports:
          http:
            port: *port

    ingress:
-      app:
+      main:
        enabled: true
        className: external-nginx
        annotations:
@ -56,7 +48,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts:
--- a/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -21,18 +21,19 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: kube-prometheus-stack
      namespace: observability
  values:
    controllers:
-      alertmanager-silencer:
+      main:
        type: cronjob
        cronjob:
          schedule: "@daily"
        containers:
-          app:
+          main:
            image:
              repository: ghcr.io/onedr0p/kubanetics
              tag: 2024.3.4@sha256:2dfb70e154b4d4cbd8b1f98f1647e4a96aa1fc084a7e07b2586e35f7fc743383
@ -41,12 +42,15 @@ spec:
              ALERTMANAGER_URL: http://alertmanager-operated.observability.svc.cluster.local:9093
              MATCHERS_0: alertname=NodeCPUHighUsage job=node-exporter
              MATCHERS_1: alertname=CephNodeDiskspaceWarning device=/dev/xvda6
-              MATCHERS_2: alertname=CephNodeDiskspaceWarning device=/dev/nvme0n1p6
-              MATCHERS_3: alertname=CephNodeDiskspaceWarning device=/dev/sda6
            securityContext:
              allowPrivilegeEscalation: false
              readOnlyRootFilesystem: true
              capabilities: { drop: ["ALL"] }
+            probes:
+              liveness: &noProbes
+                enabled: false
+              readiness: *noProbes
+              startup: *noProbes
            resources:
              requests:
                cpu: 25m
@ -57,3 +61,6 @@ spec:
            runAsUser: 568
            runAsGroup: 568
            runAsNonRoot: true
+    service:
+      main:
+        enabled: false
--- a/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml
+++ b/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -10,7 +10,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -22,19 +22,20 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  dependsOn:
    - name: vector-aggregator
      namespace: observability
  values:
    controllers:
-      vector:
+      main:
        type: daemonset
        strategy: RollingUpdate
        annotations:
          reloader.stakater.com/auto: "true"
        containers:
-          app:
+          main:
            image:
              repository: docker.io/timberio/vector
              tag: 0.36.1-alpine@sha256:cf20f6f0adb57f561df678a70c4a68361885b861882235bfb0a808610bb1b532
@ -59,6 +60,9 @@ spec:
            args: ["--config", "/etc/vector/vector.yaml"]
            securityContext:
              privileged: true
+    service:
+      main:
+        enabled: false
    serviceAccount:
      create: true
      name: vector-agent
--- a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml
+++ b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -10,7 +10,7 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      sourceRef:
        kind: HelmRepository
        name: bjw-s
@ -22,10 +22,11 @@ spec:
    cleanupOnFail: true
    remediation:
      retries: 3
-      strategy: rollback
+  uninstall:
+    keepHistory: false
  values:
    controllers:
-      vector-aggregator:
+      main:
        replicas: 2
        strategy: RollingUpdate
        annotations:
@ -43,7 +44,7 @@ spec:
              - secretRef:
                  name: vector-aggregator-secret
        containers:
-          app:
+          main:
            image:
              repository: docker.io/timberio/vector
              tag: 0.36.1-alpine@sha256:cf20f6f0adb57f561df678a70c4a68361885b861882235bfb0a808610bb1b532
@ -57,8 +58,7 @@ spec:
                matchLabels:
                  app.kubernetes.io/name: *app
    service:
-      app:
-        controller: vector-aggregator
+      main:
        type: LoadBalancer
        annotations:
          external-dns.alpha.kubernetes.io/hostname: vector.jahanson.tech
--- a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml
+++ b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml
@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@ -9,32 +9,26 @@ spec:
  chart:
    spec:
      chart: app-template
-      version: 3.0.4
+      version: 2.6.0
      interval: 30m
      sourceRef:
        kind: HelmRepository
        name: bjw-s
        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-      strategy: rollback
+
  values:
    controllers:
-      qbittorrent:
+      main:
        annotations:
          configmap.reloader.stakater.com/reload: qbittorrent-scripts
          secret.reloader.stakater.com/reload: qbittorrent-secret
+
        pod:
          securityContext:
            fsGroup: 568
            fsGroupChangePolicy: "OnRootMismatch"
        containers:
-          app:
+          main:
            nameOverride: qbittorrent
            image:
              repository: ghcr.io/onedr0p/qbittorrent
@ -110,13 +104,12 @@ spec:
                  - ALL

    service:
-      app:
-        controller: qbittorrent
+      main:
        ports:
          http:
            port: *port
      bittorrent:
-        controller: app
+        controller: main
        type: LoadBalancer
        annotations:
          io.cilium/lb-ipam-ips: 10.45.0.5
@ -128,7 +121,7 @@ spec:


    ingress:
-      app:
+      main:
        enabled: true
        className: "internal-nginx"
        hosts:
@ -136,7 +129,7 @@ spec:
            paths:
              - path: /
                service:
-                  identifier: app
+                  name: main
                  port: http
        tls:
          - hosts: