[Radarr][Change] Merge Movie and Downloads PVCs (#226)

* Merge PVCs into single media PVC. Update README

Signed-off-by: Thomas John Wesolowski <wojoinc@gmail.com>

* Format README

Signed-off-by: Thomas John Wesolowski <wojoinc@gmail.com>

* Add extraExistingClaims back in

Signed-off-by: Thomas John Wesolowski <wojoinc@gmail.com>

charts/radarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v0.2.0.1480-ls58
 description: Radarr is a movie downloading client
 name: radarr
-version: 3.2.0
+version: 4.0.0
 keywords:
   - radarr
   - usenet

charts/radarr/README.md

@@ -17,6 +17,19 @@ To install the chart with the release name `my-release`:
 helm install --name my-release billimek/radarr
 ```
 
+## Upgrading
+
+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 is exposed to the pod as a separate filesystem. This 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 v1 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 movies in your library, and use the editor to change the `Root Folder` and hit save.
+
 ## Uninstalling the Chart
 
 To uninstall/delete the `my-release` deployment:
@@ -32,7 +45,7 @@ The command removes all the Kubernetes components associated with the chart and
 The following tables lists the configurable parameters of the Sentry chart and their default values.
 
 | Parameter                                   | Description                                                                                  | Default                                        |
-|---------------------------------------------|----------------------------------------------------------------------------------------------|------------------------------------------------|
+| ------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------------------------- |
 | `image.repository`                          | Image repository                                                                             | `linuxserver/radarr`                           |
 | `image.tag`                                 | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/radarr/tags/). | `v0.2.0.1480-ls58`                             |
 | `image.pullPolicy`                          | Image pull policy                                                                            | `IfNotPresent`                                 |
@@ -77,18 +90,12 @@ The following tables lists the configurable parameters of the Sentry chart and t
 | `persistence.config.storageClass`           | Type of persistent volume claim                                                              | `-`                                            |
 | `persistence.config.accessMode`             | Persistence access mode                                                                      | `ReadWriteOnce`                                |
 | `persistence.config.skipuninstall`          | Do not delete the pvc upon helm uninstall                                                    | `false`                                        |
-| `persistence.downloads.enabled`             | Use persistent volume to store configuration data                                            | `true`                                         |
+| `persistence.media.enabled`                 | Use persistent volume to store media                                                         | `true`                                         |
-| `persistence.downloads.size`                | Size of persistent volume claim                                                              | `10Gi`                                         |
+| `persistence.media.size`                    | Size of persistent volume claim                                                              | `10Gi`                                         |
-| `persistence.downloads.existingClaim`       | Use an existing PVC to persist data                                                          | `nil`                                          |
+| `persistence.media.existingClaim`           | Use an existing PVC to persist data                                                          | `nil`                                          |
-| `persistence.downloads.storageClass`        | Type of persistent volume claim                                                              | `-`                                            |
+| `persistence.media.storageClass`            | Type of persistent volume claim                                                              | `-`                                            |
-| `persistence.downloads.accessMode`          | Persistence access mode                                                                      | `ReadWriteOnce`                                |
+| `persistence.media.accessMode`              | Persistence access mode                                                                      | `ReadWriteOnce`                                |
-| `persistence.downloads.skipuninstall`       | Do not delete the pvc upon helm uninstall                                                    | `false`                                        |
+| `persistence.media.skipuninstall`           | Do not delete the pvc upon helm uninstall                                                    | `false`                                        |
-| `persistence.movies.enabled`                | Use persistent volume to store configuration data                                            | `true`                                         |
-| `persistence.movies.size`                   | Size of persistent volume claim                                                              | `10Gi`                                         |
-| `persistence.movies.existingClaim`          | Use an existing PVC to persist data                                                          | `nil`                                          |
-| `persistence.movies.storageClass`           | Type of persistent volume claim                                                              | `-`                                            |
-| `persistence.movies.accessMode`             | Persistence access mode                                                                      | `ReadWriteOnce`                                |
-| `persistence.movies.skipuninstall`          | Do not delete the pvc upon helm uninstall                                                    | `false`                                        |
 | `persistence.extraExistingClaimMounts`      | Optionally add multiple existing claims                                                      | `[]`                                           |
 | `resources`                                 | CPU/Memory resource requests/limits                                                          | `{}`                                           |
 | `nodeSelector`                              | Node labels for pod assignment                                                               | `{}`                                           |
@@ -112,6 +119,7 @@ helm install --name my-release -f values.yaml stable/radarr
 ```
 
 ---
+
 **NOTE**
 
 If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.

charts/radarr/templates/deployment.yaml

@@ -64,15 +64,10 @@ spec:
           volumeMounts:
             - mountPath: /config
               name: config
-            - mountPath: /downloads
+            - mountPath: /media
-              name: downloads
+              name: media
-            {{- if .Values.persistence.downloads.subPath }}
+            {{- if .Values.persistence.media.subPath }}
-              subPath: {{ .Values.persistence.downloads.subPath }}
+              subPath: {{ .Values.persistence.media.subPath }}
-            {{- end }}
-            - mountPath: /movies
-              name: movies
-            {{- if .Values.persistence.movies.subPath }}
-              subPath: {{ .Values.persistence.movies.subPath }}
             {{- end }}
             {{- range .Values.persistence.extraExistingClaimMounts }}
             - name: {{ .name }}
@@ -125,17 +120,10 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
-      - name: downloads
+      - name: media
-      {{- if .Values.persistence.downloads.enabled }}
+      {{- if .Values.persistence.media.enabled }}
         persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.downloads.existingClaim }}{{ .Values.persistence.downloads.existingClaim }}{{- else }}{{ template "radarr.fullname" . }}-downloads{{- end }}
+          claimName: {{ if .Values.persistence.media.existingClaim }}{{ .Values.persistence.media.existingClaim }}{{- else }}{{ template "radarr.fullname" . }}-media{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      - name: movies
-      {{- if .Values.persistence.movies.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.movies.existingClaim }}{{ .Values.persistence.movies.existingClaim }}{{- else }}{{ template "radarr.fullname" . }}-movies{{- end }}
       {{- else }}
         emptyDir: {}
       {{- end }}

charts/radarr/templates/downloads-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.downloads.enabled (not .Values.persistence.downloads.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "radarr.fullname" . }}-downloads
-  {{- if .Values.persistence.downloads.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "radarr.name" . }}
-    helm.sh/chart: {{ include "radarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.downloads.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.downloads.size | quote }}
-{{- if .Values.persistence.downloads.storageClass }}
-{{- if (eq "-" .Values.persistence.downloads.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.downloads.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/radarr/templates/media-pvc.yaml

@@ -0,0 +1,29 @@
+
+{{- if and .Values.persistence.media.enabled (not .Values.persistence.media.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "radarr.fullname" . }}-media
+  {{- if .Values.persistence.media.skipuninstall }}
+  annotations:
+    "helm.sh/resource-policy": keep
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "radarr.name" . }}
+    helm.sh/chart: {{ include "radarr.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.media.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.media.size | quote }}
+{{- if .Values.persistence.media.storageClass }}
+{{- if (eq "-" .Values.persistence.media.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.media.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}

charts/radarr/templates/movies-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.movies.enabled (not .Values.persistence.movies.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "radarr.fullname" . }}-movies
-  {{- if .Values.persistence.movies.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "radarr.name" . }}
-    helm.sh/chart: {{ include "radarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.movies.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.movies.size | quote }}
-{{- if .Values.persistence.movies.storageClass }}
-{{- if (eq "-" .Values.persistence.movies.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.movies.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/radarr/values.yaml

@@ -99,28 +99,9 @@ persistence:
     size: 1Gi
     ## Do not delete the pvc upon helm uninstall
     skipuninstall: false
-  downloads:
+  media:
     enabled: true
-    ## radarr downloads volume configuration
+    ## radarr media volume configuration
-    ## If defined, storageClassName: <storageClass>
-    ## 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: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  movies:
-    enabled: true
-    ## Directory where movies are persisted
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is