fix: move volumes to helpers

Author: wrenix

charts/nextcloud/templates/_helpers.tpl

@@ -343,6 +343,39 @@ Swift as primary object store env vars
 {{- end -}}
 
 
+{{/*
+Volumes for a pod, which needs access to nextcloud data.
+*/}}
+{{- define "nextcloud.volumes" -}}
+- name: nextcloud-main
+  {{- if .Values.persistence.enabled }}
+  persistentVolumeClaim:
+    claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud{{- end }}
+  {{- else }}
+  emptyDir: {}
+  {{- end }}
+{{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
+- name: nextcloud-data
+  persistentVolumeClaim:
+    claimName: {{ if .Values.persistence.nextcloudData.existingClaim }}{{ .Values.persistence.nextcloudData.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud-data{{- end }}
+{{- end }}
+{{- if .Values.nextcloud.configs }}
+- name: nextcloud-config
+  configMap:
+    name: {{ template "nextcloud.fullname" . }}-config
+{{- end }}
+{{- if .Values.nextcloud.phpConfigs }}
+- name: nextcloud-phpconfig
+  configMap:
+    name: {{ template "nextcloud.fullname" . }}-phpconfig
+{{- end }}
+{{- with .Values.nextcloud.extraVolumes }}
+{{- toYaml . }}
+{{- end }}
+{{- end -}}
+
+
+
 {{/*
 Create volume mounts for the nextcloud container as well as the cron sidecar container.
 */}}
@@ -374,11 +407,13 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
 - name: nextcloud-main
   mountPath: /var/www/html/themes
   subPath: {{ ternary "themes" (printf "%s/themes" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
+
 {{- range $key, $value := .Values.nextcloud.configs }}
 - name: nextcloud-config
   mountPath: /var/www/html/config/{{ $key }}
   subPath: {{ $key }}
-{{- end }}
+{{- end }}{{/* end-range configs */}}
+
 {{- if .Values.nextcloud.configs }}
 {{- range $key, $value := .Values.nextcloud.defaultConfigs }}
 {{- if $value }}
@@ -387,14 +422,17 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
   subPath: {{ $key }}
 {{- end }}
 {{- end }}
-{{- end }}
-{{- if .Values.nextcloud.extraVolumeMounts }}
-{{ toYaml .Values.nextcloud.extraVolumeMounts }}
-{{- end }}
+{{- end }}{{/* end-if .configs (also defaultConfigs beside config, see above) */}}
+
+{{- with .Values.nextcloud.extraVolumeMounts }}
+{{ toYaml . }}
+{{- end }}{{/* end-with extraVolumes*/}}
+
 {{- $nginxEnabled := .Values.nginx.enabled -}}
 {{- range $key, $value := .Values.nextcloud.phpConfigs }}
 - name: nextcloud-phpconfig
   mountPath: {{ $nginxEnabled | ternary (printf "/usr/local/etc/php-fpm.d/%s" $key | quote) (printf "/usr/local/etc/php/conf.d/%s" $key | quote) }}
   subPath: {{ $key }}
-{{- end }}
+{{- end }}{{/* end-range phpconfig (with nginx) */}}
+
 {{- end -}}

…cloud/templates/nextcloud-ai-worker.yaml charts/nextcloud/templates/ai-worker.yamlcharts/nextcloud/templates/nextcloud-ai-worker.yaml renamed to charts/nextcloud/templates/ai-worker.yaml charts/nextcloud/templates/nextcloud-ai-worker.yaml renamed to charts/nextcloud/templates/ai-worker.yaml

@@ -70,50 +70,7 @@ spec:
             {{- toYaml .Values.aiWorker.resources | nindent 12 }}
           volumeMounts:
             {{- include "nextcloud.volumeMounts" . | trim | nindent 12 }}
-            {{- range $hook, $shell := .Values.nextcloud.hooks }}
-            {{- if $shell }}
-            - name: nextcloud-hooks
-              mountPath: /docker-entrypoint-hooks.d/{{ $hook }}/helm.sh
-              subPath: {{ $hook }}.sh
-              readOnly: true
-            {{- end }}
-            {{- end }}
       volumes:
-        - name: nextcloud-main
-          {{- if .Values.persistence.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
-        - name: nextcloud-data
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.nextcloudData.existingClaim }}{{ .Values.persistence.nextcloudData.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud-data{{- end }}
-        {{- end }}
-        {{- if .Values.nextcloud.configs }}
-        - name: nextcloud-config
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-config
-        {{- end }}
-        {{- if .Values.nextcloud.phpConfigs }}
-        - name: nextcloud-phpconfig
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-phpconfig
-        {{- end }}
-        {{- if .Values.nginx.enabled }}
-        - name: nextcloud-nginx-config
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-nginxconfig
-        {{- end }}
-        {{- if not (values .Values.nextcloud.hooks | compact | empty) }}
-        - name: nextcloud-hooks
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-hooks
-            defaultMode: 0o755
-        {{- end }}
-        {{- with .Values.nextcloud.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        {{- include "nextcloud.volumes" . | trim | nindent 8 }}
       restartPolicy: Always
-{{- end }}
+{{- end }}

charts/nextcloud/templates/deployment.yaml

@@ -348,28 +348,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        - name: nextcloud-main
-          {{- if .Values.persistence.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
-        - name: nextcloud-data
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.nextcloudData.existingClaim }}{{ .Values.persistence.nextcloudData.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud-data{{- end }}
-        {{- end }}
-        {{- if .Values.nextcloud.configs }}
-        - name: nextcloud-config
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-config
-        {{- end }}
-        {{- if .Values.nextcloud.phpConfigs }}
-        - name: nextcloud-phpconfig
-          configMap:
-            name: {{ template "nextcloud.fullname" . }}-phpconfig
-        {{- end }}
+        {{- include "nextcloud.volumes" . | trim | nindent 8 }}
         {{- if .Values.nginx.enabled }}
         - name: nextcloud-nginx-config
           configMap:
@@ -381,9 +360,6 @@ spec:
             name: {{ template "nextcloud.fullname" . }}-hooks
             defaultMode: 0o755
         {{- end }}
-        {{- with .Values.nextcloud.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
       securityContext:
         {{- with .Values.securityContext }}
         {{- toYaml . | nindent 8 }}