From 9fd5a71eee3691cde729e642a8a143290894d0f6 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Fri, 21 Jul 2023 15:32:53 -0400 Subject: [PATCH] feat(sonarr) add exportarr sidecar to sonarr (#10354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Add exportarr sidecar to sonarr ⚒️ Fixes # **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Co-authored-by: Kjeld Schouten --- charts/stable/sonarr/Chart.yaml | 2 +- charts/stable/sonarr/questions.yaml | 4 +- charts/stable/sonarr/templates/common.yaml | 7 +- charts/stable/sonarr/values.yaml | 97 +++++++++++++++++++--- 4 files changed, 89 insertions(+), 21 deletions(-) diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index 1acf7068163..d63ae3184e9 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/sonarr - https://github.com/Sonarr/Sonarr type: application -version: 15.0.30 +version: 15.1.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sonarr/questions.yaml b/charts/stable/sonarr/questions.yaml index e5ba8d6c8dc..d7855852f25 100644 --- a/charts/stable/sonarr/questions.yaml +++ b/charts/stable/sonarr/questions.yaml @@ -11,7 +11,6 @@ questions: # Include{podSpec} # Include{containerMain} - - variable: env group: App Configuration label: Image Environment @@ -34,6 +33,7 @@ questions: description: Basic - value: Forms description: Forms + # Include{containerBasic} # Include{containerAdvanced} @@ -106,6 +106,8 @@ questions: default: 568 # Include{resources} +# Include{metrics} +# Include{prometheusRule} # Include{advanced} # Include{addons} # Include{codeserver} diff --git a/charts/stable/sonarr/templates/common.yaml b/charts/stable/sonarr/templates/common.yaml index 539b471c1d2..b51394e00a4 100644 --- a/charts/stable/sonarr/templates/common.yaml +++ b/charts/stable/sonarr/templates/common.yaml @@ -1,6 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . }} - - -{{/* Render the templates */}} -{{ include "tc.v1.common.loader.apply" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/sonarr/values.yaml b/charts/stable/sonarr/values.yaml index 6dcecc27ee4..dc1d36bcb5b 100644 --- a/charts/stable/sonarr/values.yaml +++ b/charts/stable/sonarr/values.yaml @@ -2,25 +2,25 @@ image: repository: tccr.io/truecharts/sonarr pullPolicy: IfNotPresent tag: 3.0.10.1567@sha256:f420ed0b9341a5241c2278d51a7f4f59635a9c3a5670ac893542fa59052e61b2 +exportarrImage: + repository: tccr.io/truecharts/exportarr + pullPolicy: IfNotPresent + tag: v1.5.3@sha256:f369a43b28410f12ce1b96f52187dd5c6fb9769a137ecc6f7ab8fdcfbe7db58e + service: main: ports: main: port: 8989 -persistence: - config: - enabled: true - mountPath: /config -# might be supported on sonarr v4 upon released -cnpg: - main: - enabled: false - - database: sonarr - user: sonarr -portal: - open: + metrics: enabled: true + type: ClusterIP + targetSelector: exportarr + ports: + metrics: + enabled: true + port: 8990 + targetSelector: exportarr workload: main: @@ -55,3 +55,74 @@ workload: # secretKeyRef: # name: cnpg-main-urls # key: password + exportarr: + enabled: true + type: Deployment + strategy: RollingUpdate + replicas: 1 + podSpec: + containers: + exportarr: + primary: true + enabled: true + imageSelector: exportarrImage + args: + - sonarr + probes: + liveness: + enabled: true + type: http + path: /healthz + port: "{{ .Values.service.metrics.ports.metrics.port }}" + readiness: + enabled: true + type: http + path: /healthz + port: "{{ .Values.service.metrics.ports.metrics.port }}" + startup: + enabled: true + type: http + path: /healthz + port: "{{ .Values.service.metrics.ports.metrics.port }}" + env: + INTERFACE: 0.0.0.0 + PORT: "{{ .Values.service.metrics.ports.metrics.port }}" + URL: "http://localhost:{{ .Values.service.main.ports.main.port }}" + # additional metrics (slow) + # ENABLE_ADDITIONAL_METRICS: false + # enable gathering unknown queue items + # ENABLE_UNKNOWN_QUEUE_ITEMS: false + CONFIG: "/config/config.xml" + +persistence: + config: + enabled: true + targetSelector: + main: + main: + mountPath: /config + exportarr: + exportarr: + mountPath: /config + readOnly: true + +# might be supported on sonarr v4 upon released +cnpg: + main: + enabled: false + database: sonarr + user: sonarr + +metrics: + main: + enabled: true + type: "servicemonitor" + endpoints: + - port: exportarr + path: /metrics + prometheusRule: + enabled: false + +portal: + open: + enabled: true