⬆️ Update app-template ( 2.6.0 → 3.0.4 )

2025-09-17 18:24:14 +02:00 · 2024-03-29 17:29:07 +01:00
parent ece4a34f4f
commit c55739540a
27 changed files with 199 additions and 161 deletions
--- a/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/helmrelease.yaml
+++ b/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
--- a/kubernetes/apps/database/influx/app/helmrelease.yaml
+++ b/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:
-          liveness: &health
-            enabled: true
-            custom: true
-            spec:
-              initialDelaySeconds: 30
-              periodSeconds: 10
-              timeoutSeconds: 1
-              failureThreshold: 3
-              httpGet:
-                path: /health
-                port: 8086
-          readiness: *health
-          startup:
-            enabled: true
-            custom: true
-            spec:
-              initialDelaySeconds: 0
-              timeoutSeconds: 1
-              periodSeconds: 5
-              failureThreshold: 30
-              httpGet:
-                path: /health
-                port: 8086
+            probes:
+              liveness: &health
+                enabled: true
+                custom: true
+                spec:
+                  initialDelaySeconds: 30
+                  periodSeconds: 10
+                  timeoutSeconds: 1
+                  failureThreshold: 3
+                  httpGet:
+                    path: /health
+                    port: 8086
+              readiness: *health
+              startup:
+                enabled: true
+                custom: true
+                spec:
+                  initialDelaySeconds: 0
+                  timeoutSeconds: 1
+                  periodSeconds: 5
+                  failureThreshold: 30
+                  httpGet:
+                    path: /health
+                    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
--- a/kubernetes/apps/database/redis/app/helmrelease.yaml
+++ b/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