From c3bf7dd683f17eb1f2cf123fe62c15dc6636ab24 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:29:51 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20bazarr=20app-template=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/default/bazarr/app/helmrelease.yaml | 113 ++++++++++-------- .../default/bazarr/app/kustomization.yaml | 1 - .../apps/default/bazarr/app/volsync.yaml | 2 +- .../apps/default/bazarr/app/volume.yaml | 17 --- 4 files changed, 64 insertions(+), 69 deletions(-) delete mode 100644 kubernetes/apps/default/bazarr/app/volume.yaml diff --git a/kubernetes/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/apps/default/bazarr/app/helmrelease.yaml index ffa549df9..c047e7f5e 100644 --- a/kubernetes/apps/default/bazarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/bazarr/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -32,24 +32,58 @@ spec: - name: volsync namespace: volsync values: - initContainers: - 01-init-db: - image: ghcr.io/auricom/postgres-init:15.4 - imagePullPolicy: IfNotPresent - envFrom: &envFrom - - secretRef: - name: bazarr-secret - controller: - annotations: - reloader.stakater.com/auto: "true" - image: - repository: ghcr.io/onedr0p/bazarr - tag: 1.3.1@sha256:840242bb1dfb337e5bfa579af039738bbf9948f6f33deecf451ebdd9ca509e31 - env: - TZ: "${TIMEZONE}" - envFrom: - - secretRef: - name: bazarr-secret + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + initContainers: + init-db: + image: + repository: ghcr.io/auricom/postgres-init + tag: 15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0 + pullPolicy: IfNotPresent + envFrom: &envFrom + - secretRef: + name: atuin-secret + containers: + main: + image: + repository: ghcr.io/onedr0p/bazarr + tag: 1.3.1@sha256:840242bb1dfb337e5bfa579af039738bbf9948f6f33deecf451ebdd9ca509e31 + env: + TZ: "${TIMEZONE}" + envFrom: *envFrom + resources: + requests: + cpu: 23m + memory: 204M + limits: + memory: 1Gi + subcleaner: + image: + repository: registry.k8s.io/git-sync/git-sync + tag: v4.1.0 + pullPolicy: IfNotPresent + args: + - --repo=https://github.com/KBlixt/subcleaner + - --branch=master + - --wait=86400 # 1 day + - --root=/add-ons + pod: + securityContext: + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + fsGroupChangePolicy: OnRootMismatch + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /config service: main: ports: @@ -58,7 +92,7 @@ spec: ingress: main: enabled: true - ingressClassName: "nginx" + className: "nginx" annotations: auth.home.arpa/enabled: "true" hajimari.io/icon: mdi:subtitles-outline @@ -66,51 +100,30 @@ spec: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host - podSecurityContext: - runAsUser: 568 - runAsGroup: 568 - fsGroup: 568 - fsGroupChangePolicy: "OnRootMismatch" - supplementalGroups: - - 100 persistence: - config: - enabled: true - existingClaim: bazarr-config add-ons: enabled: true type: emptyDir - mountPath: /add-ons + globalMounts: + - path: /add-ons video: enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/video - mountPath: /mnt/storage/video + globalMounts: + - path: /mnt/storage/video scripts: enabled: true type: configMap name: bazarr-scripts # overriden by kustomizeconfig defaultMode: 0775 readOnly: true - resources: - requests: - cpu: 23m - memory: 204M - limits: - memory: 1Gi - sidecars: - subcleaner: - image: registry.k8s.io/git-sync/git-sync:v4.1.0 - imagePullPolicy: IfNotPresent - args: - - --repo=https://github.com/KBlixt/subcleaner - - --branch=master - - --wait=86400 # 1 day - - --root=/add-ons - volumeMounts: - - { name: add-ons, mountPath: /add-ons } + globalMounts: + - path: /scripts diff --git a/kubernetes/apps/default/bazarr/app/kustomization.yaml b/kubernetes/apps/default/bazarr/app/kustomization.yaml index 80e88d4ab..142978650 100644 --- a/kubernetes/apps/default/bazarr/app/kustomization.yaml +++ b/kubernetes/apps/default/bazarr/app/kustomization.yaml @@ -7,7 +7,6 @@ resources: - ./externalsecret.yaml - ./gatus.yaml - ./helmrelease.yaml - - ./volume.yaml - ./volsync.yaml configMapGenerator: - name: bazarr-scripts diff --git a/kubernetes/apps/default/bazarr/app/volsync.yaml b/kubernetes/apps/default/bazarr/app/volsync.yaml index bc3ad0b79..8474d4a8f 100644 --- a/kubernetes/apps/default/bazarr/app/volsync.yaml +++ b/kubernetes/apps/default/bazarr/app/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: bazarr namespace: default spec: - sourcePVC: bazarr-config + sourcePVC: config-bazarr-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/bazarr/app/volume.yaml b/kubernetes/apps/default/bazarr/app/volume.yaml deleted file mode 100644 index f742ace4e..000000000 --- a/kubernetes/apps/default/bazarr/app/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: bazarr-config - namespace: default - labels: - app.kubernetes.io/name: &name bazarr - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: rook-ceph-block