feat(pvc): add extra labels on pvcs #793

Signed-off-by: DrummyFloyd <jonathan.monnet28@gmail.com>

Author: DrummyFloyd

charts/nextcloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 8.4.1
+version: 8.5.0
 # renovate: image=docker.io/library/nextcloud
 appVersion: 32.0.0
 description: A file sharing server that puts the control and security of your own data back into your hands.

charts/nextcloud/README.md

@@ -392,12 +392,14 @@ Nextcloud will *not* delete the PVCs when uninstalling the helm chart.
 | ----------------------------------------- | ---------------------------------------------------- | --------------- |
 | `persistence.enabled`                     | Enable persistence using PVC                         | `false`         |
 | `persistence.annotations`                 | PVC annotations                                      | `{}`            |
+| `persistence.labels`                    | PVC labels                                      | `{}`            |
 | `persistence.storageClass`                | PVC Storage Class for nextcloud volume               | `nil`           |
 | `persistence.existingClaim`               | An Existing PVC name for nextcloud volume            | `nil`           |
 | `persistence.accessMode`                  | PVC Access Mode for nextcloud volume                 | `ReadWriteOnce` |
 | `persistence.size`                        | PVC Storage Request for nextcloud volume             | `8Gi`           |
 | `persistence.nextcloudData.enabled`       | Create a second PVC for the data folder in nextcloud | `false`         |
 | `persistence.nextcloudData.annotations`   | see `persistence.annotations`                        | `{}`            |
+| `persistence.nextcloudData.labels`       | see `persistence.labels`                             | `{}`            |
 | `persistence.nextcloudData.storageClass`  | see `persistence.storageClass`                       | `nil`           |
 | `persistence.nextcloudData.existingClaim` | see `persistence.existingClaim`                      | `nil`           |
 | `persistence.nextcloudData.accessMode`    | see `persistence.accessMode`                         | `ReadWriteOnce` |

charts/nextcloud/templates/nextcloud-data-pvc.yaml

@@ -6,6 +6,9 @@ metadata:
   name: {{ template "nextcloud.fullname" . }}-nextcloud-data
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
+  {{- with .Values.persistence.nextcloudData.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   annotations:
     helm.sh/resource-policy: keep
   {{- with .Values.persistence.nextcloudData.annotations }}

charts/nextcloud/templates/nextcloud-pvc.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ template "nextcloud.fullname" . }}-nextcloud
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
+  {{- with .Values.persistence.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   annotations:
     helm.sh/resource-policy: keep
   {{- with .Values.persistence.annotations }}

charts/nextcloud/values.yaml

@@ -703,6 +703,7 @@ persistence:
   # Nextcloud Data (/var/www/html)
   enabled: false
   annotations: {}
+  labels: {}
   ## nextcloud data Persistent Volume Storage Class
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
@@ -725,6 +726,7 @@ persistence:
   nextcloudData:
     enabled: false
     subPath:
+    labels: {}
     annotations: {}
     # storageClass: "-"
     # existingClaim: