From f2423b4f6aee8eba3e654574662715ce169d4e4a Mon Sep 17 00:00:00 2001 From: alexlebens Date: Wed, 29 May 2024 12:20:45 -0500 Subject: [PATCH] convert to use app-template --- clusters/cl01tl/platform/unpackerr/Chart.yaml | 18 +++-- .../unpackerr/templates/external-secret.yaml | 30 ++------ .../templates/persistent-volume-claim.yaml | 2 +- .../templates/persistent-volume.yaml | 6 +- .../cl01tl/platform/unpackerr/values.yaml | 77 +++++++++++++------ 5 files changed, 78 insertions(+), 55 deletions(-) diff --git a/clusters/cl01tl/platform/unpackerr/Chart.yaml b/clusters/cl01tl/platform/unpackerr/Chart.yaml index e69985fe0..14a42bf6a 100644 --- a/clusters/cl01tl/platform/unpackerr/Chart.yaml +++ b/clusters/cl01tl/platform/unpackerr/Chart.yaml @@ -2,11 +2,19 @@ apiVersion: v2 name: unpackerr version: 1.0.0 home: +description: Unpackerr +keywords: + - utility + - archive sources: - https://github.com/Unpackerr/unpackerr - - https://github.com/alexlebens/helm-charts/tree/main/charts/unpackerr + - https://github.com/bjw-s/helm-charts/tree/main/charts/other/app-template +maintainers: + - name: alexlebens dependencies: - - name: unpackerr - version: 0.0.2 - repository: http://alexlebens.github.io/helm-charts -appVersion: "5.4.2" + - name: app-template + alias: unpackerr + repository: https://bjw-s.github.io/helm-charts/ + version: 3.2.1 +icon: https://avatars.githubusercontent.com/u/104323643?s=48&v=4 +appVersion: v0.13.1 diff --git a/clusters/cl01tl/platform/unpackerr/templates/external-secret.yaml b/clusters/cl01tl/platform/unpackerr/templates/external-secret.yaml index ef0aeea69..6e88b8be0 100644 --- a/clusters/cl01tl/platform/unpackerr/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/unpackerr/templates/external-secret.yaml @@ -4,7 +4,7 @@ metadata: name: unpackerr-key-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: unpackerr-key-secret app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web @@ -18,48 +18,34 @@ spec: remoteRef: conversionStrategy: Default decodingStrategy: None - key: /sonarr/key + key: /cl01tl/sonarr4/key metadataPolicy: None property: key - secretKey: UN_SONARR_1_API_KEY remoteRef: conversionStrategy: Default decodingStrategy: None - key: /sonarr/key + key: /cl01tl/sonar4-4k/key metadataPolicy: None - property: 4k-key + property: key - secretKey: UN_RADARR_0_API_KEY remoteRef: conversionStrategy: Default decodingStrategy: None - key: /radarr/key + key: /cl01tl/radarr/key metadataPolicy: None property: key - secretKey: UN_RADARR_1_API_KEY remoteRef: conversionStrategy: Default decodingStrategy: None - key: /radarr/key + key: /cl01tl/radarr5-4k/key metadataPolicy: None - property: 4k-key + property: key - secretKey: UN_LIDARR_0_API_KEY remoteRef: conversionStrategy: Default decodingStrategy: None - key: /lidarr/key + key: /cl01tl/lidarr2/key metadataPolicy: None property: key - - secretKey: UN_READARR_0_API_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /readarr/key - metadataPolicy: None - property: audiobooks-key - - secretKey: UN_READARR_1_API_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /readarr/key - metadataPolicy: None - property: books-key diff --git a/clusters/cl01tl/platform/unpackerr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/platform/unpackerr/templates/persistent-volume-claim.yaml index 9165225ba..6718f0752 100644 --- a/clusters/cl01tl/platform/unpackerr/templates/persistent-volume-claim.yaml +++ b/clusters/cl01tl/platform/unpackerr/templates/persistent-volume-claim.yaml @@ -4,7 +4,7 @@ metadata: name: unpackerr-nfs-storage namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: unpackerr-nfs-storage app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: storage diff --git a/clusters/cl01tl/platform/unpackerr/templates/persistent-volume.yaml b/clusters/cl01tl/platform/unpackerr/templates/persistent-volume.yaml index ad65ed062..bff4dd12b 100644 --- a/clusters/cl01tl/platform/unpackerr/templates/persistent-volume.yaml +++ b/clusters/cl01tl/platform/unpackerr/templates/persistent-volume.yaml @@ -4,7 +4,7 @@ metadata: name: unpackerr-nfs-storage namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: unpackerr-nfs-storage app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: storage @@ -17,8 +17,8 @@ spec: accessModes: - ReadWriteMany nfs: - path: {{ .Values.persistence.media.nfsPath }} - server: {{ .Values.persistence.media.nfsServer }} + path: /volume2/Storage + server: synologybond.alexlebens.net mountOptions: - vers=4 - minorversion=1 diff --git a/clusters/cl01tl/platform/unpackerr/values.yaml b/clusters/cl01tl/platform/unpackerr/values.yaml index 0f7469b7b..483dfff3e 100644 --- a/clusters/cl01tl/platform/unpackerr/values.yaml +++ b/clusters/cl01tl/platform/unpackerr/values.yaml @@ -1,26 +1,55 @@ unpackerr: - deployment: - env: - TZ: US/Central - UN_WEBSERVER_METRICS: true - UN_SONARR_0_URL: http://sonarr4.sonarr4:8989 - UN_SONARR_0_PATHS_0: /mnt/store/Torrent/FINISHED/SONARR - UN_SONARR_1_URL: http://sonarr4-4k.sonarr4-4k:8989 - UN_SONARR_1_PATHS_0: /mnt/store/Torrent/FINISHED/SONARR4K - UN_RADARR_0_URL: http://radarr5.radarr5:7878 - UN_RADARR_0_PATHS_0: /mnt/store/Torrent/FINISHED/RADARR - UN_RADARR_1_URL: http://radarr5-4k.radarr5-4k:7878 - UN_RADARR_1_PATHS_0: /mnt/store/Torrent/FINISHED/RADARR4K - UN_LIDARR_0_URL: http://lidarr2.lidarr2:8686 - UN_LIDARR_0_PATHS_0: /mnt/store/Torrent/FINISHED/LIDARR - envFrom: - - secretRef: - name: unpackerr-key-secret + controllers: + main: + type: deployment + replicas: 1 + strategy: Recreate + revisionHistoryLimit: 3 + containers: + main: + image: + repository: golift/unpackerr + tag: v0.13.1 + pullPolicy: IfNotPresent + env: + - name: TZ + value: US/Central + - name: UN_WEBSERVER_METRICS + value: true + - name: UN_SONARR_0_URL + value: http://sonarr4.sonarr4:8989 + - name: UN_SONARR_0_PATHS_0 + value: /mnt/store/Torrent/FINISHED/SONARR + - name: UN_SONARR_1_URL + value: http://sonarr4-4k.sonarr4-4k:8989 + - name: UN_SONARR_1_PATHS_0 + value: /mnt/store/Torrent/FINISHED/SONARR4K + - name: UN_RADARR_0_URL + value: http://radarr5.radarr5:7878 + - name: UN_RADARR_0_PATHS_0 + value: /mnt/store/Torrent/FINISHED/RADARR + - name: UN_RADARR_1_URL + value: http://radarr5-4k.radarr5-4k:7878 + - name: UN_RADARR_1_PATHS_0 + value: /mnt/store/Torrent/FINISHED/RADARR4K + - name: UN_LIDARR_0_URL + value: http://lidarr2.lidarr2:8686 + - name: UN_LIDARR_0_PATHS_0 + value: /mnt/store/Torrent/FINISHED/LIDARR + envFrom: + - secretRef: + name: unpackerr-key-secret + resources: + requests: + cpu: 100m + memory: 256Mi + serviceAccount: + create: true persistence: - downloads: - mountPath: /mnt/store - claimName: unpackerr-nfs-storage -persistence: - media: - nfsPath: /volume2/Storage - nfsServer: synologybond.alexlebens.net + storage: + existingClaim: unpackerr-nfs-storage + advancedMounts: + main: + main: + - path: /mnt/store + readOnly: true