do hostpath as volume on deployment

Author: wenbenz

charts/nextcloud/README.md

@@ -413,7 +413,6 @@ Nextcloud will *not* delete the PVCs when uninstalling the helm chart.
 | `persistence.nextcloudData.existingClaim` | see `persistence.existingClaim`                         | `nil`           |
 | `persistence.nextcloudData.accessMode`    | see `persistence.accessMode`                            | `ReadWriteOnce` |
 | `persistence.nextcloudData.size`          | see `persistence.size`                                  | `8Gi`           |
-| `persistence.nextcloudData.hostName`      | Name of host node to create a pv for local storageClass | `nil`           |
 | `persistence.nextcloudData.hostPath`      | Path on the host where nextcloud data is stored         | `nil`           |
 
 ### Metrics Configurations

charts/nextcloud/templates/deployment.yaml

@@ -358,8 +358,12 @@ spec:
           {{- end }}
         {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
         - name: nextcloud-data
+          {{- if .Values.persistence.nextcloudData.hostPath }}
+          hostPath: {{ .Values.persistence.nextcloudData.hostPath }}
+          {{- else }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.nextcloudData.existingClaim }}{{ .Values.persistence.nextcloudData.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud-data{{- end }}
+          {{- end }}
         {{- end }}
         {{- if .Values.nextcloud.configs }}
         - name: nextcloud-config

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

@@ -1,35 +1,5 @@
+{{- if not .Values.persistence.nextcloudData.hostPath }}
 {{- if and .Values.persistence.enabled .Values.persistence.nextcloudData.enabled (not .Values.persistence.nextcloudData.existingClaim) }}
-{{- if .Values.persistence.nextcloudData.hostPath }}
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ template "nextcloud.fullname" . }}-nextcloud-data
-spec:
-  capacity:
-    storage: {{ .Values.persistence.nextcloudData.size | quote }}
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  {{- with .Values.persistence.nextcloudData.storageClass }}
-  storageClassName: {{ ternary "" . (eq "-" .) }}
-  {{- end }}
-  claimRef:
-    name: {{ template "nextcloud.fullname" . }}-nextcloud-data
-  hostPath:
-    path: {{ .Values.persistence.nextcloudData.hostPath }}
-    type: Directory
-  {{- with .Values.persistence.nextcloudData.hostName }}
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: kubernetes.io/hostname
-              operator: In
-              values:
-                - {{ . }}
-  {{- end }}
-{{- end }}
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -54,7 +24,5 @@ spec:
   {{- with .Values.persistence.nextcloudData.storageClass }}
   storageClassName: {{ ternary "" . (eq "-" .) }}
   {{- end }}
-  {{- if .Values.persistence.nextcloudData.hostPath }}
-  volumeName: {{ template "nextcloud.fullname" . }}-nextcloud-data
-  {{- end }}
 {{- end }}
+{{- end }}

charts/nextcloud/values.yaml

@@ -753,7 +753,6 @@ persistence:
     size: 8Gi
 
     ## If defined, use a hostPath volume for nextcloud data rather than a dynamically defined PVC.
-    hostName:
     hostPath:
 
 resources: {}