update

monicahq · Oct 26, 2024 · 567b42e · 567b42e
1 parent d021279
commit 567b42e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 64 deletions.
diff --git a/charts/monica/templates/_helpers.tpl b/charts/monica/templates/_helpers.tpl
@@ -261,12 +261,18 @@ Create volume mounts for the monica storagedir.
 {{- with .Values.monica.extraVolumeMounts }}
 {{ toYaml . }}
 {{- end }}
-{{- $nginxEnabled := .Values.nginx.enabled -}}
 {{- range $key, $value := .Values.monica.phpConfigs }}
 - name: monica-phpconfig
-  mountPath: {{ $nginxEnabled | ternary (printf "/usr/local/etc/php-fpm.d/%s" $key | quote) (printf "/usr/local/etc/php/conf.d/%s" $key | quote) }}
+  mountPath: {{ printf "/usr/local/etc/php/conf.d/%s" $key | quote }}
   subPath: {{ $key }}
 {{- end }}
+{{- if .Values.nginx.enabled }}
+{{- range $key, $value := .Values.monica.phpConfigs }}
+- name: monica-phpconfig
+  mountPath: {{ printf "/usr/local/etc/php-fpm.d/%s" $key | quote }}
+  subPath: {{ $key }}
+{{- end }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/charts/monica/templates/cronjob.yaml b/charts/monica/templates/cronjob.yaml
@@ -7,6 +7,9 @@ metadata:
   labels:
     {{- include "monica.labels" . | nindent 4 }}
     app.kubernetes.io/component: cronjob
+  annotations:
+    helm.sh/hook: post-install,post-upgrade,post-rollback
+    helm.sh/hook-weight: "15"
 spec:
   schedule: "*/1 * * * *"
   concurrencyPolicy: Forbid

diff --git a/charts/monica/templates/deployment.yaml b/charts/monica/templates/deployment.yaml
@@ -218,7 +218,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if or .Values.monica.extraInitContainers .Values.mariadb.enabled .Values.postgresql.enabled }}
+      {{- if or .Values.monica.extraInitContainers .Values.mariadb.enabled .Values.postgresql.enabled .Values.nginx.enabled }}
       initContainers:
         {{- with .Values.monica.extraInitContainers }}
         {{- toYaml . | nindent 8 }}
@@ -258,7 +258,19 @@ spec:
             - "-c"
             - "until pg_isready -h ${POSTGRES_HOST} -U ${POSTGRES_USER} ; do sleep 2 ; done"
         {{- end }}
-      {{- end }}{{/* end-if .Values.monica.extraInitContainers .Values.mariadb.enabled .Values.postgresql.enabled */}}
+        {{- if .Values.nginx.enabled }}
+        - name: monica-nginx-init
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+            - "sh"
+            - "-c"
+            - {{ .Files.Get "files/init-publicdir.sh" | quote }}
+          volumeMounts:
+            - name: monica-publicdir
+              mountPath: /public
+        {{- end }}
+      {{- end }}{{/* end-if .Values.monica.extraInitContainers .Values.mariadb.enabled .Values.postgresql.enabled .Values.nginx.enabled */}}
 
       {{- with .Values.affinity }}
       affinity:
@@ -277,8 +289,7 @@ spec:
           configMap:
             name: {{ template "monica.fullname" . }}-nginxconfig
         - name: monica-publicdir
-          persistentVolumeClaim:
-            claimName: {{ template "monica.fullname" . }}-publicdir
+          emptyDir: {}
         {{- end }}
 
       securityContext:

diff --git a/charts/monica/templates/nginx-init-publicdir.yaml b/charts/monica/templates/nginx-init-publicdir.yaml
diff --git a/charts/monica/templates/nginx-volume-publicdir.yaml b/charts/monica/templates/nginx-volume-publicdir.yaml
diff --git a/charts/monica/templates/queue.yaml b/charts/monica/templates/queue.yaml
@@ -16,6 +16,9 @@ metadata:
   labels:
     {{- include "monica.labels" . | nindent 4 }}
     app.kubernetes.io/component: queue
+  annotations:
+    helm.sh/hook: post-install,post-upgrade,post-rollback
+    helm.sh/hook-weight: "10"
 spec:
   selector:
     matchLabels: