fix owncloud

owncloud/templates/deployment.yaml

@@ -68,11 +68,8 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           volumeMounts:
-            - name: config
-              mountPath: {{ .Values.persistence.config.mountPath }}
-              subPath: config
-            - name: files
-              mountPath: {{ .Values.persistence.files.mountPath }}
+            - name: owncloud-data
+              mountPath: {{ .Values.persistence.mountPath }}
           livenessProbe:
             httpGet:
               path: /status.php
@@ -88,24 +85,13 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:
-        - name: config
-          {{- if .Values.persistence.config.enabled }}
+        - name: owncloud-data
+          {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            {{- if .Values.persistence.config.existingClaim }}
-            claimName: {{ .Values.persistence.config.existingClaim }}
+            {{- if .Values.persistence.existingClaim }}
+            claimName: {{ .Values.persistence.existingClaim }}
             {{- else }}
-            claimName: {{ include "owncloud.fullname" . }}-config
-            {{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: files
-          {{- if .Values.persistence.files.enabled }}
-          persistentVolumeClaim:
-            {{- if .Values.persistence.files.existingClaim }}
-            claimName: {{ .Values.persistence.files.existingClaim }}
-            {{- else }}
-            claimName: {{ include "owncloud.fullname" . }}-files
+            claimName: {{ include "owncloud.fullname" . }}-data
             {{- end }}
           {{- else }}
           emptyDir: {}

owncloud/templates/pvc.yaml

@@ -1,35 +1,17 @@
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "owncloud.fullname" . }}-config
+  name: {{ include "owncloud.fullname" . }}-data
   labels:
     {{- include "owncloud.labels" . | nindent 4 }}
 spec:
   accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  {{- if .Values.persistence.config.storageClass }}
-  storageClassName: {{ .Values.persistence.config.storageClass | quote }}
+    - {{ .Values.persistence.accessMode | quote }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass | quote }}
   {{- end }}
   resources:
     requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- end }}
----
-{{- if and .Values.persistence.files.enabled (not .Values.persistence.files.existingClaim) }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "owncloud.fullname" . }}-files
-  labels:
-    {{- include "owncloud.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.files.accessMode | quote }}
-  {{- if .Values.persistence.files.storageClass }}
-  storageClassName: {{ .Values.persistence.files.storageClass | quote }}
-  {{- end }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.files.size | quote }}
+      storage: {{ .Values.persistence.size | quote }}
 {{- end }}