chore(ai-worker): using nextcloud.volumeMounts for ai-worker deployment

Signed-off-by: Daniel Hendricken <[email protected]>

Author: kubeagon

charts/nextcloud/Chart.yaml

@@ -26,21 +26,21 @@ maintainers:
     url: https://wrenix.eu
   - name: jessebot
     url: https://jessebot.work
-dependencies:
-  - name: postgresql
-    version: 15.5.0
-    repository: oci://registry-1.docker.io/bitnamicharts
-    condition: postgresql.enabled
-  - name: mariadb
-    version: 18.2.0
-    repository: oci://registry-1.docker.io/bitnamicharts
-    condition: mariadb.enabled
-  - name: redis
-    version: 19.6.4
-    repository: oci://registry-1.docker.io/bitnamicharts
-    condition: redis.enabled
-  - name: collabora-online
-    version: 1.1.20
-    repository: https://collaboraonline.github.io/online
-    condition: collabora.enabled
-    alias: collabora
+# dependencies:
+#   - name: postgresql
+#     version: 15.5.0
+#     repository: oci://registry-1.docker.io/bitnamicharts
+#     condition: postgresql.enabled
+#   - name: mariadb
+#     version: 18.2.0
+#     repository: oci://registry-1.docker.io/bitnamicharts
+#     condition: mariadb.enabled
+#   - name: redis
+#     version: 19.6.4
+#     repository: oci://registry-1.docker.io/bitnamicharts
+#     condition: redis.enabled
+#   - name: collabora-online
+#     version: 1.1.20
+#     repository: https://collaboraonline.github.io/online
+#     condition: collabora.enabled
+#     alias: collabora

charts/nextcloud/templates/_helpers.tpl

@@ -397,38 +397,4 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
   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 -}}
-
-
-{{/*
-Create volume mounts for the nextcloud-aiworker container.
-*/}}
-{{- define "aiWorker.volumeMounts" -}}
-- name: nextcloud-main
-  mountPath: /var/www/
-  subPath: {{ ternary "root" (printf "%s/root" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-- name: nextcloud-main
-  mountPath: /var/www/html
-  subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-{{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
-- name: nextcloud-data
-  mountPath: {{ .Values.nextcloud.datadir }}
-  subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.nextcloudData.subPath) (empty .Values.persistence.nextcloudData.subPath) }}
-{{- else }}
-- name: nextcloud-main
-  mountPath: {{ .Values.nextcloud.datadir }}
-  subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.subPath) (empty .Values.persistence.subPath) }}
-{{- end }}
-- name: nextcloud-main
-  mountPath: /var/www/html/config
-  subPath: {{ ternary "config" (printf "%s/config" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-- name: nextcloud-main
-  mountPath: /var/www/html/custom_apps
-  subPath: {{ ternary "custom_apps" (printf "%s/custom_apps" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-- name: nextcloud-main
-  mountPath: /var/www/tmp
-  subPath: {{ ternary "tmp" (printf "%s/tmp" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-- name: nextcloud-main
-  mountPath: /var/www/html/themes
-  subPath: {{ ternary "themes" (printf "%s/themes" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-{{- end }}
+{{- end -}}

charts/nextcloud/templates/nextcloud-ai-worker.yaml

@@ -48,15 +48,15 @@ spec:
       podSecurityContext:
         {{- toYaml .Values.aiWorker.podSecurityContext | nindent 8 }}
       initContainers:
-      - name: wait-for-service
-        image: {{ .Values.aiWorker.image.repository }}:{{ .Values.aiWorker.image.tag }}
-        command:
-          - sh
-          - -c
-          - >-
-            until curl -sf https://{{ if .Values.aiWorker.useHostName }}{{ .Values.nextcloud.host }}/status.php {{- else }} http://{{ template "nextcloud.fullname" . }}:{{ .Values.service.port }}/status.php;{{- end }}
-            do echo waiting for service; sleep 5;
-            done
+        - name: wait-for-service
+          image: {{ .Values.aiWorker.image.repository }}:{{ .Values.aiWorker.image.tag }}
+          command:
+            - sh
+            - -c
+            - >-
+              until curl -sf {{- if .Values.aiWorker.useHostName }}https://{{ .Values.nextcloud.host }}/status.php{{- else }}http://{{ template "nextcloud.fullname" . }}:{{ .Values.service.port }}/status.php{{- end }};
+              do echo waiting for service; sleep 5;
+              done
       containers:
         - name: nextcloud-aiworker
           image: {{ include "nextcloud.image" . }}
@@ -69,7 +69,15 @@ spec:
           resources:
             {{- toYaml .Values.aiWorker.resources | nindent 12 }}
           volumeMounts:
-            {{- include "aiWorker.volumeMounts" . | trim | nindent 12 }}
+            {{- 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 }}
@@ -83,5 +91,29 @@ spec:
           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 }}
       restartPolicy: Always
 {{- end }}