-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(media/recyclarr): upgrade config and helmrelease #2083
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- kubernetes/main/apps/media/recyclarr/app Kustomization: flux-system/recyclarr HelmRelease: media/recyclarr
+++ kubernetes/main/apps/media/recyclarr/app Kustomization: flux-system/recyclarr HelmRelease: media/recyclarr
@@ -13,61 +13,77 @@
spec:
chart: app-template
sourceRef:
kind: HelmRepository
name: bjw-s
namespace: flux-system
- version: 1.5.1
+ version: 2.4.0
+ dependsOn:
+ - name: rook-ceph-cluster
+ namespace: rook-ceph
+ - name: volsync
+ namespace: storage
install:
- createNamespace: true
remediation:
retries: 3
- interval: 15m
- maxHistory: 2
+ interval: 30m
uninstall:
keepHistory: false
upgrade:
cleanupOnFail: true
remediation:
retries: 3
values:
- controller:
- annotations:
- reloader.stakater.com/auto: 'true'
- type: statefulset
- env:
- TZ: America/Santiago
- envFrom:
- - secretRef:
- name: recyclarr-secret
- image:
- repository: ghcr.io/recyclarr/recyclarr
- tag: 6.0.2
+ controllers:
+ main:
+ annotations:
+ reloader.stakater.com/auto: 'true'
+ containers:
+ main:
+ args:
+ - sync
+ env:
+ COMPlus_EnableDiagnostics: '0'
+ TZ: America/Santiago
+ envFrom:
+ - secretRef:
+ name: recyclarr-secret
+ image:
+ repository: ghcr.io/recyclarr/recyclarr
+ tag: 6.0.2@sha256:02add40feae0569401b5020528e06419b47046723d0bb4bef1e82325e9eefdad
+ resources:
+ limits:
+ memory: 128M
+ requests:
+ cpu: 10m
+ memory: 64M
+ securityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: true
+ cronjob:
+ schedule: '@daily'
+ pod:
+ securityContext:
+ fsGroup: 568
+ fsGroupChangePolicy: OnRootMismatch
+ runAsGroup: 568
+ runAsNonRoot: true
+ runAsUser: 568
+ type: cronjob
persistence:
+ config:
+ enabled: true
+ existingClaim: config-recyclarr-0
config-file:
- enabled: true
- mountPath: /config/recyclarr.yml
+ globalMounts:
+ - path: /config/recyclarr.yml
+ readOnly: true
+ subPath: recyclarr.yml
name: recyclarr-configmap
- readOnly: true
- subPath: recyclarr.yml
type: configMap
- podSecurityContext:
- fsGroup: 568
- fsGroupChangePolicy: OnRootMismatch
- runAsGroup: 568
- runAsUser: 568
- resources:
- limits:
- memory: 200Mi
- requests:
- cpu: 10m
- memory: 50Mi
service:
main:
enabled: false
- volumeClaimTemplates:
- - accessMode: ReadWriteOnce
- mountPath: /config
- name: config
- size: 1Gi
- storageClass: ceph-block
--- kubernetes/main/apps/media/recyclarr/app Kustomization: flux-system/recyclarr ConfigMap: media/recyclarr-configmap
+++ kubernetes/main/apps/media/recyclarr/app Kustomization: flux-system/recyclarr ConfigMap: media/recyclarr-configmap
@@ -2,146 +2,208 @@
apiVersion: v1
data:
recyclarr.yml: |
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
sonarr:
- standard:
- base_url: http://sonarr.media.svc.cluster.local:8989
+ sonarr:
+ base_url: http://sonarr.default.svc.cluster.local
api_key: !env_var SONARR_API_KEY
+
delete_old_custom_formats: true
+ replace_existing_custom_formats: true
+
quality_definition:
type: series
+
quality_profiles:
- - name: Any
- reset_unmatched_scores: true
- - name: HD
- reset_unmatched_scores: true
- - name: SD
- reset_unmatched_scores: true
+ - name: Web 1080p
+ reset_unmatched_scores:
+ enabled: true
+ upgrade:
+ allowed: true
+ until_quality: Web-1080p
+ until_score: 10000
+ min_format_score: 0
+ quality_sort: top
+ qualities:
+ - name: Web-1080p
+ qualities:
+ - WEBDL-1080p
+ - WEBRip-1080p
+ - name: HDTV-1080p
+ - name: Web-720p
+ qualities:
+ - WEBDL-720p
+ - WEBRip-720p
+ - name: HDTV-720p
+ - name: Web-480p
+ qualities:
+ - WEBDL-480p
+ - WEBRip-480p
+ - name: DVD
+ - name: SDTV
+ - name: Web 720p
+ reset_unmatched_scores:
+ enabled: true
+ upgrade:
+ allowed: true
+ until_quality: Web-720p
+ until_score: 10000
+ min_format_score: 0
+ quality_sort: top
+ qualities:
+ - name: Web-720p
+ qualities:
+ - WEBDL-720p
+ - WEBRip-720p
+ - name: HDTV-720p
+ - name: Web-480p
+ qualities:
+ - WEBDL-480p
+ - WEBRip-480p
+ - name: DVD
+ - name: SDTV
custom_formats:
- trash_ids:
+ # Unwanted
+ - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+ - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+ - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD)
+ - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+ # Misc
+ - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+ - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+ - 44e7c4de10ae50265753082e5dc76047 # Repack v3
# Streaming Services
- - d660701077794679fd59e8bdf4ce3a29 # AMZN
- - f67c9ca88f463a48346062e8ad07713f # ATVP
- - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
- - 89358767a60cc28783cdc3d0be9388a4 # DSNP
- - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
- - a880d6abc21e7c16884f3ae393f84179 # HMAX
- - f6cce30f1733d5c8194222a7507909bb # HULU
- - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
- - d34870697c9db575f17700212167be23 # NF
- - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
- - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
- - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
- - c30d2958827d1867c73318a5a2957eb1 # RED
- - ae58039e1319178e6be73caab5c42166 # SHO
- # Allowed Scene groups and tiered P2P groups
- - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene (allowed Scene groups)
- - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
- - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
- - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
- # Repacks / Propers
- - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
- - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
- - 44e7c4de10ae50265753082e5dc76047 # Repack v3
- # HDR Metadata
- - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
- - 1f733af03141f068a540eec352589a89 # DV HLG
- - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
- - 6d0d8de7b57e35518ac0308b0ddf404e # DV
- - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
- - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
- - 3497799d29a085e2ac2df9d468413c94 # HDR10
- - a3d82cbef5039f8d295478d28a887159 # HDR10+
- - 17e889ce13117940092308f48b48b45b # HLG
- - 2a7e3be05d3861d6df7171ec74cad727 # PQ
- # Unwanted
- - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
- - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
- - 9c14d194486c4014d422adc64092d794 # Dubs Only
- - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
- - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
- - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
- - 06d66ab109d4d2eddb2794d21526d140 # Retags
- - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD)
+ - d660701077794679fd59e8bdf4ce3a29 # AMZN
+ - f67c9ca88f463a48346062e8ad07713f # ATVP
+ - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+ - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+ - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+ - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+ - a880d6abc21e7c16884f3ae393f84179 # HMAX
+ - f6cce30f1733d5c8194222a7507909bb # HULU
+ - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+ - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+ - d34870697c9db575f17700212167be23 # NF
+ - b2b980877494b560443631eb1f473867 # NLZ
+ - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
+ - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+ - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+ - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
+ - c30d2958827d1867c73318a5a2957eb1 # RED
+ - ae58039e1319178e6be73caab5c42166 # SHO
+ - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+ - 5d2317d99af813b6529c7ebf01c83533 # VDL
+ - 77a7b25585c18af08f60b1547bb9b4fb # CC
+ # HQ Source Groups
+ - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+ - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+ - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+ - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
quality_profiles:
- - name: Any
- - name: HD
- - name: SD
+ - name: Web 1080p
+ - name: Web 720p
radarr:
- standard:
- base_url: http://radarr.media.svc.cluster.local:7878
+ radarr:
+ base_url: http://radarr.default.svc.cluster.local
api_key: !env_var RADARR_API_KEY
+
delete_old_custom_formats: true
+ replace_existing_custom_formats: true
+
quality_definition:
type: movie
+
quality_profiles:
- - name: HD
- reset_unmatched_scores: true
- - name: SD
- reset_unmatched_scores: true
+ - name: Remux/Web 1080p
+ reset_unmatched_scores:
+ enabled: true
+ upgrade:
+ allowed: true
+ until_quality: Remux-1080p
+ until_score: 10000
+ min_format_score: 0
+ quality_sort: top
+ qualities:
+ - name: Remux-1080p
+ - name: Bluray-1080p
+ enabled: false
+ - name: Web-1080p
+ qualities:
+ - WEBDL-1080p
+ - WEBRip-1080p
+ - name: HDTV-1080p
custom_formats:
- trash_ids:
- - ff5bc9e8ce91d46c997ca3ac6994d6f8 # UHD FraMeSToR (set to 0, 1 or 3200)
+ # Audio
+ - 496f355514737f7d83bf7aa4d24f8169 # TrueHD Atmos
+ - 2f22d89048b01681dde8afe203bf2e95 # DTS X
+ - 417804f7f2c4308c1f4c5d380d4c4475 # ATMOS (undefined)
+ - 1af239278386be2919e1bcee0bde047e # DD+ ATMOS
+ - 3cafb66171b47f226146a0770576870f # TrueHD
+ - dcf3ec6938fa32445f590a4da84256cd # DTS-HD MA
+ - a570d4a0e56a2874b64e5bfa55202a1b # FLAC
+ - e7c2fcae07cbada050a0af3357491d7b # PCM
+ - 8e109e50e0a0b83a5098b056e13bf6db # DTS-HD HRA
+ - 185f1dd7264c4562b9022d963ac37424 # DD+
+ - f9f847ac70a0af62ea4a08280b859636 # DTS-ES
+ - 1c1a4c5e823891c75bc50380a6866f73 # DTS
+ - 240770601cc226190c367ef59aba7463 # AAC
+ - c2998bd0d90ed5621d8df281e839436e # DD
+ # Movie Versions
+ - 0f12c086e289cf966fa5948eac571f44 # Hybrid
+ - 570bc9ebecd92723d2d21500f4be314c # Remaster
+ - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
+ - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
+ - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
+ - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
+ - 957d0f44b592285f26449575e8b1167e # Special Edition
+ - eecf3a857724171f968a66cb5719e152 # IMAX
+ - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+ # HQ Release Groups
+ - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+ - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+ - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+ - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
[Diff truncated by flux-local] |
--- kubernetes/main HelmRelease: media/recyclarr StatefulSet: media/recyclarr
+++ kubernetes/main HelmRelease: media/recyclarr StatefulSet: media/recyclarr
@@ -1,75 +0,0 @@
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: recyclarr
- labels:
- app.kubernetes.io/instance: recyclarr
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: recyclarr
- annotations:
- reloader.stakater.com/auto: 'true'
-spec:
- revisionHistoryLimit: 3
- replicas: 1
- podManagementPolicy: OrderedReady
- updateStrategy:
- type: RollingUpdate
- selector:
- matchLabels:
- app.kubernetes.io/name: recyclarr
- app.kubernetes.io/instance: recyclarr
- serviceName: recyclarr
- template:
- metadata:
- labels:
- app.kubernetes.io/name: recyclarr
- app.kubernetes.io/instance: recyclarr
- spec:
- serviceAccountName: default
- automountServiceAccountToken: true
- securityContext:
- fsGroup: 568
- fsGroupChangePolicy: OnRootMismatch
- runAsGroup: 568
- runAsUser: 568
- dnsPolicy: ClusterFirst
- enableServiceLinks: true
- containers:
- - name: recyclarr
- image: ghcr.io/recyclarr/recyclarr:6.0.2
- imagePullPolicy: null
- env:
- - name: TZ
- value: America/Santiago
- envFrom:
- - secretRef:
- name: recyclarr-secret
- volumeMounts:
- - name: config-file
- mountPath: /config/recyclarr.yml
- subPath: recyclarr.yml
- readOnly: true
- - mountPath: /config
- name: config
- resources:
- limits:
- memory: 200Mi
- requests:
- cpu: 10m
- memory: 50Mi
- volumes:
- - name: config-file
- configMap:
- name: recyclarr-configmap
- volumeClaimTemplates:
- - metadata:
- name: config
- spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 1Gi
- storageClassName: ceph-block
-
--- kubernetes/main HelmRelease: media/recyclarr CronJob: media/recyclarr
+++ kubernetes/main HelmRelease: media/recyclarr CronJob: media/recyclarr
@@ -0,0 +1,82 @@
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+ name: recyclarr
+ labels:
+ app.kubernetes.io/component: main
+ app.kubernetes.io/instance: recyclarr
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: recyclarr
+ annotations:
+ reloader.stakater.com/auto: 'true'
+spec:
+ concurrencyPolicy: Forbid
+ startingDeadlineSeconds: 30
+ schedule: '@daily'
+ successfulJobsHistoryLimit: 1
+ failedJobsHistoryLimit: 1
+ jobTemplate:
+ spec:
+ backoffLimit: 6
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/component: main
+ app.kubernetes.io/instance: recyclarr
+ app.kubernetes.io/name: recyclarr
+ spec:
+ enableServiceLinks: true
+ serviceAccountName: default
+ automountServiceAccountToken: true
+ securityContext:
+ fsGroup: 568
+ fsGroupChangePolicy: OnRootMismatch
+ runAsGroup: 568
+ runAsNonRoot: true
+ runAsUser: 568
+ hostIPC: false
+ hostNetwork: false
+ hostPID: false
+ dnsPolicy: ClusterFirst
+ restartPolicy: Never
+ containers:
+ - args:
+ - sync
+ env:
+ - name: COMPlus_EnableDiagnostics
+ value: '0'
+ - name: TZ
+ value: America/Santiago
+ envFrom:
+ - secretRef:
+ name: recyclarr-secret
+ image: ghcr.io/recyclarr/recyclarr:6.0.2@sha256:02add40feae0569401b5020528e06419b47046723d0bb4bef1e82325e9eefdad
+ name: main
+ resources:
+ limits:
+ memory: 128M
+ requests:
+ cpu: 10m
+ memory: 64M
+ securityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: true
+ volumeMounts:
+ - mountPath: /config
+ name: config
+ - mountPath: /config/recyclarr.yml
+ name: config-file
+ readOnly: true
+ subPath: recyclarr.yml
+ volumes:
+ - name: config
+ persistentVolumeClaim:
+ claimName: config-recyclarr-0
+ - configMap:
+ name: recyclarr-configmap
+ name: config-file
+ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.