From 799111dddb3eedc5d337172a0bb5326096dda99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Sun, 8 Nov 2020 12:39:37 -0500 Subject: [PATCH] [radarr] use new common chart (#121) * radarr: use new common chart * jackett * radarr fix newline --- charts/jackett/Chart.yaml | 4 +- charts/jackett/README.md | 2 +- charts/jackett/values.yaml | 4 +- charts/radarr/.helmignore | 23 ++++++++++ charts/radarr/Chart.yaml | 28 ++++-------- charts/radarr/OWNERS | 4 +- charts/radarr/README.md | 71 ++++++++++++++--------------- charts/radarr/ci/ct-values.yaml | 2 + charts/radarr/templates/NOTES.txt | 1 + charts/radarr/templates/common.yaml | 1 + charts/radarr/values.yaml | 43 +++++++++++++---- 11 files changed, 112 insertions(+), 71 deletions(-) create mode 100644 charts/radarr/.helmignore create mode 100644 charts/radarr/ci/ct-values.yaml create mode 100644 charts/radarr/templates/NOTES.txt create mode 100644 charts/radarr/templates/common.yaml diff --git a/charts/jackett/Chart.yaml b/charts/jackett/Chart.yaml index e156b060..d1ea1b28 100644 --- a/charts/jackett/Chart.yaml +++ b/charts/jackett/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: v0.16.1045 +appVersion: v0.16.2106 description: API Support for your favorite torrent trackers name: jackett -version: 5.0.1 +version: 5.0.2 keywords: - jackett - torrent diff --git a/charts/jackett/README.md b/charts/jackett/README.md index 3e525863..ef5f94f1 100644 --- a/charts/jackett/README.md +++ b/charts/jackett/README.md @@ -1,6 +1,6 @@ # Jackett -This is a helm chart for [Jackett](https://github.com/Jackett/Jackett) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/jackett/) +This is a helm chart for [Jackett](https://github.com/Jackett/Jackett). ## TL;DR; diff --git a/charts/jackett/values.yaml b/charts/jackett/values.yaml index f147df94..17015845 100644 --- a/charts/jackett/values.yaml +++ b/charts/jackett/values.yaml @@ -3,7 +3,7 @@ image: repository: linuxserver/jackett pullPolicy: IfNotPresent - tag: v0.16.1045-ls14 + tag: version-v0.16.2106 service: port: @@ -23,7 +23,7 @@ persistence: enabled: true emptyDir: true mountPath: /downloads - ## Jackett torrent torrentblackhole Persistent Volume Storage Class + ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning ## If undefined (the default) or set to null, no storageClassName spec is diff --git a/charts/radarr/.helmignore b/charts/radarr/.helmignore new file mode 100644 index 00000000..46fd8996 --- /dev/null +++ b/charts/radarr/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +# OWNERS file for Kubernetes +OWNERS diff --git a/charts/radarr/Chart.yaml b/charts/radarr/Chart.yaml index 8f75e3d0..1ac6e61d 100644 --- a/charts/radarr/Chart.yaml +++ b/charts/radarr/Chart.yaml @@ -1,31 +1,21 @@ apiVersion: v2 -name: radarr +appVersion: 3.0.0.3989 description: A fork of Sonarr to work with movies à la Couchpotato -type: application -version: 6.0.2 -appVersion: 3.0.0.3591 +name: radarr +version: 7.0.0 keywords: - radarr + - torrent + - usenet home: https://github.com/k8s-at-home/charts/tree/master/charts/radarr icon: https://github.com/Radarr/Radarr/blob/aphrodite/Logo/512.png?raw=true sources: - https://github.com/Radarr/Radarr - https://hub.docker.com/r/linuxserver/radarr maintainers: - - name: DirtyCajunRice - email: nick@cajun.pro - url: https://github.com/dirtycajunrice + - name: billimek + email: jeff@billimek.com dependencies: - - name: media-common + - name: common repository: https://k8s-at-home.com/charts/ - version: ^1.0.0 - alias: radarr -annotations: - artifacthub.io/links: | - - name: App Source - url: https://github.com/Radarr/Radarr - - name: Default Docker Image - url: https://hub.docker.com/r/linuxserver/radarr - artifacthub.io/maintainers: | - - name: Nicholas St. Germain - email: nick@cajun.pro + version: ^1.0.4 diff --git a/charts/radarr/OWNERS b/charts/radarr/OWNERS index 2eb39f10..51f88652 100644 --- a/charts/radarr/OWNERS +++ b/charts/radarr/OWNERS @@ -1,4 +1,4 @@ approvers: -- DirtyCajunRice +- billimek reviewers: -- DirtyCajunRice +- billimek \ No newline at end of file diff --git a/charts/radarr/README.md b/charts/radarr/README.md index d5ab90a0..ae9dc14a 100644 --- a/charts/radarr/README.md +++ b/charts/radarr/README.md @@ -1,52 +1,36 @@ -# Radarr | A fork of Sonarr to work with movies à la Couchpotato -Umbrella chart that -* Uses [media-common](https://github.com/k8s-at-home/charts/tree/master/charts/media-common) as a base -* Adds docker image information leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/radarr/) -* Deploys [Radarr](https://github.com/Radarr/Radarr) +# Radarr -## TL;DR -```console +This is a helm chart for [Radarr](https://github.com/Radarr/Radarr). + +## TL;DR; + +```shell $ helm repo add k8s-at-home https://k8s-at-home.com/charts/ $ helm install k8s-at-home/radarr ``` ## Installing the Chart -To install the chart with the release name `radarr`: + +To install the chart with the release name `my-release`: + ```console -helm install radarr k8s-at-home/radarr +helm install --name my-release k8s-at-home/radarr ``` -## Upgrading -Chart versions before 6.0.0 did not use media-common. Upgrading will require you to nest your values.yaml file under -a top-level `radarr:` key. - -Chart versions 3.2.0 and earlier used separate PVCs for Downloads and Movies. This presented an issue where Radarr would -be unable to hard-link files between the /downloads and /movies directories when importing media. This is caused because -each PVC exposed to the pod as a separate filesystem. It resulted in Radarr copying files rather than linking; -using additional storage without the user's knowledge. - -This chart now uses a single PVC for Downloads and Movies. This means all of your media (and downloads) must be in, or -be subdirectories of, a single directory. If upgrading from an earlier version of the chart, do the following: - -1. [Uninstall](#uninstalling-the-chart) your current release -2. On your backing store, organize your media, ie. media/movies, media/downloads -3. If using a pre-existing PVC, create a single new PVC for all of your media -4. Refer to the [configuration](#configuration) for updates to the chart values -5. Re-install the chart -6. Update your settings in the app to point to the new PVC, which is mounted at /media. This can be done using Radarr's -`Movie Editor` under the `Movies` tab. Simply select all artists in your library, and use the editor to change the -`Root Folder` and hit save. - ## Uninstalling the Chart -To uninstall the `radarr` deployment: + +To uninstall/delete the `my-release` deployment: + ```console -helm uninstall radarr +helm delete my-release --purge ``` + The command removes all the Kubernetes components associated with the chart and deletes the release. ## Configuration -Read through the media-common [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/media-common/values.yaml) +Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/radarr/values.yaml) file. It has several commented out suggested values. +Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```console @@ -60,11 +44,9 @@ chart. For example, helm install radarr k8s-at-home/radarr --values values.yaml ``` -These values will be nested as it is a dependency, for example ```yaml -radarr: - image: - tag: ... +image: + tag: ... ``` --- @@ -77,3 +59,18 @@ Error: rendered manifests contain a resource that already exists. Unable to cont it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`. --- + +## Upgrading an existing Release to a new major version + +A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions. + +### Upgrading from 6.x.x to 7.x.x + +Due to migrating to a centralized common library some values in `values.yaml` have changed. + +Examples: + +* `service.port` has been moved to `service.port.port`. +* `persistence.type` has been moved to `controllerType`. + +Refer to the library values.yaml for more configuration options. diff --git a/charts/radarr/ci/ct-values.yaml b/charts/radarr/ci/ct-values.yaml new file mode 100644 index 00000000..f6ccc628 --- /dev/null +++ b/charts/radarr/ci/ct-values.yaml @@ -0,0 +1,2 @@ +ingress: + enabled: true diff --git a/charts/radarr/templates/NOTES.txt b/charts/radarr/templates/NOTES.txt new file mode 100644 index 00000000..90f7b653 --- /dev/null +++ b/charts/radarr/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "common.notes.defaultNotes" . -}} diff --git a/charts/radarr/templates/common.yaml b/charts/radarr/templates/common.yaml new file mode 100644 index 00000000..a6613c2c --- /dev/null +++ b/charts/radarr/templates/common.yaml @@ -0,0 +1 @@ +{{ include "common.all" . }} diff --git a/charts/radarr/values.yaml b/charts/radarr/values.yaml index 74bce92a..577608f5 100644 --- a/charts/radarr/values.yaml +++ b/charts/radarr/values.yaml @@ -1,10 +1,37 @@ -# Default values for radarr. +# Default values for Radarr. -radarr: - image: - organization: linuxserver - repository: radarr - pullPolicy: IfNotPresent - tag: 3.0.0.3624-ls21 - service: +image: + repository: linuxserver/radarr + pullPolicy: IfNotPresent + tag: version-3.0.0.3989 + +service: + port: port: 7878 + +env: {} + # TZ: UTC + # PUID: 1001 + # PGID: 1001 + +persistence: + config: + enabled: true + emptyDir: true + + media: + enabled: true + emptyDir: true + mountPath: /media + ## Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + # storageClass: "-" + # accessMode: ReadWriteOnce + # size: 1Gi + ## Do not delete the pvc upon helm uninstall + # skipuninstall: false + # existingClaim: ""