From 6078e6d25b070113246a0bb21d0d902f9fb3763b Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 26 Mar 2024 20:58:06 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20app-template=20(?= =?UTF-8?q?=202.6.0=20=E2=86=92=203.0.4=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/default/homebox/app/helmrelease.yaml | 24 ++++++++++-------- .../homelab/minio/backup/helmrelease.yaml | 19 +++++++------- .../homelab/opnsense/backup/helmrelease.yaml | 16 ++++++------ .../homelab/truenas/backup/helmrelease.yaml | 19 +++++++------- .../truenas/certs-deploy/helmrelease.yaml | 18 +++++++------ .../truenas/photo-sort/helmrelease.yaml | 20 ++++++++------- .../default/invidious/app/helmrelease.yaml | 18 +++++++------ .../default/jellyfin/app/helmrelease.yaml | 25 ++++++++++--------- .../apps/default/joplin/app/helmrelease.yaml | 18 +++++++------ .../apps/default/komf/app/helmrelease.yaml | 14 ++++++----- .../apps/default/komga/app/helmrelease.yaml | 22 ++++++++-------- .../apps/default/kresus/app/helmrelease.yaml | 19 +++++++------- .../default/libmedium/app/helmrelease.yaml | 18 +++++++------ .../default/libreddit/app/helmrelease.yaml | 17 +++++++------ .../apps/default/lidarr/app/helmrelease.yaml | 24 ++++++++++-------- .../default/linkding/app/helmrelease.yaml | 18 +++++++------ .../apps/default/lldap/app/helmrelease.yaml | 16 ++++++------ .../apps/default/lms/app/helmrelease.yaml | 23 +++++++++-------- .../apps/default/lychee/app/helmrelease.yaml | 22 ++++++++-------- .../default/lychee/app/sync/helmrelease.yaml | 18 +++++++------ 20 files changed, 210 insertions(+), 178 deletions(-) diff --git a/kubernetes/apps/default/homebox/app/helmrelease.yaml b/kubernetes/apps/default/homebox/app/helmrelease.yaml index 0b572954e..1dd392593 100644 --- a/kubernetes/apps/default/homebox/app/helmrelease.yaml +++ b/kubernetes/apps/default/homebox/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: + homebox: containers: - main: + app: image: repository: ghcr.io/hay-kot/homebox tag: v0.10.3@sha256:b1fbca6fc1ad2bd3634d13056d1bc0242cf92e9bad4ca21ce57589be3fe4987e @@ -46,27 +47,28 @@ spec: limits: memory: 256M service: - main: + app: + controller: *app ports: http: port: 7745 ingress: - main: + app: enabled: true className: nginx annotations: hajimari.io/enable: "true" hajimari.io/appName: *app - hajimari.io/info: "Inventory management system" - hajimari.io/icon: "devices" + hajimari.io/info: Inventory management system + hajimari.io/icon: devices hajimari.io/targetBlank: "true" hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - - path: "/" - pathType: "Prefix" + - path: / service: - name: main + identifier: app + port: http tls: - hosts: - *host diff --git a/kubernetes/apps/default/homelab/minio/backup/helmrelease.yaml b/kubernetes/apps/default/homelab/minio/backup/helmrelease.yaml index adafdf2c1..4d87f16d9 100644 --- a/kubernetes/apps/default/homelab/minio/backup/helmrelease.yaml +++ b/kubernetes/apps/default/homelab/minio/backup/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: homelab-minio-backup + name: &app homelab-minio-backup 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,30 +23,29 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + homelab-minio-backup: type: cronjob cronjob: concurrencyPolicy: Forbid schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/auricom/rclone tag: 1.62.2@sha256:8d3ae01ed5295974be1b229f7398ce93a03c77a3fdaf301ea35bf929bb19389a - command: ["/bin/bash", "/app/minio-rclone.sh"] + command: [/bin/bash, /app/minio-rclone.sh] envFrom: - secretRef: name: homelab-minio-secret - service: - main: - enabled: false service: - main: + app: + controller: *app enabled: false persistence: config: diff --git a/kubernetes/apps/default/homelab/opnsense/backup/helmrelease.yaml b/kubernetes/apps/default/homelab/opnsense/backup/helmrelease.yaml index bc74f82c6..48da9762d 100644 --- a/kubernetes/apps/default/homelab/opnsense/backup/helmrelease.yaml +++ b/kubernetes/apps/default/homelab/opnsense/backup/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: homelab-opnsense-backup + name: &app homelab-opnsense-backup 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,22 +23,23 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + homelab-opnsense-backup: type: cronjob cronjob: concurrencyPolicy: Forbid schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 - command: ["/bin/bash", "/app/opnsense-backup.sh"] + command: [/bin/bash, /app/opnsense-backup.sh] env: OPNSENSE_URL: "https://opnsense.${SECRET_DOMAIN}" S3_URL: "https://minio.${SECRET_DOMAIN}:9000" @@ -46,7 +47,8 @@ spec: - secretRef: name: homelab-opnsense-secret service: - main: + app: + controller: *app enabled: false persistence: config: diff --git a/kubernetes/apps/default/homelab/truenas/backup/helmrelease.yaml b/kubernetes/apps/default/homelab/truenas/backup/helmrelease.yaml index da8dc2128..2f30c0279 100644 --- a/kubernetes/apps/default/homelab/truenas/backup/helmrelease.yaml +++ b/kubernetes/apps/default/homelab/truenas/backup/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: homelab-truenas-backup + name: &app homelab-truenas-backup 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,38 +23,39 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + homelab-truenas-backup: type: cronjob cronjob: concurrencyPolicy: Forbid schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 - command: ["/bin/bash", "/app/truenas-backup.sh"] + command: [/bin/bash, /app/truenas-backup.sh] env: HOSTNAME: truenas envFrom: &envFrom - secretRef: name: &secret homelab-truenas-secret truenas-remote-backup: - name: truenas-remote-backup image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 - command: ["/bin/bash", "/app/truenas-backup.sh"] + command: [/bin/bash, /app/truenas-backup.sh] env: HOSTNAME: truenas-remote envFrom: *envFrom service: - main: + app: + controller: *app enabled: false persistence: config: diff --git a/kubernetes/apps/default/homelab/truenas/certs-deploy/helmrelease.yaml b/kubernetes/apps/default/homelab/truenas/certs-deploy/helmrelease.yaml index ab798c4ce..8418dda39 100644 --- a/kubernetes/apps/default/homelab/truenas/certs-deploy/helmrelease.yaml +++ b/kubernetes/apps/default/homelab/truenas/certs-deploy/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: homelab-truenas-certs-deploy + name: &app homelab-truenas-certs-deploy 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,22 +23,23 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + homelab-truenas-certs-deploy: type: cronjob cronjob: concurrencyPolicy: Forbid schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 - command: ["/bin/bash", "/app/truenas-certs-deploy.sh"] + command: [/bin/bash, /app/truenas-certs-deploy.sh] env: HOSTNAME: truenas TRUENAS_HOME: /mnt/storage/home/homelab @@ -51,7 +52,7 @@ spec: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 - command: ["/bin/bash", "/app/truenas-certs-deploy.sh"] + command: [/bin/bash, /app/truenas-certs-deploy.sh] env: HOSTNAME: truenas-remote TRUENAS_HOME: /mnt/vol1/home/homelab @@ -59,7 +60,8 @@ spec: CERTS_DEPLOY_POSTGRESQL_ENABLED: "False" envFrom: *envFrom service: - main: + app: + controller: *app enabled: false persistence: config: diff --git a/kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml b/kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml index 8aa527cb1..ea7eb634c 100644 --- a/kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml +++ b/kubernetes/apps/default/homelab/truenas/photo-sort/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: homelab-truenas-photo-sort + name: &app homelab-truenas-photo-sort 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,24 +23,25 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + homelab-truenas-photo-sort: type: cronjob cronjob: concurrencyPolicy: Forbid - schedule: "23 */3 * * *" + schedule: 23 */3 * * * containers: - main: + app: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:41af2d2a69bfff5c4f4dc7aafb654c46d2c44e1fca89a44b463b75c53f02f7aa command: - - "/bin/bash" - - "-c" + - /bin/bash + - -c - | #!/bin/bash @@ -52,7 +53,8 @@ spec: SORT_SOURCE_DIR: /mnt/storage/photo/mobile SORT_DEST_DIR: /mnt/storage/photo service: - main: + app: + controller: *app enabled: false persistence: scripts: diff --git a/kubernetes/apps/default/invidious/app/helmrelease.yaml b/kubernetes/apps/default/invidious/app/helmrelease.yaml index 78325358d..9fda07d23 100644 --- a/kubernetes/apps/default/invidious/app/helmrelease.yaml +++ b/kubernetes/apps/default/invidious/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,12 +23,13 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + invidious-server: strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -41,7 +42,7 @@ spec: - secretRef: name: invidious-secret containers: - main: + app: image: repository: quay.io/invidious/invidious tag: latest@sha256:ed76a9c4d976dc4ed2575b6b59a108b0cbe9e642cb581df04fd0b0321eebaa3a @@ -51,14 +52,15 @@ spec: cpu: 50m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 3000 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -74,7 +76,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml index 9cee8f776..a14d6ed9d 100644 --- a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml +++ b/kubernetes/apps/default/jellyfin/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 @@ -37,11 +38,11 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch controllers: - main: + jellyfin: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/jellyfin tag: 10.8.11@sha256:926e2a9f6677a0c7b12feba29f36c954154869318d6a52df72f72ff9c74cf494 @@ -75,7 +76,8 @@ spec: gpu.intel.com/i915: 1 memory: 4Gi service: - main: + app: + controller: *app type: LoadBalancer loadBalancerIP: *loadBalancerIP externalTrafficPolicy: Local @@ -83,9 +85,9 @@ spec: http: port: 8096 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: external-dns.alpha.kubernetes.io/enabled: "true" external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}. @@ -95,7 +97,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -109,22 +111,21 @@ spec: music: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/music globalMounts: - path: /mnt/storage/music photo: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/photo - mountPath: /mnt/storage/photo globalMounts: - path: /mnt/storage/photo video: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/video globalMounts: - path: /mnt/storage/video diff --git a/kubernetes/apps/default/joplin/app/helmrelease.yaml b/kubernetes/apps/default/joplin/app/helmrelease.yaml index 2621cf74c..7a5a22e85 100644 --- a/kubernetes/apps/default/joplin/app/helmrelease.yaml +++ b/kubernetes/apps/default/joplin/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,12 +23,13 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + joplin: strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -41,7 +42,7 @@ spec: - secretRef: name: joplin-secret containers: - main: + app: image: repository: joplin/server tag: 2.14.2-beta@sha256:b87564ef34e9ed0513e9b925b617cb8a1371eddfc8476f1fbd3fa85341d51508 @@ -61,14 +62,15 @@ spec: cpu: 50m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: *port ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: external-dns.alpha.kubernetes.io/enabled: "true" external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}. @@ -78,7 +80,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/komf/app/helmrelease.yaml b/kubernetes/apps/default/komf/app/helmrelease.yaml index 5a33bfd00..80d0eb125 100644 --- a/kubernetes/apps/default/komf/app/helmrelease.yaml +++ b/kubernetes/apps/default/komf/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 @@ -30,14 +31,14 @@ spec: - name: komga values: controllers: - main: + komf: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: sndxr/komf - tag: "0.33.0@sha256:074cd429b3cc452b26ca4aba2760ee0c5dae5f85d3ae1cb16b50b6f602ce1e80" + tag: 0.33.0@sha256:074cd429b3cc452b26ca4aba2760ee0c5dae5f85d3ae1cb16b50b6f602ce1e80 env: KOMF_KOMGA_BASE_URI: http://komga.default.svc.cluster.local:8080 KOMF_LOG_LEVEL: INFO @@ -51,7 +52,8 @@ spec: limits: memory: 4282M service: - main: + app: + controller: *app ports: http: port: 8085 diff --git a/kubernetes/apps/default/komga/app/helmrelease.yaml b/kubernetes/apps/default/komga/app/helmrelease.yaml index 5d796e849..445463982 100644 --- a/kubernetes/apps/default/komga/app/helmrelease.yaml +++ b/kubernetes/apps/default/komga/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,17 +23,18 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + komga: containers: - main: + app: image: repository: gotson/komga - tag: "1.10.4@sha256:5b4f581be33141f07abed7bb665077352fb046183f3614b0a647530588784735" + tag: 1.10.4@sha256:5b4f581be33141f07abed7bb665077352fb046183f3614b0a647530588784735 env: TZ: "${TIMEZONE}" SERVER_PORT: &port 8080 @@ -44,22 +45,23 @@ spec: limits: memory: 4282M service: - main: + app: + controller: *app ports: http: port: *port ingress: - main: + app: enabled: true annotations: hajimari.io/icon: mdi:ideogram-cjk-variant - className: "nginx" + className: nginx hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -72,7 +74,7 @@ spec: - path: /config comics: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/home/claude/comics globalMounts: - path: /mnt/storage/home/claude/comics diff --git a/kubernetes/apps/default/kresus/app/helmrelease.yaml b/kubernetes/apps/default/kresus/app/helmrelease.yaml index a971956ed..8a1cd0fa5 100644 --- a/kubernetes/apps/default/kresus/app/helmrelease.yaml +++ b/kubernetes/apps/default/kresus/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 @@ -34,7 +35,7 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch controllers: - main: + kresus: annotations: reloader.stakater.com/auto: "true" initContainers: @@ -46,11 +47,10 @@ spec: - secretRef: name: kresus-secret containers: - main: + app: image: repository: ghcr.io/auricom/kresus tag: 0.20.1@sha256:85b4d8c11da8ebe95adce529d55e003ec50fba645ac7094e84468fb37ea42811 - imagePullPolicy: IfNotPresent env: HOST: 0.0.0.0 PORT: 9876 @@ -71,14 +71,15 @@ spec: cpu: 100m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 9876 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -91,7 +92,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/libmedium/app/helmrelease.yaml b/kubernetes/apps/default/libmedium/app/helmrelease.yaml index 0d98d4799..16e6d3a6c 100644 --- a/kubernetes/apps/default/libmedium/app/helmrelease.yaml +++ b/kubernetes/apps/default/libmedium/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,17 +23,18 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + libmedium: strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: realaravinth/libmedium tag: master@sha256:c5e82cc00eb85cda0e9db4b72b229f66b5be76b88ffe55b4117bd01102910cf3 @@ -42,14 +43,15 @@ spec: cpu: 50m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 7000 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -64,7 +66,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/libreddit/app/helmrelease.yaml b/kubernetes/apps/default/libreddit/app/helmrelease.yaml index 9228e1bf9..517585bcb 100644 --- a/kubernetes/apps/default/libreddit/app/helmrelease.yaml +++ b/kubernetes/apps/default/libreddit/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 @@ -28,10 +28,10 @@ spec: keepHistory: false values: controllers: - main: + libreddit: strategy: RollingUpdate containers: - main: + app: image: repository: ghcr.io/auricom/libreddit tag: 0.30.1@sha256:c89c2b98ab0eb08f4677d24a3a7577661ed4325c797b042023ce959195534c4f @@ -55,14 +55,15 @@ spec: cpu: 50m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: *port ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -77,7 +78,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/lidarr/app/helmrelease.yaml b/kubernetes/apps/default/lidarr/app/helmrelease.yaml index b84c24eec..72698c164 100644 --- a/kubernetes/apps/default/lidarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/lidarr/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 @@ -34,10 +35,10 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch controllers: - main: + lidarr: annotations: reloader.stakater.com/auto: "true" - configmap.reloader.stakater.com/reload: "lidarr-pushover" + configmap.reloader.stakater.com/reload: lidarr-pushover initContainers: init-db: image: @@ -48,7 +49,7 @@ spec: - secretRef: name: lidarr-secret containers: - main: + app: image: repository: ghcr.io/onedr0p/lidarr-develop tag: 2.2.3.4098@sha256:ddb5035c57005792761e60371ab7e2ca3e0804fa5ab6952266b0d5f797ed08c2 @@ -69,14 +70,15 @@ spec: limits: memory: 2000Mi service: - main: + app: + controller: *app ports: http: port: *port ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: nginx.ingress.kubernetes.io/auth-method: GET nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify @@ -89,7 +91,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -102,13 +104,13 @@ spec: - path: /config music: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/music globalMounts: - path: /mnt/storage/music downloads: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/downloads globalMounts: - path: /mnt/storage/downloads diff --git a/kubernetes/apps/default/linkding/app/helmrelease.yaml b/kubernetes/apps/default/linkding/app/helmrelease.yaml index ff90a2102..f8f3c25a8 100644 --- a/kubernetes/apps/default/linkding/app/helmrelease.yaml +++ b/kubernetes/apps/default/linkding/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,12 +23,13 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false values: controllers: - main: + linkding: strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" @@ -41,7 +42,7 @@ spec: - secretRef: name: linkding-secret containers: - main: + app: image: repository: sissbruecker/linkding tag: 1.25.0@sha256:32ec417b6ddb92ca20ff71a07c524b68ad2853e99258acfae1d3cef2de03f3cc @@ -66,14 +67,15 @@ spec: cpu: 10m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: *port ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: link hosts: @@ -81,7 +83,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/lldap/app/helmrelease.yaml b/kubernetes/apps/default/lldap/app/helmrelease.yaml index a89dee532..a829328eb 100644 --- a/kubernetes/apps/default/lldap/app/helmrelease.yaml +++ b/kubernetes/apps/default/lldap/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,7 +37,7 @@ spec: matchLabels: app.kubernetes.io/name: *app controllers: - main: + lldap: replicas: 2 strategy: RollingUpdate annotations: @@ -51,7 +52,7 @@ spec: - secretRef: name: lldap-secret containers: - main: + app: image: repository: ghcr.io/lldap/lldap tag: v0.5.0 @@ -69,7 +70,8 @@ spec: limits: memory: 500Mi service: - main: + app: + controller: *app ports: http: port: *port @@ -77,7 +79,7 @@ spec: enabled: true port: *ldapPort ingress: - main: + app: enabled: true annotations: hajimari.io/icon: mdi:account-multiple @@ -87,7 +89,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/lms/app/helmrelease.yaml b/kubernetes/apps/default/lms/app/helmrelease.yaml index e19d817c8..e581727a4 100644 --- a/kubernetes/apps/default/lms/app/helmrelease.yaml +++ b/kubernetes/apps/default/lms/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 @@ -28,11 +28,11 @@ spec: keepHistory: false values: controllers: - main: + lms: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: toertel/logitech-media-server tag: v8.4.0-1@sha256:07dde462237c0618034c9d2db33967f5bc0db34544558e8edaac32ef0614555a @@ -46,7 +46,8 @@ spec: limits: memory: 4096Mi service: - main: + app: + controller: *app type: LoadBalancer loadBalancerIP: ${CLUSTER_LB_LMS} externalTrafficPolicy: Local @@ -66,9 +67,9 @@ spec: port: 3483 protocol: UDP ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: hajimari.io/icon: mdi:file-music hosts: @@ -76,7 +77,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -89,19 +90,19 @@ spec: - path: /srv/squeezebox music: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: *music globalMounts: - path: *music music-helene: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/home/helene/Musique globalMounts: - path: /mnt/storage/home/helene/Musique playlists: type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: *playlist globalMounts: - path: *playlist diff --git a/kubernetes/apps/default/lychee/app/helmrelease.yaml b/kubernetes/apps/default/lychee/app/helmrelease.yaml index 7f2e84c85..bd64b6209 100644 --- a/kubernetes/apps/default/lychee/app/helmrelease.yaml +++ b/kubernetes/apps/default/lychee/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 @@ -31,7 +32,7 @@ spec: namespace: database values: controllers: - main: + lychee: annotations: reloader.stakater.com/auto: "true" initContainers: @@ -43,7 +44,7 @@ spec: - secretRef: name: lychee-secret containers: - main: + app: image: repository: lycheeorg/lychee-laravel tag: v5.1.2@sha256:7fc2f88fb993a5930ce8396fce401a0396d9051199945a3d2c6c01c45eeeae38 @@ -62,14 +63,15 @@ spec: cpu: 100m memory: 256Mi service: - main: + app: + controller: *app ports: http: port: 80 ingress: - main: + app: enabled: true - className: "nginx" + className: nginx annotations: external-dns.alpha.kubernetes.io/enabled: "true" external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}. @@ -79,7 +81,8 @@ spec: paths: - path: / service: - name: main + identifier: app + port: http tls: - hosts: - *host @@ -92,8 +95,7 @@ spec: photo: enabled: true type: nfs - server: "192.168.9.10" + server: ${LOCAL_LAN_TRUENAS} path: /mnt/storage/photo - readOnly: true globalMounts: - path: /mnt/storage/photo diff --git a/kubernetes/apps/default/lychee/app/sync/helmrelease.yaml b/kubernetes/apps/default/lychee/app/sync/helmrelease.yaml index 3a0595816..ec26162da 100644 --- a/kubernetes/apps/default/lychee/app/sync/helmrelease.yaml +++ b/kubernetes/apps/default/lychee/app/sync/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: lychee-sync + name: &app lychee-sync 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,6 +23,7 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 uninstall: keepHistory: false @@ -32,15 +33,15 @@ spec: type: cronjob cronjob: concurrencyPolicy: Forbid - schedule: "0 0 * * 1" # At 00:00 on Monday + schedule: 0 0 * * 1 # At 00:00 on Monday containers: main: image: repository: ghcr.io/auricom/kubectl tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3 command: - - "/bin/bash" - - "-c" + - /bin/bash + - -c - | #!/bin/bash @@ -56,8 +57,9 @@ spec: exit 1 fi service: - main: + app: + controller: *app enabled: false serviceAccount: create: false - name: "jobs" + name: jobs