From c30afd2ac9b3d004cc36d7cecfcddd39f162fe27 Mon Sep 17 00:00:00 2001 From: Smeagol Date: Tue, 19 Mar 2024 22:20:21 +0000 Subject: [PATCH 1/2] Update Helm release app-template to v3 --- .archive/kubernetes/default/jellyfin/app/helmrelease.yaml | 2 +- kubernetes/apps/default/maintainerr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/overseerr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/prowlarr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/radarr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/recyclarr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/sabnzbd/app/helmrelease.yaml | 2 +- kubernetes/apps/default/sonarr/app/helmrelease.yaml | 2 +- kubernetes/apps/default/tautulli/app/helmrelease.yaml | 2 +- kubernetes/apps/default/unpackerr/app/helmrelease.yaml | 2 +- .../dragonfly-operator/app/helmrelease.yaml | 2 +- kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml | 2 +- kubernetes/apps/network/cloudflared/app/helmrelease.yaml | 2 +- kubernetes/apps/network/echo-server/app/helmrelease.yaml | 2 +- .../observability/alertmanager-silencer/app/helmrelease.yaml | 2 +- kubernetes/apps/observability/vector/app/agent/helmrelease.yaml | 2 +- .../apps/observability/vector/app/aggregator/helmrelease.yaml | 2 +- kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml b/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml index eb639f59..28b67a29 100644 --- a/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml +++ b/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/maintainerr/app/helmrelease.yaml b/kubernetes/apps/default/maintainerr/app/helmrelease.yaml index 719dc102..6c88e612 100644 --- a/kubernetes/apps/default/maintainerr/app/helmrelease.yaml +++ b/kubernetes/apps/default/maintainerr/app/helmrelease.yaml @@ -8,7 +8,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 interval: 30m sourceRef: kind: HelmRepository diff --git a/kubernetes/apps/default/overseerr/app/helmrelease.yaml b/kubernetes/apps/default/overseerr/app/helmrelease.yaml index 82eeec15..41803694 100644 --- 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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml index c68cbddc..2f3b7374 100644 --- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml index d93de234..0261f928 100644 --- a/kubernetes/apps/default/radarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml index ef40a5c6..2448cd70 100644 --- 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: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml index 82952147..7dba2e2f 100644 --- a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml +++ b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml index fdba7c04..ef155b75 100644 --- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/tautulli/app/helmrelease.yaml b/kubernetes/apps/default/tautulli/app/helmrelease.yaml index d6a8dfa7..d1230d2f 100644 --- a/kubernetes/apps/default/tautulli/app/helmrelease.yaml +++ b/kubernetes/apps/default/tautulli/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/default/unpackerr/app/helmrelease.yaml b/kubernetes/apps/default/unpackerr/app/helmrelease.yaml index 0691e4c6..c2638ba0 100644 --- a/kubernetes/apps/default/unpackerr/app/helmrelease.yaml +++ b/kubernetes/apps/default/unpackerr/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml b/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml index 72de9409..8786c3b4 100644 --- a/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml +++ b/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml b/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml index 492d7a02..4a7db179 100644 --- a/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml index 5ad8d37f..7ff31101 100644 --- a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml +++ b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/apps/network/echo-server/app/helmrelease.yaml index 456b2f53..179f7db1 100644 --- a/kubernetes/apps/network/echo-server/app/helmrelease.yaml +++ b/kubernetes/apps/network/echo-server/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 interval: 30m sourceRef: kind: HelmRepository diff --git a/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml b/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml index 3f6af2b1..60cdaf34 100644 --- a/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml +++ b/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml b/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml index 28436ec7..accc0573 100644 --- a/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml +++ b/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml index 4acdd471..6788d0fd 100644 --- a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml +++ b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 sourceRef: kind: HelmRepository name: bjw-s diff --git a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml index 72c42f96..3b95bccc 100644 --- a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml +++ b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: app-template - version: 2.6.0 + version: 3.0.4 interval: 30m sourceRef: kind: HelmRepository From 1ea51681cff948e12ae633839b6c5e53cf0cc602 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Tue, 19 Mar 2024 17:38:08 -0500 Subject: [PATCH 2/2] app-template v3 modifications --- .../default/jellyfin/app/helmrelease.yaml | 23 ++++++------ .../default/maintainerr/app/helmrelease.yaml | 36 +++++++++++-------- .../default/overseerr/app/helmrelease.yaml | 13 ++++--- .../default/prowlarr/app/helmrelease.yaml | 16 ++++----- .../apps/default/radarr/app/helmrelease.yaml | 12 +++---- .../default/recyclarr/app/helmrelease.yaml | 11 ++---- .../apps/default/sabnzbd/app/helmrelease.yaml | 16 ++++----- .../apps/default/sonarr/app/helmrelease.yaml | 11 +++--- .../default/tautulli/app/helmrelease.yaml | 16 ++++----- .../default/unpackerr/app/helmrelease.yaml | 22 +++++++----- .../dragonfly-operator/app/helmrelease.yaml | 9 ++--- .../kube-system/fstrim/app/helmrelease.yaml | 12 +++---- .../network/cloudflared/app/helmrelease.yaml | 22 +++++++----- .../network/echo-server/app/helmrelease.yaml | 22 ++++++++---- .../app/helmrelease.yaml | 19 ++++------ .../vector/app/agent/helmrelease.yaml | 12 +++---- .../vector/app/aggregator/helmrelease.yaml | 12 +++---- .../qbittorrent/app/helmrelease.yaml | 25 ++++++++----- 18 files changed, 161 insertions(+), 148 deletions(-) diff --git a/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml b/.archive/kubernetes/default/jellyfin/app/helmrelease.yaml index 28b67a29..b1e72ea9 100644 --- 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/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: @@ -15,7 +15,6 @@ spec: kind: HelmRepository name: bjw-s namespace: flux-system - maxHistory: 2 install: remediation: retries: 3 @@ -23,17 +22,15 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback values: controllers: - main: + jellyfin: type: statefulset annotations: reloader.stakater.com/auto: "true" - runtimeClassName: nvidia containers: - main: + app: image: repository: jellyfin/jellyfin tag: 10.8.13 @@ -69,6 +66,7 @@ spec: nvidia.com/gpu: 1 memory: 4Gi pod: + runtimeClassName: nvidia enableServiceLinks: false nodeSelector: nvidia.com/gpu.present: "true" @@ -79,12 +77,13 @@ spec: fsGroupChangePolicy: OnRootMismatch supplementalGroups: [44, 105, 10000] service: - main: + app: + controller: jellyfin ports: http: port: *port ingress: - main: + app: enabled: true className: external-nginx annotations: @@ -95,7 +94,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: @@ -111,7 +110,7 @@ spec: media: enabled: true type: nfs - server: 10.1.1.30 - path: /mnt/Nahar/Media + server: 10.1.1.12 + path: /mnt/users/Media globalMounts: - path: /media diff --git a/kubernetes/apps/default/maintainerr/app/helmrelease.yaml b/kubernetes/apps/default/maintainerr/app/helmrelease.yaml index 6c88e612..36b24ada 100644 --- 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://ks.hsn.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: @@ -14,15 +14,22 @@ spec: kind: HelmRepository name: bjw-s namespace: flux-system + install: + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + strategy: rollback interval: 30m values: controllers: - main: + maintainerr: annotations: reloader.stakater.com/auto: "true" - containers: - main: + app: image: repository: ghcr.io/jorenn92/maintainerr tag: 2.0.2@sha256:4e0f5199f09b8a1fc7d9933c1ecbf508b6d4f18b6f8d1e40bd0453dc14c80a5c @@ -34,22 +41,21 @@ spec: memory: 128Mi limits: memory: 1Gi - pod: - securityContext: - runAsUser: ${APP_UID} - runAsGroup: ${APP_GID} - fsGroup: ${APP_GID} - fsGroupChangePolicy: "OnRootMismatch" - + pod: + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + fsGroup: 1000 + fsGroupChangePolicy: "OnRootMismatch" service: - main: + app: + controller: maintainerr ports: http: port: 6246 ingress: - main: - enabled: true + app: className: internal-nginx hosts: - host: &host "{{ .Release.Name }}.jahanson.tech" @@ -57,7 +63,7 @@ spec: - path: / pathType: Prefix service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/overseerr/app/helmrelease.yaml b/kubernetes/apps/default/overseerr/app/helmrelease.yaml index 41803694..e59f5102 100644 --- a/kubernetes/apps/default/overseerr/app/helmrelease.yaml +++ b/kubernetes/apps/default/overseerr/app/helmrelease.yaml @@ -21,8 +21,7 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: rook-ceph-cluster namespace: rook-ceph @@ -30,11 +29,11 @@ spec: namespace: volsync-system values: controllers: - main: + overseerr: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/sct/overseerr tag: 1.33.2@sha256:714ea6db2bc007a2262d112bef7eec74972eb33d9c72bddb9cbd98b8742de950 @@ -74,12 +73,12 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch service: - main: + app: ports: http: port: *port ingress: - main: + app: enabled: true className: external-nginx annotations: @@ -91,7 +90,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml index 2f3b7374..622ae45f 100644 --- 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://ks.hsn.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: @@ -21,15 +21,14 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback values: controllers: - main: + prowlarr: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/prowlarr-develop tag: 1.14.3.4333@sha256:af90aa422bf142df26cf70aaebab5fd609f68cc5639ebfe643b4547fee8c76e3 @@ -97,12 +96,13 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch service: - main: + app: + controller: prowlarr ports: http: port: *port ingress: - main: + app: enabled: true className: internal-nginx hosts: @@ -110,7 +110,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml index 0261f928..59804057 100644 --- 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://ks.hsn.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: @@ -21,18 +21,17 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: rook-ceph-cluster namespace: rook-ceph values: controllers: - main: + radarr: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/radarr tag: 5.3.6.8612@sha256:431f4d8da415645cd18359d0b704d4191f400eb57137ed3e5749774f3915c0a8 @@ -103,6 +102,7 @@ spec: supplementalGroups: [10000] service: main: + controller: radarr ports: http: port: *port @@ -115,7 +115,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml index 2448cd70..231725b8 100644 --- a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml @@ -21,8 +21,7 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: rook-ceph-cluster namespace: rook-ceph @@ -30,14 +29,14 @@ spec: namespace: volsync-system values: controllers: - main: + recyclarr: type: cronjob annotations: reloader.stakater.com/auto: "true" cronjob: schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/recyclarr/recyclarr tag: 6.0.2@sha256:02add40feae0569401b5020528e06419b47046723d0bb4bef1e82325e9eefdad @@ -66,12 +65,8 @@ spec: runAsNonRoot: true fsGroup: 568 fsGroupChangePolicy: OnRootMismatch - service: - main: - enabled: false persistence: config: - enabled: true existingClaim: recyclarr config-file: type: configMap diff --git a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml index 7dba2e2f..302e7d4c 100644 --- 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://ks.hsn.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: @@ -21,8 +21,7 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: rook-ceph-cluster namespace: rook-ceph @@ -30,11 +29,11 @@ spec: namespace: volsync-system values: controllers: - main: + sabnzbd: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/sabnzbd tag: 4.2.3@sha256:fa8ddea45e56b0e36454c3c0eb30ff5521d90aeb5b35301656ae9236680be3a9 @@ -85,12 +84,13 @@ spec: fsGroupChangePolicy: OnRootMismatch supplementalGroups: [10000] service: - main: + app: + controller: sabnzbd ports: http: port: *port ingress: - main: + app: enabled: true className: internal-nginx hosts: @@ -98,7 +98,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml index ef155b75..bc8cc7be 100644 --- 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://ks.hsn.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: @@ -28,11 +28,11 @@ spec: namespace: rook-ceph values: controllers: - main: + sonarr: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/sonarr tag: 4.0.2.1183@sha256:bbfcda0754272515ce12972924652699934074b46b11d27bc515c8ea5fb870f5 @@ -102,7 +102,8 @@ spec: fsGroupChangePolicy: OnRootMismatch supplementalGroups: [10000] service: - main: + app: + controller: sonarr ports: http: port: *port @@ -115,7 +116,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/tautulli/app/helmrelease.yaml b/kubernetes/apps/default/tautulli/app/helmrelease.yaml index d1230d2f..993b6fdf 100644 --- 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://ks.hsn.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: @@ -21,8 +21,7 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: rook-ceph-cluster namespace: rook-ceph @@ -30,11 +29,11 @@ spec: namespace: volsync-system values: controllers: - main: + tautulli: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/onedr0p/tautulli tag: 2.13.4@sha256:b3000c0063cc4c0c6f2436fb7174f4bcfd8d91eca05206731edccb8b643ea570 @@ -86,12 +85,13 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch service: - main: + app: + controller: tautulli ports: http: port: *port ingress: - main: + app: enabled: true className: external-nginx annotations: @@ -102,7 +102,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/default/unpackerr/app/helmrelease.yaml b/kubernetes/apps/default/unpackerr/app/helmrelease.yaml index c2638ba0..88700337 100644 --- 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://ks.hsn.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: @@ -21,15 +21,14 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback values: controllers: - main: + unpackerr: annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: ghcr.io/unpackerr/unpackerr tag: 0.13.1@sha256:04fcb43fa70e6db88331962760607842cdf19889e6d35d9d2fde0cf6a1550eaf @@ -60,13 +59,20 @@ spec: fsGroup: 568 fsGroupChangePolicy: OnRootMismatch service: - main: + app: + controller: unpackerr ports: http: port: 5656 serviceMonitor: - main: - enabled: true + app: + serviceName: unpackerr + endpoints: + - port: http + scheme: http + path: /metrics + interval: 1m + scrapeTimeout: 10s persistence: media: type: nfs diff --git a/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml b/kubernetes/apps/dragonfly-operator-system/dragonfly-operator/app/helmrelease.yaml index 8786c3b4..cc03e834 100644 --- 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://ks.hsn.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: @@ -28,7 +28,7 @@ spec: create: false name: dragonfly-operator-controller-manager controllers: - main: + dragonfly-operator: containers: rbac-proxy: image: @@ -50,7 +50,7 @@ spec: limits: cpu: 500m memory: 128Mi - main: + app: image: repository: docker.dragonflydb.io/dragonflydb/operator tag: v1.1.1 @@ -123,7 +123,8 @@ spec: matchLabels: app.kubernetes.io/name: *app service: - main: + app: + controller: dragonfly-operator ports: http: port: *port diff --git a/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml b/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml index 4a7db179..81512485 100644 --- 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://ks.hsn.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: @@ -21,17 +21,16 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback values: controllers: - main: + kubanetics: type: cronjob cronjob: schedule: "@weekly" parallelism: 6 # Set to my total number of nodes containers: - main: + app: image: repository: ghcr.io/onedr0p/kubanetics tag: 2024.3.4@sha256:2dfb70e154b4d4cbd8b1f98f1647e4a96aa1fc084a7e07b2586e35f7fc743383 @@ -61,9 +60,6 @@ spec: labelSelector: matchLabels: app.kubernetes.io/name: *app - service: - main: - enabled: false persistence: procfs: type: hostPath diff --git a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml index 7ff31101..36ed962d 100644 --- 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://ks.hsn.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: @@ -21,20 +21,19 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: ingress-nginx namespace: network values: controllers: - main: + cloudflared: replicas: 2 strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: docker.io/cloudflare/cloudflared tag: 2024.2.1@sha256:60e94a8669dccbe461b6913ce33ab759104334220b49042ec03cfca62a2f01e7 @@ -87,13 +86,20 @@ spec: matchLabels: app.kubernetes.io/name: *app service: - main: + app: + controller: cloudflared ports: http: port: *port serviceMonitor: - main: - enabled: true + app: + serviceName: cloudflared + endpoints: + - port: http + scheme: http + path: /metrics + interval: 1m + scrapeTimeout: 10s persistence: config: enabled: true diff --git a/kubernetes/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/apps/network/echo-server/app/helmrelease.yaml index 179f7db1..45c0fea2 100644 --- 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/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: @@ -16,12 +16,19 @@ spec: kind: HelmRepository name: bjw-s namespace: flux-system - + install: + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + strategy: rollback + retries: 3 values: controllers: - main: + echo-server: containers: - main: + app: image: repository: ghcr.io/mendhak/http-https-echo tag: "31" @@ -31,13 +38,14 @@ spec: LOG_IGNORE_PATH: "/healthz" service: - main: + app: + controller: echo-server ports: http: port: *port ingress: - main: + app: enabled: true className: external-nginx annotations: @@ -48,7 +56,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: diff --git a/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml b/kubernetes/apps/observability/alertmanager-silencer/app/helmrelease.yaml index 60cdaf34..bc2787ec 100644 --- 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://ks.hsn.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: @@ -21,19 +21,18 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: kube-prometheus-stack namespace: observability values: controllers: - main: + alertmanager-silencer: type: cronjob cronjob: schedule: "@daily" containers: - main: + app: image: repository: ghcr.io/onedr0p/kubanetics tag: 2024.3.4@sha256:2dfb70e154b4d4cbd8b1f98f1647e4a96aa1fc084a7e07b2586e35f7fc743383 @@ -42,15 +41,12 @@ 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 @@ -61,6 +57,3 @@ spec: runAsUser: 568 runAsGroup: 568 runAsNonRoot: true - service: - main: - enabled: false diff --git a/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml b/kubernetes/apps/observability/vector/app/agent/helmrelease.yaml index accc0573..e3333e7e 100644 --- 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://ks.hsn.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: @@ -22,20 +22,19 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback dependsOn: - name: vector-aggregator namespace: observability values: controllers: - main: + vector: type: daemonset strategy: RollingUpdate annotations: reloader.stakater.com/auto: "true" containers: - main: + app: image: repository: docker.io/timberio/vector tag: 0.36.1-alpine@sha256:cf20f6f0adb57f561df678a70c4a68361885b861882235bfb0a808610bb1b532 @@ -60,9 +59,6 @@ spec: args: ["--config", "/etc/vector/vector.yaml"] securityContext: privileged: true - service: - main: - enabled: false serviceAccount: create: true name: vector-agent diff --git a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml index 6788d0fd..1be52f32 100644 --- 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://ks.hsn.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: @@ -22,11 +22,10 @@ spec: cleanupOnFail: true remediation: retries: 3 - uninstall: - keepHistory: false + strategy: rollback values: controllers: - main: + vector-aggregator: replicas: 2 strategy: RollingUpdate annotations: @@ -44,7 +43,7 @@ spec: - secretRef: name: vector-aggregator-secret containers: - main: + app: image: repository: docker.io/timberio/vector tag: 0.36.1-alpine@sha256:cf20f6f0adb57f561df678a70c4a68361885b861882235bfb0a808610bb1b532 @@ -58,7 +57,8 @@ spec: matchLabels: app.kubernetes.io/name: *app service: - main: + app: + controller: vector-aggregator type: LoadBalancer annotations: external-dns.alpha.kubernetes.io/hostname: vector.jahanson.tech diff --git a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml index 3b95bccc..a6886914 100644 --- 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/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: @@ -15,20 +15,26 @@ spec: kind: HelmRepository name: bjw-s namespace: flux-system - + install: + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + strategy: rollback values: controllers: - main: + qbittorrent: annotations: configmap.reloader.stakater.com/reload: qbittorrent-scripts secret.reloader.stakater.com/reload: qbittorrent-secret - pod: securityContext: fsGroup: 568 fsGroupChangePolicy: "OnRootMismatch" containers: - main: + app: nameOverride: qbittorrent image: repository: ghcr.io/onedr0p/qbittorrent @@ -104,12 +110,13 @@ spec: - ALL service: - main: + app: + controller: qbittorrent ports: http: port: *port bittorrent: - controller: main + controller: app type: LoadBalancer annotations: io.cilium/lb-ipam-ips: 10.45.0.5 @@ -121,7 +128,7 @@ spec: ingress: - main: + app: enabled: true className: "internal-nginx" hosts: @@ -129,7 +136,7 @@ spec: paths: - path: / service: - name: main + identifier: app port: http tls: - hosts: