⬆️ Update app-template ( 2.6.0 → 3.0.4 )

kubernetes/apps/database/cloudnative-pg/cluster/pgdump/helmrelease.yaml

@@ -1,16 +1,16 @@
 ---
-# 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:
-  name: cloudnative-pg-postgres16-pgdump
+  name: &app cloudnative-pg-postgres16-pgdump
   namespace: default
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,12 +23,13 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      cloudnative-pg-postgres16-pgdump:
         type: cronjob
         cronjob:
           concurrencyPolicy: Forbid
@@ -39,7 +40,7 @@ spec:
               repository: ghcr.io/onedr0p/postgres-init
               tag: 16
             env:
-              EXCLUDE_DBS: "app home_assistant lidarr_log radarr_log sonarr_log prowlarr_log postgres template0 template1"
+              EXCLUDE_DBS: app home_assistant lidarr_log radarr_log sonarr_log prowlarr_log postgres template0 template1
             envFrom: &envFrom
               - secretRef:
                   name: cloudnative-pg-postgres16-pgdump-secret
@@ -73,21 +74,22 @@ spec:
 
                 cat $OUTPUT_FILE
         containers:
-          main:
+          app:
             image:
               repository: prodrigestivill/postgres-backup-local
               tag: 16-alpine
-            command: ["/backup.sh"]
+            command: [/backup.sh]
             env:
               POSTGRES_DB_FILE: /config/db_list
-              POSTGRES_EXTRA_OPTS: "-Z9 --schema=public --blobs"
+              POSTGRES_EXTRA_OPTS: -Z9 --schema=public --blobs
               BACKUP_KEEP_DAYS: "7"
               BACKUP_KEEP_WEEKS: "4"
               BACKUP_KEEP_MONTHS: "3"
               HEALTHCHECK_PORT: "8080"
             envFrom: *envFrom
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     persistence:
       config:
@@ -98,7 +100,7 @@ spec:
       backups:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/backups/postgresql
         globalMounts:
           - path: /backups

kubernetes/apps/database/influx/app/helmrelease.yaml

@@ -1,15 +1,15 @@
 ---
-# 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:
-  name: influx
+  name: &app influx
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -20,6 +20,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -27,11 +28,11 @@ spec:
     defaultPodOptions:
       automountServiceAccountToken: false
     controllers:
-      main:
+      influx:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: docker.io/library/influxdb
               tag: 2.7-alpine
@@ -41,41 +42,40 @@ spec:
                 memory: 128M
               limits:
                 memory: 384M
-        probes:
+            probes:
-          liveness: &health
+              liveness: &health
-            enabled: true
+                enabled: true
-            custom: true
+                custom: true
-            spec:
+                spec:
-              initialDelaySeconds: 30
+                  initialDelaySeconds: 30
-              periodSeconds: 10
+                  periodSeconds: 10
-              timeoutSeconds: 1
+                  timeoutSeconds: 1
-              failureThreshold: 3
+                  failureThreshold: 3
-              httpGet:
+                  httpGet:
-                path: /health
+                    path: /health
-                port: 8086
+                    port: 8086
-          readiness: *health
+              readiness: *health
-          startup:
+              startup:
-            enabled: true
+                enabled: true
-            custom: true
+                custom: true
-            spec:
+                spec:
-              initialDelaySeconds: 0
+                  initialDelaySeconds: 0
-              timeoutSeconds: 1
+                  timeoutSeconds: 1
-              periodSeconds: 5
+                  periodSeconds: 5
-              failureThreshold: 30
+                  failureThreshold: 30
-              httpGet:
+                  httpGet:
-                path: /health
+                    path: /health
-                port: 8086
+                    port: 8086
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             enabled: false
+            port: 8080
           influx:
             enabled: true
             port: 8086
-    ingress:
-      main:
-        enabled: false
     persistence:
       config:
         enabled: true

kubernetes/apps/database/redis/app/helmrelease.yaml

@@ -1,15 +1,15 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-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:
-  name: redis
+  name: &app redis
 spec:
   interval: 15m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -21,13 +21,14 @@ spec:
       retries: 5
   upgrade:
     remediation:
+      strategy: rollback
       retries: 5
   values:
     controllers:
-      main:
+      redis:
         type: statefulset
         containers:
-          main:
+          app:
             image:
               repository: redis
               tag: 7.2.4-alpine
@@ -75,7 +76,8 @@ spec:
             env:
               REDIS_PORT: "6379"
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 6379

kubernetes/apps/default/atuin/app/helmrelease.yaml

@@ -89,7 +89,7 @@ spec:
             interval: 1m
             scrapeTimeout: 10s
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/authelia/app/helmrelease.yaml

@@ -142,7 +142,7 @@ spec:
             interval: 1m
             scrapeTimeout: 10s
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/babybuddy/app/helmrelease.yaml

@@ -80,7 +80,7 @@ spec:
           http:
             port: 3000
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/bazarr/app/helmrelease.yaml

@@ -82,7 +82,7 @@ spec:
           http:
             port: 6767
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/calibre/app/helmrelease.yaml

@@ -52,7 +52,7 @@ spec:
           http:
             port: 8080
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/hajimari/app/helmrelease.yaml

@@ -87,7 +87,7 @@ spec:
               url: https://whazor.github.io/k8s-at-home-search/
               targetBlank: false
     ingress:
-      main:
+      app:
         enabled: true
         ingressClassName: nginx
         annotations:

kubernetes/apps/default/home-assistant/code/helmrelease.yaml

@@ -74,7 +74,7 @@ spec:
           http:
             port: 8888
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         hosts:

kubernetes/apps/default/prowlarr/app/helmrelease.yaml

@@ -66,7 +66,7 @@ spec:
           http:
             port: *port
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/vikunja/app/helmrelease.yaml

@@ -72,7 +72,7 @@ spec:
           http:
             port: 8080
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/wallabag/app/helmrelease.yaml

@@ -88,7 +88,7 @@ spec:
           http:
             port: 80
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/whoogle/app/helmrelease.yaml

@@ -65,7 +65,7 @@ spec:
           http:
             port: 5000
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml

@@ -96,7 +96,7 @@ spec:
           http:
             port: &port 8080
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:

kubernetes/apps/flux-system/capacitor/app/helmrelease.yaml

@@ -1,15 +1,15 @@
 ---
-# 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:
-  name: capacitor
+  name: &app capacitor
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -20,15 +20,16 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      capacitor:
         strategy: RollingUpdate
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/gimlet-io/capacitor
               tag: v0.3.3
@@ -48,14 +49,14 @@ spec:
       create: true
       name: "capacitor"
     service:
-      main:
+      app:
-        controller: main
+        controller: *app
         ports:
           http:
             enabled: true
             port: 9000
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -65,7 +66,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:

kubernetes/apps/kube-system/external-secrets/stores/onepassword/helmrelease.yaml

@@ -1,15 +1,16 @@
 ---
+# 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:
-  name: onepassword-connect
+  name: &app onepassword-connect
   namespace: kube-system
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -22,12 +23,13 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      onepassword-connect:
         annotations:
           reloader.stakater.com/auto: "true"
         pod:
@@ -35,7 +37,7 @@ spec:
             runAsUser: 999
             runAsGroup: 999
         containers:
-          main:
+          app:
             image:
               # repository: docker.io/1password/connect-api
               repository: ghcr.io/haraldkoch/onepassword-connect-api
@@ -90,25 +92,33 @@ spec:
                   secretKeyRef:
                     name: onepassword-connect-secret
                     key: onepassword-credentials.json
-            readinessProbe:
+            probes:
-              httpGet:
+              readiness:
-                path: /health
+                enabled: true
-                port: *sport
+                custom: true
-              initialDelaySeconds: 15
+                spec:
-            livenessProbe:
+                  httpGet:
-              httpGet:
+                    path: /health
-                path: /heartbeat
+                    port: *sport
-                port: *sport
+                  initialDelaySeconds: 15
-              failureThreshold: 3
+              liveness:
-              periodSeconds: 30
+                enabled: true
-              initialDelaySeconds: 15
+                custom: true
+                spec:
+                  httpGet:
+                    path: /heartbeat
+                    port: *sport
+                  failureThreshold: 3
+                  periodSeconds: 30
+                  initialDelaySeconds: 15
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -118,7 +128,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:

kubernetes/apps/kube-system/intel-device-plugin/exporter/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -31,10 +32,10 @@ spec:
       nodeSelector:
         intel.feature.node.kubernetes.io/gpu: "true"
     controllers:
-      main:
+      intel-gpu-exporter:
         type: daemonset
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/onedr0p/intel-gpu-exporter
               tag: rolling@sha256:f324725adc5497510f204aec64d398dddddd15052ce234c3f700606bb3d91a99
@@ -49,12 +50,14 @@ spec:
             securityContext:
               privileged: true
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 8080
     serviceMonitor:
-      main:
+      app:
+        serviceName: app
         enabled: true
         endpoints:
           - port: http

kubernetes/apps/monitoring/gatus/app/helmrelease.yaml

@@ -1,16 +1,16 @@
 ---
-# 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:
-  name: gatus
+  name: &app gatus
   namespace: monitoring
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,17 +23,17 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      gatus:
         annotations:
           reloader.stakater.com/auto: "true"
         initContainers:
-          init-db:
+          01-init-db:
-            order: 1
             image:
               repository: ghcr.io/onedr0p/postgres-init
               tag: 16
@@ -41,8 +41,7 @@ spec:
             envFrom: &envFrom
               - secretRef:
                   name: gatus-secret
-          init-config:
+          02-init-config:
-            order: 2
             image: &configSyncImage
               repository: ghcr.io/kiwigrid/k8s-sidecar
               tag: 1.26.1@sha256:b8d5067137fec093cf48670dc3a1dbb38f9e734f3a6683015c2e89a45db5fd16
@@ -60,7 +59,7 @@ spec:
               limits:
                 memory: 128Mi
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/twin/gatus
               tag: v5.8.0@sha256:fecb4c38722df59f5e00ab4fcf2393d9b8dad9161db208d8d79386dc86da8a55
@@ -88,15 +87,22 @@ spec:
             envFrom: *envFrom
             resources: *configSyncResources
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
     serviceMonitor:
-      main:
+      app:
-        enabled: true
+        serviceName: *app
+        endpoints:
+          - port: http
+            scheme: http
+            path: /metrics
+            interval: 1m
+            scrapeTimeout: 10s
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -108,14 +114,14 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
               - *host
     serviceAccount:
       create: true
-      name: gatus
+      name: *app
     persistence:
       config:
         enabled: true

kubernetes/apps/monitoring/scrutiny/app/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -22,6 +22,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -29,11 +30,11 @@ spec:
     defaultPodOptions:
       automountServiceAccountToken: false
     controllers:
-      main:
+      scrutiny:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/analogj/scrutiny
               tag: master-web
@@ -50,12 +51,13 @@ spec:
               limits:
                 memory: 128Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: &port 8080
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -65,7 +67,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -114,6 +116,5 @@ spec:
         enabled: true
         type: hostPath
         hostPath: /run/udev
-        readOnly: true
         globalMounts:
           - path: /run/udev

kubernetes/apps/monitoring/scrutiny/collector/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -22,6 +22,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -33,10 +34,10 @@ spec:
         # capabilities:
         #   add: ["SYS_RAWIO"] # allow access to smartctl
     controllers:
-      main:
+      scrutiny-collector:
         type: daemonset
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/analogj/scrutiny
               tag: master-collector
@@ -56,7 +57,8 @@ spec:
               limits:
                 memory: 128Mi
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     persistence:
       config:
@@ -68,20 +70,17 @@ spec:
         enabled: true
         type: hostPath
         hostPath: /run/udev
-        readOnly: true
         globalMounts:
           - path: /run/udev
       nvme0n1:
         enabled: true
         type: hostPath
         hostPath: /dev/nvme0n1
-        readOnly: true
         globalMounts:
           - path: /dev/nvme0n1
       sda:
         enabled: true
         type: hostPath
         hostPath: /dev/sda
-        readOnly: true
         globalMounts:
           - path: /dev/sda

kubernetes/apps/monitoring/vector/app/agent/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -22,6 +22,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -29,13 +30,13 @@ spec:
     - name: vector-aggregator
   values:
     controllers:
-      main:
+      vector-agent:
         type: daemonset
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: docker.io/timberio/vector
               tag: 0.36.1-debian@sha256:67c4cfc8fd70c7a0182fdc3ba815f34cebb0c9702e9a0a2b1fbe4f11dac719fa
@@ -61,7 +62,8 @@ spec:
             securityContext:
               privileged: true
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     serviceAccount:
       create: true

kubernetes/apps/monitoring/vector/app/aggregator/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,12 +23,13 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      vector-aggregator:
         replicas: 2
         strategy: RollingUpdate
         annotations:
@@ -47,7 +48,7 @@ spec:
               - secretRef:
                   name: vector-aggregator-secret
         containers:
-          main:
+          app:
             image:
               repository: docker.io/timberio/vector
               tag: 0.36.1-debian@sha256:67c4cfc8fd70c7a0182fdc3ba815f34cebb0c9702e9a0a2b1fbe4f11dac719fa
@@ -61,7 +62,8 @@ spec:
                 matchLabels:
                   app.kubernetes.io/name: *app
     service:
-      main:
+      app:
+        controller: *app
         type: LoadBalancer
         loadBalancerIP: 192.168.169.108
         externalTrafficPolicy: Local

kubernetes/apps/networking/k8s-gateway/app/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -36,13 +37,13 @@ spec:
             matchLabels:
               app.kubernetes.io/name: *app
     controllers:
-      main:
+      k8s-gateway:
         replicas: 2
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: quay.io/oriedge/k8s_gateway
               tag: v0.4.0
@@ -63,13 +64,15 @@ spec:
               startup:
                 enabled: false
     service:
-      main:
+      app:
+        controller: *app
         type: LoadBalancer
         loadBalancerIP: "${CLUSTER_LB_K8SGATEWAY}"
         externalTrafficPolicy: Local
         ports:
           http:
             enabled: false
+            port: 8080
           metrics:
             enabled: true
             port: 9153
@@ -79,7 +82,8 @@ spec:
             targetPort: 1053
             protocol: UDP
     serviceMonitor:
-      main:
+      app:
+        serviceName: *app
         enabled: true
         endpoints:
           - port: metrics

kubernetes/apps/ngnode/landing-page/app-staging/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,14 +23,15 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      ngnode-landing-page-staging:
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/ngnodehq/landing-page
               tag: v0.1.2
@@ -41,12 +42,13 @@ spec:
               limits:
                 memory: 400Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 3000
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -57,7 +59,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:

kubernetes/apps/ngnode/landing-page/app/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,14 +23,15 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      ngnode-landing-page:
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/ngnodehq/landing-page
               tag: v0.1.4@sha256:87e6e0c73a0a97b1ad47d9d09d006c1b56257964561f2f47c9111f3cfb54399a
@@ -41,12 +42,13 @@ spec:
               limits:
                 memory: 400Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 3000
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -57,19 +59,19 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
           - host: "www.ngnode.com"
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
           - host: "ngnode.com"
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:

kubernetes/apps/rook-ceph/rook-ceph/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:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -56,7 +57,8 @@ spec:
             securityContext:
               privileged: true
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     persistence:
       dev: