mirror of
https://github.com/mastodon/chart
synced 2025-03-14 21:11:50 +00:00
Add mastodon.persistence.assets.existingClaim
and mastodon.persistence.assets.existingClaim
(#79)
Signed-off-by: jessebot <jessebot@linux.com> Co-authored-by: Tim Campbell <timetinytim@gmail.com>
This commit is contained in:
parent
2a6b7cf30b
commit
69df6394ae
|
@ -83,6 +83,28 @@ Create the name of the service account to use
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create the name of the assets persistent volume to use
|
||||||
|
*/}}
|
||||||
|
{{- define "mastodon.pvc.assets" -}}
|
||||||
|
{{- if .Values.mastodon.persistence.assets.existingClaim }}
|
||||||
|
{{- printf "%s" (tpl .Values.mastodon.persistence.assets.existingClaim $) -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- printf "%s-assets" (include "common.names.fullname" .) -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create the name of the system persistent volume to use
|
||||||
|
*/}}
|
||||||
|
{{- define "mastodon.pvc.system" -}}
|
||||||
|
{{- if .Values.mastodon.persistence.system.existingClaim }}
|
||||||
|
{{- printf "%s" (tpl .Values.mastodon.persistence.system.existingClaim $) -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- printf "%s-system" (include "common.names.fullname" .) -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Create a default fully qualified name for dependent services.
|
Create a default fully qualified name for dependent services.
|
||||||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||||
|
|
|
@ -36,10 +36,10 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "mastodon.fullname" . }}-media-remove
|
- name: {{ include "mastodon.fullname" . }}-media-remove
|
||||||
|
|
|
@ -67,10 +67,10 @@ spec:
|
||||||
{{- if (not $context.Values.mastodon.s3.enabled) }}
|
{{- if (not $context.Values.mastodon.s3.enabled) }}
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" $context }}-assets
|
claimName: {{ template "mastodon.pvc.assets" $context }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" $context }}-system
|
claimName: {{ template "mastodon.pvc.system" $context }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
||||||
{{- if dig "customDatabaseConfigYml" "configMapRef" "name" false . }}
|
{{- if dig "customDatabaseConfigYml" "configMapRef" "name" false . }}
|
||||||
|
|
|
@ -46,10 +46,10 @@ spec:
|
||||||
{{- if (not .Values.mastodon.s3.enabled) }}
|
{{- if (not .Values.mastodon.s3.enabled) }}
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
||||||
{{- if .Values.mastodon.web.customDatabaseConfigYml.configMapRef.name }}
|
{{- if .Values.mastodon.web.customDatabaseConfigYml.configMapRef.name }}
|
||||||
|
|
|
@ -37,10 +37,10 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "mastodon.fullname" . }}-assets-precompile
|
- name: {{ include "mastodon.fullname" . }}-assets-precompile
|
||||||
|
|
|
@ -37,10 +37,10 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "mastodon.fullname" . }}-chewy-setup
|
- name: {{ include "mastodon.fullname" . }}-chewy-setup
|
||||||
|
|
|
@ -37,10 +37,10 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "mastodon.fullname" . }}-create-admin
|
- name: {{ include "mastodon.fullname" . }}-create-admin
|
||||||
|
|
|
@ -37,10 +37,10 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-assets
|
claimName: {{ template "mastodon.pvc.assets" . }}
|
||||||
- name: system
|
- name: system
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ template "mastodon.fullname" . }}-system
|
claimName: {{ template "mastodon.pvc.system" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "mastodon.fullname" . }}-db-migrate
|
- name: {{ include "mastodon.fullname" . }}-db-migrate
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if (not .Values.mastodon.s3.enabled) -}}
|
{{- if and (not .Values.mastodon.s3.enabled) (not .Values.mastodon.persistence.assets.existingClaim) -}}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if (not .Values.mastodon.s3.enabled) -}}
|
{{- if and (not .Values.mastodon.s3.enabled) (not .Values.mastodon.persistence.system.existingClaim) -}}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -62,11 +62,15 @@ mastodon:
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Gi
|
storage: 10Gi
|
||||||
|
# -- name of existing persistent volume claim to use for assets
|
||||||
|
existingClaim:
|
||||||
system:
|
system:
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 100Gi
|
storage: 100Gi
|
||||||
|
# -- name of existing persistent volume claim to use for system
|
||||||
|
existingClaim:
|
||||||
s3:
|
s3:
|
||||||
enabled: false
|
enabled: false
|
||||||
access_key: ""
|
access_key: ""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user